summaryrefslogtreecommitdiff
authordrw <drw>2005-04-24 21:58:21 (UTC)
committer drw <drw>2005-04-24 21:58:21 (UTC)
commitbebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d (patch) (unidiff)
treeb730105ca766ff432d559957eadf8429d3094771
parentb513e26413e5b2aa7a52c23044e936a45b681f4b (diff)
downloadopie-bebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d.zip
opie-bebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d.tar.gz
opie-bebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d.tar.bz2
Resource -> OResource
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/suspendapplet/suspend.cpp9
-rw-r--r--core/applets/suspendapplet/suspendapplet.pro2
2 files changed, 4 insertions, 7 deletions
diff --git a/core/applets/suspendapplet/suspend.cpp b/core/applets/suspendapplet/suspend.cpp
index 4fbd704..f675766 100644
--- a/core/applets/suspendapplet/suspend.cpp
+++ b/core/applets/suspendapplet/suspend.cpp
@@ -1,7 +1,8 @@
1#include "suspend.h" 1#include "suspend.h"
2 2
3#include <opie2/oresource.h>
4
3#include <qpe/applnk.h> 5#include <qpe/applnk.h>
4#include <qpe/resource.h>
5#include <qpe/qcopenvelope_qws.h> 6#include <qpe/qcopenvelope_qws.h>
6 7
7#include <qapplication.h> 8#include <qapplication.h>
@@ -42,11 +43,7 @@ QString SuspendApplet::tr( const char* s, const char* p ) const
42 43
43QIconSet SuspendApplet::icon ( ) const 44QIconSet SuspendApplet::icon ( ) const
44{ 45{
45 QPixmap pix; 46 QPixmap pix = Opie::Core::OResource::loadPixmap( "suspend", Opie::Core::OResource::SmallIcon );
46 QImage img = Resource::loadImage ( "suspend" );
47
48 if ( !img. isNull ( ))
49 pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
50 return pix; 47 return pix;
51} 48}
52 49
diff --git a/core/applets/suspendapplet/suspendapplet.pro b/core/applets/suspendapplet/suspendapplet.pro
index 6607383..5f139df 100644
--- a/core/applets/suspendapplet/suspendapplet.pro
+++ b/core/applets/suspendapplet/suspendapplet.pro
@@ -6,7 +6,7 @@ TARGET = suspendapplet
6DESTDIR = $(OPIEDIR)/plugins/applets 6DESTDIR = $(OPIEDIR)/plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe -lopiecore2
10VERSION = 1.0.0 10VERSION = 1.0.0
11 11
12include( $(OPIEDIR)/include.pro ) 12include( $(OPIEDIR)/include.pro )