Resource -> OResource, remove some unnecessary includes

2 files changed, 8 insertions, 17 deletions

diff --git a/noncore/games/zsame/StoneWidget.cpp b/noncore/games/zsame/StoneWidget.cpp
index 5dd0252..f370714 100644
--- a/noncore/games/zsame/StoneWidget.cpp
+++ b/noncore/games/zsame/StoneWidget.cpp
@@ -17,14 +17,11 @@
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <opie2/oresource.h>
 
-
-
-#include <qpe/resource.h>
+#include <qbitmap.h>
 
 #include <time.h>
 #include <assert.h>
 
@@ -39,12 +36,9 @@ struct StoneSlice {
 
 StoneWidget::StoneWidget( QWidget *parent, int x, int y )
     : QWidget(parent,"StoneWidget"), stonefield(x,y)
 {
-//    setBackgroundPixmap(QPixmap(locate("wallpaper", "Time-For-Lunch-2.jpg")));
-//    QPixmap stonemap(locate("appdata", "stones.png"));
-
-    QPixmap stonemap = Resource::loadPixmap("zsame/stones" );
+    QPixmap stonemap = Opie::Core::OResource::loadPixmap( "zsame/stones" );
     assert(!stonemap.isNull());
 
     slice=0;
     maxslices=30;
diff --git a/noncore/games/zsame/ZSameWidget.cpp b/noncore/games/zsame/ZSameWidget.cpp
index dee4a1c..7bcbee1 100644
--- a/noncore/games/zsame/ZSameWidget.cpp
+++ b/noncore/games/zsame/ZSameWidget.cpp
@@ -18,13 +18,10 @@
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
 
-#include <stdio.h>
-
 #include <opie2/oapplicationfactory.h>
-
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 
 #include <qtoolbar.h>
 #include <qmenubar.h>
 #include <qapplication.h>
@@ -57,27 +54,27 @@ ZSameWidget::ZSameWidget( QWidget* parent, const char* name,  WFlags fl )
     QToolBar* tb = new QToolBar( this );
 
     QPopupMenu* fileMenu = new QPopupMenu( this );
 
-    QAction* a = new QAction(tr("New Game"), Resource::loadIconSet("new") ,
+    QAction* a = new QAction(tr("New Game"), Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
                              QString::null, 0, this, "new_icon");
     a->addTo( fileMenu );
     a->addTo( tb );
     connect(a, SIGNAL(activated()), this, SLOT(m_new()));
 
-    a = new QAction(tr("Restart This Board"), Resource::loadIconSet("redo"),
+    a = new QAction(tr("Restart This Board"), Opie::Core::OResource::loadPixmap( "redo", Opie::Core::OResource::SmallIcon ),
                               QString::null, 0, this, "restart_board" );
     a->addTo( fileMenu );
     connect( a, SIGNAL(activated()), this, SLOT(m_restart()));
     restart = a;
 
-    a = new QAction( tr("Undo"), Resource::loadIconSet("undo"),
+    a = new QAction( tr("Undo"), Opie::Core::OResource::loadPixmap( "undo", Opie::Core::OResource::SmallIcon ),
                      QString::null, 0, this, "undo_action" );
     a->addTo( fileMenu );
     a->addTo( tb );
     connect( a, SIGNAL(activated()), this, SLOT(m_undo()));
 
-    a = new QAction(tr("Quit"), Resource::loadIconSet("quit_icon"),
+    a = new QAction(tr("Quit"), Opie::Core::OResource::loadPixmap( "quit_icon", Opie::Core::OResource::SmallIcon ),
                               QString::null, 0, this, "quit_action");
     a->addTo( fileMenu );
     a->addTo( tb );
     connect(a, SIGNAL(activated()), this, SLOT(m_quit()));