summaryrefslogtreecommitdiff
authordrw <drw>2005-05-24 00:09:07 (UTC)
committer drw <drw>2005-05-24 00:09:07 (UTC)
commit1ce0e947a999c2a98d6f6a78e69a8d1f433d7cba (patch) (unidiff)
tree2ddbea9f816ad8bec8516dffc72bb42cf1a5b614
parent6f01d6a0d9daa537b2aa54ed36ea77e755a463d3 (diff)
downloadopie-1ce0e947a999c2a98d6f6a78e69a8d1f433d7cba.zip
opie-1ce0e947a999c2a98d6f6a78e69a8d1f433d7cba.tar.gz
opie-1ce0e947a999c2a98d6f6a78e69a8d1f433d7cba.tar.bz2
Resource -> OResource
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/opie-sh/config.in2
-rw-r--r--noncore/tools/opie-sh/fviewer.cpp4
-rw-r--r--noncore/tools/opie-sh/fviewer.h1
-rw-r--r--noncore/tools/opie-sh/mbox.cpp8
-rw-r--r--noncore/tools/opie-sh/mbox.h1
-rw-r--r--noncore/tools/opie-sh/opie-sh.control2
-rw-r--r--noncore/tools/opie-sh/opie-sh.pro2
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
@@ -1,4 +1,4 @@
1 config OPIE-SH 1 config OPIE-SH
2 boolean "opie-sh (qdialog frontend allows you to write dialogs from shell scripts)" 2 boolean "opie-sh (qdialog frontend allows you to write dialogs from shell scripts)"
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
@@ -15,11 +15,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16#include "fviewer.h" 16#include "fviewer.h"
17 17
18#include <opie2/oresource.h>
19
18FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent, const char*name):QWidget(parent, name) 20FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent, const char*name):QWidget(parent, name)
19{ 21{
20 QVBoxLayout *layout = new QVBoxLayout(this); 22 QVBoxLayout *layout = new QVBoxLayout(this);
21 23
22 setIcon(Resource::loadPixmap("opie-sh")); 24 setIcon(Opie::Core::OResource::loadPixmap("opie-sh", Opie::Core::OResource::SmallIcon));
23 25
24 textView = new QTextBrowser(this, "textview"); 26 textView = new QTextBrowser(this, "textview");
25 layout->addWidget(textView); 27 layout->addWidget(textView);
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
@@ -21,7 +21,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21#include <qlayout.h> 21#include <qlayout.h>
22#include <qtimer.h> 22#include <qtimer.h>
23#include <qdir.h> 23#include <qdir.h>
24#include <qpe/resource.h>
25 24
26class FViewer :public QWidget 25class FViewer :public QWidget
27{ 26{
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
@@ -16,6 +16,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16 16
17#include "mbox.h" 17#include "mbox.h"
18 18
19#include <opie2/oresource.h>
20
19MBox::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) 21MBox::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)
20{ 22{
21 QVBoxLayout *layout = new QVBoxLayout(this); 23 QVBoxLayout *layout = new QVBoxLayout(this);
@@ -36,13 +38,13 @@ MBox::MBox(int w, int h, int type, QString title, QString message, QString *btex
36 switch (type) 38 switch (type)
37 { 39 {
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;
47 } 49 }
48 50
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
@@ -14,7 +14,6 @@ You should have received a copy of the GNU General Public License along with thi
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include <qpe/resource.h>
18#include <qdialog.h> 17#include <qdialog.h>
19#include <qstring.h> 18#include <qstring.h>
20#include <qiconset.h> 19#include <qiconset.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
@@ -5,7 +5,7 @@ Section: opie/sh
5Maintainer: Thomas Stephens <spiralman@softhome.net> 5Maintainer: Thomas Stephens <spiralman@softhome.net>
6Architecture: arm 6Architecture: arm
7Version: 0.5$EXTRAVERSION 7Version: 0.5$EXTRAVERSION
8Depends: task-opie-minimal 8Depends: task-opie-minimal, libopiecore2
9License: GPL 9License: GPL
10Description: A QDialog shell frontend 10Description: A QDialog shell frontend
11 A program to let you use various dialogs from the console (or a shell script) 11 A program to let you use various dialogs from the console (or a shell script)
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
@@ -5,7 +5,7 @@ HEADERS =mbox.h fviewer.h inputdialog.h
5 SOURCES =opie-sh.cpp mbox.cpp fviewer.cpp inputdialog.cpp 5 SOURCES =opie-sh.cpp mbox.cpp fviewer.cpp inputdialog.cpp
6 INCLUDEPATH +=$(OPIEDIR)/include 6 INCLUDEPATH +=$(OPIEDIR)/include
7 DEPENDPATH +=$(OPIEDIR)/include 7 DEPENDPATH +=$(OPIEDIR)/include
8 LIBS +=-lqpe 8 LIBS +=-lqpe -lopiecore2
9TARGET = opie-sh 9TARGET = opie-sh
10 10
11include( $(OPIEDIR)/include.pro ) 11include( $(OPIEDIR)/include.pro )