author | drw <drw> | 2004-03-02 15:45:42 (UTC) |
---|---|---|
committer | drw <drw> | 2004-03-02 15:45:42 (UTC) |
commit | 270a76fbf653df353476ddf17835d532ceb6b6c2 (patch) (side-by-side diff) | |
tree | f967cf572a6f8f3742fb2612137d50594220dc32 /noncore | |
parent | e31fe9d73c6cd9be80bb18ca45ad3618192f718f (diff) | |
download | opie-270a76fbf653df353476ddf17835d532ceb6b6c2.zip opie-270a76fbf653df353476ddf17835d532ceb6b6c2.tar.gz opie-270a76fbf653df353476ddf17835d532ceb6b6c2.tar.bz2 |
ShowImg: libopie -> libopie2
-rw-r--r-- | noncore/multimedia/showimg/config.in | 2 | ||||
-rw-r--r-- | noncore/multimedia/showimg/main.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/showimg/opie-showimg.control | 2 | ||||
-rw-r--r-- | noncore/multimedia/showimg/showimg.cpp | 11 | ||||
-rw-r--r-- | noncore/multimedia/showimg/showimg.pro | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/noncore/multimedia/showimg/config.in b/noncore/multimedia/showimg/config.in index 36e8cf0..808c841 100644 --- a/noncore/multimedia/showimg/config.in +++ b/noncore/multimedia/showimg/config.in @@ -1,4 +1,4 @@ config SHOWIMG boolean "opie-showimg (image viewer)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI diff --git a/noncore/multimedia/showimg/main.cpp b/noncore/multimedia/showimg/main.cpp index 1c864e9..b61cffb 100644 --- a/noncore/multimedia/showimg/main.cpp +++ b/noncore/multimedia/showimg/main.cpp @@ -20,7 +20,7 @@ #include "showimg.h" -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> -OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> )
\ No newline at end of file +OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> ) diff --git a/noncore/multimedia/showimg/opie-showimg.control b/noncore/multimedia/showimg/opie-showimg.control index 1e54383..2fbfabc 100644 --- a/noncore/multimedia/showimg/opie-showimg.control +++ b/noncore/multimedia/showimg/opie-showimg.control @@ -3,9 +3,9 @@ Files: plugins/application/libshowimg.so* bin/showimg apps/Applications/showimg. Priority: optional Section: opie/applications Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal,libopiecore2, libopieui2 Description: Image Viewer The image viewer for the Opie environment. Supports all graphics formats are compiled into Qt/Embedded (eg. PNG). Version: $QPE_VERSION$EXTRAVERSION diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp index 82eac33..6c0c4db 100644 --- a/noncore/multimedia/showimg/showimg.cpp +++ b/noncore/multimedia/showimg/showimg.cpp @@ -26,20 +26,21 @@ #include "ImageFileSelector.h" #include "settingsdialog.h" -#include <opie/ofiledialog.h> +#include <opie2/ofiledialog.h> #include <qpe/qpeapplication.h> #include <qpe/config.h> #include <qpe/resource.h> -#include <math.h> -#include <qmenubar.h> #include <qpe/qpetoolbar.h> + #include <qaction.h> #include <qfiledialog.h> +#include <qmenubar.h> #include <qspinbox.h> +#include <math.h> ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent) : QDialog(parent,0,true) @@ -197,9 +198,9 @@ void ImageWidget::mouseReleaseEvent(QMouseEvent *) } //=========================================================================== -ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags ) +ImageViewer::ImageViewer( QWidget *parent, const char *name, int /*wFlags*/ ) : QMainWindow( parent, name, WResizeNoErase ), filename( 0 ), bFromDocView( FALSE ) { setCaption( tr("Image Viewer") ); setIcon( Resource::loadPixmap( "ImageViewer" ) ); @@ -521,9 +522,9 @@ void ImageViewer::openFile() { QStringList image; image << "image/*"; types.insert("Images", image); - QString str = OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 ); + QString str = Opie::OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 ); DocLnk link(str); // if ( link.isValid() ) openFile(link); diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro index 76b020e..94fb162 100644 --- a/noncore/multimedia/showimg/showimg.pro +++ b/noncore/multimedia/showimg/showimg.pro @@ -3,7 +3,7 @@ HEADERS = showimg.h ImageFileSelector.h settingsdialog.h settingsdialogbase.h SOURCES = main.cpp showimg.cpp ImageFileSelector.cpp settingsdialog.cpp settingsdialogbase.cpp TARGET = showimg INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -l opieui2 include ( $(OPIEDIR)/include.pro ) |