Resource -> OResource

4 files changed, 11 insertions, 9 deletions

diff --git a/core/applets/irdaapplet/config.in b/core/applets/irdaapplet/config.in
index 0976e8f..49f55ef 100644
--- a/core/applets/irdaapplet/config.in
+++ b/core/applets/irdaapplet/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) 
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index 7709bed..cea836e 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -19,5 +19,6 @@
 /* OPIE */
+#include <opie2/oresource.h>
 #include <opie2/otaskbarapplet.h>
+
 #include <qpe/applnk.h>
-#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -50,6 +51,6 @@ IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
 
-    m_irdaOnPixmap = Resource::loadImage( "irdaapplet/irdaon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
-    m_irdaOffPixmap = Resource::loadImage( "irdaapplet/irdaoff" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
-    m_irdaDiscoveryOnPixmap = Resource::loadImage( "irdaapplet/magglass" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
-    m_receiveActivePixmap = Resource::loadImage( "irdaapplet/receive" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
+    m_irdaOnPixmap = Opie::Core::OResource::loadPixmap( "irdaapplet/irdaon", Opie::Core::OResource::SmallIcon );
+    m_irdaOffPixmap = Opie::Core::OResource::loadPixmap( "irdaapplet/irdaoff", Opie::Core::OResource::SmallIcon );
+    m_irdaDiscoveryOnPixmap = Opie::Core::OResource::loadPixmap( "irdaapplet/magglass", Opie::Core::OResource::SmallIcon );
+    m_receiveActivePixmap = Opie::Core::OResource::loadPixmap( "irdaapplet/receive", Opie::Core::OResource::SmallIcon );
 
@@ -95,3 +96,4 @@ void IrdaApplet::popup ( QString message, QString icon )
         else
-                m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 );
+        m_popup-> insertItem ( QIconSet ( Opie::Core::OResource::loadPixmap ( icon, Opie::Core::OResource::SmallIcon )),
+                               message, 0 );
 
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro
index 095c13c..f1145e1 100644
--- a/core/applets/irdaapplet/irdaapplet.pro
+++ b/core/applets/irdaapplet/irdaapplet.pro
@@ -8,3 +8,3 @@ INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH      += 
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
 VERSION   = 1.0.0
diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control
index bcc6603..ef2eaef 100644
--- a/core/applets/irdaapplet/opie-irdaapplet.control
+++ b/core/applets/irdaapplet/opie-irdaapplet.control
@@ -6,3 +6,3 @@ Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
-Depends: task-opie-minimal, libopieobex1
+Depends: task-opie-minimal, libopieobex1, libopiecore2
 Description: IrDA Applet