1 files changed, 14 insertions, 17 deletions

diff --git a/noncore/games/solitaire/patiencecardgame.h b/noncore/games/solitaire/patiencecardgame.h
index 0d0e3d5..b76251a 100644
--- a/noncore/games/solitaire/patiencecardgame.h
+++ b/noncore/games/solitaire/patiencecardgame.h
@@ -9,25 +9,25 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef PATIENCE_CARD_GAME_H
-#define PATIENCE_CARD_GAME_H 
+#define PATIENCE_CARD_GAME_H
 
 
 #include <qpopupmenu.h>
 #include <qmainwindow.h>
 #include <qintdict.h>
 #include <qcanvas.h>
 #include <qgfx_qws.h>
 // #include "canvascardshapes.h"
 // #include "canvascard.h"
 #include "canvascardgame.h"
 
 
@@ -37,89 +37,89 @@ public:
     PatienceFaceDownDeck(int x, int y, QCanvas *canvas)
         : CardPile(x, y), CanvasRoundRect(x, y, canvas) { }
     virtual bool isAllowedOnTop(Card *card) {
 	Q_UNUSED(card);
 	// Need to check it is from the faceUpDealingPile
 	return TRUE;
     }
     virtual bool isAllowedToBeMoved(Card *card) {
 	Q_UNUSED(card);
 	//if ( ( !card->isFacing() ) && ( card == cardOnTop() ) )
 	if ( card == cardOnTop() )
 	    return TRUE;
-        return FALSE;	
+        return FALSE;
     }
 };
 
 
 class PatienceFaceUpDeck : public CardPile, public CanvasRoundRect
 {
 public:
     PatienceFaceUpDeck(int x, int y, QCanvas *canvas)
         : CardPile(x, y), CanvasRoundRect(x, y, canvas) { }
     virtual bool isAllowedOnTop(Card *card) {
 	Q_UNUSED(card);
 	// Need to check it is from the faceDownDealingPile
 	return TRUE;
     }
     virtual bool isAllowedToBeMoved(Card *card) {
 	Q_UNUSED(card);
 	//if ( ( card->isFacing() ) && ( card == cardOnTop() ) )
 	if ( card == cardOnTop() )
 	    return TRUE;
-        return FALSE;	
+        return FALSE;
     }
 };
 
 
 class PatienceDiscardPile : public CardPile, public CanvasRoundRect
 {
 public:
     PatienceDiscardPile(int x, int y, QCanvas *canvas)
         : CardPile(x, y), CanvasRoundRect(x, y, canvas) { }
     virtual bool isAllowedOnTop(Card *card) {
 	if ( card->isFacing() && ( card->getCardPile()->cardInfront(card) == NULL ) &&
 	   ( ( ( cardOnTop() == NULL ) && ( card->getValue() == ace ) ) ||
 	     ( ( cardOnTop() != NULL ) &&
 	       ( (int)card->getValue() == (int)cardOnTop()->getValue() + 1 ) &&
 	       ( card->getSuit() == cardOnTop()->getSuit() ) ) ) )
 	    return TRUE;
-        return FALSE;	
+        return FALSE;
     }
     virtual bool isAllowedToBeMoved(Card *card) {
 	if ( card->isFacing() && ( card == cardOnTop() ) )
 	    return TRUE;
-        return FALSE;	
+        return FALSE;
     }
 };
 
 
 class PatienceWorkingPile : public CardPile, public CanvasRoundRect
 {
 public:
     PatienceWorkingPile(int x, int y, QCanvas *canvas)
         : CardPile(x, y), CanvasRoundRect(x, y, canvas), top(x, y) { }
     virtual bool isAllowedOnTop(Card *card) {
 	if ( card->isFacing() &&
 	     ( ( ( cardOnTop() == NULL ) && (card->getValue() == king) ) ||
 	       ( ( cardOnTop() != NULL ) &&
  	         ( (int)card->getValue() + 1 == (int)cardOnTop()->getValue() ) &&
 	         ( card->isRed() != cardOnTop()->isRed() ) ) ) )
 	    return TRUE;
-        return FALSE;	
+        return FALSE;
     }
     virtual bool isAllowedToBeMoved(Card *card) {
 	if ( card->isFacing() )
 	    return TRUE;
-        return FALSE;	
+        return FALSE;
     }
     virtual void cardAddedToTop(Card *card) {
 	Q_UNUSED(card);
 	top = getCardPos(NULL);
 	setNextX( top.x() );
 	setNextY( top.y() );
     }
     virtual void cardRemoved(Card *card) {
 	Q_UNUSED(card);
 
 	Card *newTopCard = cardOnTop();
 
@@ -139,67 +139,64 @@ public:
 		top = QPoint( top.x(), top.y() + offsetDown );
 	    }
     	    setNextX( top.x() );
 	    setNextY( top.y() );
 	}
     }
     virtual QPoint getCardPos(Card *c) {
 	int x = pileX, y = pileY;
 	Card *card = cardOnBottom();
 	while ((card != c) && (card != NULL)) {
 	    if (card->isFacing()) {
 		int offsetDown = ( qt_screen->deviceWidth() < 200 ) ? 9 : 13;
-		y += offsetDown; 
+		y += offsetDown;
 	    } else {
-		x += 1;    
+		x += 1;
 		y += 3;
 	    }
-	    card = cardInfront(card); 
+	    card = cardInfront(card);
 	}
 	return QPoint( x, y );
     }
     virtual QPoint getHypertheticalNextCardPos(void) {
 	return top;
 	// return QPoint( getNextX(), getNextY() );
     }
 private:
     QPoint top;
 
 };
 
 
 class PatienceCardGame : public CanvasCardGame
 {
 public:
     PatienceCardGame(QCanvas *c, bool snap, QWidget *parent = 0);
     virtual ~PatienceCardGame();
     virtual void deal(void);
-    virtual bool haveWeWon() { 
+	int deckTurns;
+    virtual bool haveWeWon() {
 	return ( discardPiles[0]->kingOnTop() &&
 		 discardPiles[1]->kingOnTop() &&
 		 discardPiles[2]->kingOnTop() &&
 		 discardPiles[3]->kingOnTop() );;
     }
     virtual void mousePress(QPoint p);
     virtual void mouseRelease(QPoint p) { Q_UNUSED(p); }
 //    virtual void mouseMove(QPoint p);
     virtual bool mousePressCard(Card *card, QPoint p);
     virtual void mouseReleaseCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); }
 //    virtual void mouseMoveCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); }
-    bool canTurnOverDeck(void) { return (numberOfTimesThroughDeck != 3); }
-    void throughDeck(void) {
-	numberOfTimesThroughDeck++;
-	if (numberOfTimesThroughDeck == 3)
-    	    circleCross->setCross();
-    }
+    bool canTurnOverDeck();
+    void throughDeck();
     bool snapOn;
     virtual void writeConfig( Config& cfg );
     virtual void readConfig( Config& cfg );
 private:
     CanvasCircleOrCross *circleCross;
     CanvasRoundRect *rectangle;
     PatienceWorkingPile *workingPiles[7];
     PatienceDiscardPile *discardPiles[4];
     PatienceFaceDownDeck *faceDownDealingPile;
     PatienceFaceUpDeck *faceUpDealingPile;
     int numberOfTimesThroughDeck;
 };