[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegames/kpat
From: Parker Coates <parker.coates () kdemail ! net>
Date: 2012-02-15 4:45:19
Message-ID: 20120215044519.C9678AC894 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1280170 by coates:
Let DealerScenes know about the DealerInfo that created them.
M +6 -1 clock.cpp
M +1 -0 clock.h
M +40 -10 dealer.cpp
M +4 -3 dealer.h
M +7 -1 fortyeight.cpp
M +1 -0 fortyeight.h
M +7 -1 freecell.cpp
M +1 -0 freecell.h
M +7 -1 golf.cpp
M +1 -0 golf.h
M +7 -1 grandf.cpp
M +1 -0 grandf.h
M +8 -1 gypsy.cpp
M +1 -1 gypsy.h
M +7 -1 idiot.cpp
M +1 -0 idiot.h
M +8 -1 klondike.cpp
M +1 -0 klondike.h
M +0 -1 mainwindow.cpp
M +7 -1 mod3.cpp
M +1 -0 mod3.h
M +7 -1 simon.cpp
M +1 -0 simon.h
M +7 -1 spider.cpp
M +1 -0 spider.h
M +7 -1 yukon.cpp
M +1 -0 yukon.h
--- trunk/KDE/kdegames/kpat/clock.cpp #1280169:1280170
@@ -42,6 +42,11 @@
#include <KLocale>
+Clock::Clock( const DealerInfo * di )
+ : DealerScene( di )
+{
+}
+
void Clock::initialize()
{
setSceneAlignment( AlignHCenter | AlignVCenter );
@@ -152,7 +157,7 @@
virtual DealerScene *createGame() const
{
- return new Clock();
+ return new Clock( this );
}
} clockDealerInfo;
--- trunk/KDE/kdegames/kpat/clock.h #1280169:1280170
@@ -44,6 +44,7 @@
Q_OBJECT
public:
+ Clock( const DealerInfo * di );
virtual void initialize();
protected:
--- trunk/KDE/kdegames/kpat/dealer.cpp #1280169:1280170
@@ -37,6 +37,7 @@
#include "dealer.h"
+#include "dealerinfo.h"
#include "gamestate.h"
#include "messagebox.h"
#include "renderer.h"
@@ -207,7 +208,6 @@
class DealerScene::DealerScenePrivate
{
public:
- int gameId;
int gameNumber;
bool autodropEnabled;
@@ -592,7 +592,8 @@
}
-DealerScene::DealerScene()
+DealerScene::DealerScene( const DealerInfo * di )
+ : m_di( di )
{
setItemIndexMethod(QGraphicsScene::NoIndex);
@@ -1868,20 +1869,49 @@
updateWonItem();
}
-void DealerScene::setGameId(int id) { d->gameId = id; }
-int DealerScene::gameId() const { return d->gameId; }
-void DealerScene::setActions(int actions) { d->actions = actions; }
-int DealerScene::actions() const { return d->actions; }
+int DealerScene::gameId() const
+{
+ return m_di->baseId();
+}
-QList<QAction*> DealerScene::configActions() const { return QList<QAction*>(); }
-Solver *DealerScene::solver() const { return d->solver; }
+void DealerScene::setActions( int actions )
+{
+ d->actions = actions;
+}
-int DealerScene::neededFutureMoves() const { return d->neededFutureMoves; }
-void DealerScene::setNeededFutureMoves( int i ) { d->neededFutureMoves = i; }
+int DealerScene::actions() const
+{
+ return d->actions;
+}
+
+QList<QAction*> DealerScene::configActions() const
+{
+ return QList<QAction*>();
+}
+
+
+Solver * DealerScene::solver() const
+{
+ return d->solver;
+}
+
+
+int DealerScene::neededFutureMoves() const
+{
+ return d->neededFutureMoves;
+}
+
+
+void DealerScene::setNeededFutureMoves( int i )
+{
+ d->neededFutureMoves = i;
+}
+
+
void DealerScene::setDeckContents( int copies, const QList<KCardDeck::Suit> & suits \
) {
Q_ASSERT( copies >= 1 );
--- trunk/KDE/kdegames/kpat/dealer.h #1280169:1280170
@@ -38,8 +38,8 @@
#ifndef DEALER_H
#define DEALER_H
-class DealerScene;
class CardDiff;
+class DealerInfo;
class GameState;
class MoveHint;
#include "patpile.h"
@@ -62,7 +62,7 @@
public:
enum { None = 0, Hint = 1, Demo = 2, Draw = 4, Deal = 8, Redeal = 16 } Actions;
- DealerScene();
+ DealerScene( const DealerInfo * di );
~DealerScene();
virtual void initialize() = 0;
@@ -79,7 +79,6 @@
int gameNumber() const;
- void setGameId( int id );
int gameId() const;
void setActions( int actions );
@@ -224,6 +223,8 @@
const QList<KCardPile*> & freeCells );
void continueMultiStepMove();
+ const DealerInfo * const m_di;
+
class DealerScenePrivate;
DealerScenePrivate *d;
};
--- trunk/KDE/kdegames/kpat/fortyeight.cpp #1280169:1280170
@@ -44,6 +44,12 @@
#include <KLocale>
+Fortyeight::Fortyeight( const DealerInfo* di )
+ : DealerScene( di )
+{
+}
+
+
void Fortyeight::initialize()
{
const qreal dist_x = 1.11;
@@ -248,7 +254,7 @@
virtual DealerScene *createGame() const
{
- return new Fortyeight();
+ return new Fortyeight( this );
}
} fortyEightDealerInfo;
--- trunk/KDE/kdegames/kpat/fortyeight.h #1280169:1280170
@@ -44,6 +44,7 @@
Q_OBJECT
public:
+ Fortyeight( const DealerInfo * di );
virtual void initialize();
protected:
--- trunk/KDE/kdegames/kpat/freecell.cpp #1280169:1280170
@@ -49,6 +49,12 @@
const int CHUNKSIZE = 100;
+Freecell::Freecell( const DealerInfo * di )
+ : DealerScene( di )
+{
+}
+
+
void Freecell::initialize()
{
setDeckContents();
@@ -264,7 +270,7 @@
virtual DealerScene *createGame() const
{
- return new Freecell();
+ return new Freecell( this );
}
} freecellDealerInfo;
--- trunk/KDE/kdegames/kpat/freecell.h #1280169:1280170
@@ -46,6 +46,7 @@
Q_OBJECT
public:
+ Freecell( const DealerInfo * di );
virtual void initialize();
protected:
--- trunk/KDE/kdegames/kpat/golf.cpp #1280169:1280170
@@ -43,6 +43,12 @@
#include <KLocale>
+Golf::Golf( const DealerInfo * di )
+ : DealerScene( di )
+{
+}
+
+
void Golf::initialize()
{
const qreal dist_x = 1.11;
@@ -173,7 +179,7 @@
virtual DealerScene *createGame() const
{
- return new Golf();
+ return new Golf( this );
}
} golfDealerInfo;
--- trunk/KDE/kdegames/kpat/golf.h #1280169:1280170
@@ -44,6 +44,7 @@
Q_OBJECT
public:
+ Golf( const DealerInfo * di );
virtual void initialize();
protected:
--- trunk/KDE/kdegames/kpat/grandf.cpp #1280169:1280170
@@ -45,6 +45,12 @@
#include <KLocale>
+Grandf::Grandf( const DealerInfo * di )
+ : DealerScene( di )
+{
+}
+
+
void Grandf::initialize()
{
setDeckContents();
@@ -196,7 +202,7 @@
virtual DealerScene *createGame() const
{
- return new Grandf();
+ return new Grandf( this );
}
} grandfDealerInfo;
--- trunk/KDE/kdegames/kpat/grandf.h #1280169:1280170
@@ -46,6 +46,7 @@
Q_OBJECT
public:
+ Grandf( const DealerInfo * di );
virtual void initialize();
protected:
--- trunk/KDE/kdegames/kpat/gypsy.cpp #1280169:1280170
@@ -42,6 +42,13 @@
#include <KLocale>
+
+Gypsy::Gypsy( const DealerInfo * di )
+ : DealerScene( di )
+{
+}
+
+
void Gypsy::initialize()
{
const qreal dist_x = 1.11;
@@ -172,7 +179,7 @@
virtual DealerScene *createGame() const
{
- return new Gypsy();
+ return new Gypsy( this );
}
} gypsyDealerInfo;
--- trunk/KDE/kdegames/kpat/gypsy.h #1280169:1280170
@@ -44,9 +44,9 @@
Q_OBJECT
public:
+ Gypsy( const DealerInfo * di );
virtual void initialize();
-
protected:
virtual void setGameState( const QString & state );
virtual bool checkAdd(const PatPile * pile, const QList<KCard*> & oldCards, \
const QList<KCard*> & newCards) const;
--- trunk/KDE/kdegames/kpat/idiot.cpp #1280169:1280170
@@ -43,6 +43,12 @@
#include <KLocale>
+Idiot::Idiot( const DealerInfo * di )
+ : DealerScene( di )
+{
+}
+
+
void Idiot::initialize()
{
setSceneAlignment( AlignHCenter | AlignVCenter );
@@ -255,7 +261,7 @@
virtual DealerScene *createGame() const
{
- return new Idiot();
+ return new Idiot( this );
}
} idiotDealerInfo;
--- trunk/KDE/kdegames/kpat/idiot.h #1280169:1280170
@@ -45,6 +45,7 @@
Q_OBJECT
public:
+ Idiot( const DealerInfo * di );
virtual void initialize();
virtual bool isGameWon() const;
--- trunk/KDE/kdegames/kpat/klondike.cpp #1280169:1280170
@@ -79,6 +79,13 @@
return positions;
}
+
+Klondike::Klondike( const DealerInfo * di )
+ : DealerScene( di )
+{
+}
+
+
void Klondike::initialize()
{
// The units of the follwoing constants are pixels
@@ -346,7 +353,7 @@
virtual DealerScene *createGame() const
{
- return new Klondike();
+ return new Klondike( this );
}
} klondikeDealerInfo;
--- trunk/KDE/kdegames/kpat/klondike.h #1280169:1280170
@@ -48,6 +48,7 @@
Q_OBJECT
public:
+ Klondike( const DealerInfo * di );
virtual void initialize();
virtual void mapOldId(int id);
virtual int oldId() const;
--- trunk/KDE/kdegames/kpat/mainwindow.cpp #1280169:1280170
@@ -518,7 +518,6 @@
m_dealer = di->createGame();
m_dealer->setDeck( m_cardDeck );
m_dealer->initialize();
- m_dealer->setGameId( di->baseId() );
m_dealer->mapOldId( id );
m_dealer->setSolverEnabled( m_solverEnabledAction->isChecked() );
m_dealer->setAutoDropEnabled( m_autoDropEnabledAction->isChecked() );
--- trunk/KDE/kdegames/kpat/mod3.cpp #1280169:1280170
@@ -43,6 +43,12 @@
#include <KLocale>
+Mod3::Mod3( const DealerInfo * di )
+ : DealerScene( di )
+{
+}
+
+
void Mod3::initialize()
{
// Piles are placed very close together. Set layoutSpacing to 0 to prevent
@@ -234,7 +240,7 @@
virtual DealerScene *createGame() const
{
- return new Mod3();
+ return new Mod3( this );
}
} mod3DealerInfo;
--- trunk/KDE/kdegames/kpat/mod3.h #1280169:1280170
@@ -45,6 +45,7 @@
Q_OBJECT
public:
+ Mod3( const DealerInfo * di );
virtual void initialize();
protected:
--- trunk/KDE/kdegames/kpat/simon.cpp #1280169:1280170
@@ -43,6 +43,12 @@
#include <KLocale>
+Simon::Simon( const DealerInfo * di )
+ : DealerScene( di )
+{
+}
+
+
void Simon::initialize()
{
setDeckContents();
@@ -133,7 +139,7 @@
virtual DealerScene *createGame() const
{
- return new Simon();
+ return new Simon( this );
}
} simonDealerInfo;
--- trunk/KDE/kdegames/kpat/simon.h #1280169:1280170
@@ -44,6 +44,7 @@
Q_OBJECT
public:
+ Simon( const DealerInfo * di );
virtual void initialize();
protected:
--- trunk/KDE/kdegames/kpat/spider.cpp #1280169:1280170
@@ -65,6 +65,12 @@
};
+Spider::Spider( const DealerInfo * di )
+ : DealerScene( di )
+{
+}
+
+
void Spider::initialize()
{
m_leg = 0;
@@ -480,7 +486,7 @@
virtual DealerScene *createGame() const
{
- return new Spider();
+ return new Spider( this );
}
} spideDealerInfo;
--- trunk/KDE/kdegames/kpat/spider.h #1280169:1280170
@@ -47,6 +47,7 @@
Q_OBJECT
public:
+ Spider( const DealerInfo * di );
virtual void initialize();
virtual void mapOldId(int id);
virtual int oldId() const;
--- trunk/KDE/kdegames/kpat/yukon.cpp #1280169:1280170
@@ -43,6 +43,12 @@
#include <KLocale>
+Yukon::Yukon( const DealerInfo * di )
+ : DealerScene( di )
+{
+}
+
+
void Yukon::initialize()
{
const qreal dist_x = 1.11;
@@ -128,7 +134,7 @@
virtual DealerScene *createGame() const
{
- return new Yukon();
+ return new Yukon( this );
}
} yukonDealerInfo;
--- trunk/KDE/kdegames/kpat/yukon.h #1280169:1280170
@@ -46,6 +46,7 @@
Q_OBJECT
public:
+ Yukon( const DealerInfo * di );
virtual void initialize();
public slots:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic