author | drw <drw> | 2005-05-24 00:09:07 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-24 00:09:07 (UTC) |
commit | 1ce0e947a999c2a98d6f6a78e69a8d1f433d7cba (patch) (side-by-side diff) | |
tree | 2ddbea9f816ad8bec8516dffc72bb42cf1a5b614 /noncore/tools/opie-sh | |
parent | 6f01d6a0d9daa537b2aa54ed36ea77e755a463d3 (diff) | |
download | opie-1ce0e947a999c2a98d6f6a78e69a8d1f433d7cba.zip opie-1ce0e947a999c2a98d6f6a78e69a8d1f433d7cba.tar.gz opie-1ce0e947a999c2a98d6f6a78e69a8d1f433d7cba.tar.bz2 |
Resource -> OResource
-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 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) + 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 +#include <opie2/oresource.h> + 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, - setIcon(Resource::loadPixmap("opie-sh")); + setIcon(Opie::Core::OResource::loadPixmap("opie-sh", Opie::Core::OResource::SmallIcon)); 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 #include <qdir.h> -#include <qpe/resource.h> 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 +#include <opie2/oresource.h> + 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 case 0: - image->setPixmap(Resource::loadPixmap("opie-sh/info")); + image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/info", Opie::Core::OResource::SmallIcon)); break; case 1: - image->setPixmap(Resource::loadPixmap("opie-sh/warning")); + image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/warning", Opie::Core::OResource::SmallIcon)); break; case 2: - image->setPixmap(Resource::loadPixmap("opie-sh/error")); + image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/error", Opie::Core::OResource::SmallIcon)); 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 -#include <qpe/resource.h> #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 Version: 0.5$EXTRAVERSION -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 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 DEPENDPATH +=$(OPIEDIR)/include -LIBS +=-lqpe +LIBS +=-lqpe -lopiecore2 TARGET = opie-sh |