summaryrefslogtreecommitdiff
Unidiff
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
@@ -1,4 +1,4 @@
1 config SHOWIMG 1 config SHOWIMG
2 boolean "opie-showimg (image viewer)" 2 boolean "opie-showimg (image viewer)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 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
@@ -21,6 +21,6 @@
21#include "showimg.h" 21#include "showimg.h"
22 22
23 23
24#include <opie/oapplicationfactory.h> 24#include <opie2/oapplicationfactory.h>
25 25
26OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> ) \ No newline at end of file 26OPIE_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
@@ -4,7 +4,7 @@ Priority: optional
4Section: opie/applications 4Section: opie/applications
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal,libopiecore2, libopieui2
8Description: Image Viewer 8Description: Image Viewer
9 The image viewer for the Opie environment. Supports 9 The image viewer for the Opie environment. Supports
10 all graphics formats are compiled into Qt/Embedded (eg. PNG). 10 all graphics formats are compiled into Qt/Embedded (eg. PNG).
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
@@ -27,18 +27,19 @@
27#include "settingsdialog.h" 27#include "settingsdialog.h"
28 28
29 29
30#include <opie/ofiledialog.h> 30#include <opie2/ofiledialog.h>
31 31
32#include <qpe/qpeapplication.h> 32#include <qpe/qpeapplication.h>
33#include <qpe/config.h> 33#include <qpe/config.h>
34#include <qpe/resource.h> 34#include <qpe/resource.h>
35#include <math.h>
36#include <qmenubar.h>
37#include <qpe/qpetoolbar.h> 35#include <qpe/qpetoolbar.h>
36
38#include <qaction.h> 37#include <qaction.h>
39#include <qfiledialog.h> 38#include <qfiledialog.h>
39#include <qmenubar.h>
40#include <qspinbox.h> 40#include <qspinbox.h>
41 41
42#include <math.h>
42 43
43 44
44ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent) 45ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent)
@@ -198,7 +199,7 @@ void ImageWidget::mouseReleaseEvent(QMouseEvent *)
198 199
199//=========================================================================== 200//===========================================================================
200 201
201ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags ) 202ImageViewer::ImageViewer( QWidget *parent, const char *name, int /*wFlags*/ )
202: QMainWindow( parent, name, WResizeNoErase ), filename( 0 ), bFromDocView( FALSE ) 203: QMainWindow( parent, name, WResizeNoErase ), filename( 0 ), bFromDocView( FALSE )
203{ 204{
204 setCaption( tr("Image Viewer") ); 205 setCaption( tr("Image Viewer") );
@@ -522,7 +523,7 @@ void ImageViewer::openFile() {
522 image << "image/*"; 523 image << "image/*";
523 types.insert("Images", image); 524 types.insert("Images", image);
524 525
525 QString str = OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 ); 526 QString str = Opie::OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 );
526 DocLnk link(str); 527 DocLnk link(str);
527// if ( link.isValid() ) 528// if ( link.isValid() )
528 openFile(link); 529 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
@@ -4,6 +4,6 @@ SOURCES = main.cpp showimg.cpp ImageFileSelector.cpp settingsdialog.cpp settin
4TARGET = showimg 4TARGET = showimg
5INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
6DEPENDPATH += $(OPIEDIR)/include 6DEPENDPATH += $(OPIEDIR)/include
7LIBS += -lqpe -lopie 7LIBS += -lqpe -lopiecore2 -l opieui2
8 8
9include ( $(OPIEDIR)/include.pro ) 9include ( $(OPIEDIR)/include.pro )