-rw-r--r-- | examples/simple-icon/config.in | 2 | ||||
-rw-r--r-- | examples/simple-icon/opie-simple.control | 2 | ||||
-rw-r--r-- | examples/simple-icon/simple.cpp | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/examples/simple-icon/config.in b/examples/simple-icon/config.in index ec5e1ee..f0f9181 100644 --- a/examples/simple-icon/config.in +++ b/examples/simple-icon/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config SIMPLE_ICON | 1 | config SIMPLE_ICON |
2 | boolean "Simples Widget which loads Pixmaps and plays sound" | 2 | boolean "Simples Widget which loads Pixmaps and plays sound" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && EXAMPLES |
diff --git a/examples/simple-icon/opie-simple.control b/examples/simple-icon/opie-simple.control index 5adcf01..5e326ab 100644 --- a/examples/simple-icon/opie-simple.control +++ b/examples/simple-icon/opie-simple.control | |||
@@ -3,7 +3,7 @@ Files: bin/simple-icon apps/Examples/simple-icon.desktop | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/examples | 4 | Section: opie/examples |
5 | Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org> | 5 | Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal, opie-pics | 7 | Depends: task-opie-minimal, libopiecore2, opie-pics |
8 | Description: A simple icon example | 8 | Description: A simple icon example |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | Version: $QPE_VERSION$EXTRAVERSION |
diff --git a/examples/simple-icon/simple.cpp b/examples/simple-icon/simple.cpp index fec1823..2c98ec0 100644 --- a/examples/simple-icon/simple.cpp +++ b/examples/simple-icon/simple.cpp | |||
@@ -2,13 +2,12 @@ | |||
2 | #include <qpushbutton.h> // the header file for the QPushButton | 2 | #include <qpushbutton.h> // the header file for the QPushButton |
3 | #include <qlayout.h> | 3 | #include <qlayout.h> |
4 | 4 | ||
5 | #include <qpe/qpeapplication.h> // the QPEApplication | 5 | #include <qpe/qpeapplication.h> // the QPEApplication |
6 | #include <qpe/resource.h> // for loading icon | ||
7 | #include <qpe/sound.h> // for playing a sound | 6 | #include <qpe/sound.h> // for playing a sound |
8 | 7 | ||
9 | #include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching | 8 | #include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching |
10 | 9 | #include <opie2/oresource.h> // for loading icon | |
11 | #include "simple.h" | 10 | #include "simple.h" |
12 | 11 | ||
13 | /* | 12 | /* |
14 | * implementation of simple | 13 | * implementation of simple |
@@ -52,9 +51,9 @@ Simple::Simple( QWidget* parent, const char* name, WFlags fl ) | |||
52 | * Resource will search hard for a Pixmap in $OPIEDIR/pics | 51 | * Resource will search hard for a Pixmap in $OPIEDIR/pics |
53 | * to find 'logo/opielogo' You need to pass the subdir | 52 | * to find 'logo/opielogo' You need to pass the subdir |
54 | * but not the ending | 53 | * but not the ending |
55 | */ | 54 | */ |
56 | lbl->setPixmap( Resource::loadPixmap("logo/opielogo") ); | 55 | lbl->setPixmap( Opie::Core::OResource::loadPixmap("logo/opielogo", Opie::Core::OResource::SmallIcon) ); |
57 | layout->addWidget( lbl ); | 56 | layout->addWidget( lbl ); |
58 | 57 | ||
59 | 58 | ||
60 | /* creates a button as child of this widget */ | 59 | /* creates a button as child of this widget */ |