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
@@ -69,7 +69,7 @@
 #include <qfontdatabase.h>
 
 #ifdef USEQPE
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 #ifdef OPIE
 #if defined(OPIEFILEDIALOG)
 #include <qpe/applnk.h>
@@ -118,8 +118,8 @@ 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")
@@ -303,7 +303,7 @@ 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
@@ -4,7 +4,7 @@ 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
@@ -14,6 +14,7 @@ SUBDIRS         = pluckerbaselib \
                   ArriereCodec \
                   RebCodec \
                   reader
+LIBS            += -lopiecore2
 
 # these are added only built if enabled in "make menuconfig"
 #                  FliteDyn