author | drw <drw> | 2005-04-24 20:40:30 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-24 20:40:30 (UTC) |
commit | 4ae9e590b1606ff1bf437ed7c1ebe019d19edd7b (patch) (unidiff) | |
tree | d2c087c0623b6e6a0f7750069b7fc6ceea042d1a | |
parent | 01ab9377017060c7ad3ab9e4ed2b76a879d442f6 (diff) | |
download | opie-4ae9e590b1606ff1bf437ed7c1ebe019d19edd7b.zip opie-4ae9e590b1606ff1bf437ed7c1ebe019d19edd7b.tar.gz opie-4ae9e590b1606ff1bf437ed7c1ebe019d19edd7b.tar.bz2 |
Resource -> OResource
-rw-r--r-- | core/applets/aboutapplet/about.cpp | 9 | ||||
-rw-r--r-- | core/applets/aboutapplet/aboutapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/aboutapplet/opie-aboutapplet.control | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/core/applets/aboutapplet/about.cpp b/core/applets/aboutapplet/about.cpp index ec214f3..accfdd6 100644 --- a/core/applets/aboutapplet/about.cpp +++ b/core/applets/aboutapplet/about.cpp | |||
@@ -3,5 +3,6 @@ | |||
3 | 3 | ||
4 | #include <opie2/oresource.h> | ||
5 | |||
4 | #include <qpe/applnk.h> | 6 | #include <qpe/applnk.h> |
5 | #include <qpe/qpeapplication.h> | 7 | #include <qpe/qpeapplication.h> |
6 | #include <qpe/resource.h> | ||
7 | #include <qpe/qcopenvelope_qws.h> | 8 | #include <qpe/qcopenvelope_qws.h> |
@@ -46,7 +47,3 @@ QIconSet AboutApplet::icon() const | |||
46 | { | 47 | { |
47 | QPixmap pix; | 48 | QPixmap pix = Opie::Core::OResource::loadPixmap ( "logo/opielogo", Opie::Core::OResource::SmallIcon ); |
48 | QImage img = Resource::loadImage ( "logo/opielogo" ); | ||
49 | |||
50 | if ( !img.isNull() ) | ||
51 | pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
52 | return pix; | 49 | return pix; |
diff --git a/core/applets/aboutapplet/aboutapplet.pro b/core/applets/aboutapplet/aboutapplet.pro index f12f7fd..c2841c4 100644 --- a/core/applets/aboutapplet/aboutapplet.pro +++ b/core/applets/aboutapplet/aboutapplet.pro | |||
@@ -9,3 +9,3 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
9 | DEPENDPATH += $(OPIEDIR)/include | 9 | DEPENDPATH += $(OPIEDIR)/include |
10 | LIBS += -lqpe | 10 | LIBS += -lqpe -lopiecore2 |
11 | VERSION = 1.0.0 | 11 | VERSION = 1.0.0 |
diff --git a/core/applets/aboutapplet/opie-aboutapplet.control b/core/applets/aboutapplet/opie-aboutapplet.control index 9d85de4..11fe300 100644 --- a/core/applets/aboutapplet/opie-aboutapplet.control +++ b/core/applets/aboutapplet/opie-aboutapplet.control | |||
@@ -6,3 +6,3 @@ Maintainer: Opie Team <opie@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2 |
8 | Conflicts: opie-aboutapplet-ipaq | 8 | Conflicts: opie-aboutapplet-ipaq |