summaryrefslogtreecommitdiff
authordrw <drw>2005-04-24 22:08:11 (UTC)
committer drw <drw>2005-04-24 22:08:11 (UTC)
commit98e94a485c456304d5f0b7a1f281470e2c0ac705 (patch) (unidiff)
tree0b3bb1d20111ed27d5ec215b37adb1b6eeefa076
parentbebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d (diff)
downloadopie-98e94a485c456304d5f0b7a1f281470e2c0ac705.zip
opie-98e94a485c456304d5f0b7a1f281470e2c0ac705.tar.gz
opie-98e94a485c456304d5f0b7a1f281470e2c0ac705.tar.bz2
Resource -> OResource
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/homeapplet/home.cpp9
-rw-r--r--core/applets/homeapplet/homeapplet.pro2
2 files changed, 4 insertions, 7 deletions
diff --git a/core/applets/homeapplet/home.cpp b/core/applets/homeapplet/home.cpp
index 02d1265..5a917ff 100644
--- a/core/applets/homeapplet/home.cpp
+++ b/core/applets/homeapplet/home.cpp
@@ -1,7 +1,8 @@
1#include "home.h" 1#include "home.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 HomeApplet::tr( const char* s, const char* p ) const
42 43
43QIconSet HomeApplet::icon ( ) const 44QIconSet HomeApplet::icon ( ) const
44{ 45{
45 QPixmap pix; 46 QPixmap pix = Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon );
46 QImage img = Resource::loadImage ( "home" );
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/homeapplet/homeapplet.pro b/core/applets/homeapplet/homeapplet.pro
index a8db61f..e21e80f 100644
--- a/core/applets/homeapplet/homeapplet.pro
+++ b/core/applets/homeapplet/homeapplet.pro
@@ -6,7 +6,7 @@ TARGET = homeapplet
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 )