Resource -> OResource

1 files changed, 5 insertions, 6 deletions

diff --git a/examples/main-tab/simple.cpp b/examples/main-tab/simple.cpp
index 7edb557..1e2d028 100644
--- a/examples/main-tab/simple.cpp
+++ b/examples/main-tab/simple.cpp
@@ -7,8 +7,8 @@
 
 #include <qpe/qpeapplication.h> // the QPEApplication
-#include <qpe/resource.h>
 #include <qpe/sound.h>
 
 #include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching
+#include <opie2/oresource.h>
 #include <opie2/otabwidget.h>
 
@@ -88,5 +88,5 @@ void MainWindow::initUI() {
 
 
-    QAction *a = new QAction( tr("Quit"), Resource::loadIconSet("quit_icon"),
+    QAction *a = new QAction( tr("Quit"), Opie::Core::OResource::loadPixmap("quit_icon", Opie::Core::OResource::SmallIcon),
                               QString::null, 0, this, "quit_action" );
     /*
@@ -97,6 +97,5 @@ void MainWindow::initUI() {
     a->addTo( fileMenu );
 
-   a =  new QAction(tr("Fire"),
-                             Resource::loadIconSet("new"),
+   a =  new QAction(tr("Fire"), Opie::Core::OResource::loadPixmap("new", Opie::Core::OResource::SmallIcon),
                              QString::null, 0, this, "fire_button");
 
@@ -174,9 +173,9 @@ Simple2::Simple2( 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
+     * OResource 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 );