summaryrefslogtreecommitdiff
authordrw <drw>2005-05-20 21:23:29 (UTC)
committer drw <drw>2005-05-20 21:23:29 (UTC)
commitdfdc651b989550e30f2b72f535ce0cd3431fc9f4 (patch) (unidiff)
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
@@ -18,12 +18,9 @@
18 * 18 *
19 */ 19 */
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
28#include <time.h> 25#include <time.h>
29#include <assert.h> 26#include <assert.h>
@@ -40,10 +37,7 @@ struct StoneSlice {
40StoneWidget::StoneWidget( QWidget *parent, int x, int y ) 37StoneWidget::StoneWidget( QWidget *parent, int x, int y )
41 : QWidget(parent,"StoneWidget"), stonefield(x,y) 38 : QWidget(parent,"StoneWidget"), stonefield(x,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());
48 42
49 slice=0; 43 slice=0;
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
@@ -19,11 +19,8 @@
19 * 19 *
20 */ 20 */
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
28#include <qtoolbar.h> 25#include <qtoolbar.h>
29#include <qmenubar.h> 26#include <qmenubar.h>
@@ -58,25 +55,25 @@ ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl )
58 55
59 QPopupMenu* fileMenu = new QPopupMenu( this ); 56 QPopupMenu* fileMenu = new QPopupMenu( this );
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");
63 a->addTo( fileMenu ); 60 a->addTo( fileMenu );
64 a->addTo( tb ); 61 a->addTo( tb );
65 connect(a, SIGNAL(activated()), this, SLOT(m_new())); 62 connect(a, SIGNAL(activated()), this, SLOT(m_new()));
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" );
69 a->addTo( fileMenu ); 66 a->addTo( fileMenu );
70 connect( a, SIGNAL(activated()), this, SLOT(m_restart())); 67 connect( a, SIGNAL(activated()), this, SLOT(m_restart()));
71 restart = a; 68 restart = a;
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" );
75 a->addTo( fileMenu ); 72 a->addTo( fileMenu );
76 a->addTo( tb ); 73 a->addTo( tb );
77 connect( a, SIGNAL(activated()), this, SLOT(m_undo())); 74 connect( a, SIGNAL(activated()), this, SLOT(m_undo()));
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");
81 a->addTo( fileMenu ); 78 a->addTo( fileMenu );
82 a->addTo( tb ); 79 a->addTo( tb );