-rw-r--r-- | noncore/tools/opie-sh/config.in | 2 | ||||
-rw-r--r-- | noncore/tools/opie-sh/fviewer.cpp | 4 | ||||
-rw-r--r-- | noncore/tools/opie-sh/fviewer.h | 1 | ||||
-rw-r--r-- | noncore/tools/opie-sh/mbox.cpp | 8 | ||||
-rw-r--r-- | noncore/tools/opie-sh/mbox.h | 1 | ||||
-rw-r--r-- | noncore/tools/opie-sh/opie-sh.control | 2 | ||||
-rw-r--r-- | noncore/tools/opie-sh/opie-sh.pro | 2 |
7 files changed, 11 insertions, 9 deletions
diff --git a/noncore/tools/opie-sh/config.in b/noncore/tools/opie-sh/config.in index b3ca373..c4e99c3 100644 --- a/noncore/tools/opie-sh/config.in +++ b/noncore/tools/opie-sh/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
diff --git a/noncore/tools/opie-sh/fviewer.cpp b/noncore/tools/opie-sh/fviewer.cpp index 6f8f054..bef7233 100644 --- a/noncore/tools/opie-sh/fviewer.cpp +++ b/noncore/tools/opie-sh/fviewer.cpp | |||
@@ -17,2 +17,4 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
17 | 17 | ||
18 | #include <opie2/oresource.h> | ||
19 | |||
18 | FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent, const char*name):QWidget(parent, name) | 20 | FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent, const char*name):QWidget(parent, name) |
@@ -21,3 +23,3 @@ FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent, | |||
21 | 23 | ||
22 | setIcon(Resource::loadPixmap("opie-sh")); | 24 | setIcon(Opie::Core::OResource::loadPixmap("opie-sh", Opie::Core::OResource::SmallIcon)); |
23 | 25 | ||
diff --git a/noncore/tools/opie-sh/fviewer.h b/noncore/tools/opie-sh/fviewer.h index cd5206c..e0b3813 100644 --- a/noncore/tools/opie-sh/fviewer.h +++ b/noncore/tools/opie-sh/fviewer.h | |||
@@ -23,3 +23,2 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
23 | #include <qdir.h> | 23 | #include <qdir.h> |
24 | #include <qpe/resource.h> | ||
25 | 24 | ||
diff --git a/noncore/tools/opie-sh/mbox.cpp b/noncore/tools/opie-sh/mbox.cpp index 04b397d..45145d9 100644 --- a/noncore/tools/opie-sh/mbox.cpp +++ b/noncore/tools/opie-sh/mbox.cpp | |||
@@ -18,2 +18,4 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
18 | 18 | ||
19 | #include <opie2/oresource.h> | ||
20 | |||
19 | MBox::MBox(int w, int h, int type, QString title, QString message, QString *btext0, QString *btext1, QString *btext2, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f) | 21 | MBox::MBox(int w, int h, int type, QString title, QString message, QString *btext0, QString *btext1, QString *btext2, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f) |
@@ -38,9 +40,9 @@ MBox::MBox(int w, int h, int type, QString title, QString message, QString *btex | |||
38 | case 0: | 40 | case 0: |
39 | image->setPixmap(Resource::loadPixmap("opie-sh/info")); | 41 | image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/info", Opie::Core::OResource::SmallIcon)); |
40 | break; | 42 | break; |
41 | case 1: | 43 | case 1: |
42 | image->setPixmap(Resource::loadPixmap("opie-sh/warning")); | 44 | image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/warning", Opie::Core::OResource::SmallIcon)); |
43 | break; | 45 | break; |
44 | case 2: | 46 | case 2: |
45 | image->setPixmap(Resource::loadPixmap("opie-sh/error")); | 47 | image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/error", Opie::Core::OResource::SmallIcon)); |
46 | break; | 48 | break; |
diff --git a/noncore/tools/opie-sh/mbox.h b/noncore/tools/opie-sh/mbox.h index 66c982a..967a0a3 100644 --- a/noncore/tools/opie-sh/mbox.h +++ b/noncore/tools/opie-sh/mbox.h | |||
@@ -16,3 +16,2 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
16 | 16 | ||
17 | #include <qpe/resource.h> | ||
18 | #include <qdialog.h> | 17 | #include <qdialog.h> |
diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control index 6627335..67b552f 100644 --- a/noncore/tools/opie-sh/opie-sh.control +++ b/noncore/tools/opie-sh/opie-sh.control | |||
@@ -7,3 +7,3 @@ Architecture: arm | |||
7 | Version: 0.5$EXTRAVERSION | 7 | Version: 0.5$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal, libopiecore2 |
9 | License: GPL | 9 | License: GPL |
diff --git a/noncore/tools/opie-sh/opie-sh.pro b/noncore/tools/opie-sh/opie-sh.pro index 57f7978..b0cf052 100644 --- a/noncore/tools/opie-sh/opie-sh.pro +++ b/noncore/tools/opie-sh/opie-sh.pro | |||
@@ -7,3 +7,3 @@ INCLUDEPATH +=$(OPIEDIR)/include | |||
7 | DEPENDPATH +=$(OPIEDIR)/include | 7 | DEPENDPATH +=$(OPIEDIR)/include |
8 | LIBS +=-lqpe | 8 | LIBS +=-lqpe -lopiecore2 |
9 | TARGET = opie-sh | 9 | TARGET = opie-sh |