author | drw <drw> | 2005-05-20 21:23:29 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-20 21:23:29 (UTC) |
commit | dfdc651b989550e30f2b72f535ce0cd3431fc9f4 (patch) (unidiff) | |
tree | 1f5e64509fe2ef75a14c1909a8f981779b7b5acb /noncore/games/zsame/ZSameWidget.cpp | |
parent | 5e7bbe42671f565bef961b44862ddbf68beed774 (diff) | |
download | opie-dfdc651b989550e30f2b72f535ce0cd3431fc9f4.zip opie-dfdc651b989550e30f2b72f535ce0cd3431fc9f4.tar.gz opie-dfdc651b989550e30f2b72f535ce0cd3431fc9f4.tar.bz2 |
Resource -> OResource, remove some unnecessary includes
Diffstat (limited to 'noncore/games/zsame/ZSameWidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/games/zsame/ZSameWidget.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
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 | |||
@@ -10,29 +10,26 @@ | |||
10 | * | 10 | * |
11 | * This program is distributed in the hope that it will be useful, | 11 | * This program is distributed in the hope that it will be useful, |
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | * GNU General Public License for more details. | 14 | * GNU General Public License for more details. |
15 | * | 15 | * |
16 | * You should have received a copy of the GNU General Public License | 16 | * You should have received a copy of the GNU General Public License |
17 | * along with this program; if not, write to the Free Software | 17 | * along with this program; if not, write to the Free Software |
18 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 18 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
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> |
30 | #include <qapplication.h> | 27 | #include <qapplication.h> |
31 | #include <qaction.h> | 28 | #include <qaction.h> |
32 | #include <qmessagebox.h> | 29 | #include <qmessagebox.h> |
33 | 30 | ||
34 | #include <kapplication.h> | 31 | #include <kapplication.h> |
35 | 32 | ||
36 | #include "ZSameWidget.h" | 33 | #include "ZSameWidget.h" |
37 | 34 | ||
38 | static int default_colors=3; | 35 | static int default_colors=3; |
@@ -49,43 +46,43 @@ ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl ) | |||
49 | : QMainWindow( parent, name, fl ) | 46 | : QMainWindow( parent, name, fl ) |
50 | { | 47 | { |
51 | setCaption(tr("ZSame")); | 48 | setCaption(tr("ZSame")); |
52 | 49 | ||
53 | setToolBarsMovable( false ); | 50 | setToolBarsMovable( false ); |
54 | QToolBar* con = new QToolBar( this ); | 51 | QToolBar* con = new QToolBar( this ); |
55 | con->setHorizontalStretchable( true ); | 52 | con->setHorizontalStretchable( true ); |
56 | QMenuBar* mb = new QMenuBar( con ); | 53 | QMenuBar* mb = new QMenuBar( con ); |
57 | QToolBar* tb = new QToolBar( this ); | 54 | QToolBar* tb = new QToolBar( this ); |
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 ); |
83 | connect(a, SIGNAL(activated()), this, SLOT(m_quit())); | 80 | connect(a, SIGNAL(activated()), this, SLOT(m_quit())); |
84 | 81 | ||
85 | mb->insertItem(tr("Game" ), fileMenu ); | 82 | mb->insertItem(tr("Game" ), fileMenu ); |
86 | 83 | ||
87 | int foo[2]; | 84 | int foo[2]; |
88 | desktop_widget(foo); | 85 | desktop_widget(foo); |
89 | stone = new StoneWidget(this,foo[0],foo[1]); | 86 | stone = new StoneWidget(this,foo[0],foo[1]); |
90 | 87 | ||
91 | connect( stone, SIGNAL(s_gameover()), this, SLOT(gameover())); | 88 | connect( stone, SIGNAL(s_gameover()), this, SLOT(gameover())); |