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 | |||
@@ -68,9 +68,9 @@ | |||
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> |
@@ -117,10 +117,10 @@ 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) |
@@ -302,9 +302,9 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) | |||
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 | ||