| 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 | |
| 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 @@ -2,3 +2,3 @@ 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 @@ -22,5 +22,5 @@ -#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 @@ -5,5 +5,5 @@ 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 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 @@ -28,16 +28,17 @@ -#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> @@ -199,5 +200,5 @@ 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 ) { @@ -523,5 +524,5 @@ void ImageViewer::openFile() { 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() ) 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 @@ -5,5 +5,5 @@ TARGET = showimg INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -l opieui2 include ( $(OPIEDIR)/include.pro ) |