Rename old tq methods that no longer need a unique name

16 files changed, 86 insertions, 86 deletions

diff --git a/libtdegames/highscore/kexthighscore_internal.cpp b/libtdegames/highscore/kexthighscore_internal.cpp
index a679002c..388c8a88 100644
--- a/libtdegames/highscore/kexthighscore_internal.cpp
+++ b/libtdegames/highscore/kexthighscore_internal.cpp
@@ -780,7 +780,7 @@ int ManagerPrivate::submitScore(const Score &ascore,
 
     Score score = ascore;
     score.setData("id", _playerInfos->id() + 1);
-    score.setData("date", TQDateTime::tqcurrentDateTime());
+    score.setData("date", TQDateTime::currentDateTime());
 
     // ask new name if anonymous and winner
     const char *dontAskAgainName = "highscore_ask_name_dialog";
diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp
index e799883b..365e7aed 100644
--- a/libtdegames/highscore/kscoredialog.cpp
+++ b/libtdegames/highscore/kscoredialog.cpp
@@ -130,7 +130,7 @@ void KScoreDialog::setupDialog()
    d->tqlayout->addRowSpacing(4, 15);
 
    d->commentLabel = new TQLabel(d->page);
-   d->commentLabel->tqsetAlignment(AlignVCenter | AlignHCenter);
+   d->commentLabel->setAlignment(AlignVCenter | AlignHCenter);
    d->tqlayout->addMultiCellWidget(d->commentLabel, 1, 1, 0, d->nrCols-1);
 
    TQFont bold = font();
@@ -207,7 +207,7 @@ void KScoreDialog::aboutToShow()
    } 
    else
    {
-      d->commentLabel->setMinimumSize(d->commentLabel->tqsizeHint());
+      d->commentLabel->setMinimumSize(d->commentLabel->sizeHint());
       d->commentLabel->show();
       d->tqlayout->addRowSpacing(0, -10);
       d->tqlayout->addRowSpacing(2, 10);
@@ -267,7 +267,7 @@ void KScoreDialog::aboutToShow()
       }
    }
    d->latest = -1;
-   setFixedSize(tqminimumSizeHint());
+   setFixedSize(minimumSizeHint());
 }
 
 void KScoreDialog::loadScores()
diff --git a/libtdegames/kcanvasrootpixmap.cpp b/libtdegames/kcanvasrootpixmap.cpp
index 20440458..5e036740 100644
--- a/libtdegames/kcanvasrootpixmap.cpp
+++ b/libtdegames/kcanvasrootpixmap.cpp
@@ -33,7 +33,7 @@ KCanvasRootPixmap::KCanvasRootPixmap(TQCanvasView *view, const char *name)
 void KCanvasRootPixmap::backgroundUpdatedSlot(const TQPixmap &pixmap)
 {
     if ( _view && _view->canvas() )
-        _view->canvas()->tqsetBackgroundPixmap(pixmap);
+        _view->canvas()->setBackgroundPixmap(pixmap);
 }
 
 #include "kcanvasrootpixmap.moc"
diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp
index fc73de22..c79a8d78 100644
--- a/libtdegames/kcarddialog.cpp
+++ b/libtdegames/kcarddialog.cpp
@@ -41,9 +41,9 @@
 #include <tqpushbutton.h>
 #include <kdebug.h>
 
-#define KCARD_DEFAULTDECK TQString::tqfromLatin1("deck0.png")
-#define KCARD_DEFAULTCARD TQString::tqfromLatin1("11.png")
-#define KCARD_DEFAULTCARDDIR TQString::tqfromLatin1("cards-default/")
+#define KCARD_DEFAULTDECK TQString::fromLatin1("deck0.png")
+#define KCARD_DEFAULTCARD TQString::fromLatin1("11.png")
+#define KCARD_DEFAULTCARDDIR TQString::fromLatin1("cards-default/")
 
 // values for the resize slider
 #define SLIDER_MIN 400
@@ -51,19 +51,19 @@
 
 // KConfig entries
 #define CONF_GROUP "KCardDialog"
-#define CONF_RANDOMDECK TQString::tqfromLatin1("RandomDeck")
-#define CONF_DECK TQString::tqfromLatin1("Deck")
-#define CONF_CARDDIR TQString::tqfromLatin1("CardDir")
-#define CONF_RANDOMCARDDIR TQString::tqfromLatin1("RandomCardDir")
-#define CONF_USEGLOBALDECK TQString::tqfromLatin1("GlobalDeck")
-#define CONF_USEGLOBALCARDDIR TQString::tqfromLatin1("GlobalCardDir")
-#define CONF_SCALE TQString::tqfromLatin1("Scale")
+#define CONF_RANDOMDECK TQString::fromLatin1("RandomDeck")
+#define CONF_DECK TQString::fromLatin1("Deck")
+#define CONF_CARDDIR TQString::fromLatin1("CardDir")
+#define CONF_RANDOMCARDDIR TQString::fromLatin1("RandomCardDir")
+#define CONF_USEGLOBALDECK TQString::fromLatin1("GlobalDeck")
+#define CONF_USEGLOBALCARDDIR TQString::fromLatin1("GlobalCardDir")
+#define CONF_SCALE TQString::fromLatin1("Scale")
 
-#define CONF_GLOBAL_GROUP TQString::tqfromLatin1("KCardDialog Settings")
-#define CONF_GLOBAL_DECK TQString::tqfromLatin1("GlobalDeck")
-#define CONF_GLOBAL_CARDDIR TQString::tqfromLatin1("GlobalCardDir")
-#define CONF_GLOBAL_RANDOMDECK TQString::tqfromLatin1("GlobalRandomDeck")
-#define CONF_GLOBAL_RANDOMCARDDIR TQString::tqfromLatin1("GlobalRandomCardDir")
+#define CONF_GLOBAL_GROUP TQString::fromLatin1("KCardDialog Settings")
+#define CONF_GLOBAL_DECK TQString::fromLatin1("GlobalDeck")
+#define CONF_GLOBAL_CARDDIR TQString::fromLatin1("GlobalCardDir")
+#define CONF_GLOBAL_RANDOMDECK TQString::fromLatin1("GlobalRandomDeck")
+#define CONF_GLOBAL_RANDOMCARDDIR TQString::fromLatin1("GlobalRandomCardDir")
 
 
 class KCardDialogPrivate
@@ -128,9 +128,9 @@ int KCardDialog::getCardDeck(TQString &pDeck, TQString &pCardDir, TQWidget *pPar
     // TODO check for global cards/decks!!!!
         pDeck=dlg.deck();
         pCardDir=dlg.cardDir();
-        if (!pCardDir.isNull() && pCardDir.right(1)!=TQString::tqfromLatin1("/"))
+        if (!pCardDir.isNull() && pCardDir.right(1)!=TQString::fromLatin1("/"))
         {
-            pCardDir+=TQString::tqfromLatin1("/");
+            pCardDir+=TQString::fromLatin1("/");
         }
         if (pRandomDeck)
         {
@@ -218,7 +218,7 @@ void KCardDialog::getConfigCardDeck(KConfig* conf, TQString &pDeck, TQString &pC
 TQString KCardDialog::getDefaultDeck()
 {
     KCardDialog::init();
-    return locate("cards", TQString::tqfromLatin1("decks/") + KCARD_DEFAULTDECK);
+    return locate("cards", TQString::fromLatin1("decks/") + KCARD_DEFAULTDECK);
 }
 
 TQString KCardDialog::getDefaultCardDir()
@@ -234,12 +234,12 @@ TQString KCardDialog::getCardPath(const TQString &carddir, int index)
     KCardDialog::init();
 
     TQString entry = carddir + TQString::number(index);
-    if (KStandardDirs::exists(entry + TQString::tqfromLatin1(".png")))
-        return entry + TQString::tqfromLatin1(".png");
+    if (KStandardDirs::exists(entry + TQString::fromLatin1(".png")))
+        return entry + TQString::fromLatin1(".png");
 
     // rather theoretical
-    if (KStandardDirs::exists(entry + TQString::tqfromLatin1(".xpm")))
-        return entry + TQString::tqfromLatin1(".xpm");
+    if (KStandardDirs::exists(entry + TQString::fromLatin1(".xpm")))
+        return entry + TQString::fromLatin1(".xpm");
 
     return TQString();
 }
@@ -299,7 +299,7 @@ void KCardDialog::setupDialog(bool showResizeBox)
     l->addWidget(grp3, 0, AlignTop|AlignHCenter);
     d->deckLabel = new TQLabel(grp3);
     d->deckLabel->setText(i18n("empty"));
-    d->deckLabel->tqsetAlignment(AlignHCenter|AlignVCenter);
+    d->deckLabel->setAlignment(AlignHCenter|AlignVCenter);
     d->deckLabel->setGeometry(10, 20, 80, 90);
 
     d->randomDeck = new TQCheckBox(plainPage());
@@ -349,7 +349,7 @@ void KCardDialog::setupDialog(bool showResizeBox)
     l->addWidget(grp4, 0, AlignTop|AlignHCenter);
     d->cardLabel = new TQLabel(grp4);
     d->cardLabel->setText(i18n("empty"));
-    d->cardLabel->tqsetAlignment(AlignHCenter|AlignVCenter);
+    d->cardLabel->setAlignment(AlignHCenter|AlignVCenter);
     d->cardLabel->setGeometry(10, 20, 80, 90 );
 
     d->randomCardDir = new TQCheckBox(plainPage());
@@ -465,7 +465,7 @@ void KCardDialog::insertCardIcons()
     for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
         KSimpleConfig cfg(*it);
-        cfg.setGroup(TQString::tqfromLatin1("KDE Backdeck"));
+        cfg.setGroup(TQString::fromLatin1("KDE Backdeck"));
         TQString path = (*it).left((*it).findRev('/') + 1);
         assert(path[path.length() - 1] == '/');
         TQPixmap pixmap(path + cfg.readEntry("Preview", "12c.png"));
@@ -507,7 +507,7 @@ void KCardDialog::insertDeckIcons()
 
         // pixmap=pixmap.xForm(m);
 
-        cfg.setGroup(TQString::tqfromLatin1("KDE Cards"));
+        cfg.setGroup(TQString::fromLatin1("KDE Cards"));
         TQString name=cfg.readEntry("Name", i18n("unnamed"));
         TQIconViewItem *item= new TQIconViewItem(d->deckIconView,name, pixmap);
 
@@ -562,12 +562,12 @@ void KCardDialog::slotCardClicked(TQIconViewItem *item)
 TQString KCardDialog::getDeckName(const TQString &desktop)
 {
     TQString entry = desktop.left(desktop.length() - strlen(".desktop"));
-    if (KStandardDirs::exists(entry + TQString::tqfromLatin1(".png")))
-        return entry + TQString::tqfromLatin1(".png");
+    if (KStandardDirs::exists(entry + TQString::fromLatin1(".png")))
+        return entry + TQString::fromLatin1(".png");
 
     // rather theoretical
-    if (KStandardDirs::exists(entry + TQString::tqfromLatin1(".xpm")))
-        return entry + TQString::tqfromLatin1(".xpm");
+    if (KStandardDirs::exists(entry + TQString::fromLatin1(".xpm")))
+        return entry + TQString::fromLatin1(".xpm");
     return TQString();
 }
 
@@ -634,8 +634,8 @@ void KCardDialog::slotRandomCardDirToggled(bool on)
   if (on) {
       d->cardLabel->setText("random");
       setCardDir(getRandomCardDir());
-      if (cardDir().length()>0 && cardDir().right(1)!=TQString::tqfromLatin1("/"))  {
-          setCardDir(cardDir() + TQString::tqfromLatin1("/"));
+      if (cardDir().length()>0 && cardDir().right(1)!=TQString::fromLatin1("/"))  {
+          setCardDir(cardDir() + TQString::fromLatin1("/"));
       }
   } else {
       d->cardLabel->setText("empty");
@@ -742,7 +742,7 @@ void KCardDialog::saveConfig(KConfig* conf)
 
 void KCardDialog::slotSetGlobalDeck()
 {
- KSimpleConfig* conf = new KSimpleConfig(TQString::tqfromLatin1("kdeglobals"), false);
+ KSimpleConfig* conf = new KSimpleConfig(TQString::fromLatin1("kdeglobals"), false);
  conf->setGroup(CONF_GLOBAL_GROUP);
 
  conf->writeEntry(CONF_GLOBAL_DECK, deck());
@@ -753,7 +753,7 @@ void KCardDialog::slotSetGlobalDeck()
 
 void KCardDialog::slotSetGlobalCardDir()
 {
- KSimpleConfig* conf = new KSimpleConfig(TQString::tqfromLatin1("kdeglobals"), false);
+ KSimpleConfig* conf = new KSimpleConfig(TQString::fromLatin1("kdeglobals"), false);
  conf->setGroup(CONF_GLOBAL_GROUP);
 
  conf->writePathEntry(CONF_GLOBAL_CARDDIR, cardDir());
@@ -764,7 +764,7 @@ void KCardDialog::slotSetGlobalCardDir()
 
 void KCardDialog::getGlobalDeck(TQString& deck, bool& random)
 {
- KSimpleConfig* conf = new KSimpleConfig(TQString::tqfromLatin1("kdeglobals"), true);
+ KSimpleConfig* conf = new KSimpleConfig(TQString::fromLatin1("kdeglobals"), true);
  conf->setGroup(CONF_GLOBAL_GROUP);
 
  if (!conf->hasKey(CONF_GLOBAL_DECK) || conf->readBoolEntry(CONF_GLOBAL_RANDOMDECK, false)) {
@@ -780,7 +780,7 @@ void KCardDialog::getGlobalDeck(TQString& deck, bool& random)
 
 void KCardDialog::getGlobalCardDir(TQString& dir, bool& random)
 {
- KSimpleConfig* conf = new KSimpleConfig(TQString::tqfromLatin1("kdeglobals"), true);
+ KSimpleConfig* conf = new KSimpleConfig(TQString::fromLatin1("kdeglobals"), true);
  conf->setGroup(CONF_GLOBAL_GROUP);
 
  if (!conf->hasKey(CONF_GLOBAL_CARDDIR) || conf->readBoolEntry(CONF_GLOBAL_RANDOMCARDDIR, false)) {
@@ -799,7 +799,7 @@ void KCardDialog::init()
     static bool _inited = false;
     if (_inited)
         return;
-    KGlobal::dirs()->addResourceType("cards", KStandardDirs::kde_default("data") + TQString::tqfromLatin1("carddecks/"));
+    KGlobal::dirs()->addResourceType("cards", KStandardDirs::kde_default("data") + TQString::fromLatin1("carddecks/"));
 
     KGlobal::locale()->insertCatalogue("libtdegames");
     _inited = true;
diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp
index 14f74103..f08f3a55 100644
--- a/libtdegames/kchatbase.cpp
+++ b/libtdegames/kchatbase.cpp
@@ -364,7 +364,7 @@ TQListBoxItem* KChatBase::layoutMessage(const TQString& fromName, const TQString
  if (text.startsWith("/me ")) {
 	// replace "/me" by a nice star. leave one space after the star
 	TQPixmap pix;
-	pix.load(locate("data", TQString::tqfromLatin1("tdegames/pics/star.png")));
+	pix.load(locate("data", TQString::fromLatin1("tdegames/pics/star.png")));
 	
 	//TODO KChatBasePixmap? Should change the font here!
 	
diff --git a/libtdegames/kgame/DESIGN b/libtdegames/kgame/DESIGN
index cd737e3a..b1c48146 100644
--- a/libtdegames/kgame/DESIGN
+++ b/libtdegames/kgame/DESIGN
@@ -359,7 +359,7 @@ KDialogBase::addVBoxPage() (for example).
 5.1.1 Debug KGame
 -----------------
 The first page, "Debug KGame" shows on the left most or even all status values of
-KGame. That contains e.g.  minPlayers(), isAdmin(), gametqStatus(), ...
+KGame. That contains e.g.  minPlayers(), isAdmin(), gameStatus(), ...
 The right side is probably the more important one. It lists *all* KGameProperties
 which have been inserted to this KGame object (only to this KGame object - not
 the ones that have been added to the players!). Most of the status variables of
diff --git a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
index 49623238..6b56432c 100644
--- a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
+++ b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
@@ -56,7 +56,7 @@ public:
 		mGameMaster = 0;
 		mGameAdmin = 0;
 		mGameOffering = 0;
-		mGametqStatus = 0;
+		mGameStatus = 0;
 		mGameRunning = 0;
 		mGameMaxPlayers = 0;
 		mGameMinPlayers = 0;
@@ -93,7 +93,7 @@ public:
 	TQListViewItem* mGameMaster;
 	TQListViewItem* mGameAdmin;
 	TQListViewItem* mGameOffering;
-	TQListViewItem* mGametqStatus;
+	TQListViewItem* mGameStatus;
 	TQListViewItem* mGameRunning;
 	TQListViewItem* mGameMaxPlayers;
 	TQListViewItem* mGameMinPlayers;
@@ -166,7 +166,7 @@ void KGameDebugDialog::initGamePage()
  d->mGameMaster = new TQListViewItem(v, i18n("Is Master"));
  d->mGameAdmin = new TQListViewItem(v, i18n("Is Admin"));
  d->mGameOffering = new TQListViewItem(v, i18n("Is Offering Connections"));
- d->mGametqStatus = new TQListViewItem(v, i18n("Game Status"));
+ d->mGameStatus = new TQListViewItem(v, i18n("Game Status"));
  d->mGameRunning = new TQListViewItem(v, i18n("Game is Running"));
  d->mGameMaxPlayers = new TQListViewItem(v, i18n("Maximal Players"));
  d->mGameMinPlayers = new TQListViewItem(v, i18n("Minimal Players"));
@@ -186,7 +186,7 @@ void KGameDebugDialog::initPlayerPage()
  d->mPlayerList = new KListBox(d->mPlayerPage);
  connect(d->mPlayerList, TQT_SIGNAL(executed(TQListBoxItem*)), this, TQT_SLOT(slotUpdatePlayerData(TQListBoxItem*)));
  listLayout->addWidget(d->mPlayerList);
- d->mPlayerList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
+ d->mPlayerList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
 
  KListView* v = new KListView(d->mPlayerPage);
  tqlayout->addWidget(v);
@@ -274,7 +274,7 @@ void KGameDebugDialog::clearGameData()
  d->mGameMaster->setText(1, "");
  d->mGameAdmin->setText(1, "");
  d->mGameOffering->setText(1, "");
- d->mGametqStatus->setText(1, "");
+ d->mGameStatus->setText(1, "");
  d->mGameRunning->setText(1, "");
  d->mGameMaxPlayers->setText(1, "");
  d->mGameMinPlayers->setText(1, "");
@@ -320,7 +320,7 @@ void KGameDebugDialog::slotUpdateGameData()
  d->mGameMaster->setText(1, d->mGame->isMaster() ? i18n("True") : i18n("False"));
  d->mGameAdmin->setText(1, d->mGame->isAdmin() ? i18n("True") : i18n("False"));
  d->mGameOffering->setText(1, d->mGame->isOfferingConnections() ? i18n("True") : i18n("False"));
- d->mGametqStatus->setText(1, TQString::number(d->mGame->gametqStatus()));
+ d->mGameStatus->setText(1, TQString::number(d->mGame->gameStatus()));
  d->mGameRunning->setText(1, d->mGame->isRunning() ? i18n("True") : i18n("False"));
  d->mGameMaxPlayers->setText(1, TQString::number(d->mGame->maxPlayers()));
  d->mGameMinPlayers->setText(1, TQString::number(d->mGame->minPlayers()));
diff --git a/libtdegames/kgame/kgame.cpp b/libtdegames/kgame/kgame.cpp
index 2eebac64..c2f7f583 100644
--- a/libtdegames/kgame/kgame.cpp
+++ b/libtdegames/kgame/kgame.cpp
@@ -75,7 +75,7 @@ public:
     //KGamePropertys
     KGamePropertyInt mMaxPlayer;
     KGamePropertyUInt mMinPlayer;
-    KGamePropertyInt mGametqStatus; // Game running?
+    KGamePropertyInt mGameStatus; // Game running?
     TQValueList<int> mInactiveIdList;
 
 };
@@ -95,8 +95,8 @@ KGame::KGame(int cookie,TQObject* parent) : KGameNetwork(cookie,parent)
  d->mMaxPlayer.setLocal(-1);  // Infinite
  d->mMinPlayer.registerData(KGamePropertyBase::IdMinPlayer, this, i18n("MinPlayers"));
  d->mMinPlayer.setLocal(0);   // Always ok
- d->mGametqStatus.registerData(KGamePropertyBase::IdGametqStatus, this, i18n("GameStatus"));
- d->mGametqStatus.setLocal(Init);
+ d->mGameStatus.registerData(KGamePropertyBase::IdGameStatus, this, i18n("GameStatus"));
+ d->mGameStatus.setLocal(Init);
  // d->mUniquePlayerNumber = 0;
  d->mRandom = new KRandomSequence;
  d->mRandom->setSeed(0);
@@ -542,10 +542,10 @@ void KGame::systemRemovePlayer(KPlayer* player,bool deleteit)
    kdWarning(11001) << "player " << player << "(" << player->id() << ") Could not be found!" << endl;
  }
 
- if (gametqStatus()==(int)Run && playerCount()<minPlayers())
+ if (gameStatus()==(int)Run && playerCount()<minPlayers())
  {
    kdWarning(11001) << k_funcinfo ": not enough players, PAUSING game\n" << endl;
-   setGametqStatus(Pause);
+   setGameStatus(Pause);
  }
 }
 
@@ -680,11 +680,11 @@ int KGame::maxPlayers() const
 uint KGame::playerCount() const
 { return d->mPlayerList.count(); }
 
-int KGame::gametqStatus() const
-{ return d->mGametqStatus.value(); }
+int KGame::gameStatus() const
+{ return d->mGameStatus.value(); }
 
 bool KGame::isRunning() const
-{ return d->mGametqStatus.value() == Run; }
+{ return d->mGameStatus.value() == Run; }
 
 KGamePropertyHandler* KGame::dataHandler() const
 { return d->mProperties; }
@@ -772,7 +772,7 @@ KPlayer * KGame::playerInputFinished(KPlayer *player)
    {
      player->setTurn(false);
    }
-   setGametqStatus(End);
+   setGameStatus(End);
    emit signalGameOver(gameOver,player,this);
  }
  else if (!player->asyncInput())
@@ -829,7 +829,7 @@ KPlayer *KGame::nextPlayer(KPlayer *last,bool exclusive)
  return 0;
 }
 
-void KGame::setGametqStatus(int status)
+void KGame::setGameStatus(int status)
 {
  kdDebug(11001) << k_funcinfo << ": GAMESTATUS CHANGED  to" << status << endl;
  if (status==(int)Run && playerCount()<minPlayers()) 
@@ -837,7 +837,7 @@ void KGame::setGametqStatus(int status)
    kdDebug(11001) << k_funcinfo << ": not enough players, pausing game\n" << endl;
    status=Pause;
  }
- d->mGametqStatus = status;
+ d->mGameStatus = status;
 }
 
 void KGame::networkTransmission(TQDataStream &stream, int msgid, TQ_UINT32 receiver, TQ_UINT32 sender, TQ_UINT32 /*clientID*/)
@@ -1244,7 +1244,7 @@ void KGame::Debug()
  kdDebug(11001) << "------------------- KGAME -------------------------" << endl;
  kdDebug(11001) << "this:          " << this << endl;
  kdDebug(11001) << "uniquePlayer   " << d->mUniquePlayerNumber << endl;
- kdDebug(11001) << "gameStatus     " << gametqStatus() << endl;
+ kdDebug(11001) << "gameStatus     " << gameStatus() << endl;
  kdDebug(11001) << "MaxPlayers :   " << maxPlayers() << endl;
  kdDebug(11001) << "NoOfPlayers :  " << playerCount() << endl;
  kdDebug(11001) << "NoOfInactive:  " << d->mInactivePlayerList.count() << endl;
@@ -1264,7 +1264,7 @@ void KGame::slotServerDisconnected() // Client side
   kdDebug(11001) << "======= SERVER DISCONNECT ======="<<endl;
   kdDebug(11001) << "+++ (CLIENT)++++++++" << k_funcinfo << ": our GameID="<<gameId() << endl;
 
-  int oldgamestatus=gametqStatus();
+  int oldgamestatus=gameStatus();
 
   KPlayer *player;
   KGamePlayerList removeList;
@@ -1326,7 +1326,7 @@ void KGame::slotClientDisconnected(TQ_UINT32 clientID,bool /*broken*/) // server
 {
  kdDebug(11001) << "++++(SERVER)+++++++" << k_funcinfo << " clientId=" << clientID << endl;
 
- int oldgamestatus=gametqStatus();
+ int oldgamestatus=gameStatus();
 
  KPlayer *player;
  KGamePlayerList removeList;
diff --git a/libtdegames/kgame/kgame.h b/libtdegames/kgame/kgame.h
index bf66dcb8..486397e2 100644
--- a/libtdegames/kgame/kgame.h
+++ b/libtdegames/kgame/kgame.h
@@ -118,7 +118,7 @@ public:
      * The KGame e.g. sets the status to Pause when you have
      * less player than the minimum amount
      */
-	enum GametqStatus
+	enum GameStatus
 	{
 		Init = 0,
 		Run = 1,
@@ -127,7 +127,7 @@ public:
 		Abort = 4,
 		SystemPause = 5,
 		Intro = 6,
-		UsertqStatus = 7
+		UserStatus = 7
 	};
 
     // Properties
@@ -387,14 +387,14 @@ public:
      *
      * @return game status
      */
-    int gametqStatus() const;
+    int gameStatus() const;
 
     /**
      * sets the game status
      *
      * @param status the new status
      */
-    void setGametqStatus(int status);
+    void setGameStatus(int status);
 
     /**
     *  docu: see KPlayer
diff --git a/libtdegames/kgame/kgameproperty.h b/libtdegames/kgame/kgameproperty.h
index f02c4db0..0bb117b8 100644
--- a/libtdegames/kgame/kgameproperty.h
+++ b/libtdegames/kgame/kgameproperty.h
@@ -51,7 +51,7 @@ public:
 		IdName=5,
 
 		//KGame
-		IdGametqStatus=6,
+		IdGameStatus=6,
 		IdMaxPlayer=7,
 		IdMinPlayer=8,
 
diff --git a/libtdegames/kgame/kmessageclient.cpp b/libtdegames/kgame/kmessageclient.cpp
index 0233884a..ca90bbd1 100644
--- a/libtdegames/kgame/kmessageclient.cpp
+++ b/libtdegames/kgame/kmessageclient.cpp
@@ -132,7 +132,7 @@ TQ_UINT16 KMessageClient::peerPort () const
 
 TQString KMessageClient::peerName () const
 {
- return d->connection ? d->connection->peerName() : TQString::tqfromLatin1("localhost");
+ return d->connection ? d->connection->peerName() : TQString::fromLatin1("localhost");
 }
 
 // --------------------- Sending messages
diff --git a/libtdegames/kgame/kmessageio.h b/libtdegames/kgame/kmessageio.h
index 326476ff..69038df9 100644
--- a/libtdegames/kgame/kmessageio.h
+++ b/libtdegames/kgame/kmessageio.h
@@ -123,7 +123,7 @@ public:
     @since 3.2
     @return "localhost" in the default implementation. Reimplemented in @ref KMessageSocket
   */
-  virtual TQString peerName () const { return TQString::tqfromLatin1("localhost"); }
+  virtual TQString peerName () const { return TQString::fromLatin1("localhost"); }
 
 
 signals:
diff --git a/libtdegames/kgame/messages.txt b/libtdegames/kgame/messages.txt
index c42d2d91..3a163790 100644
--- a/libtdegames/kgame/messages.txt
+++ b/libtdegames/kgame/messages.txt
@@ -82,7 +82,7 @@ IdRemovePlayer   Q_INT16  playerid
 IdError          Q_INT32  errorcode
                  QString  errortext
 
-IdGametqStatus     Q_INT32  status
+IdGameStatus     Q_INT32  status
 
 IdPlayerProperty Q_INT16  propertyId
                  user defined -> the property
diff --git a/libtdegames/kgamelcd.cpp b/libtdegames/kgamelcd.cpp
index cf079a15..fc814f18 100644
--- a/libtdegames/kgamelcd.cpp
+++ b/libtdegames/kgamelcd.cpp
@@ -217,7 +217,7 @@ void KGameLCDList::init(const TQString &title)
     top->setColStretch(1, 1);
 
     _title = new TQLabel(title, this);
-    _title->tqsetAlignment(AlignCenter);
+    _title->setAlignment(AlignCenter);
     top->addMultiCellWidget(_title, 0, 0, 0, 1, AlignCenter);
 }
 
diff --git a/libtdegames/kgameprogress.cpp b/libtdegames/kgameprogress.cpp
index 98876aa3..0bb56014 100644
--- a/libtdegames/kgameprogress.cpp
+++ b/libtdegames/kgameprogress.cpp
@@ -79,11 +79,11 @@ void KGameProgress::initialize()
 void KGameProgress::paletteChange()
 {
 	TQPalette p = kapp->palette();
-	const TQColorGroup &tqcolorGroup = p.active();
+	const TQColorGroup &colorGroup = p.active();
 	if (!use_supplied_bar_color)
-		bar_color = tqcolorGroup.highlight();
-	bar_text_color = tqcolorGroup.highlightedText();
-	text_color = tqcolorGroup.text();
+		bar_color = colorGroup.highlight();
+	bar_text_color = colorGroup.highlightedText();
+	text_color = colorGroup.text();
 	setPalette(p);
 
 	adjustStyle();
@@ -151,7 +151,7 @@ bool KGameProgress::textEnabled() const
 	return text_enabled;
 }
 
-TQSize KGameProgress::tqsizeHint() const
+TQSize KGameProgress::sizeHint() const
 {
 	TQSize s( size() );
 
@@ -164,9 +164,9 @@ TQSize KGameProgress::tqsizeHint() const
 	return s;
 }
 
-TQSize KGameProgress::tqminimumSizeHint() const
+TQSize KGameProgress::minimumSizeHint() const
 {
-	return tqsizeHint();
+	return sizeHint();
 }
 
 TQSizePolicy KGameProgress::sizePolicy() const
@@ -213,7 +213,7 @@ void KGameProgress::styleChange(TQStyle&)
 
 void KGameProgress::adjustStyle()
 {
-	switch (tqstyle().tqstyleHint(TQStyle::SH_GUIStyle)) {
+	switch (tqstyle().styleHint(TQStyle::SH_GUIStyle)) {
 		case WindowsStyle:
 			setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 			break;
@@ -242,9 +242,9 @@ void KGameProgress::drawText(TQPainter *p)
 	// the current value and the maximum value respectively.
 	TQString s(format_);
 
-	s.replace(TQRegExp(TQString::tqfromLatin1("%p")), TQString::number(recalcValue(100)));
-	s.replace(TQRegExp(TQString::tqfromLatin1("%v")), TQString::number(value()));
-	s.replace(TQRegExp(TQString::tqfromLatin1("%m")), TQString::number(maxValue()));
+	s.replace(TQRegExp(TQString::fromLatin1("%p")), TQString::number(recalcValue(100)));
+	s.replace(TQRegExp(TQString::fromLatin1("%v")), TQString::number(value()));
+	s.replace(TQRegExp(TQString::fromLatin1("%m")), TQString::number(maxValue()));
 
 	p->setPen(text_color);
 	TQFont font = p->font();
diff --git a/libtdegames/kgameprogress.h b/libtdegames/kgameprogress.h
index 834b127c..e4144b94 100644
--- a/libtdegames/kgameprogress.h
+++ b/libtdegames/kgameprogress.h
@@ -162,11 +162,11 @@ public:
 
   /**
    */
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
 
   /**
    */
-  virtual TQSize tqminimumSizeHint() const;
+  virtual TQSize minimumSizeHint() const;
 
   /**
    */