summaryrefslogtreecommitdiff
authordrw <drw>2005-05-20 21:23:29 (UTC)
committer drw <drw>2005-05-20 21:23:29 (UTC)
commitdfdc651b989550e30f2b72f535ce0cd3431fc9f4 (patch) (side-by-side diff)
tree1f5e64509fe2ef75a14c1909a8f981779b7b5acb
parent5e7bbe42671f565bef961b44862ddbf68beed774 (diff)
downloadopie-dfdc651b989550e30f2b72f535ce0cd3431fc9f4.zip
opie-dfdc651b989550e30f2b72f535ce0cd3431fc9f4.tar.gz
opie-dfdc651b989550e30f2b72f535ce0cd3431fc9f4.tar.bz2
Resource -> OResource, remove some unnecessary includes
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 @@
-#include <stdio.h>
-#include <stdlib.h>
+#include <opie2/oresource.h>
-
-
-#include <qpe/resource.h>
+#include <qbitmap.h>
@@ -42,6 +39,3 @@ StoneWidget::StoneWidget( QWidget *parent, int x, int 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());
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 @@
-#include <stdio.h>
-
#include <opie2/oapplicationfactory.h>
-
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
@@ -60,3 +57,3 @@ ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl )
- 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");
@@ -66,3 +63,3 @@ ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl )
- 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" );
@@ -72,3 +69,3 @@ ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl )
- 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" );
@@ -78,3 +75,3 @@ ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl )
- 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");