summaryrefslogtreecommitdiff
path: root/core/applets/irdaapplet/irda.cpp
Unidiff
Diffstat (limited to 'core/applets/irdaapplet/irda.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/irdaapplet/irda.cpp14
1 files changed, 8 insertions, 6 deletions
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 @@
17#include "irda.h" 17#include "irda.h"
18 18
19/* OPIE */ 19/* OPIE */
20#include <opie2/oresource.h>
20#include <opie2/otaskbarapplet.h> 21#include <opie2/otaskbarapplet.h>
22
21#include <qpe/applnk.h> 23#include <qpe/applnk.h>
22#include <qpe/resource.h>
23#include <qpe/qcopenvelope_qws.h> 24#include <qpe/qcopenvelope_qws.h>
24#include <qpe/ir.h> 25#include <qpe/ir.h>
25 26
@@ -48,10 +49,10 @@ IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
48 49
49 m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ); 50 m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP );
50 51
51 m_irdaOnPixmap = Resource::loadImage( "irdaapplet/irdaon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize()); 52 m_irdaOnPixmap = Opie::Core::OResource::loadPixmap( "irdaapplet/irdaon", Opie::Core::OResource::SmallIcon );
52 m_irdaOffPixmap = Resource::loadImage( "irdaapplet/irdaoff" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize()); 53 m_irdaOffPixmap = Opie::Core::OResource::loadPixmap( "irdaapplet/irdaoff", Opie::Core::OResource::SmallIcon );
53 m_irdaDiscoveryOnPixmap = Resource::loadImage( "irdaapplet/magglass" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize()); 54 m_irdaDiscoveryOnPixmap = Opie::Core::OResource::loadPixmap( "irdaapplet/magglass", Opie::Core::OResource::SmallIcon );
54 m_receiveActivePixmap = Resource::loadImage( "irdaapplet/receive" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize()); 55 m_receiveActivePixmap = Opie::Core::OResource::loadPixmap( "irdaapplet/receive", Opie::Core::OResource::SmallIcon );
55 56
56 m_irda_active = false; 57 m_irda_active = false;
57 m_irda_discovery_active = false; 58 m_irda_discovery_active = false;
@@ -93,7 +94,8 @@ void IrdaApplet::popup ( QString message, QString icon )
93 if ( icon. isEmpty ( )) 94 if ( icon. isEmpty ( ))
94 m_popup-> insertItem ( message, 0 ); 95 m_popup-> insertItem ( message, 0 );
95 else 96 else
96 m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 ); 97 m_popup-> insertItem ( QIconSet ( Opie::Core::OResource::loadPixmap ( icon, Opie::Core::OResource::SmallIcon )),
98 message, 0 );
97 99
98 QPoint p = mapToGlobal ( QPoint ( 0, 0 )); 100 QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
99 QSize s = m_popup-> sizeHint ( ); 101 QSize s = m_popup-> sizeHint ( );