| author | drw <drw> | 2005-04-24 22:08:11 (UTC) |
|---|---|---|
| committer | drw <drw> | 2005-04-24 22:08:11 (UTC) |
| commit | 98e94a485c456304d5f0b7a1f281470e2c0ac705 (patch) (side-by-side diff) | |
| tree | 0b3bb1d20111ed27d5ec215b37adb1b6eeefa076 | |
| parent | bebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d (diff) | |
| download | opie-98e94a485c456304d5f0b7a1f281470e2c0ac705.zip opie-98e94a485c456304d5f0b7a1f281470e2c0ac705.tar.gz opie-98e94a485c456304d5f0b7a1f281470e2c0ac705.tar.bz2 | |
Resource -> OResource
| -rw-r--r-- | core/applets/homeapplet/home.cpp | 9 | ||||
| -rw-r--r-- | core/applets/homeapplet/homeapplet.pro | 2 |
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,20 +1,21 @@ #include "home.h" +#include <opie2/oresource.h> + #include <qpe/applnk.h> -#include <qpe/resource.h> #include <qpe/qcopenvelope_qws.h> #include <qapplication.h> HomeApplet::HomeApplet ( ) : QObject ( 0, "HomeApplet" ) { } HomeApplet::~HomeApplet ( ) { } int HomeApplet::position ( ) const { return 4; @@ -29,37 +30,33 @@ QString HomeApplet::text ( ) const { return tr( "Desktop" ); } QString HomeApplet::tr( const char* s ) const { return qApp->translate( "HomeApplet", s, 0 ); } QString HomeApplet::tr( const char* s, const char* p ) const { return qApp->translate( "HomeApplet", s, p ); } QIconSet HomeApplet::icon ( ) const { - QPixmap pix; - QImage img = Resource::loadImage ( "home" ); - - if ( !img. isNull ( )) - pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); + QPixmap pix = Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon ); return pix; } QPopupMenu *HomeApplet::popup ( QWidget * ) const { return 0; } void HomeApplet::activated ( ) { // to desktop (home) QCopEnvelope ( "QPE/Application/qpe", "raise()" ); } QRESULT HomeApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) 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 @@ -1,13 +1,13 @@ TEMPLATE = lib CONFIG += qt plugin warn_on HEADERS = home.h SOURCES = home.cpp TARGET = homeapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 include( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/applets |