author | drw <drw> | 2005-04-24 21:58:21 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-24 21:58:21 (UTC) |
commit | bebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d (patch) (unidiff) | |
tree | b730105ca766ff432d559957eadf8429d3094771 /core | |
parent | b513e26413e5b2aa7a52c23044e936a45b681f4b (diff) | |
download | opie-bebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d.zip opie-bebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d.tar.gz opie-bebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d.tar.bz2 |
Resource -> OResource
-rw-r--r-- | core/applets/suspendapplet/suspend.cpp | 9 | ||||
-rw-r--r-- | core/applets/suspendapplet/suspendapplet.pro | 2 |
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,10 +1,11 @@ | |||
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> |
8 | 9 | ||
9 | SuspendApplet::SuspendApplet ( ) | 10 | SuspendApplet::SuspendApplet ( ) |
10 | : QObject ( 0, "SuspendApplet" ) | 11 | : QObject ( 0, "SuspendApplet" ) |
@@ -39,17 +40,13 @@ QString SuspendApplet::tr( const char* s, const char* p ) const | |||
39 | { | 40 | { |
40 | return qApp->translate( "SuspendApplet", s, p ); | 41 | return qApp->translate( "SuspendApplet", s, p ); |
41 | } | 42 | } |
42 | 43 | ||
43 | QIconSet SuspendApplet::icon ( ) const | 44 | QIconSet 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 | ||
53 | QPopupMenu *SuspendApplet::popup ( QWidget * ) const | 50 | QPopupMenu *SuspendApplet::popup ( QWidget * ) const |
54 | { | 51 | { |
55 | return 0; | 52 | return 0; |
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 | |||
@@ -3,11 +3,11 @@ CONFIG += qt plugin warn_on | |||
3 | HEADERS = suspend.h | 3 | HEADERS = suspend.h |
4 | SOURCES = suspend.cpp | 4 | SOURCES = suspend.cpp |
5 | TARGET = suspendapplet | 5 | TARGET = suspendapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe -lopiecore2 |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include( $(OPIEDIR)/include.pro ) | 12 | include( $(OPIEDIR)/include.pro ) |
13 | target.path = $$prefix/plugins/applets | 13 | target.path = $$prefix/plugins/applets |