| author | drw <drw> | 2005-05-17 22:48:25 (UTC) |
|---|---|---|
| committer | drw <drw> | 2005-05-17 22:48:25 (UTC) |
| commit | 0892a9d473bfeacc921d586266e6889153654737 (patch) (side-by-side diff) | |
| 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 @@ -68,9 +68,9 @@ #include "util.h" #include <qfontdatabase.h> #ifdef USEQPE -#include <qpe/resource.h> +#include <opie2/oresource.h> #ifdef OPIE #if defined(OPIEFILEDIALOG) #include <qpe/applnk.h> #include <opie2/ofiledialog.h> @@ -117,10 +117,10 @@ unsigned long QTReaderApp::m_uid = 0; void QTReaderApp::setScrollState(bool _b) { m_scrollButton->setOn(_b); } #ifdef USEQPE -#define geticon(iconname) Resource::loadPixmap( iconname ) -#define getmyicon(iconname) Resource::loadPixmap( PICDIR iconname ) +#define geticon(iconname) Opie::Core::OResource::loadPixmap( iconname, Opie::Core::OResource::SmallIcon ) +#define getmyicon(iconname) Opie::Core::OResource::loadPixmap( PICDIR iconname, Opie::Core::OResource::SmallIcon ) #else //#define geticon(iconname) QPixmap(PICDIR iconname ".png") #define geticon(iconname) QPixmap(PICDIR +"/"+iconname+".png") #define getmyicon(iconname) geticon(iconname) @@ -302,9 +302,9 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) */ m_autogenstr = "^ *[A-Z].*[a-z] *$"; #ifdef USEQPE - setIcon( Resource::loadPixmap( PICDIR "uqtreader") ); + setIcon( Opie::Core::OResource::loadPixmap( PICDIR "uqtreader", Opie::Core::OResource::SmallIcon ) ); #else setIcon( QPixmap (PICDIR + "/uqtreader.png") ); #endif /* USEQPE */ 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 @@ -3,8 +3,8 @@ Files: bin/reader lib/libreader* plugins/reader/* apps/Applications/opie-reader. Priority: optional Section: opie/applications Maintainer: Tim Wentford <timwentford@hotmail.com> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 License: GPL Description: E-Book reader 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 @@ -13,8 +13,9 @@ SUBDIRS = pluckerbaselib \ pluckerdecompress \ ArriereCodec \ RebCodec \ reader +LIBS += -lopiecore2 # these are added only built if enabled in "make menuconfig" # FliteDyn # FliteDyn16 |