summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/showimg/config.in2
-rw-r--r--noncore/multimedia/showimg/main.cpp4
-rw-r--r--noncore/multimedia/showimg/opie-showimg.control2
-rw-r--r--noncore/multimedia/showimg/showimg.cpp11
-rw-r--r--noncore/multimedia/showimg/showimg.pro2
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
@@ -3,2 +3,2 @@
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
@@ -23,4 +23,4 @@
-#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
@@ -6,3 +6,3 @@ Maintainer: Opie Team <opie@handhelds.org>
Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal,libopiecore2, libopieui2
Description: Image Viewer
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
@@ -29,3 +29,3 @@
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
@@ -34,9 +34,10 @@
#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>
@@ -200,3 +201,3 @@ 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 )
@@ -524,3 +525,3 @@ void ImageViewer::openFile() {
- QString str = OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 );
+ QString str = Opie::OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 );
DocLnk link(str);
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
@@ -6,3 +6,3 @@ INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiecore2 -l opieui2