| 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/simple-icon | |
| parent | d2474c8e654d223b85b6200ce09fabd3a40af8e3 (diff) | |
| download | opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.zip opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.tar.gz opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.tar.bz2 | |
Resource -> OResource
| -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 @@ config SIMPLE_ICON boolean "Simples Widget which loads Pixmaps and plays sound" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES + 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 @@ -1,9 +1,9 @@ Package: opie-simple-icon-example Files: bin/simple-icon apps/Examples/simple-icon.desktop Priority: optional Section: opie/examples Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org> Architecture: arm -Depends: task-opie-minimal, opie-pics +Depends: task-opie-minimal, libopiecore2, opie-pics Description: A simple icon example 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 @@ -1,16 +1,15 @@ #include <qlabel.h> // a label #include <qpushbutton.h> // the header file for the QPushButton #include <qlayout.h> #include <qpe/qpeapplication.h> // the QPEApplication -#include <qpe/resource.h> // for loading icon #include <qpe/sound.h> // for playing a sound #include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching - +#include <opie2/oresource.h> // for loading icon #include "simple.h" /* * implementation of simple */ @@ -50,13 +49,13 @@ Simple::Simple( QWidget* parent, const char* name, WFlags fl ) QLabel *lbl = new QLabel( this, "a name for the label" ); /* * Resource will search hard for a Pixmap in $OPIEDIR/pics * to find 'logo/opielogo' You need to pass the subdir * but not the ending */ - lbl->setPixmap( Resource::loadPixmap("logo/opielogo") ); + lbl->setPixmap( Opie::Core::OResource::loadPixmap("logo/opielogo", Opie::Core::OResource::SmallIcon) ); layout->addWidget( lbl ); /* creates a button as child of this widget */ m_button = new QPushButton(this); /* |