Diffstat (limited to 'core/applets/lockapplet/lock.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/lockapplet/lock.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/applets/lockapplet/lock.cpp b/core/applets/lockapplet/lock.cpp index 89f27bb..a831b99 100644 --- a/core/applets/lockapplet/lock.cpp +++ b/core/applets/lockapplet/lock.cpp | |||
@@ -1,11 +1,11 @@ | |||
1 | #include "lock.h" | 1 | #include "lock.h" |
2 | 2 | ||
3 | /* OPIE */ | 3 | /* OPIE */ |
4 | #include <opie2/multiauthpassword.h> | 4 | #include <opie2/multiauthpassword.h> |
5 | #include <opie2/oresource.h> | ||
5 | 6 | ||
6 | #include <qpe/applnk.h> | 7 | #include <qpe/applnk.h> |
7 | #include <qpe/resource.h> | ||
8 | 8 | ||
9 | /* QT */ | 9 | /* QT */ |
10 | #include <qiconset.h> | 10 | #include <qiconset.h> |
11 | #include <qpopupmenu.h> | 11 | #include <qpopupmenu.h> |
@@ -37,12 +37,9 @@ QString LockMenuApplet::text() const | |||
37 | 37 | ||
38 | 38 | ||
39 | QIconSet LockMenuApplet::icon() const | 39 | QIconSet LockMenuApplet::icon() const |
40 | { | 40 | { |
41 | QPixmap pix; | 41 | QPixmap pix = Opie::Core::OResource::loadPixmap( "security/lock", Opie::Core::OResource::SmallIcon ); |
42 | QImage img = Resource::loadImage( "security/lock" ); | ||
43 | if ( !img.isNull() ) | ||
44 | pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
45 | return pix; | 42 | return pix; |
46 | } | 43 | } |
47 | 44 | ||
48 | QPopupMenu* LockMenuApplet::popup(QWidget*) const | 45 | QPopupMenu* LockMenuApplet::popup(QWidget*) const |