| author | drw <drw> | 2005-06-15 22:39:20 (UTC) |
|---|---|---|
| committer | drw <drw> | 2005-06-15 22:39:20 (UTC) |
| commit | e0205bac48b9d23af9feb48004c24fcf7a5e8200 (patch) (side-by-side diff) | |
| tree | 2faa077192fd0bfc4fc409f0513cc0e82113fa9e /examples/menuapplet | |
| parent | d2474c8e654d223b85b6200ce09fabd3a40af8e3 (diff) | |
| download | opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.zip opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.tar.gz opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.tar.bz2 | |
Resource -> OResource
| -rw-r--r-- | examples/menuapplet/config.in | 2 | ||||
| -rw-r--r-- | examples/menuapplet/example.cpp | 9 | ||||
| -rw-r--r-- | examples/menuapplet/menuapplet.pro | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/examples/menuapplet/config.in b/examples/menuapplet/config.in index 3167478..9425d9f 100644 --- a/examples/menuapplet/config.in +++ b/examples/menuapplet/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && EXAMPLES diff --git a/examples/menuapplet/example.cpp b/examples/menuapplet/example.cpp index 8ae77da..079030f 100644 --- a/examples/menuapplet/example.cpp +++ b/examples/menuapplet/example.cpp @@ -2,4 +2,3 @@ -#include <qpe/applnk.h> -#include <qpe/resource.h> +#include <opie2/oresource.h> @@ -37,7 +36,3 @@ QIconSet MenuAppletExample::icon() const { - QPixmap pix; - QImage img = Resource::loadImage( "Tux" ); - if ( !img.isNull() ) - pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - return pix; + return Opie::Core::OResource::loadPixmap( "Tux", Opie::Core::OResource::SmallIcon ); } diff --git a/examples/menuapplet/menuapplet.pro b/examples/menuapplet/menuapplet.pro index 1e20e78..e8858ec 100644 --- a/examples/menuapplet/menuapplet.pro +++ b/examples/menuapplet/menuapplet.pro @@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 |