Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065.

1 files changed, 24 insertions, 24 deletions

diff --git a/kbackgammon/engines/fibs/kplayerlist.cpp b/kbackgammon/engines/fibs/kplayerlist.cpp
index 25a169b5..62fb9a95 100644
--- a/kbackgammon/engines/fibs/kplayerlist.cpp
+++ b/kbackgammon/engines/fibs/kplayerlist.cpp
@@ -24,7 +24,7 @@
 #include "kplayerlist.moc"
 #include "kplayerlist.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqiconset.h>
 #include <tqgroupbox.h>
 #include <tqpopupmenu.h>
@@ -101,7 +101,7 @@ public:
         case KFibsPlayerList::Watches:
         case KFibsPlayerList::Client:
         case KFibsPlayerList::Email:
-        case KFibsPlayerList::Status:
+        case KFibsPlayerList::tqStatus:
         case KFibsPlayerList::Host:
             s = s.lower();
             break;
@@ -175,7 +175,7 @@ public:
     /*
      * Short abbreviations for Blind, Ready, and Away.
      */
-    TQString mAbrv[KFibsPlayerList::MaxStatus];
+    TQString mAbrv[KFibsPlayerList::MaxtqStatus];
 
     /*
      * Name of the last selected player - for internal purposes
@@ -218,7 +218,7 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name)
     d->mCol[Player]->name     = i18n("Player");
     d->mCol[Opponent]->name   = i18n("Opponent");
     d->mCol[Watches]->name    = i18n("Watches");
-    d->mCol[Status]->name     = i18n("Status");
+    d->mCol[tqStatus]->name     = i18n("Status");
     d->mCol[Rating]->name     = i18n("Rating");
     d->mCol[Experience]->name = i18n("Exp.");
     d->mCol[Idle]->name       = i18n("Idle");
@@ -231,7 +231,7 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name)
     d->mCol[Player]->key     = "player";
     d->mCol[Opponent]->key   = "opponent";
     d->mCol[Watches]->key    = "watches";
-    d->mCol[Status]->key     = "status";
+    d->mCol[tqStatus]->key     = "status";
     d->mCol[Rating]->key     = "rating";
     d->mCol[Experience]->key = "experience";
     d->mCol[Idle]->key       = "idle";
@@ -469,7 +469,7 @@ void KFibsPlayerList::getSetupPages(KTabCtl *nb, int space)
     gl = new TQGridLayout(gbl, LVEnd, 2, 20);
     gl->addWidget(lb, 0, 0);
 
-    // two column layout....
+    // two column tqlayout....
     for (i = 1; i < LVEnd/2; i++) {
         gl->addWidget(d->mCol[2*i-1]->cb, i, 0);
         gl->addWidget(d->mCol[2*i  ]->cb, i, 1);
@@ -569,12 +569,12 @@ void KFibsPlayerList::showContextMenu(KListView *, TQListViewItem *i, const TQPo
      */
     d->mUser = (i ? i->text(Player) : TQString());
 
-    d->mAct[KFibsPlayerListPrivate::Info  ]->setText(i18n("Info on %1" ).arg(d->mUser));
-    d->mAct[KFibsPlayerListPrivate::Talk  ]->setText(i18n("Talk to %1" ).arg(d->mUser));
-    d->mAct[KFibsPlayerListPrivate::Mail  ]->setText(i18n("Email to %1").arg(d->mUser));
-    d->mAct[KFibsPlayerListPrivate::Look  ]->setText(i18n("Look at %1" ).arg(d->mUser));
-    d->mAct[KFibsPlayerListPrivate::Watch ]->setText(i18n("Watch %1"   ).arg(d->mUser));
-    d->mAct[KFibsPlayerListPrivate::Update]->setText(i18n("Update %1"  ).arg(d->mUser));
+    d->mAct[KFibsPlayerListPrivate::Info  ]->setText(i18n("Info on %1" ).tqarg(d->mUser));
+    d->mAct[KFibsPlayerListPrivate::Talk  ]->setText(i18n("Talk to %1" ).tqarg(d->mUser));
+    d->mAct[KFibsPlayerListPrivate::Mail  ]->setText(i18n("Email to %1").tqarg(d->mUser));
+    d->mAct[KFibsPlayerListPrivate::Look  ]->setText(i18n("Look at %1" ).tqarg(d->mUser));
+    d->mAct[KFibsPlayerListPrivate::Watch ]->setText(i18n("Watch %1"   ).tqarg(d->mUser));
+    d->mAct[KFibsPlayerListPrivate::Update]->setText(i18n("Update %1"  ).tqarg(d->mUser));
 
     d->mAct[KFibsPlayerListPrivate::Info    ]->setEnabled(i);
     d->mAct[KFibsPlayerListPrivate::Talk    ]->setEnabled(i);
@@ -587,15 +587,15 @@ void KFibsPlayerList::showContextMenu(KListView *, TQListViewItem *i, const TQPo
     d->mAct[KFibsPlayerListPrivate::Unwatch]->setEnabled(d->mWatch);
 
     d->mPm[0]->setItemEnabled(d->mInID, i && d->mName != d->mUser);
-    d->mPm[0]->changeItem(d->mInID, i18n("Invite %1").arg(d->mUser));
+    d->mPm[0]->changeItem(d->mInID, i18n("Invite %1").tqarg(d->mUser));
 
     d->mMail = (i && d->mCol[Email]->show ? i->text(d->mCol[Email]->index) : TQString());
     d->mAct[KFibsPlayerListPrivate::Mail]->setEnabled(!d->mMail.isEmpty());
 
-    if (i && d->mCol[Status]->show)
+    if (i && d->mCol[tqStatus]->show)
         d->mAct[KFibsPlayerListPrivate::BlindAct]->setText
-            ((i->text(d->mCol[Status]->index).contains(d->mAbrv[Blind])) ?
-             i18n("Unblind %1").arg(d->mUser) : i18n("Blind %1").arg(d->mUser));
+            ((i->text(d->mCol[tqStatus]->index).contains(d->mAbrv[Blind])) ?
+             i18n("Unblind %1").tqarg(d->mUser) : i18n("Blind %1").tqarg(d->mUser));
     else
         d->mAct[KFibsPlayerListPrivate::BlindAct]->setText(i18n("Blind"));
 
@@ -721,7 +721,7 @@ void KFibsPlayerList::changePlayer(const TQString &line)
     TQDateTime fromEpoch;
     TQString str_entry[LVEnd], tmp;
 
-    entry[Status][0] = '\0';
+    entry[tqStatus][0] = '\0';
 
     // the line comes from FIBS and is 7 bit ASCII
     sscanf(line.latin1(), "%99s %99s %99s %1s %1s %99s %99s %99s %99s %99s %99s %99s", entry[Player], entry[Opponent],
@@ -738,9 +738,9 @@ void KFibsPlayerList::changePlayer(const TQString &line)
         if ((str_entry[j] = entry[j]) == "-")
             str_entry[j] = "";
     }
-    str_entry[Status].replace(Ready, 1, ready[0] == '0' ? "-" : d->mAbrv[Ready]);
-    str_entry[Status].replace(Away,  1, away [0] == '0' ? "-" : d->mAbrv[Away ]);
-    str_entry[Status].replace(Blind, 1, "-");
+    str_entry[tqStatus].replace(Ready, 1, ready[0] == '0' ? "-" : d->mAbrv[Ready]);
+    str_entry[tqStatus].replace(Away,  1, away [0] == '0' ? "-" : d->mAbrv[Away ]);
+    str_entry[tqStatus].replace(Blind, 1, "-");
 
     // disable drawing until the end of update
     setUpdatesEnabled(false);
@@ -771,7 +771,7 @@ void KFibsPlayerList::changePlayer(const TQString &line)
  found:
 
     // getting here means the player is in the list - update private status
-    str_entry[Status].replace(Blind,1,i->text(Status).contains
+    str_entry[tqStatus].replace(Blind,1,i->text(tqStatus).contains
                               (d->mAbrv[Blind]) ? d->mAbrv[Blind] : "-");
 
  update:
@@ -808,7 +808,7 @@ void KFibsPlayerList::deletePlayer(const TQString &player)
 /*
  * Set/Unset the status stat in the corresponding column of the list
  */
-void KFibsPlayerList::changePlayerStatus(const TQString &player, int stat, bool flag)
+void KFibsPlayerList::changePlayertqStatus(const TQString &player, int stat, bool flag)
 {
     TQListViewItem *i = 0;
 
@@ -827,7 +827,7 @@ void KFibsPlayerList::changePlayerStatus(const TQString &player, int stat, bool
     /*
      * Update the status flag
      */
-    i->setText(Status, i->text(Status).replace(stat, 1, (flag) ? d->mAbrv[stat] : "-"));
+    i->setText(tqStatus, i->text(tqStatus).replace(stat, 1, (flag) ? d->mAbrv[stat] : "-"));
 }
 
 
@@ -886,7 +886,7 @@ void KFibsPlayerList::setName(const TQString &name)
  */
 void KFibsPlayerList::updateCaption()
 {
-    setCaption(i18n("Player List - %1 - %2/%3").arg(childCount()).arg(d->mCount[0]).arg(d->mCount[1]));
+    setCaption(i18n("Player List - %1 - %2/%3").tqarg(childCount()).tqarg(d->mCount[0]).tqarg(d->mCount[1]));
 }
 
 /*