diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | a13e26c2f1eb3c5be81acf4f571dd4bafac10199 (patch) | |
tree | 1f1d3e407ae668b1448847970b2f1b626083faf6 /ksnake | |
parent | 24c5cdc2737fe0044b11a12359606973eb93fc0b (diff) | |
download | tdegames-a13e26c2f1eb3c5be81acf4f571dd4bafac10199.tar.gz tdegames-a13e26c2f1eb3c5be81acf4f571dd4bafac10199.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksnake')
-rw-r--r-- | ksnake/board.cpp | 8 | ||||
-rw-r--r-- | ksnake/board.h | 2 | ||||
-rw-r--r-- | ksnake/game.cpp | 2 | ||||
-rw-r--r-- | ksnake/game.h | 2 | ||||
-rw-r--r-- | ksnake/progress.cpp | 4 | ||||
-rw-r--r-- | ksnake/progress.h | 2 | ||||
-rw-r--r-- | ksnake/rattler.cpp | 4 | ||||
-rw-r--r-- | ksnake/rattler.h | 2 | ||||
-rw-r--r-- | ksnake/startroom.cpp | 4 | ||||
-rw-r--r-- | ksnake/startroom.h | 2 | ||||
-rw-r--r-- | ksnake/view.cpp | 4 | ||||
-rw-r--r-- | ksnake/view.h | 2 |
12 files changed, 19 insertions, 19 deletions
diff --git a/ksnake/board.cpp b/ksnake/board.cpp index e9e44cd0..0959dee1 100644 --- a/ksnake/board.cpp +++ b/ksnake/board.cpp @@ -48,7 +48,7 @@ int Pos::price() const { void Pos::setParent(Pos *p) { _parent = p; } -Pos *Pos::tqparent() const { +Pos *Pos::parent() const { return(_parent); } Pos *Pos::listNext() { @@ -241,7 +241,7 @@ int Board::getNextCloseTo(int s, int d, bool diag, int lastIndex) if(list->index() == d) { // Find first movement after root. for(; ; list = p) { - p = list->tqparent(); + p = list->parent(); if(p == root) { // This is our move. int nextSq = list->index(); @@ -265,7 +265,7 @@ int Board::getNextCloseTo(int s, int d, bool diag, int lastIndex) continue; } - int pi = list->tqparent() ? list->tqparent()->index() : lastIndex; + int pi = list->parent() ? list->parent()->index() : lastIndex; if(pi != -1 && direction(pi, list->index()) != direction(list->index(), i)) { pri += 10; @@ -277,7 +277,7 @@ int Board::getNextCloseTo(int s, int d, bool diag, int lastIndex) // Check price of found position with current one. if(p->price() > pri) { // We found a cheapear way to reach the same - // place, so let's change the tqparent and price of p. + // place, so let's change the parent and price of p. p->setPrice(list->price() + 1); p->setParent(list); list->addList(p); diff --git a/ksnake/board.h b/ksnake/board.h index c7514d75..0eece38d 100644 --- a/ksnake/board.h +++ b/ksnake/board.h @@ -47,7 +47,7 @@ public: void setPrice(int p); int price() const; void setParent(Pos *p); - Pos *tqparent() const; + Pos *parent() const; Pos *listNext(); void addBTree(Pos *np); Pos *searchBTree(int i); diff --git a/ksnake/game.cpp b/ksnake/game.cpp index 600bbd55..29e8b5df 100644 --- a/ksnake/game.cpp +++ b/ksnake/game.cpp @@ -54,7 +54,7 @@ #define SCORE 1 #define LIVES 2 -Game::Game(TQWidget *tqparent, const char *name) : KMainWindow(tqparent,name) +Game::Game(TQWidget *parent, const char *name) : KMainWindow(parent,name) { // create statusbar statusBar()->insertItem(i18n("Score: 0"), SCORE); diff --git a/ksnake/game.h b/ksnake/game.h index 509856e7..f3595bb3 100644 --- a/ksnake/game.h +++ b/ksnake/game.h @@ -39,7 +39,7 @@ Q_OBJECT TQ_OBJECT public: - Game(TQWidget *tqparent=0, const char *name=0); + Game(TQWidget *parent=0, const char *name=0); ~Game(); private slots: diff --git a/ksnake/progress.cpp b/ksnake/progress.cpp index 1e2c0f72..547ddbab 100644 --- a/ksnake/progress.cpp +++ b/ksnake/progress.cpp @@ -25,8 +25,8 @@ #include "progress.h" -Progress::Progress(TQWidget *tqparent, const char *name) - : KGameProgress(0, 300, 300, Qt::Horizontal, tqparent, name) +Progress::Progress(TQWidget *parent, const char *name) + : KGameProgress(0, 300, 300, Qt::Horizontal, parent, name) { setBarColor("green1"); setTextEnabled(false); diff --git a/ksnake/progress.h b/ksnake/progress.h index ae78aa47..b395de65 100644 --- a/ksnake/progress.h +++ b/ksnake/progress.h @@ -33,7 +33,7 @@ class Progress : public KGameProgress Q_OBJECT TQ_OBJECT public: - Progress( TQWidget *tqparent=0, const char *name=0 ); + Progress( TQWidget *parent=0, const char *name=0 ); public slots: void advance(); diff --git a/ksnake/rattler.cpp b/ksnake/rattler.cpp index 8fc0999f..4c68f316 100644 --- a/ksnake/rattler.cpp +++ b/ksnake/rattler.cpp @@ -43,8 +43,8 @@ TQBitArray gameState(5); TQLabel *label = 0; int speed[4] = { 130, 95, 55, 40 }; -Rattler::Rattler( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +Rattler::Rattler( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { setFocusPolicy(TQ_StrongFocus); diff --git a/ksnake/rattler.h b/ksnake/rattler.h index 4c9b72ee..9aff9fa6 100644 --- a/ksnake/rattler.h +++ b/ksnake/rattler.h @@ -46,7 +46,7 @@ class Rattler : public TQWidget TQ_OBJECT public: - Rattler ( TQWidget *tqparent=0, const char *name=0 ); + Rattler ( TQWidget *parent=0, const char *name=0 ); ~Rattler(); void setActionCollection(KActionCollection *a){ actionCollection = a;} diff --git a/ksnake/startroom.cpp b/ksnake/startroom.cpp index a50536e0..9792ee4b 100644 --- a/ksnake/startroom.cpp +++ b/ksnake/startroom.cpp @@ -33,8 +33,8 @@ #include "levels.h" -StartRoom::StartRoom( TQWidget *tqparent, const char *name) - : TQWidget( tqparent, name ) +StartRoom::StartRoom( TQWidget *parent, const char *name) + : TQWidget( parent, name ) { TQGridLayout *Form1Layout = new TQGridLayout( this, 1, 1, 11, 6, "Form1Layout"); TQSpacerItem* spacer = new TQSpacerItem( 20, 61, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); diff --git a/ksnake/startroom.h b/ksnake/startroom.h index 222bd50f..7ddba17e 100644 --- a/ksnake/startroom.h +++ b/ksnake/startroom.h @@ -36,7 +36,7 @@ class StartRoom : public TQWidget Q_OBJECT TQ_OBJECT public: - StartRoom( TQWidget *tqparent=0, const char *name=0 ); + StartRoom( TQWidget *parent=0, const char *name=0 ); private slots: void loadLevel(int level); diff --git a/ksnake/view.cpp b/ksnake/view.cpp index dec662ea..add5cf16 100644 --- a/ksnake/view.cpp +++ b/ksnake/view.cpp @@ -32,8 +32,8 @@ int MAPWIDTH = BRICKSIZE * 35; int MAPHEIGHT = MAPWIDTH; #define BAR_HEIGHT 12 -View::View( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +View::View( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { progress = new Progress(this); rattler = new Rattler( this); diff --git a/ksnake/view.h b/ksnake/view.h index 2ab132d7..9e05da9f 100644 --- a/ksnake/view.h +++ b/ksnake/view.h @@ -35,7 +35,7 @@ class View : public TQWidget Q_OBJECT TQ_OBJECT public: - View ( TQWidget *tqparent=0, const char *name=0 ); + View ( TQWidget *parent=0, const char *name=0 ); Progress *progress; Rattler *rattler; |