Resource -> OResource

2 files changed, 5 insertions, 5 deletions

diff --git a/examples/simple-pim/opie-simple.control b/examples/simple-pim/opie-simple.control
index 1b54f91..80ad85b 100644
--- a/examples/simple-pim/opie-simple.control
+++ b/examples/simple-pim/opie-simple.control
@@ -1,9 +1,9 @@
 Package: opie-simple-pim-example
 Files: bin/main-tab apps/Examples/main-tab.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, libopieui2, libopiepim2, opie-pics
 Description:  A simple example
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/examples/simple-pim/simple.cpp b/examples/simple-pim/simple.cpp
index 00c5600..6019d04 100644
--- a/examples/simple-pim/simple.cpp
+++ b/examples/simple-pim/simple.cpp
@@ -5,16 +5,16 @@
 #include "simple.h"
 
 /* Then the Ope include files.
 This includes qpe stuff which will eventually be merged with libopie2 */
 #include <opie2/odebug.h> // for odebug streams
 #include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching
+#include <opie2/oresource.h>
 #include <opie2/otabwidget.h>
 #include <opie2/owait.h>
 #include <qpe/qpeapplication.h> // the QPEApplication
-#include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/datebookmonth.h>
 #include <qpe/timestring.h>
 using namespace Opie::Core;
 
@@ -128,35 +128,35 @@ void MainWindow::initUI() {
     QMenuBar *mb = new QMenuBar( menuBarHolder );
     QToolBar *tb = new QToolBar( this );
 
     QPopupMenu *fileMenu = new QPopupMenu( this );
 
 
-    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" );
     /*
      * Connect quit to the QApplication quit slot
      */
     connect(a, SIGNAL(activated() ),
             qApp, SLOT(quit() ) );
     a->addTo( fileMenu );
 
     a =  new QAction(tr("View Current"),
-                     Resource::loadIconSet("zoom"),
+                     Opie::Core::OResource::loadPixmap("zoom", Opie::Core::OResource::SmallIcon),
                      QString::null, 0, this, "view current");
     /* a simple whats this online explanation of out button */
     a->setWhatsThis(tr("Views the current record")  );
     /* or QWhatsThis::add(widget, "description" ); */
 
     /* see  the power? */
     a->addTo( fileMenu );
     a->addTo( tb );
     m_fire = a;
 
     a = new QAction(tr("Choose Date"),
-                    Resource::loadIconSet("day"),
+                    Opie::Core::OResource::loadPixmap("day", Opie::Core::OResource::SmallIcon),
                     QString::null, 0, this, "choose date" );
     a->addTo( fileMenu );
     a->addTo( tb );
     m_dateAction = a;
 
     mb->insertItem(tr("File"), fileMenu );