summaryrefslogtreecommitdiffstats
path: root/kpat
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 15:12:46 -0600
committerTimothy Pearson <[email protected]>2013-02-01 15:12:46 -0600
commit58a97ed3af5e4df6c4a58d043b0c267bd97056a9 (patch)
tree5a2fde6842fd422cae2d8670d382be965098cc32 /kpat
parent2ce15ee76fd2d9d18a63c035a0f5b00b94c60cdc (diff)
downloadtdegames-58a97ed3af5e4df6c4a58d043b0c267bd97056a9.tar.gz
tdegames-58a97ed3af5e4df6c4a58d043b0c267bd97056a9.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kpat')
-rw-r--r--kpat/clock.cpp4
-rw-r--r--kpat/clock.h2
-rw-r--r--kpat/computation.cpp4
-rw-r--r--kpat/computation.h2
-rw-r--r--kpat/dealer.cpp14
-rw-r--r--kpat/dealer.h18
-rw-r--r--kpat/fortyeight.cpp4
-rw-r--r--kpat/fortyeight.h2
-rw-r--r--kpat/freecell.cpp8
-rw-r--r--kpat/freecell.h2
-rw-r--r--kpat/golf.cpp4
-rw-r--r--kpat/golf.h2
-rw-r--r--kpat/grandf.cpp4
-rw-r--r--kpat/grandf.h6
-rw-r--r--kpat/gypsy.cpp4
-rw-r--r--kpat/gypsy.h6
-rw-r--r--kpat/idiot.cpp4
-rw-r--r--kpat/idiot.h2
-rw-r--r--kpat/kings.cpp4
-rw-r--r--kpat/kings.h4
-rw-r--r--kpat/klondike.cpp6
-rw-r--r--kpat/klondike.h2
-rw-r--r--kpat/mod3.cpp4
-rw-r--r--kpat/mod3.h2
-rw-r--r--kpat/napoleon.cpp4
-rw-r--r--kpat/napoleon.h2
-rw-r--r--kpat/pwidget.cpp22
-rw-r--r--kpat/pwidget.h26
-rw-r--r--kpat/simon.cpp4
-rw-r--r--kpat/simon.h2
-rw-r--r--kpat/spider.cpp8
-rw-r--r--kpat/spider.h2
-rw-r--r--kpat/yukon.cpp4
-rw-r--r--kpat/yukon.h2
34 files changed, 95 insertions, 95 deletions
diff --git a/kpat/clock.cpp b/kpat/clock.cpp
index 7fcb94b4..433fa2d9 100644
--- a/kpat/clock.cpp
+++ b/kpat/clock.cpp
@@ -4,7 +4,7 @@
#include <assert.h>
#include "cardmaps.h"
-Clock::Clock( KMainWindow* parent, const char *name )
+Clock::Clock( TDEMainWindow* parent, const char *name )
: Dealer( parent, name )
{
const int dist_x = cardMap::CARDX() * 11 / 10 + 1;
@@ -85,7 +85,7 @@ static class LocalDealerInfo11 : public DealerInfo
{
public:
LocalDealerInfo11() : DealerInfo(I18N_NOOP("G&randfather's Clock"), 11) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Clock(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Clock(parent); }
} gfi11;
#include "clock.moc"
diff --git a/kpat/clock.h b/kpat/clock.h
index a126b0fc..eac9a984 100644
--- a/kpat/clock.h
+++ b/kpat/clock.h
@@ -8,7 +8,7 @@ class Clock : public Dealer {
public:
- Clock( KMainWindow* parent=0, const char* name=0);
+ Clock( TDEMainWindow* parent=0, const char* name=0);
virtual bool checkAdd ( int checkIndex, const Pile *c1, const CardList& c2) const;
virtual bool startAutoDrop() { return false; }
diff --git a/kpat/computation.cpp b/kpat/computation.cpp
index 22f104aa..f8475d0a 100644
--- a/kpat/computation.cpp
+++ b/kpat/computation.cpp
@@ -27,7 +27,7 @@
#include <assert.h>
#include "cardmaps.h"
-Computation::Computation( KMainWindow *parent, const char *name )
+Computation::Computation( TDEMainWindow *parent, const char *name )
:Dealer( parent, name)
{
deck = Deck::new_deck(this);
@@ -114,7 +114,7 @@ static class LocalDealerInfo6 : public DealerInfo
{
public:
LocalDealerInfo6() : DealerInfo(I18N_NOOP("&Calculation"), 6) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Computation(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Computation(parent); }
} ldi6;
#include "computation.moc"
diff --git a/kpat/computation.h b/kpat/computation.h
index 1aded3b1..bc063f11 100644
--- a/kpat/computation.h
+++ b/kpat/computation.h
@@ -33,7 +33,7 @@ class Computation : public Dealer {
public:
- Computation( KMainWindow *parent = 0, const char *name=0 );
+ Computation( TDEMainWindow *parent = 0, const char *name=0 );
virtual void restart();
diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp
index 2867e113..6757680c 100644
--- a/kpat/dealer.cpp
+++ b/kpat/dealer.cpp
@@ -55,7 +55,7 @@ void DealerInfoList::add(DealerInfo *dealer)
Dealer *Dealer::s_instance = 0;
-Dealer::Dealer( KMainWindow* _parent , const char* _name )
+Dealer::Dealer( TDEMainWindow* _parent , const char* _name )
: TQCanvasView( 0, _parent, _name ),
towait(0),
myActions(0),
@@ -108,13 +108,13 @@ void Dealer::setBackgroundPixmap(const TQPixmap &background, const TQColor &midc
void Dealer::setupActions() {
- TQPtrList<KAction> actionlist;
+ TQPtrList<TDEAction> actionlist;
kdDebug(11111) << "setupActions " << actions() << endl;
if (actions() & Dealer::Hint) {
- ahint = new KAction( i18n("&Hint"), TQString::fromLatin1("wizard"), Key_H, TQT_TQOBJECT(this),
+ ahint = new TDEAction( i18n("&Hint"), TQString::fromLatin1("wizard"), Key_H, TQT_TQOBJECT(this),
TQT_SLOT(hint()),
parent()->actionCollection(), "game_hint");
actionlist.append(ahint);
@@ -122,7 +122,7 @@ void Dealer::setupActions() {
ahint = 0;
if (actions() & Dealer::Demo) {
- ademo = new KToggleAction( i18n("&Demo"), TQString::fromLatin1("1rightarrow"), CTRL+Key_D, TQT_TQOBJECT(this),
+ ademo = new TDEToggleAction( i18n("&Demo"), TQString::fromLatin1("1rightarrow"), CTRL+Key_D, TQT_TQOBJECT(this),
TQT_SLOT(toggleDemo()),
parent()->actionCollection(), "game_demo");
actionlist.append(ademo);
@@ -130,7 +130,7 @@ void Dealer::setupActions() {
ademo = 0;
if (actions() & Dealer::Redeal) {
- aredeal = new KAction (i18n("&Redeal"), TQString::fromLatin1("queue"), 0, TQT_TQOBJECT(this),
+ aredeal = new TDEAction (i18n("&Redeal"), TQString::fromLatin1("queue"), 0, TQT_TQOBJECT(this),
TQT_SLOT(redeal()),
parent()->actionCollection(), "game_redeal");
actionlist.append(aredeal);
@@ -154,9 +154,9 @@ Dealer::~Dealer()
s_instance = 0;
}
-KMainWindow *Dealer::parent() const
+TDEMainWindow *Dealer::parent() const
{
- return dynamic_cast<KMainWindow*>(TQCanvasView::parent());
+ return dynamic_cast<TDEMainWindow*>(TQCanvasView::parent());
}
diff --git a/kpat/dealer.h b/kpat/dealer.h
index 814e33d4..7dfc5825 100644
--- a/kpat/dealer.h
+++ b/kpat/dealer.h
@@ -6,12 +6,12 @@
#include <krandomsequence.h>
class TQDomDocument;
-class KMainWindow;
+class TDEMainWindow;
class Dealer;
class DealerInfo;
-class KAction;
-class KSelectAction;
-class KToggleAction;
+class TDEAction;
+class TDESelectAction;
+class TDEToggleAction;
class KPixmap;
class DealerInfoList {
@@ -35,7 +35,7 @@ public:
}
const char *name;
uint gameindex;
- virtual Dealer *createGame(KMainWindow *parent) = 0;
+ virtual Dealer *createGame(TDEMainWindow *parent) = 0;
};
class CardState;
@@ -61,7 +61,7 @@ class Dealer: public TQCanvasView
public:
- Dealer( KMainWindow* parent = 0, const char* name = 0 );
+ Dealer( TDEMainWindow* parent = 0, const char* name = 0 );
virtual ~Dealer();
static const Dealer *instance();
@@ -171,7 +171,7 @@ protected:
// it's not const because it changes the random seed
virtual MoveHint *chooseHint();
- KMainWindow *parent() const;
+ TDEMainWindow *parent() const;
bool waiting() const { return _waiting != 0; }
void setWaiting(bool w);
@@ -206,8 +206,8 @@ protected:
int myActions;
bool toldAboutLostGame;
- KToggleAction *ademo;
- KAction *ahint, *aredeal;
+ TDEToggleAction *ademo;
+ TDEAction *ahint, *aredeal;
KRandomSequence randseq;
TQColor _midcolor;
diff --git a/kpat/fortyeight.cpp b/kpat/fortyeight.cpp
index 1747b647..05fabd74 100644
--- a/kpat/fortyeight.cpp
+++ b/kpat/fortyeight.cpp
@@ -27,7 +27,7 @@ void HorLeftPile::initSizes()
}
-Fortyeight::Fortyeight( KMainWindow* parent, const char* name)
+Fortyeight::Fortyeight( TDEMainWindow* parent, const char* name)
: Dealer(parent,name)
{
deck = Deck::new_deck(this, 2);
@@ -194,7 +194,7 @@ static class LocalDealerInfo8 : public DealerInfo
{
public:
LocalDealerInfo8() : DealerInfo(I18N_NOOP("Forty && &Eight"), 8) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Fortyeight(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Fortyeight(parent); }
} ldi9;
//-------------------------------------------------------------------------//
diff --git a/kpat/fortyeight.h b/kpat/fortyeight.h
index fcf6c4a5..5a97e01a 100644
--- a/kpat/fortyeight.h
+++ b/kpat/fortyeight.h
@@ -20,7 +20,7 @@ class Fortyeight : public Dealer
public:
- Fortyeight( KMainWindow* parent=0, const char* name=0);
+ Fortyeight( TDEMainWindow* parent=0, const char* name=0);
virtual bool isGameLost() const;
public slots:
diff --git a/kpat/freecell.cpp b/kpat/freecell.cpp
index 4575d95b..7cbb9470 100644
--- a/kpat/freecell.cpp
+++ b/kpat/freecell.cpp
@@ -49,7 +49,7 @@ void FreecellPile::moveCards(CardList &c, Pile *to)
//-------------------------------------------------------------------------//
FreecellBase::FreecellBase( int decks, int stores, int freecells, int fill, bool unlimit,
- KMainWindow* parent, const char* name)
+ TDEMainWindow* parent, const char* name)
: Dealer(parent,name),
solver_instance(0), es_filling(fill), solver_ret(FCS_STATE_NOT_BEGAN_YET),
unlimited_move(unlimit)
@@ -813,11 +813,11 @@ bool FreecellBase::checkRemove(int checkIndex, const Pile *p, const Card *c) con
class Freecell : public FreecellBase
{
public:
- Freecell( KMainWindow* parent=0, const char* name=0);
+ Freecell( TDEMainWindow* parent=0, const char* name=0);
virtual void deal();
};
-Freecell::Freecell( KMainWindow* parent, const char* name)
+Freecell::Freecell( TDEMainWindow* parent, const char* name)
: FreecellBase(1, 8, 4, FCS_ES_FILLED_BY_ANY_CARD, false, parent, name)
{
for (int i = 0; i < 8; i++)
@@ -846,7 +846,7 @@ static class LocalDealerInfo3 : public DealerInfo
{
public:
LocalDealerInfo3() : DealerInfo(I18N_NOOP("&Freecell"), 3) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Freecell(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Freecell(parent); }
} ldi8;
//-------------------------------------------------------------------------//
diff --git a/kpat/freecell.h b/kpat/freecell.h
index aaa1d55b..feca1963 100644
--- a/kpat/freecell.h
+++ b/kpat/freecell.h
@@ -38,7 +38,7 @@ class FreecellBase : public Dealer
public:
FreecellBase( int decks, int stores, int freecells, int es_filling, bool unlimited_move,
- KMainWindow* parent=0, const char* name=0);
+ TDEMainWindow* parent=0, const char* name=0);
void moveCards(CardList &c, FreecellPile *from, Pile *to);
TQString solverFormat() const;
virtual ~FreecellBase();
diff --git a/kpat/golf.cpp b/kpat/golf.cpp
index 053525da..7f21744f 100644
--- a/kpat/golf.cpp
+++ b/kpat/golf.cpp
@@ -19,7 +19,7 @@ TQSize HorRightPile::cardOffset( bool _spread, bool, const Card *) const
//-------------------------------------------------------------------------//
-Golf::Golf( KMainWindow* parent, const char* _name)
+Golf::Golf( TDEMainWindow* parent, const char* _name)
: Dealer( parent, _name )
{
const int dist_x = cardMap::CARDX() * 11 / 10 + 1;
@@ -158,7 +158,7 @@ static class LocalDealerInfo13 : public DealerInfo
{
public:
LocalDealerInfo13() : DealerInfo(I18N_NOOP("Go&lf"), 12) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Golf(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Golf(parent); }
} ldi13;
//-------------------------------------------------------------------------//
diff --git a/kpat/golf.h b/kpat/golf.h
index 7227c478..7b6b51fe 100644
--- a/kpat/golf.h
+++ b/kpat/golf.h
@@ -19,7 +19,7 @@ class Golf : public Dealer
public:
- Golf( KMainWindow* parent=0, const char* name=0);
+ Golf( TDEMainWindow* parent=0, const char* name=0);
void deal();
virtual void restart();
virtual bool isGameLost() const;
diff --git a/kpat/grandf.cpp b/kpat/grandf.cpp
index c15c6103..39cd1280 100644
--- a/kpat/grandf.cpp
+++ b/kpat/grandf.cpp
@@ -25,7 +25,7 @@
#include <assert.h>
#include "cardmaps.h"
-Grandf::Grandf( KMainWindow* parent, const char *name )
+Grandf::Grandf( TDEMainWindow* parent, const char *name )
: Dealer( parent, name )
{
deck = Deck::new_deck(this);
@@ -221,7 +221,7 @@ static class LocalDealerInfo1 : public DealerInfo
{
public:
LocalDealerInfo1() : DealerInfo(I18N_NOOP("&Grandfather"), 1) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Grandf(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Grandf(parent); }
} gfdi;
#include "grandf.moc"
diff --git a/kpat/grandf.h b/kpat/grandf.h
index 77f368a2..b479ad74 100644
--- a/kpat/grandf.h
+++ b/kpat/grandf.h
@@ -29,17 +29,17 @@
#include "dealer.h"
-class KAction;
+class TDEAction;
class Pile;
class Deck;
-class KMainWindow;
+class TDEMainWindow;
class Grandf : public Dealer {
Q_OBJECT
public:
- Grandf( KMainWindow* parent=0, const char* name=0);
+ Grandf( TDEMainWindow* parent=0, const char* name=0);
public slots:
void redeal();
diff --git a/kpat/gypsy.cpp b/kpat/gypsy.cpp
index 5432336a..db38aa20 100644
--- a/kpat/gypsy.cpp
+++ b/kpat/gypsy.cpp
@@ -3,7 +3,7 @@
#include "deck.h"
#include "cardmaps.h"
-Gypsy::Gypsy( KMainWindow* parent, const char *name )
+Gypsy::Gypsy( TDEMainWindow* parent, const char *name )
: Dealer( parent, name )
{
const int dist_x = cardMap::CARDX() * 11 / 10 + 1;
@@ -111,7 +111,7 @@ static class LocalDealerInfo7 : public DealerInfo
{
public:
LocalDealerInfo7() : DealerInfo(I18N_NOOP("Gy&psy"), 7) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Gypsy(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Gypsy(parent); }
} gyfdi;
#include "gypsy.moc"
diff --git a/kpat/gypsy.h b/kpat/gypsy.h
index beb3e6ea..96f4502e 100644
--- a/kpat/gypsy.h
+++ b/kpat/gypsy.h
@@ -4,17 +4,17 @@
#include "dealer.h"
-class KAction;
+class TDEAction;
class Pile;
class Deck;
-class KMainWindow;
+class TDEMainWindow;
class Gypsy : public Dealer {
Q_OBJECT
public:
- Gypsy( KMainWindow* parent=0, const char* name=0);
+ Gypsy( TDEMainWindow* parent=0, const char* name=0);
virtual bool isGameLost() const;
public slots:
diff --git a/kpat/idiot.cpp b/kpat/idiot.cpp
index 3ac49ef5..40fd041c 100644
--- a/kpat/idiot.cpp
+++ b/kpat/idiot.cpp
@@ -25,7 +25,7 @@
#include "cardmaps.h"
-Idiot::Idiot( KMainWindow* parent, const char* _name)
+Idiot::Idiot( TDEMainWindow* parent, const char* _name)
: Dealer( parent, _name )
{
// Create the deck to the left.
@@ -227,7 +227,7 @@ static class LocalDealerInfo2 : public DealerInfo
{
public:
LocalDealerInfo2() : DealerInfo(I18N_NOOP("&Aces Up"), 2) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Idiot(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Idiot(parent); }
} ldi4;
diff --git a/kpat/idiot.h b/kpat/idiot.h
index d0871b56..f6b61323 100644
--- a/kpat/idiot.h
+++ b/kpat/idiot.h
@@ -33,7 +33,7 @@ class Idiot: public Dealer
public:
- Idiot( KMainWindow* parent = 0, const char* name = 0 );
+ Idiot( TDEMainWindow* parent = 0, const char* name = 0 );
virtual bool isGameWon() const;
diff --git a/kpat/kings.cpp b/kpat/kings.cpp
index 7654a88f..739d3166 100644
--- a/kpat/kings.cpp
+++ b/kpat/kings.cpp
@@ -6,7 +6,7 @@
#include "freecell-solver/fcs_enums.h"
#include "cardmaps.h"
-Kings::Kings( KMainWindow* parent, const char *name )
+Kings::Kings( TDEMainWindow* parent, const char *name )
: FreecellBase( 2, 8, 8, FCS_ES_FILLED_BY_KINGS_ONLY, true, parent, name )
{
const int dist_x = cardMap::CARDX() * 11 / 10 + 1;
@@ -125,7 +125,7 @@ static class LocalDealerInfo12 : public DealerInfo
{
public:
LocalDealerInfo12() : DealerInfo(I18N_NOOP("&The Kings"), 12) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Kings(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Kings(parent); }
} gfdi12;
#endif
diff --git a/kpat/kings.h b/kpat/kings.h
index 881110fc..73b5795a 100644
--- a/kpat/kings.h
+++ b/kpat/kings.h
@@ -5,14 +5,14 @@
class Pile;
class Deck;
-class KMainWindow;
+class TDEMainWindow;
class Kings : public FreecellBase {
Q_OBJECT
public:
- Kings( KMainWindow* parent=0, const char* name=0);
+ Kings( TDEMainWindow* parent=0, const char* name=0);
virtual bool isGameLost() const;
public slots:
diff --git a/kpat/klondike.cpp b/kpat/klondike.cpp
index dcf4c1f8..cb137c0c 100644
--- a/kpat/klondike.cpp
+++ b/kpat/klondike.cpp
@@ -50,7 +50,7 @@ private:
CardList cardlist;
};
-Klondike::Klondike( bool easy, KMainWindow* parent, const char* _name )
+Klondike::Klondike( bool easy, TDEMainWindow* parent, const char* _name )
: Dealer( parent, _name )
{
// The units of the follwoing constants are pixels
@@ -481,14 +481,14 @@ static class LocalDealerInfo0 : public DealerInfo
{
public:
LocalDealerInfo0() : DealerInfo(I18N_NOOP("&Klondike"), 0) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Klondike(true, parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Klondike(true, parent); }
} ldi0;
static class LocalDealerInfo14 : public DealerInfo
{
public:
LocalDealerInfo14() : DealerInfo(I18N_NOOP("Klondike (&draw 3)"), 13) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Klondike(false, parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Klondike(false, parent); }
} ldi14;
diff --git a/kpat/klondike.h b/kpat/klondike.h
index 75ff9fe4..4ed7088c 100644
--- a/kpat/klondike.h
+++ b/kpat/klondike.h
@@ -36,7 +36,7 @@ class Klondike : public Dealer {
public:
- Klondike( bool easy, KMainWindow* parent=0, const char* name=0);
+ Klondike( bool easy, TDEMainWindow* parent=0, const char* name=0);
public:
virtual void restart();
diff --git a/kpat/mod3.cpp b/kpat/mod3.cpp
index 45a8d026..96b42a5a 100644
--- a/kpat/mod3.cpp
+++ b/kpat/mod3.cpp
@@ -26,7 +26,7 @@
//-------------------------------------------------------------------------//
-Mod3::Mod3( KMainWindow* parent, const char* _name)
+Mod3::Mod3( TDEMainWindow* parent, const char* _name)
: Dealer( parent, _name )
{
const int dist_x = cardMap::CARDX() * 11 / 10 + 1;
@@ -301,7 +301,7 @@ static class LocalDealerInfo5 : public DealerInfo
{
public:
LocalDealerInfo5() : DealerInfo(I18N_NOOP("M&od3"), 5) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Mod3(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Mod3(parent); }
} ldi5;
//-------------------------------------------------------------------------//
diff --git a/kpat/mod3.h b/kpat/mod3.h
index 1eb19fef..396832e2 100644
--- a/kpat/mod3.h
+++ b/kpat/mod3.h
@@ -31,7 +31,7 @@ class Mod3 : public Dealer
public:
- Mod3( KMainWindow* parent=0, const char* name=0);
+ Mod3( TDEMainWindow* parent=0, const char* name=0);
void deal();
diff --git a/kpat/napoleon.cpp b/kpat/napoleon.cpp
index 7f7c7f95..289501a0 100644
--- a/kpat/napoleon.cpp
+++ b/kpat/napoleon.cpp
@@ -22,7 +22,7 @@
#include "deck.h"
#include "cardmaps.h"
-Napoleon::Napoleon( KMainWindow* parent, const char* _name )
+Napoleon::Napoleon( TDEMainWindow* parent, const char* _name )
: Dealer( parent, _name )
{
deck = Deck::new_deck( this );
@@ -198,7 +198,7 @@ static class LocalDealerInfo4 : public DealerInfo
{
public:
LocalDealerInfo4() : DealerInfo(I18N_NOOP("&Napoleon's Tomb"), 4) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Napoleon(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Napoleon(parent); }
} ldi3;
#include "napoleon.moc"
diff --git a/kpat/napoleon.h b/kpat/napoleon.h
index 89342331..1f500d89 100644
--- a/kpat/napoleon.h
+++ b/kpat/napoleon.h
@@ -28,7 +28,7 @@ class Napoleon : public Dealer {
Q_OBJECT
public:
- Napoleon (KMainWindow* parent=0, const char* name=0);
+ Napoleon (TDEMainWindow* parent=0, const char* name=0);
virtual void restart();
virtual void getHints();
diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp
index 7e0f85c2..003b4b6f 100644
--- a/kpat/pwidget.cpp
+++ b/kpat/pwidget.cpp
@@ -55,7 +55,7 @@ void saveGame(int) {
}
pWidget::pWidget()
- : KMainWindow(0, "pwidget"), dill(0)
+ : TDEMainWindow(0, "pwidget"), dill(0)
{
current_pwidget = this;
// KCrash::setEmergencySaveFunction(::saveGame);
@@ -73,14 +73,14 @@ pWidget::pWidget()
recent->loadEntries(TDEGlobal::config());
(void)KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveGame()),
actionCollection(), "save");
- (void)new KAction(i18n("&Choose Game..."), 0, TQT_TQOBJECT(this), TQT_SLOT(chooseGame()),
+ (void)new TDEAction(i18n("&Choose Game..."), 0, TQT_TQOBJECT(this), TQT_SLOT(chooseGame()),
actionCollection(), "choose_game");
- (void)new KAction(i18n("Restart &Game"), TQString::fromLatin1("reload"), 0,
+ (void)new TDEAction(i18n("Restart &Game"), TQString::fromLatin1("reload"), 0,
TQT_TQOBJECT(this), TQT_SLOT(restart()),
actionCollection(), "restart_game");
(void)KStdAction::help(TQT_TQOBJECT(this), TQT_SLOT(helpGame()), actionCollection(), "help_game");
- games = new KSelectAction(i18n("&Game Type"), 0, TQT_TQOBJECT(this),
+ games = new TDESelectAction(i18n("&Game Type"), 0, TQT_TQOBJECT(this),
TQT_SLOT(newGameType()),
actionCollection(), "game_type");
TQStringList list;
@@ -104,7 +104,7 @@ pWidget::pWidget()
TDEGlobal::dirs()->addResourceType("wallpaper", TDEStandardDirs::kde_default("data") + "kpat/backgrounds/");
TDEGlobal::dirs()->addResourceType("wallpaper", TDEStandardDirs::kde_default("data") + "ksnake/backgrounds/");
- wallpapers = new KSelectAction(i18n("&Change Background"), 0, TQT_TQOBJECT(this),
+ wallpapers = new TDESelectAction(i18n("&Change Background"), 0, TQT_TQOBJECT(this),
TQT_SLOT(changeWallpaper()),
actionCollection(), "wallpaper");
list.clear();
@@ -131,16 +131,16 @@ pWidget::pWidget()
(void)new cardMap(midcolor);
- backs = new KAction(i18n("&Switch Cards..."), 0, TQT_TQOBJECT(this),
+ backs = new TDEAction(i18n("&Switch Cards..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(changeBackside()),
actionCollection(), "backside");
- stats = new KAction(i18n("&Statistics"), 0, TQT_TQOBJECT(this), TQT_SLOT(showStats()),
+ stats = new TDEAction(i18n("&Statistics"), 0, TQT_TQOBJECT(this), TQT_SLOT(showStats()),
actionCollection(),"game_stats");
- animation = new KToggleAction(i18n( "&Animation on Startup" ),
+ animation = new TDEToggleAction(i18n( "&Animation on Startup" ),
0, TQT_TQOBJECT(this), TQT_SLOT(animationChanged()),
actionCollection(), "animation");
- dropaction = new KToggleAction(i18n("&Enable Autodrop"),
+ dropaction = new TDEToggleAction(i18n("&Enable Autodrop"),
0, TQT_TQOBJECT(this), TQT_SLOT(enableAutoDrop()),
actionCollection(), "enable_autodrop");
dropaction->setCheckedState(i18n("Disable Autodrop"));
@@ -168,7 +168,7 @@ pWidget::pWidget()
statusBar()->insertItem( "", 1, 0, true );
createGUI(TQString(), false);
- KAcceleratorManager::manage(menuBar());
+ TDEAcceleratorManager::manage(menuBar());
newGameType();
adjustSize();
@@ -394,7 +394,7 @@ void pWidget::showEvent(TQShowEvent *e)
{
if (dill)
dill->setMinimumSize(TQSize(0,0));
- KMainWindow::showEvent(e);
+ TDEMainWindow::showEvent(e);
}
void pWidget::slotGameInfo(const TQString &text)
diff --git a/kpat/pwidget.h b/kpat/pwidget.h
index b07eb917..1c1564f5 100644
--- a/kpat/pwidget.h
+++ b/kpat/pwidget.h
@@ -26,14 +26,14 @@
#include <kmainwindow.h>
class Dealer;
-class KToggleAction;
-class KSelectAction;
-class KRecentFilesAction;
-class KAction;
+class TDEToggleAction;
+class TDESelectAction;
+class TDERecentFilesAction;
+class TDEAction;
class TQWidgetStack;
class TQLabel;
-class pWidget: public KMainWindow {
+class pWidget: public TDEMainWindow {
Q_OBJECT
@@ -74,18 +74,18 @@ private:
Dealer *dill; // The current patience
- KSelectAction *games;
- KSelectAction *wallpapers;
- KAction *backs;
- KAction *undo;
- KToggleAction *animation;
- KToggleAction *dropaction;
- KAction *stats;
+ TDESelectAction *games;
+ TDESelectAction *wallpapers;
+ TDEAction *backs;
+ TDEAction *undo;
+ TDEToggleAction *animation;
+ TDEToggleAction *dropaction;
+ TDEAction *stats;
TQPixmap background;
TQColor midcolor;
TQStringList wallpaperlist;
- KRecentFilesAction *recent;
+ TDERecentFilesAction *recent;
};
#endif
diff --git a/kpat/simon.cpp b/kpat/simon.cpp
index 287ecd00..0639ded4 100644
--- a/kpat/simon.cpp
+++ b/kpat/simon.cpp
@@ -5,7 +5,7 @@
#include <assert.h>
#include "cardmaps.h"
-Simon::Simon( KMainWindow* parent, const char *name )
+Simon::Simon( TDEMainWindow* parent, const char *name )
: Dealer( parent, name )
{
deck = Deck::new_deck(this);
@@ -150,7 +150,7 @@ static class LocalDealerInfo9 : public DealerInfo
{
public:
LocalDealerInfo9() : DealerInfo(I18N_NOOP("&Simple Simon"), 9) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Simon(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Simon(parent); }
} gfi9;
#include "simon.moc"
diff --git a/kpat/simon.h b/kpat/simon.h
index bcf2300b..be6733de 100644
--- a/kpat/simon.h
+++ b/kpat/simon.h
@@ -8,7 +8,7 @@ class Simon : public Dealer {
public:
- Simon( KMainWindow* parent=0, const char* name=0);
+ Simon( TDEMainWindow* parent=0, const char* name=0);
public slots:
void deal();
diff --git a/kpat/spider.cpp b/kpat/spider.cpp
index c8e6abc5..b4ac19c0 100644
--- a/kpat/spider.cpp
+++ b/kpat/spider.cpp
@@ -48,7 +48,7 @@ void SpiderPile::moveCards(CardList &c, Pile *to)
//-------------------------------------------------------------------------//
-Spider::Spider(int suits, KMainWindow* parent, const char* _name)
+Spider::Spider(int suits, TDEMainWindow* parent, const char* _name)
: Dealer(parent, _name)
{
const int dist_x = cardMap::CARDX() * 11 / 10 + 1;
@@ -459,21 +459,21 @@ static class LocalDealerInfo15 : public DealerInfo
{
public:
LocalDealerInfo15() : DealerInfo(I18N_NOOP("S&pider (Easy)"), 14) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Spider(1, parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Spider(1, parent); }
} ldi15;
static class LocalDealerInfo16 : public DealerInfo
{
public:
LocalDealerInfo16() : DealerInfo(I18N_NOOP("Spider (&Medium)"), 15) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Spider(2, parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Spider(2, parent); }
} ldi16;
static class LocalDealerInfo17 : public DealerInfo
{
public:
LocalDealerInfo17() : DealerInfo(I18N_NOOP("Spider (&Hard)"), 16) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Spider(4, parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Spider(4, parent); }
} ldi17;
//-------------------------------------------------------------------------//
diff --git a/kpat/spider.h b/kpat/spider.h
index 4a3e9cc0..0b5d7a9f 100644
--- a/kpat/spider.h
+++ b/kpat/spider.h
@@ -37,7 +37,7 @@ class Spider : public Dealer
public:
- Spider(int suits, KMainWindow *parent=0, const char *name=0);
+ Spider(int suits, TDEMainWindow *parent=0, const char *name=0);
void deal();
void dealRow();
void checkPileDeck(Pile *to);
diff --git a/kpat/yukon.cpp b/kpat/yukon.cpp
index 859b3746..dad4e7f8 100644
--- a/kpat/yukon.cpp
+++ b/kpat/yukon.cpp
@@ -5,7 +5,7 @@
#include <assert.h>
#include "cardmaps.h"
-Yukon::Yukon( KMainWindow* parent, const char *name )
+Yukon::Yukon( TDEMainWindow* parent, const char *name )
: Dealer( parent, name )
{
const int dist_x = cardMap::CARDX() * 11 / 10 + 1;
@@ -124,7 +124,7 @@ static class LocalDealerInfo10 : public DealerInfo
{
public:
LocalDealerInfo10() : DealerInfo(I18N_NOOP("&Yukon"), 10) {}
- virtual Dealer *createGame(KMainWindow *parent) { return new Yukon(parent); }
+ virtual Dealer *createGame(TDEMainWindow *parent) { return new Yukon(parent); }
} gfi10;
#include "yukon.moc"
diff --git a/kpat/yukon.h b/kpat/yukon.h
index a11cfbee..8acb7195 100644
--- a/kpat/yukon.h
+++ b/kpat/yukon.h
@@ -8,7 +8,7 @@ class Yukon : public Dealer {
public:
- Yukon( KMainWindow* parent=0, const char* name=0);
+ Yukon( TDEMainWindow* parent=0, const char* name=0);
virtual bool isGameLost() const;
public slots: