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/applets/suspendapplet/suspend.cpp | |
parent | b513e26413e5b2aa7a52c23044e936a45b681f4b (diff) | |
download | opie-bebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d.zip opie-bebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d.tar.gz opie-bebd0bb33ac2508bf8df37a1f20c7ec404bcbc2d.tar.bz2 |
Resource -> OResource
Diffstat (limited to 'core/applets/suspendapplet/suspend.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/suspendapplet/suspend.cpp | 9 |
1 files changed, 3 insertions, 6 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,8 +1,9 @@ | |||
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 | ||
@@ -41,13 +42,9 @@ QString SuspendApplet::tr( const char* s, const char* p ) const | |||
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 |