| author | drw <drw> | 2005-04-24 21:48:43 (UTC) |
|---|---|---|
| committer | drw <drw> | 2005-04-24 21:48:43 (UTC) |
| commit | 40a0b1f81d5f53fede7831707d89a840d6691bd9 (patch) (side-by-side diff) | |
| tree | 9841e4cc54ef7e2347482a5219b3986940736c64 /core/applets/logoutapplet | |
| parent | 2391cfd9c79b87b3b00a4bb4a1d76981debb4486 (diff) | |
| download | opie-40a0b1f81d5f53fede7831707d89a840d6691bd9.zip opie-40a0b1f81d5f53fede7831707d89a840d6691bd9.tar.gz opie-40a0b1f81d5f53fede7831707d89a840d6691bd9.tar.bz2 | |
Resource -> OResource
| -rw-r--r-- | core/applets/logoutapplet/logout.cpp | 9 | ||||
| -rw-r--r-- | core/applets/logoutapplet/logoutapplet.pro | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/core/applets/logoutapplet/logout.cpp b/core/applets/logoutapplet/logout.cpp index 0f36f16..dc0c67c 100644 --- a/core/applets/logoutapplet/logout.cpp +++ b/core/applets/logoutapplet/logout.cpp @@ -1,7 +1,8 @@ #include "logout.h" +#include <opie2/oresource.h> + #include <qpe/applnk.h> -#include <qpe/resource.h> #include <qpe/qcopenvelope_qws.h> #include <qapplication.h> @@ -45,11 +46,7 @@ QString LogoutApplet::tr( const char* s, const char* p ) const QIconSet LogoutApplet::icon ( ) const { - QPixmap pix; - QImage img = Resource::loadImage ( "logout" ); - - if ( !img. isNull ( )) - pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); + QPixmap pix = Opie::Core::OResource::loadPixmap("logout", Opie::Core::OResource::SmallIcon ); return pix; } diff --git a/core/applets/logoutapplet/logoutapplet.pro b/core/applets/logoutapplet/logoutapplet.pro index 23cab02..5bb1571 100644 --- a/core/applets/logoutapplet/logoutapplet.pro +++ b/core/applets/logoutapplet/logoutapplet.pro @@ -6,7 +6,7 @@ TARGET = logoutapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 include( $(OPIEDIR)/include.pro ) |