author | drw <drw> | 2005-05-17 22:48:25 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-17 22:48:25 (UTC) |
commit | 0892a9d473bfeacc921d586266e6889153654737 (patch) (unidiff) | |
tree | d3ea1c3b08ac642b999db357a3ccbff691ce8bce | |
parent | 58c3aa9b498e43665511fbe8f32995e0a4cb29d6 (diff) | |
download | opie-0892a9d473bfeacc921d586266e6889153654737.zip opie-0892a9d473bfeacc921d586266e6889153654737.tar.gz opie-0892a9d473bfeacc921d586266e6889153654737.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/opie-reader/opie-reader.control | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/opie-reader.pro | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp index 8ef0674..b985094 100644 --- a/noncore/apps/opie-reader/QTReaderApp.cpp +++ b/noncore/apps/opie-reader/QTReaderApp.cpp | |||
@@ -66,13 +66,13 @@ | |||
66 | #include "FixedFont.h" | 66 | #include "FixedFont.h" |
67 | #include "URLDialog.h" | 67 | #include "URLDialog.h" |
68 | #include "util.h" | 68 | #include "util.h" |
69 | #include <qfontdatabase.h> | 69 | #include <qfontdatabase.h> |
70 | 70 | ||
71 | #ifdef USEQPE | 71 | #ifdef USEQPE |
72 | #include <qpe/resource.h> | 72 | #include <opie2/oresource.h> |
73 | #ifdef OPIE | 73 | #ifdef OPIE |
74 | #if defined(OPIEFILEDIALOG) | 74 | #if defined(OPIEFILEDIALOG) |
75 | #include <qpe/applnk.h> | 75 | #include <qpe/applnk.h> |
76 | #include <opie2/ofiledialog.h> | 76 | #include <opie2/ofiledialog.h> |
77 | using namespace Opie::Ui; | 77 | using namespace Opie::Ui; |
78 | #else | 78 | #else |
@@ -115,14 +115,14 @@ QString picdir() | |||
115 | 115 | ||
116 | unsigned long QTReaderApp::m_uid = 0; | 116 | unsigned long QTReaderApp::m_uid = 0; |
117 | 117 | ||
118 | void QTReaderApp::setScrollState(bool _b) { m_scrollButton->setOn(_b); } | 118 | void QTReaderApp::setScrollState(bool _b) { m_scrollButton->setOn(_b); } |
119 | 119 | ||
120 | #ifdef USEQPE | 120 | #ifdef USEQPE |
121 | #define geticon(iconname) Resource::loadPixmap( iconname ) | 121 | #define geticon(iconname) Opie::Core::OResource::loadPixmap( iconname, Opie::Core::OResource::SmallIcon ) |
122 | #define getmyicon(iconname) Resource::loadPixmap( PICDIR iconname ) | 122 | #define getmyicon(iconname) Opie::Core::OResource::loadPixmap( PICDIR iconname, Opie::Core::OResource::SmallIcon ) |
123 | #else | 123 | #else |
124 | //#define geticon(iconname) QPixmap(PICDIR iconname ".png") | 124 | //#define geticon(iconname) QPixmap(PICDIR iconname ".png") |
125 | #define geticon(iconname) QPixmap(PICDIR +"/"+iconname+".png") | 125 | #define geticon(iconname) QPixmap(PICDIR +"/"+iconname+".png") |
126 | #define getmyicon(iconname) geticon(iconname) | 126 | #define getmyicon(iconname) geticon(iconname) |
127 | //#define geticon(iconname) QIconSet( QPixmap(PICDIR iconname) ) | 127 | //#define geticon(iconname) QIconSet( QPixmap(PICDIR iconname) ) |
128 | #endif | 128 | #endif |
@@ -300,13 +300,13 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) | |||
300 | 300 | ||
301 | // qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot); | 301 | // qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot); |
302 | */ | 302 | */ |
303 | m_autogenstr = "^ *[A-Z].*[a-z] *$"; | 303 | m_autogenstr = "^ *[A-Z].*[a-z] *$"; |
304 | 304 | ||
305 | #ifdef USEQPE | 305 | #ifdef USEQPE |
306 | setIcon( Resource::loadPixmap( PICDIR "uqtreader") ); | 306 | setIcon( Opie::Core::OResource::loadPixmap( PICDIR "uqtreader", Opie::Core::OResource::SmallIcon ) ); |
307 | #else | 307 | #else |
308 | setIcon( QPixmap (PICDIR + "/uqtreader.png") ); | 308 | setIcon( QPixmap (PICDIR + "/uqtreader.png") ); |
309 | #endif /* USEQPE */ | 309 | #endif /* USEQPE */ |
310 | 310 | ||
311 | // QPEToolBar *bar = new QPEToolBar( this ); | 311 | // QPEToolBar *bar = new QPEToolBar( this ); |
312 | // menubar = new QPEToolBar( this ); | 312 | // menubar = new QPEToolBar( this ); |
diff --git a/noncore/apps/opie-reader/opie-reader.control b/noncore/apps/opie-reader/opie-reader.control index 60976b2..d53f70d 100644 --- a/noncore/apps/opie-reader/opie-reader.control +++ b/noncore/apps/opie-reader/opie-reader.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-reader | 1 | Package: opie-reader |
2 | Files: bin/reader lib/libreader* plugins/reader/* apps/Applications/opie-reader.desktop pics/opie-reader/* | 2 | Files: bin/reader lib/libreader* plugins/reader/* apps/Applications/opie-reader.desktop pics/opie-reader/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Tim Wentford <timwentford@hotmail.com> | 5 | Maintainer: Tim Wentford <timwentford@hotmail.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2 |
8 | License: GPL | 8 | License: GPL |
9 | Description: E-Book reader | 9 | Description: E-Book reader |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |
diff --git a/noncore/apps/opie-reader/opie-reader.pro b/noncore/apps/opie-reader/opie-reader.pro index 47980e1..da39154 100644 --- a/noncore/apps/opie-reader/opie-reader.pro +++ b/noncore/apps/opie-reader/opie-reader.pro | |||
@@ -11,12 +11,13 @@ SUBDIRS = pluckerbaselib \ | |||
11 | ppmsCodec \ | 11 | ppmsCodec \ |
12 | FliteCmd \ | 12 | FliteCmd \ |
13 | pluckerdecompress \ | 13 | pluckerdecompress \ |
14 | ArriereCodec \ | 14 | ArriereCodec \ |
15 | RebCodec \ | 15 | RebCodec \ |
16 | reader | 16 | reader |
17 | LIBS += -lopiecore2 | ||
17 | 18 | ||
18 | # these are added only built if enabled in "make menuconfig" | 19 | # these are added only built if enabled in "make menuconfig" |
19 | # FliteDyn | 20 | # FliteDyn |
20 | # FliteDyn16 | 21 | # FliteDyn16 |
21 | 22 | ||
22 | include( $(OPIEDIR)/include.pro ) | 23 | include( $(OPIEDIR)/include.pro ) |