author | zecke <zecke> | 2004-02-06 10:33:09 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-06 10:33:09 (UTC) |
commit | 46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25 (patch) (unidiff) | |
tree | ab868f654bd296d693b74c43e166a8403aa9ede4 /noncore | |
parent | 5b2b3a4147742e7053539d3c58a2a552eb830815 (diff) | |
download | opie-46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25.zip opie-46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25.tar.gz opie-46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25.tar.bz2 |
Update from Qtopia1.7 (borders on the items)
make it quicklaunchable
-rw-r--r-- | noncore/games/fifteen/fifteen.cpp | 83 | ||||
-rw-r--r-- | noncore/games/fifteen/fifteen.h | 12 | ||||
-rw-r--r-- | noncore/games/fifteen/fifteen.pro | 4 | ||||
-rw-r--r-- | noncore/games/fifteen/main.cpp | 20 |
4 files changed, 70 insertions, 49 deletions
diff --git a/noncore/games/fifteen/fifteen.cpp b/noncore/games/fifteen/fifteen.cpp index 2e4ed94..b4e0308 100644 --- a/noncore/games/fifteen/fifteen.cpp +++ b/noncore/games/fifteen/fifteen.cpp | |||
@@ -1,87 +1,90 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "fifteen.h" | 21 | #include "fifteen.h" |
22 | 22 | ||
23 | #include <qpe/resource.h> | 23 | #include <qtopia/resource.h> |
24 | #include <qpe/config.h> | 24 | #include <qtopia/config.h> |
25 | 25 | ||
26 | #include <qvbox.h> | 26 | #include <qvbox.h> |
27 | #include <qaction.h> | 27 | #include <qaction.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qpainter.h> | 29 | #include <qpainter.h> |
30 | #include <qpopupmenu.h> | 30 | #include <qpopupmenu.h> |
31 | #include <qmessagebox.h> | 31 | #include <qmessagebox.h> |
32 | #include <qpe/qpetoolbar.h> | 32 | #include <qtoolbar.h> |
33 | #include <qmenubar.h> | 33 | #include <qmenubar.h> |
34 | #include <qstringlist.h> | 34 | #include <qstringlist.h> |
35 | #include <qapplication.h> | 35 | #include <qapplication.h> |
36 | #include <qtoolbutton.h> | ||
36 | 37 | ||
37 | #include <stdlib.h> | 38 | #include <stdlib.h> |
38 | #include <time.h> | 39 | #include <time.h> |
39 | 40 | ||
40 | FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name) | 41 | FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name, WFlags fl) |
41 | : QMainWindow( parent, name ) | 42 | : QMainWindow( parent, name, fl ) |
42 | { | 43 | { |
43 | // random seed | 44 | // random seed |
44 | srand(time(0)); | 45 | srand(time(0)); |
45 | 46 | setCaption( tr("Fifteen Pieces") ); | |
46 | setToolBarsMovable( FALSE ); | ||
47 | QVBox *vbox = new QVBox( this ); | ||
48 | PiecesTable *table = new PiecesTable( vbox ); | ||
49 | setCentralWidget(vbox); | ||
50 | 47 | ||
51 | QToolBar *toolbar = new QToolBar(this); | 48 | QToolBar *toolbar = new QToolBar(this); |
52 | toolbar->setHorizontalStretchable( TRUE ); | 49 | toolbar->setHorizontalStretchable( FALSE ); |
53 | addToolBar(toolbar); | ||
54 | |||
55 | QMenuBar *menubar = new QMenuBar( toolbar ); | 50 | QMenuBar *menubar = new QMenuBar( toolbar ); |
56 | menubar->setMargin(0); | 51 | menubar->setMargin(0); |
57 | |||
58 | QPopupMenu *game = new QPopupMenu( this ); | 52 | QPopupMenu *game = new QPopupMenu( this ); |
59 | 53 | ||
60 | QWidget *spacer = new QWidget( toolbar ); | 54 | QWidget *spacer = new QWidget( toolbar ); |
61 | spacer->setBackgroundMode( PaletteButton ); | 55 | spacer->setBackgroundMode( PaletteButton ); |
62 | toolbar->setStretchableWidget( spacer ); | 56 | toolbar->setStretchableWidget( spacer ); |
63 | 57 | ||
58 | |||
59 | setToolBarsMovable( FALSE ); | ||
60 | QVBox *vbox = new QVBox( this ); | ||
61 | PiecesTable *table = new PiecesTable( vbox ); | ||
62 | setCentralWidget(vbox); | ||
63 | |||
64 | |||
65 | |||
64 | QAction *a = new QAction( tr( "Randomize" ), Resource::loadPixmap( "new" ), | 66 | QAction *a = new QAction( tr( "Randomize" ), Resource::loadPixmap( "new" ), |
65 | QString::null, 0, this, 0 ); | 67 | QString::null, 0, this, 0 ); |
66 | connect( a, SIGNAL( activated() ), table, SLOT( slotRandomize() ) ); | 68 | connect( a, SIGNAL( activated() ), table, SLOT( slotRandomize() ) ); |
67 | a->addTo( game ); | 69 | a->addTo( game ); |
68 | a->addTo( toolbar ); | 70 | a->addTo( toolbar ); |
69 | 71 | ||
70 | a = new QAction( tr( "Solve" ), Resource::loadPixmap( "repeat" ), | 72 | /* This is pointless and confusing. |
73 | a = new QAction( tr( "Solve" ), Resource::loadIconSet( "repeat" ), | ||
71 | QString::null, 0, this, 0 ); | 74 | QString::null, 0, this, 0 ); |
72 | connect( a, SIGNAL( activated() ), table, SLOT( slotReset() ) ); | 75 | connect( a, SIGNAL( activated() ), table, SLOT( slotReset() ) ); |
73 | a->addTo( game ); | 76 | a->addTo( game ); |
74 | a->addTo( toolbar ); | 77 | a->addTo( toolbar ); |
75 | 78 | */ | |
76 | menubar->insertItem( tr( "Game" ), game ); | 79 | menubar->insertItem( tr( "Game" ), game ); |
77 | } | 80 | } |
78 | 81 | ||
79 | PiecesTable::PiecesTable(QWidget* parent, const char* name ) | 82 | PiecesTable::PiecesTable(QWidget* parent, const char* name ) |
80 | : QTableView(parent, name), _menu(0), _randomized(false) | 83 | : QTableView(parent, name), _menu(0), _randomized(false) |
81 | { | 84 | { |
82 | // setup table view | 85 | // setup table view |
83 | setFrameStyle(StyledPanel | Sunken); | 86 | setFrameStyle(StyledPanel | Sunken); |
84 | setBackgroundMode(NoBackground); | 87 | setBackgroundMode(NoBackground); |
85 | setMouseTracking(true); | 88 | setMouseTracking(true); |
86 | 89 | ||
87 | setNumRows(4); | 90 | setNumRows(4); |
@@ -100,97 +103,121 @@ PiecesTable::PiecesTable(QWidget* parent, const char* name ) | |||
100 | } | 103 | } |
101 | 104 | ||
102 | PiecesTable::~PiecesTable() | 105 | PiecesTable::~PiecesTable() |
103 | { | 106 | { |
104 | writeConfig(); | 107 | writeConfig(); |
105 | } | 108 | } |
106 | 109 | ||
107 | void PiecesTable::writeConfig() | 110 | void PiecesTable::writeConfig() |
108 | { | 111 | { |
109 | Config cfg("Fifteen"); | 112 | Config cfg("Fifteen"); |
110 | cfg.setGroup("Game"); | 113 | cfg.setGroup("Game"); |
111 | QStringList map; | 114 | QStringList map; |
112 | for (unsigned int i = 0; i < 16; i++) | 115 | for (int i = 0; i < 16; i++) |
113 | map.append( QString::number( _map[i] ) ); | 116 | map.append( QString::number( _map[i] ) ); |
114 | cfg.writeEntry("Map", map, '-'); | 117 | cfg.writeEntry("Map", map, '-'); |
115 | cfg.writeEntry("Randomized", _randomized ); | 118 | cfg.writeEntry("Randomized", _randomized ); |
116 | } | 119 | } |
117 | 120 | ||
118 | void PiecesTable::readConfig() | 121 | void PiecesTable::readConfig() |
119 | { | 122 | { |
120 | Config cfg("Fifteen"); | 123 | Config cfg("Fifteen"); |
121 | cfg.setGroup("Game"); | 124 | cfg.setGroup("Game"); |
122 | QStringList map = cfg.readListEntry("Map", '-'); | 125 | QStringList map = cfg.readListEntry("Map", '-'); |
123 | _randomized = cfg.readBoolEntry( "Randomized", FALSE ); | 126 | _randomized = cfg.readBoolEntry( "Randomized", FALSE ); |
124 | unsigned int i = 0; | 127 | int i = 0; |
125 | for ( QStringList::Iterator it = map.begin(); it != map.end(); ++it ) { | 128 | for ( QStringList::Iterator it = map.begin(); it != map.end(); ++it ) { |
126 | _map[i] = (*it).toInt(); | 129 | _map[i] = (*it).toInt(); |
127 | i++; | 130 | i++; |
128 | if ( i > 15 ) break; | 131 | if ( i > 15 ) break; |
129 | } | 132 | } |
130 | } | 133 | } |
131 | 134 | ||
132 | void PiecesTable::paintCell(QPainter *p, int row, int col) | 135 | void PiecesTable::paintCell(QPainter *p, int row, int col) |
133 | { | 136 | { |
134 | int w = cellWidth(); | 137 | int w = cellWidth(); |
135 | int h = cellHeight(); | 138 | int h = cellHeight(); |
136 | int x2 = w - 1; | 139 | int x2 = w - 1; |
137 | int y2 = h - 1; | 140 | int y2 = h - 1; |
138 | 141 | ||
139 | int number = _map[col + row * numCols()] + 1; | 142 | int number = _map[col + row * numCols()] + 1; |
140 | 143 | ||
141 | // draw cell background | 144 | // draw cell background |
142 | if(number == 16) | 145 | if(number == 16) |
143 | p->setBrush(colorGroup().background()); | 146 | p->setBrush(colorGroup().background()); |
144 | else | 147 | else |
145 | p->setBrush(_colors[number-1]); | 148 | p->setBrush(_colors[number-1]); |
146 | p->setPen(NoPen); | 149 | p->setPen(NoPen); |
147 | p->drawRect(0, 0, w, h); | 150 | p->drawRect(0, 0, w, h); |
148 | 151 | ||
152 | if (number == 16) return; | ||
153 | |||
149 | // draw borders | 154 | // draw borders |
150 | if (height() > 40) { | 155 | if (height() > 40) { |
151 | p->setPen(colorGroup().text()); | 156 | p->setBrush(_colors[number-1].light(130)); |
152 | if(col < numCols()-1) | 157 | p->drawPolygon(light_border); |
153 | p->drawLine(x2, 0, x2, y2); // right border line | ||
154 | 158 | ||
155 | if(row < numRows()-1) | 159 | p->setBrush(_colors[number-1].dark(130)); |
156 | p->drawLine(0, y2, x2, y2); // bottom boder line | 160 | p->drawPolygon(dark_border); |
157 | } | 161 | } |
158 | 162 | ||
159 | // draw number | 163 | // draw number |
160 | if (number == 16) return; | ||
161 | p->setPen(black); | 164 | p->setPen(black); |
162 | p->drawText(0, 0, x2, y2, AlignHCenter | AlignVCenter, QString::number(number)); | 165 | p->drawText(0, 0, x2, y2, AlignHCenter | AlignVCenter, QString::number(number)); |
163 | } | 166 | } |
164 | 167 | ||
165 | void PiecesTable::resizeEvent(QResizeEvent *e) | 168 | void PiecesTable::resizeEvent(QResizeEvent *e) |
166 | { | 169 | { |
167 | QTableView::resizeEvent(e); | 170 | QTableView::resizeEvent(e); |
168 | 171 | ||
169 | setCellWidth(contentsRect().width()/ numRows()); | 172 | setCellWidth(contentsRect().width()/ numRows()); |
170 | setCellHeight(contentsRect().height() / numCols()); | 173 | setCellHeight(contentsRect().height() / numCols()); |
174 | |||
175 | // | ||
176 | // Calculate 3d-effect borders | ||
177 | // | ||
178 | intcell_w = cellWidth(); | ||
179 | intcell_h = cellHeight(); | ||
180 | int x_offset = cell_w - int(cell_w * 0.9);// 10% should be enough | ||
181 | inty_offset = cell_h - int(cell_h * 0.9); | ||
182 | |||
183 | light_border.setPoints(6, | ||
184 | 0, 0, | ||
185 | cell_w, 0, | ||
186 | cell_w - x_offset, y_offset, | ||
187 | x_offset, y_offset, | ||
188 | x_offset, cell_h - y_offset, | ||
189 | 0, cell_h); | ||
190 | |||
191 | dark_border.setPoints(6, | ||
192 | cell_w, 0, | ||
193 | cell_w, cell_h, | ||
194 | 0, cell_h, | ||
195 | x_offset, cell_h - y_offset, | ||
196 | cell_w - x_offset, cell_h - y_offset, | ||
197 | cell_w - x_offset, y_offset); | ||
171 | } | 198 | } |
172 | 199 | ||
173 | void PiecesTable::initColors() | 200 | void PiecesTable::initColors() |
174 | { | 201 | { |
175 | _colors.resize(numRows() * numCols()); | 202 | _colors.resize(numRows() * numCols()); |
176 | for (int r = 0; r < numRows(); r++) | 203 | for (int r = 0; r < numRows(); r++) |
177 | for (int c = 0; c < numCols(); c++) | 204 | for (int c = 0; c < numCols(); c++) |
178 | _colors[c + r *numCols()] = QColor(255 - 70 * c,255 - 70 * r, 150); | 205 | _colors[c + r *numCols()] = QColor(255 - 70 * c,255 - 70 * r, 150); |
179 | } | 206 | } |
180 | 207 | ||
181 | void PiecesTable::initMap() | 208 | void PiecesTable::initMap() |
182 | { | 209 | { |
183 | _map.resize(16); | 210 | _map.resize(16); |
184 | for (unsigned int i = 0; i < 16; i++) | 211 | for ( int i = 0; i < 16; i++) |
185 | _map[i] = i; | 212 | _map[i] = i; |
186 | 213 | ||
187 | _randomized = false; | 214 | _randomized = false; |
188 | } | 215 | } |
189 | 216 | ||
190 | void PiecesTable::randomizeMap() | 217 | void PiecesTable::randomizeMap() |
191 | { | 218 | { |
192 | initMap(); | 219 | initMap(); |
193 | _randomized = true; | 220 | _randomized = true; |
194 | // find the free position | 221 | // find the free position |
195 | int pos = _map.find(15); | 222 | int pos = _map.find(15); |
196 | 223 | ||
@@ -232,26 +259,26 @@ void PiecesTable::randomizeMap() | |||
232 | for(int r = frow; r > row; r--) { | 259 | for(int r = frow; r > row; r--) { |
233 | _map[col + r * numCols()] = _map[ col + (r-1) *numCols()]; | 260 | _map[col + r * numCols()] = _map[ col + (r-1) *numCols()]; |
234 | } | 261 | } |
235 | } | 262 | } |
236 | else if (row > frow) { | 263 | else if (row > frow) { |
237 | for(int r = frow; r < row; r++) { | 264 | for(int r = frow; r < row; r++) { |
238 | _map[col + r * numCols()] = _map[ col + (r+1) *numCols()]; | 265 | _map[col + r * numCols()] = _map[ col + (r+1) *numCols()]; |
239 | } | 266 | } |
240 | } | 267 | } |
241 | } | 268 | } |
242 | // move free cell to click position | 269 | // move free cell to click position |
243 | _map[pos=(col + row * numCols())] = 15; | 270 | _map[pos=(col + row * numCols())] = 15; |
244 | repaint(); | ||
245 | } | 271 | } |
272 | repaint(); | ||
246 | } | 273 | } |
247 | 274 | ||
248 | void PiecesTable::checkwin() | 275 | void PiecesTable::checkwin() |
249 | { | 276 | { |
250 | if(!_randomized) return; | 277 | if(!_randomized) return; |
251 | 278 | ||
252 | int i; | 279 | int i; |
253 | for (i = 0; i < 16; i++) | 280 | for (i = 0; i < 16; i++) |
254 | if(i != _map[i]) | 281 | if(i != _map[i]) |
255 | break; | 282 | break; |
256 | 283 | ||
257 | if (i == 16) { | 284 | if (i == 16) { |
diff --git a/noncore/games/fifteen/fifteen.h b/noncore/games/fifteen/fifteen.h index 703a8a7..58eb756 100644 --- a/noncore/games/fifteen/fifteen.h +++ b/noncore/games/fifteen/fifteen.h | |||
@@ -1,38 +1,39 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #ifndef __fifteenapplet_h__ | 21 | #ifndef __fifteenapplet_h__ |
22 | #define __fifteenapplet_h__ | 22 | #define __fifteenapplet_h__ |
23 | 23 | ||
24 | #include <qmainwindow.h> | 24 | #include <qmainwindow.h> |
25 | #include <qtableview.h> | 25 | #include <qtableview.h> |
26 | #include <qarray.h> | 26 | #include <qarray.h> |
27 | #include <qpointarray.h> | ||
27 | 28 | ||
28 | class QPopupMenu; | 29 | class QPopupMenu; |
29 | 30 | ||
30 | class PiecesTable : public QTableView | 31 | class PiecesTable : public QTableView |
31 | { | 32 | { |
32 | Q_OBJECT | 33 | Q_OBJECT |
33 | 34 | ||
34 | public: | 35 | public: |
35 | PiecesTable(QWidget* parent = 0, const char* name = 0); | 36 | PiecesTable(QWidget* parent = 0, const char* name = 0); |
36 | ~PiecesTable(); | 37 | ~PiecesTable(); |
37 | 38 | ||
38 | protected slots: | 39 | protected slots: |
@@ -48,36 +49,41 @@ class PiecesTable : public QTableView | |||
48 | void initMap(); | 49 | void initMap(); |
49 | void initColors(); | 50 | void initColors(); |
50 | void randomizeMap(); | 51 | void randomizeMap(); |
51 | void checkwin(); | 52 | void checkwin(); |
52 | void readConfig(); | 53 | void readConfig(); |
53 | void writeConfig(); | 54 | void writeConfig(); |
54 | 55 | ||
55 | private: | 56 | private: |
56 | QArray<int> _map; | 57 | QArray<int> _map; |
57 | QArray<QColor> _colors; | 58 | QArray<QColor> _colors; |
58 | QPopupMenu *_menu; | 59 | QPopupMenu *_menu; |
59 | bool _randomized; | 60 | bool _randomized; |
61 | QPointArraylight_border; | ||
62 | QPointArraydark_border; | ||
60 | 63 | ||
61 | enum MenuOp { mRandomize = 1, mReset = 2 }; | 64 | enum MenuOp { mRandomize = 1, mReset = 2 }; |
62 | }; | 65 | }; |
63 | 66 | ||
64 | class FifteenWidget : public QWidget | 67 | class FifteenWidget : public QWidget |
65 | { | 68 | { |
66 | Q_OBJECT | 69 | Q_OBJECT |
67 | 70 | ||
68 | public: | 71 | public: |
69 | FifteenWidget(QWidget *parent = 0, const char *name = 0); | 72 | FifteenWidget(QWidget *parent = 0, const char *name = 0); |
70 | 73 | ||
71 | private: | 74 | private: |
72 | PiecesTable *_table; | 75 | PiecesTable *_table; |
73 | }; | 76 | }; |
74 | 77 | ||
75 | class FifteenMainWindow : public QMainWindow | 78 | class FifteenMainWindow : public QMainWindow |
76 | { | 79 | { |
77 | Q_OBJECT | 80 | Q_OBJECT |
78 | 81 | ||
79 | public: | 82 | public: |
80 | FifteenMainWindow(QWidget *parent=0, const char* name=0); | 83 | static QString appName() { |
84 | return QString::fromLatin1("fifteen"); | ||
85 | } | ||
86 | FifteenMainWindow(QWidget *parent=0, const char* name=0, WFlags fl=0); | ||
81 | }; | 87 | }; |
82 | 88 | ||
83 | #endif | 89 | #endif |
diff --git a/noncore/games/fifteen/fifteen.pro b/noncore/games/fifteen/fifteen.pro index 43d336d..14ea3c9 100644 --- a/noncore/games/fifteen/fifteen.pro +++ b/noncore/games/fifteen/fifteen.pro | |||
@@ -1,12 +1,10 @@ | |||
1 | DESTDIR = $(OPIEDIR)/bin | 1 | CONFIG = qt warn_on release quick-app |
2 | TEMPLATE= app | ||
3 | CONFIG = qt warn_on release | ||
4 | HEADERS = fifteen.h | 2 | HEADERS = fifteen.h |
5 | SOURCES = fifteen.cpp \ | 3 | SOURCES = fifteen.cpp \ |
6 | main.cpp | 4 | main.cpp |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH+= $(OPIEDIR)/include | 6 | DEPENDPATH+= $(OPIEDIR)/include |
9 | LIBS += -lqpe | 7 | LIBS += -lqpe |
10 | TARGET = fifteen | 8 | TARGET = fifteen |
11 | 9 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 10 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/games/fifteen/main.cpp b/noncore/games/fifteen/main.cpp index 4838a36..74a7368 100644 --- a/noncore/games/fifteen/main.cpp +++ b/noncore/games/fifteen/main.cpp | |||
@@ -1,33 +1,23 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2004 Holger Freyther. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Opie Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | ||
17 | ** not clear to you. | ||
18 | ** | ||
19 | **********************************************************************/ | 16 | **********************************************************************/ |
20 | 17 | ||
21 | #include "fifteen.h" | 18 | #include "fifteen.h" |
22 | 19 | ||
23 | #include <qpe/qpeapplication.h> | 20 | #include <opie/oapplicationfactory.h> |
21 | |||
22 | OPIE_EXPORT_APP( OApplicationFactory<FifteenMainWindow> ) | ||
24 | 23 | ||
25 | int main( int argc, char ** argv) | ||
26 | { | ||
27 | QPEApplication app( argc, argv ); | ||
28 | |||
29 | FifteenMainWindow mw; | ||
30 | mw.setCaption( FifteenMainWindow::tr("Fifteen Pieces") ); | ||
31 | app.showMainWidget( &mw ); | ||
32 | return app.exec(); | ||
33 | } | ||