author | drw <drw> | 2004-03-02 15:45:42 (UTC) |
---|---|---|
committer | drw <drw> | 2004-03-02 15:45:42 (UTC) |
commit | 270a76fbf653df353476ddf17835d532ceb6b6c2 (patch) (unidiff) | |
tree | f967cf572a6f8f3742fb2612137d50594220dc32 /noncore/multimedia | |
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 @@ | |||
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 | |||
@@ -22,5 +22,5 @@ | |||
22 | 22 | ||
23 | 23 | ||
24 | #include <opie/oapplicationfactory.h> | 24 | #include <opie2/oapplicationfactory.h> |
25 | 25 | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> ) \ No newline at end of file | 26 | 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 | |||
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal,libopiecore2, libopieui2 |
8 | Description: Image Viewer | 8 | Description: Image Viewer |
9 | The image viewer for the Opie environment. Supports | 9 | 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 @@ | |||
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 | ||
@@ -199,5 +200,5 @@ void ImageWidget::mouseReleaseEvent(QMouseEvent *) | |||
199 | //=========================================================================== | 200 | //=========================================================================== |
200 | 201 | ||
201 | ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags ) | 202 | ImageViewer::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 | { |
@@ -523,5 +524,5 @@ void ImageViewer::openFile() { | |||
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() ) |
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 | |||
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
7 | LIBS += -lqpe -lopie | 7 | LIBS += -lqpe -lopiecore2 -l opieui2 |
8 | 8 | ||
9 | include ( $(OPIEDIR)/include.pro ) | 9 | include ( $(OPIEDIR)/include.pro ) |