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 /noncore/apps/opie-reader/QTReaderApp.cpp | |
parent | 58c3aa9b498e43665511fbe8f32995e0a4cb29d6 (diff) | |
download | opie-0892a9d473bfeacc921d586266e6889153654737.zip opie-0892a9d473bfeacc921d586266e6889153654737.tar.gz opie-0892a9d473bfeacc921d586266e6889153654737.tar.bz2 |
Resource -> OResource
Diffstat (limited to 'noncore/apps/opie-reader/QTReaderApp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.cpp | 8 |
1 files changed, 4 insertions, 4 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 | |||
@@ -69,7 +69,7 @@ | |||
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> |
@@ -118,8 +118,8 @@ unsigned long QTReaderApp::m_uid = 0; | |||
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") |
@@ -303,7 +303,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) | |||
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 */ |