-rw-r--r-- | noncore/games/solitaire/canvascard.cpp | 5 | ||||
-rw-r--r-- | noncore/games/solitaire/canvascardgame.cpp | 8 | ||||
-rw-r--r-- | noncore/games/solitaire/canvascardwindow.cpp | 5 | ||||
-rw-r--r-- | noncore/games/solitaire/canvasshapes.cpp | 2 | ||||
-rw-r--r-- | noncore/games/solitaire/card.cpp | 3 | ||||
-rw-r--r-- | noncore/games/solitaire/cardpile.cpp | 2 | ||||
-rw-r--r-- | noncore/games/solitaire/chicanecardgame.cpp | 1 | ||||
-rw-r--r-- | noncore/games/solitaire/freecellcardgame.cpp | 1 | ||||
-rw-r--r-- | noncore/games/solitaire/harpcardgame.cpp | 1 | ||||
-rw-r--r-- | noncore/games/solitaire/main.cpp | 1 | ||||
-rw-r--r-- | noncore/games/solitaire/patiencecardgame.cpp | 1 | ||||
-rw-r--r-- | noncore/games/solitaire/teeclubcardgame.cpp | 1 |
12 files changed, 0 insertions, 31 deletions
diff --git a/noncore/games/solitaire/canvascard.cpp b/noncore/games/solitaire/canvascard.cpp index 7c4a5ba..c36da6c 100644 --- a/noncore/games/solitaire/canvascard.cpp +++ b/noncore/games/solitaire/canvascard.cpp | |||
@@ -9,33 +9,28 @@ | |||
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 "cardgame.h" | ||
22 | #include "canvascard.h" | 21 | #include "canvascard.h" |
23 | 22 | ||
24 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
25 | 24 | ||
26 | #include <qpainter.h> | ||
27 | #include <qimage.h> | ||
28 | #include <qpaintdevice.h> | ||
29 | #include <qbitmap.h> | ||
30 | #include <qgfx_qws.h> // Needed to get the device's width | 25 | #include <qgfx_qws.h> // Needed to get the device's width |
31 | 26 | ||
32 | #include <math.h> | 27 | #include <math.h> |
33 | 28 | ||
34 | #if defined( QT_QWS_CASSIOPEIA ) | 29 | #if defined( QT_QWS_CASSIOPEIA ) |
35 | #define SLOW_HARDWARE | 30 | #define SLOW_HARDWARE |
36 | #endif | 31 | #endif |
37 | 32 | ||
38 | // Seems to be fast enough to me even without Transformations in the library | 33 | // Seems to be fast enough to me even without Transformations in the library |
39 | //#if defined( QT_NO_TRANSFORMATIONS ) && defined( QT_QWS_IPAQ ) | 34 | //#if defined( QT_NO_TRANSFORMATIONS ) && defined( QT_QWS_IPAQ ) |
40 | //#define SLOW_HARDWARE | 35 | //#define SLOW_HARDWARE |
41 | //#endif | 36 | //#endif |
diff --git a/noncore/games/solitaire/canvascardgame.cpp b/noncore/games/solitaire/canvascardgame.cpp index 9ae2a23..ed5748e 100644 --- a/noncore/games/solitaire/canvascardgame.cpp +++ b/noncore/games/solitaire/canvascardgame.cpp | |||
@@ -9,35 +9,27 @@ | |||
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 "cardgame.h" | ||
22 | #include "canvasshapes.h" | ||
23 | #include "canvascard.h" | ||
24 | #include "canvascardgame.h" | 21 | #include "canvascardgame.h" |
25 | 22 | ||
26 | #include <qpe/resource.h> | ||
27 | #include <qpe/config.h> | ||
28 | 23 | ||
29 | #include <qmainwindow.h> | ||
30 | #include <qmenubar.h> | ||
31 | #include <qpainter.h> | ||
32 | #include <qgfx_qws.h> | 24 | #include <qgfx_qws.h> |
33 | 25 | ||
34 | #include <stdlib.h> | 26 | #include <stdlib.h> |
35 | #include <limits.h> | 27 | #include <limits.h> |
36 | #include <time.h> | 28 | #include <time.h> |
37 | #include <math.h> | 29 | #include <math.h> |
38 | 30 | ||
39 | 31 | ||
40 | extern int highestZ; | 32 | extern int highestZ; |
41 | 33 | ||
42 | 34 | ||
43 | class CanvasCardPile : public QCanvasRectangle | 35 | class CanvasCardPile : public QCanvasRectangle |
diff --git a/noncore/games/solitaire/canvascardwindow.cpp b/noncore/games/solitaire/canvascardwindow.cpp index c12344a..503bc92 100644 --- a/noncore/games/solitaire/canvascardwindow.cpp +++ b/noncore/games/solitaire/canvascardwindow.cpp | |||
@@ -10,35 +10,30 @@ | |||
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 "canvascardwindow.h" | 21 | #include "canvascardwindow.h" |
22 | #include "patiencecardgame.h" | ||
23 | #include "freecellcardgame.h" | 22 | #include "freecellcardgame.h" |
24 | #include "chicanecardgame.h" | 23 | #include "chicanecardgame.h" |
25 | #include "harpcardgame.h" | 24 | #include "harpcardgame.h" |
26 | #include "teeclubcardgame.h" | 25 | #include "teeclubcardgame.h" |
27 | 26 | ||
28 | #include <qpe/resource.h> | ||
29 | 27 | ||
30 | #include <qmainwindow.h> | ||
31 | #include <qpopupmenu.h> | ||
32 | #include <qstyle.h> | ||
33 | 28 | ||
34 | 29 | ||
35 | CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) : | 30 | CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) : |
36 | QMainWindow(parent, name, f), canvas(230, 260), snapOn(TRUE), cardBack(4), gameType(0), | 31 | QMainWindow(parent, name, f), canvas(230, 260), snapOn(TRUE), cardBack(4), gameType(0), |
37 | cardGame(NULL) | 32 | cardGame(NULL) |
38 | { | 33 | { |
39 | setIcon( Resource::loadPixmap( "cards" ) ); | 34 | setIcon( Resource::loadPixmap( "cards" ) ); |
40 | setCaption(tr("Patience")); | 35 | setCaption(tr("Patience")); |
41 | 36 | ||
42 | // Create Playing Area for Games | 37 | // Create Playing Area for Games |
43 | if ( QPixmap::defaultDepth() < 12 ) { | 38 | if ( QPixmap::defaultDepth() < 12 ) { |
44 | // canvas.setBackgroundColor(QColor(0x51, 0x74, 0x6B)); | 39 | // canvas.setBackgroundColor(QColor(0x51, 0x74, 0x6B)); |
diff --git a/noncore/games/solitaire/canvasshapes.cpp b/noncore/games/solitaire/canvasshapes.cpp index 6ccd4a4..011958d 100644 --- a/noncore/games/solitaire/canvasshapes.cpp +++ b/noncore/games/solitaire/canvasshapes.cpp | |||
@@ -8,26 +8,24 @@ | |||
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 | #include <qpainter.h> | ||
21 | #include <qcanvas.h> | ||
22 | #include <qgfx_qws.h> | 20 | #include <qgfx_qws.h> |
23 | #include "canvasshapes.h" | 21 | #include "canvasshapes.h" |
24 | 22 | ||
25 | 23 | ||
26 | CanvasRoundRect::CanvasRoundRect(int x, int y, QCanvas *canvas) : | 24 | CanvasRoundRect::CanvasRoundRect(int x, int y, QCanvas *canvas) : |
27 | QCanvasRectangle( x, y, ( qt_screen->deviceWidth() < 200 ) ? 20 : 23, ( qt_screen->deviceWidth() < 200 ) ? 27 : 36, canvas) | 25 | QCanvasRectangle( x, y, ( qt_screen->deviceWidth() < 200 ) ? 20 : 23, ( qt_screen->deviceWidth() < 200 ) ? 27 : 36, canvas) |
28 | { | 26 | { |
29 | setZ(0); | 27 | setZ(0); |
30 | show(); | 28 | show(); |
31 | } | 29 | } |
32 | 30 | ||
33 | 31 | ||
diff --git a/noncore/games/solitaire/card.cpp b/noncore/games/solitaire/card.cpp index 609e280..52e38ac 100644 --- a/noncore/games/solitaire/card.cpp +++ b/noncore/games/solitaire/card.cpp | |||
@@ -11,28 +11,25 @@ | |||
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 "card.h" | 21 | #include "card.h" |
22 | 22 | ||
23 | #include <qpe/config.h> | ||
24 | 23 | ||
25 | #include <qpoint.h> | ||
26 | #include <qlist.h> | ||
27 | 24 | ||
28 | /* | 25 | /* |
29 | Card( eValue v, eSuit s, bool f ) : | 26 | Card( eValue v, eSuit s, bool f ) : |
30 | val(v), suit(s), faceUp(f), showing(FALSE), ix(0), iy(0), iz(0), cardPile(NULL) { } | 27 | val(v), suit(s), faceUp(f), showing(FALSE), ix(0), iy(0), iz(0), cardPile(NULL) { } |
31 | virtual ~Card() { } | 28 | virtual ~Card() { } |
32 | eValue getValue() { return val; } | 29 | eValue getValue() { return val; } |
33 | eSuit getSuit() { return suit; } | 30 | eSuit getSuit() { return suit; } |
34 | CardPile *getCardPile() { return cardPile; } | 31 | CardPile *getCardPile() { return cardPile; } |
35 | bool isFacing() { return faceUp; } | 32 | bool isFacing() { return faceUp; } |
36 | bool isShowing() { return showing; } | 33 | bool isShowing() { return showing; } |
37 | bool isRed() { return ((suit == diamonds) || (suit == hearts)); } | 34 | bool isRed() { return ((suit == diamonds) || (suit == hearts)); } |
38 | int getX(void) { return ix; } | 35 | int getX(void) { return ix; } |
diff --git a/noncore/games/solitaire/cardpile.cpp b/noncore/games/solitaire/cardpile.cpp index aace2e2..1d572be 100644 --- a/noncore/games/solitaire/cardpile.cpp +++ b/noncore/games/solitaire/cardpile.cpp | |||
@@ -13,27 +13,25 @@ | |||
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 "cardpile.h" | 21 | #include "cardpile.h" |
22 | #include "card.h" | 22 | #include "card.h" |
23 | 23 | ||
24 | #include <qpe/config.h> | 24 | #include <qpe/config.h> |
25 | #include <qpoint.h> | ||
26 | 25 | ||
27 | #include <qlist.h> | ||
28 | 26 | ||
29 | 27 | ||
30 | CardPile::CardPile(int x, int y) : pileX(x), pileY(y), dealing(FALSE), PileResize(FALSE) { | 28 | CardPile::CardPile(int x, int y) : pileX(x), pileY(y), dealing(FALSE), PileResize(FALSE) { |
31 | pileWidth = 0; | 29 | pileWidth = 0; |
32 | pileHeight = 0; | 30 | pileHeight = 0; |
33 | pileNextX = pileX; | 31 | pileNextX = pileX; |
34 | pileNextY = pileY; | 32 | pileNextY = pileY; |
35 | pileCenterX = x + pileWidth / 2; | 33 | pileCenterX = x + pileWidth / 2; |
36 | pileCenterY = y + pileHeight / 2; | 34 | pileCenterY = y + pileHeight / 2; |
37 | pileRadius = (pileWidth > pileHeight) ? pileWidth : pileHeight; | 35 | pileRadius = (pileWidth > pileHeight) ? pileWidth : pileHeight; |
38 | pileOffsetDown = 13; | 36 | pileOffsetDown = 13; |
39 | } | 37 | } |
diff --git a/noncore/games/solitaire/chicanecardgame.cpp b/noncore/games/solitaire/chicanecardgame.cpp index 6729a94..6c607b9 100644 --- a/noncore/games/solitaire/chicanecardgame.cpp +++ b/noncore/games/solitaire/chicanecardgame.cpp | |||
@@ -17,25 +17,24 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | ** | 19 | ** |
20 | ** created on base of patiencecardgame by cam (C.A.Mader) 2002 | 20 | ** created on base of patiencecardgame by cam (C.A.Mader) 2002 |
21 | ** Rules for this game: | 21 | ** Rules for this game: |
22 | **use 2 decks = 104 cards | 22 | **use 2 decks = 104 cards |
23 | **deal 8 rows with 3 hidden cards and one open card | 23 | **deal 8 rows with 3 hidden cards and one open card |
24 | ** append red to black and vice versa | 24 | ** append red to black and vice versa |
25 | **each card can be layed on a free place | 25 | **each card can be layed on a free place |
26 | **deal 8 cards at once | 26 | **deal 8 cards at once |
27 | ** | 27 | ** |
28 | **********************************************************************/ | 28 | **********************************************************************/ |
29 | #include <qgfx_qws.h> | ||
30 | #include "chicanecardgame.h" | 29 | #include "chicanecardgame.h" |
31 | 30 | ||
32 | 31 | ||
33 | extern int highestZ; | 32 | extern int highestZ; |
34 | 33 | ||
35 | 34 | ||
36 | ChicaneCardGame::ChicaneCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent, 2)// Use 2 Decks | 35 | ChicaneCardGame::ChicaneCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent, 2)// Use 2 Decks |
37 | { | 36 | { |
38 | highestZ = 0; | 37 | highestZ = 0; |
39 | 38 | ||
40 | for (int i = 0; i < 8; i++) { | 39 | for (int i = 0; i < 8; i++) { |
41 | discardPiles[i] = new ChicaneDiscardPile( 27 + i * 26, 10, canvas() ); | 40 | discardPiles[i] = new ChicaneDiscardPile( 27 + i * 26, 10, canvas() ); |
diff --git a/noncore/games/solitaire/freecellcardgame.cpp b/noncore/games/solitaire/freecellcardgame.cpp index aeb32fc..d474f4e 100644 --- a/noncore/games/solitaire/freecellcardgame.cpp +++ b/noncore/games/solitaire/freecellcardgame.cpp | |||
@@ -8,25 +8,24 @@ | |||
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 | #include <qgfx_qws.h> | ||
21 | #include "freecellcardgame.h" | 20 | #include "freecellcardgame.h" |
22 | 21 | ||
23 | 22 | ||
24 | extern int highestZ; | 23 | extern int highestZ; |
25 | int numberOfFreeCells = 4; | 24 | int numberOfFreeCells = 4; |
26 | 25 | ||
27 | 26 | ||
28 | FreecellCardGame::FreecellCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent) | 27 | FreecellCardGame::FreecellCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent) |
29 | { | 28 | { |
30 | numberOfFreeCells = 4; | 29 | numberOfFreeCells = 4; |
31 | highestZ = 0; | 30 | highestZ = 0; |
32 | 31 | ||
diff --git a/noncore/games/solitaire/harpcardgame.cpp b/noncore/games/solitaire/harpcardgame.cpp index 0711622..d13d73b 100644 --- a/noncore/games/solitaire/harpcardgame.cpp +++ b/noncore/games/solitaire/harpcardgame.cpp | |||
@@ -19,25 +19,24 @@ | |||
19 | ** | 19 | ** |
20 | ** created on base of patiencecardgame by cam (C.A.Mader) 2002 | 20 | ** created on base of patiencecardgame by cam (C.A.Mader) 2002 |
21 | ** Rules for this game: | 21 | ** Rules for this game: |
22 | ** use 2 decks = 104 cards | 22 | ** use 2 decks = 104 cards |
23 | ** deal 8 rows with one open card in the first place | 23 | ** deal 8 rows with one open card in the first place |
24 | ** one hidden and one open in the second place and so on | 24 | ** one hidden and one open in the second place and so on |
25 | ** append red to black and vice versa | 25 | ** append red to black and vice versa |
26 | ** each card can be layed on a free place | 26 | ** each card can be layed on a free place |
27 | ** deal 8 cards at once | 27 | ** deal 8 cards at once |
28 | ** | 28 | ** |
29 | ** | 29 | ** |
30 | **********************************************************************/ | 30 | **********************************************************************/ |
31 | #include <qgfx_qws.h> | ||
32 | #include "harpcardgame.h" | 31 | #include "harpcardgame.h" |
33 | 32 | ||
34 | 33 | ||
35 | extern int highestZ; | 34 | extern int highestZ; |
36 | 35 | ||
37 | 36 | ||
38 | HarpCardGame::HarpCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent, 2)// Use 2 Decks | 37 | HarpCardGame::HarpCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent, 2)// Use 2 Decks |
39 | { | 38 | { |
40 | highestZ = 0; | 39 | highestZ = 0; |
41 | 40 | ||
42 | for (int i = 0; i < 8; i++) { | 41 | for (int i = 0; i < 8; i++) { |
43 | discardPiles[i] = new HarpDiscardPile( 27 + i * 26, 10, canvas() ); | 42 | discardPiles[i] = new HarpDiscardPile( 27 + i * 26, 10, canvas() ); |
diff --git a/noncore/games/solitaire/main.cpp b/noncore/games/solitaire/main.cpp index bd3cf8b..9301171 100644 --- a/noncore/games/solitaire/main.cpp +++ b/noncore/games/solitaire/main.cpp | |||
@@ -11,16 +11,15 @@ | |||
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 "canvascardwindow.h" | 21 | #include "canvascardwindow.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | ||
24 | #include <opie/oapplicationfactory.h> | 23 | #include <opie/oapplicationfactory.h> |
25 | 24 | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<CanvasCardWindow> ) \ No newline at end of file | 25 | OPIE_EXPORT_APP( OApplicationFactory<CanvasCardWindow> ) \ No newline at end of file |
diff --git a/noncore/games/solitaire/patiencecardgame.cpp b/noncore/games/solitaire/patiencecardgame.cpp index 96a599c..756577a 100644 --- a/noncore/games/solitaire/patiencecardgame.cpp +++ b/noncore/games/solitaire/patiencecardgame.cpp | |||
@@ -8,25 +8,24 @@ | |||
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 | #include <qgfx_qws.h> | ||
21 | #include "patiencecardgame.h" | 20 | #include "patiencecardgame.h" |
22 | 21 | ||
23 | 22 | ||
24 | int highestZ = 0; | 23 | int highestZ = 0; |
25 | 24 | ||
26 | 25 | ||
27 | PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent) | 26 | PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent) |
28 | { | 27 | { |
29 | numberOfTimesThroughDeck = 0; | 28 | numberOfTimesThroughDeck = 0; |
30 | highestZ = 0; | 29 | highestZ = 0; |
31 | 30 | ||
32 | if ( qt_screen->deviceWidth() < 200 ) | 31 | if ( qt_screen->deviceWidth() < 200 ) |
diff --git a/noncore/games/solitaire/teeclubcardgame.cpp b/noncore/games/solitaire/teeclubcardgame.cpp index 0941e0d..b1af757 100644 --- a/noncore/games/solitaire/teeclubcardgame.cpp +++ b/noncore/games/solitaire/teeclubcardgame.cpp | |||
@@ -19,25 +19,24 @@ | |||
19 | ** | 19 | ** |
20 | ** created on base of patiencecardgame by cam (C.A.Mader) 2002 | 20 | ** created on base of patiencecardgame by cam (C.A.Mader) 2002 |
21 | ** Rules for this game: | 21 | ** Rules for this game: |
22 | ** use 2 decks = 104 cards | 22 | ** use 2 decks = 104 cards |
23 | ** deal 9 rows with 5 open cards each | 23 | ** deal 9 rows with 5 open cards each |
24 | ** append one card to each other card which is one step higher | 24 | ** append one card to each other card which is one step higher |
25 | ** move only columns of cards which are equal in suit | 25 | ** move only columns of cards which are equal in suit |
26 | ** each card can be layed on a free place | 26 | ** each card can be layed on a free place |
27 | ** deal 1 card at once on the first pile | 27 | ** deal 1 card at once on the first pile |
28 | ** | 28 | ** |
29 | ** | 29 | ** |
30 | **********************************************************************/ | 30 | **********************************************************************/ |
31 | #include <qgfx_qws.h> | ||
32 | #include "teeclubcardgame.h" | 31 | #include "teeclubcardgame.h" |
33 | 32 | ||
34 | 33 | ||
35 | extern int highestZ; | 34 | extern int highestZ; |
36 | 35 | ||
37 | 36 | ||
38 | TeeclubCardGame::TeeclubCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent, 2)// Use 2 Decks | 37 | TeeclubCardGame::TeeclubCardGame(QCanvas *c, bool snap, QWidget *parent) : CanvasCardGame(*c, snap, parent, 2)// Use 2 Decks |
39 | { | 38 | { |
40 | highestZ = 0; | 39 | highestZ = 0; |
41 | 40 | ||
42 | for (int i = 0; i < 8; i++) { | 41 | for (int i = 0; i < 8; i++) { |
43 | discardPiles[i] = new TeeclubDiscardPile( 27 + i * 26, 10, canvas() ); | 42 | discardPiles[i] = new TeeclubDiscardPile( 27 + i * 26, 10, canvas() ); |