From a829bcb3e78882cf9070a75dfacf9906931e8e80 Mon Sep 17 00:00:00 2001
From: drw <drw>
Date: Wed, 04 May 2005 21:59:13 +0000
Subject: Resource -> OResource

---
(limited to 'core')

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
@@ -1,4 +1,4 @@
   config IRDAAPPLET
     boolean "opie-irdaapplet (applet for IR beaming/discovery)"
     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
@@ -17,9 +17,10 @@
 #include "irda.h"
 
 /* OPIE */
+#include <opie2/oresource.h>
 #include <opie2/otaskbarapplet.h>
+
 #include <qpe/applnk.h>
-#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/ir.h>
 
@@ -48,10 +49,10 @@ IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
 
     m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP );
 
-    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 );
 
 	m_irda_active = false;
 	m_irda_discovery_active = false;
@@ -93,7 +94,8 @@ void IrdaApplet::popup ( QString message, QString icon )
 	if ( icon. isEmpty ( ))
 		m_popup-> insertItem ( message, 0 );
 	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 );
 
 	QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
 	QSize s = m_popup-> sizeHint ( );
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
@@ -6,7 +6,7 @@ TARGET    	= irdaapplet
 DESTDIR   	= $(OPIEDIR)/plugins/applets
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH      += 
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
 VERSION   = 1.0.0
 
 include( $(OPIEDIR)/include.pro )
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
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/applets
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
-Depends: task-opie-minimal, libopieobex1
+Depends: task-opie-minimal, libopieobex1, libopiecore2
 Description: IrDA Applet
  An IrDA taskbar applet for the Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
--
cgit v0.9.0.2