summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/zsame/StoneWidget.cpp12
-rw-r--r--noncore/games/zsame/ZSameWidget.cpp13
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
@@ -20,8 +20,5 @@
20 20
21#include <stdio.h> 21#include <opie2/oresource.h>
22#include <stdlib.h>
23 22
24 23#include <qbitmap.h>
25
26#include <qpe/resource.h>
27 24
@@ -42,6 +39,3 @@ StoneWidget::StoneWidget( QWidget *parent, int x, int y )
42{ 39{
43// setBackgroundPixmap(QPixmap(locate("wallpaper", "Time-For-Lunch-2.jpg"))); 40 QPixmap stonemap = Opie::Core::OResource::loadPixmap( "zsame/stones" );
44// QPixmap stonemap(locate("appdata", "stones.png"));
45
46 QPixmap stonemap = Resource::loadPixmap("zsame/stones" );
47 assert(!stonemap.isNull()); 41 assert(!stonemap.isNull());
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
@@ -21,7 +21,4 @@
21 21
22#include <stdio.h>
23
24#include <opie2/oapplicationfactory.h> 22#include <opie2/oapplicationfactory.h>
25 23#include <opie2/oresource.h>
26#include <qpe/resource.h>
27 24
@@ -60,3 +57,3 @@ ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl )
60 57
61 QAction* a = new QAction(tr("New Game"), Resource::loadIconSet("new") , 58 QAction* a = new QAction(tr("New Game"), Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
62 QString::null, 0, this, "new_icon"); 59 QString::null, 0, this, "new_icon");
@@ -66,3 +63,3 @@ ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl )
66 63
67 a = new QAction(tr("Restart This Board"), Resource::loadIconSet("redo"), 64 a = new QAction(tr("Restart This Board"), Opie::Core::OResource::loadPixmap( "redo", Opie::Core::OResource::SmallIcon ),
68 QString::null, 0, this, "restart_board" ); 65 QString::null, 0, this, "restart_board" );
@@ -72,3 +69,3 @@ ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl )
72 69
73 a = new QAction( tr("Undo"), Resource::loadIconSet("undo"), 70 a = new QAction( tr("Undo"), Opie::Core::OResource::loadPixmap( "undo", Opie::Core::OResource::SmallIcon ),
74 QString::null, 0, this, "undo_action" ); 71 QString::null, 0, this, "undo_action" );
@@ -78,3 +75,3 @@ ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl )
78 75
79 a = new QAction(tr("Quit"), Resource::loadIconSet("quit_icon"), 76 a = new QAction(tr("Quit"), Opie::Core::OResource::loadPixmap( "quit_icon", Opie::Core::OResource::SmallIcon ),
80 QString::null, 0, this, "quit_action"); 77 QString::null, 0, this, "quit_action");