1 files changed, 4 insertions, 12 deletions

diff --git a/noncore/games/fifteen/fifteen.cpp b/noncore/games/fifteen/fifteen.cpp
index bb57ee1..c41c0a4 100644
--- a/noncore/games/fifteen/fifteen.cpp
+++ b/noncore/games/fifteen/fifteen.cpp
@@ -25,4 +25,4 @@
 #include <opie2/ofileselector.h>
+#include <opie2/oresource.h>
 
-#include <qtopia/resource.h>
 #include <qtopia/config.h>
@@ -54,2 +54,3 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name, WFlags f
   QPopupMenu *game = new QPopupMenu( this );
+  menubar->insertItem( tr( "Game" ), game );
 
@@ -67,3 +68,3 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name, WFlags f
 
-  QAction *a = new QAction( tr( "Randomize" ), Resource::loadPixmap( "new" ),
+  QAction *a = new QAction( tr( "Randomize" ), Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
                             QString::null, 0, this, 0 );
@@ -74,3 +75,3 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name, WFlags f
 
-  a  = new QAction( tr("Configure"), Resource::loadPixmap( "SettingsIcon" ),
+  a  = new QAction( tr("Configure"), Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
                     QString::null, 0, this, 0 );
@@ -78,11 +79,2 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name, WFlags f
   a->addTo( game );
-
-    /* This is pointless and confusing.
-  a = new QAction( tr( "Solve" ), Resource::loadIconSet( "repeat" ),
-                   QString::null, 0, this, 0 );
-  connect( a, SIGNAL( activated() ), table, SLOT( slotReset() ) );
-  a->addTo( game );
-  a->addTo( toolbar );
-    */
-  menubar->insertItem( tr( "Game" ), game );
 }