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

This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065.

1 files changed, 25 insertions, 25 deletions

diff --git a/kbackgammon/engines/fibs/kbgfibschat.cpp b/kbackgammon/engines/fibs/kbgfibschat.cpp
index bae73d46..c3490cec 100644
--- a/kbackgammon/engines/fibs/kbgfibschat.cpp
+++ b/kbackgammon/engines/fibs/kbgfibschat.cpp
@@ -28,17 +28,17 @@
 
 #include <tqstring.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpopupmenu.h>
 #include <tqregexp.h>
 #include <tqfont.h>
 #include <tqwhatsthis.h>
 #include <tqdatetime.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqsimplerichtext.h>
 #include <tqregion.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpainter.h>
 #include <tqpoint.h>
 #include <tqlistbox.h>
@@ -123,7 +123,7 @@ protected:
      */
     virtual void paint(TQPainter *p)
     {
-        t->draw(p, 1, 1, TQRegion(p->viewport()), w->colorGroup());
+        t->draw(p, 1, 1, TQRegion(p->viewport()), w->tqcolorGroup());
     }
 
 private:
@@ -200,7 +200,7 @@ KBgChat::KBgChat(TQWidget *parent, const char *name)
     d->mInvt = new TQPopupMenu();
 
     setAutoAddMessages(false); // we get an echo from FIBS
-    setFromNickname(i18n("%1 user").arg(PROG_NAME));
+    setFromNickname(i18n("%1 user").tqarg(PROG_NAME));
 
     if (!addSendingEntry(i18n("Kibitz to watchers and players"), CLIP_YOU_KIBITZ))
         kdDebug(10500) << "adding kibitz" << endl;
@@ -450,7 +450,7 @@ void KBgChat::startGame(const TQString &name)
     if (!id) {
         id = new int(nextId());
         d->mName2ID->insert(name, id);
-        addSendingEntry(i18n("Talk to %1").arg(name), *id);
+        addSendingEntry(i18n("Talk to %1").tqarg(name), *id);
     }
     setSendingEntry(CLIP_YOU_KIBITZ);
 }
@@ -476,7 +476,7 @@ void KBgChat::fibsTalk(const TQString &name)
     if (!id) {
         id = new int(nextId());
         d->mName2ID->insert(name, id);
-        addSendingEntry(i18n("Talk to %1").arg(name), *id);
+        addSendingEntry(i18n("Talk to %1").tqarg(name), *id);
     }
     setSendingEntry(*id);
 }
@@ -549,7 +549,7 @@ void KBgChat::handleData(const TQString &msg)
         switch (cmd) {
         case CLIP_SAYS:
             if (!d->mGag.contains(user)) {
-                cMsg = i18n("<u>%1 tells you:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), ""));
+                cMsg = i18n("<u>%1 tells you:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), ""));
                 cMsg = "<font color=\"red\">" + cMsg + "</font>";
                 emit personalMessage(cMsg);
             } else
@@ -558,7 +558,7 @@ void KBgChat::handleData(const TQString &msg)
 
         case CLIP_SHOUTS:
             if ((!((KToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked()) && (!d->mGag.contains(user))) {
-                cMsg = i18n("<u>%1 shouts:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), ""));
+                cMsg = i18n("<u>%1 shouts:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), ""));
                 cMsg = "<font color=\"black\">" + cMsg + "</font>";
             } else
                 cMsg = "";
@@ -566,7 +566,7 @@ void KBgChat::handleData(const TQString &msg)
 
         case CLIP_WHISPERS:
             if (!d->mGag.contains(user)) {
-                cMsg = i18n("<u>%1 whispers:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), ""));
+                cMsg = i18n("<u>%1 whispers:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), ""));
                 cMsg = "<font color=\"red\">" + cMsg + "</font>";
                 emit personalMessage(cMsg);
             } else
@@ -575,7 +575,7 @@ void KBgChat::handleData(const TQString &msg)
 
         case CLIP_KIBITZES:
             if (!d->mGag.contains(user)) {
-                cMsg = i18n("<u>%1 kibitzes:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), ""));
+                cMsg = i18n("<u>%1 kibitzes:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), ""));
                 cMsg = "<font color=\"red\">" + cMsg + "</font>";
                 emit personalMessage(cMsg);
             } else
@@ -583,28 +583,28 @@ void KBgChat::handleData(const TQString &msg)
             break;
 
         case CLIP_YOU_SAY:
-            cMsg = i18n("<u>You tell %1:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), ""));
+            cMsg = i18n("<u>You tell %1:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), ""));
             cMsg = "<font color=\"darkgreen\">" + cMsg + "</font>";
             emit personalMessage(cMsg);
             user = TQString();
             break;
 
         case CLIP_YOU_SHOUT:
-            cMsg = i18n("<u>You shout:</u> %1").arg(cMsg);
+            cMsg = i18n("<u>You shout:</u> %1").tqarg(cMsg);
             cMsg = "<font color=\"darkgreen\">" + cMsg + "</font>";
             emit personalMessage(cMsg);
             user = TQString();
             break;
 
         case CLIP_YOU_WHISPER:
-            cMsg = i18n("<u>You whisper:</u> %1").arg(cMsg);
+            cMsg = i18n("<u>You whisper:</u> %1").tqarg(cMsg);
             cMsg = "<font color=\"darkgreen\">" + cMsg + "</font>";
             emit personalMessage(cMsg);
             user = TQString();
             break;
 
         case CLIP_YOU_KIBITZ:
-            cMsg = i18n("<u>You kibitz:</u> %1").arg(cMsg);
+            cMsg = i18n("<u>You kibitz:</u> %1").tqarg(cMsg);
             cMsg = "<font color=\"darkgreen\">" + cMsg + "</font>";
             emit personalMessage(cMsg);
             user = TQString();
@@ -615,21 +615,21 @@ void KBgChat::handleData(const TQString &msg)
             cMsg.remove(0, cMsg.find(' ')+1);
             date.setTime_t(cMsg.left(cMsg.find(' ')+1).toUInt());
             cMsg.remove(0, cMsg.find(' '));
-            cMsg = i18n("<u>User %1 left a message at %2</u>: %3").arg(user).arg(date.toString()).arg(cMsg);
+            cMsg = i18n("<u>User %1 left a message at %2</u>: %3").tqarg(user).tqarg(date.toString()).tqarg(cMsg);
             cMsg = "<font color=\"red\">" + cMsg + "</font>";
             emit personalMessage(cMsg);
             user = TQString();
             break;
 
         case CLIP_MESSAGE_DELIVERED:
-            cMsg = i18n("Your message for %1 has been delivered.").arg(user);
+            cMsg = i18n("Your message for %1 has been delivered.").tqarg(user);
             cMsg = TQString("<font color=\"darkgreen\">") + cMsg + "</font>";
             emit personalMessage(cMsg);
             user = TQString();
             break;
 
         case CLIP_MESSAGE_SAVED:
-            cMsg = i18n("Your message for %1 has been saved.").arg(user);
+            cMsg = i18n("Your message for %1 has been saved.").tqarg(user);
             cMsg = TQString("<font color=\"darkgreen\">") + cMsg + "</font>";
             emit personalMessage(cMsg);
             user = TQString();
@@ -683,22 +683,22 @@ void KBgChat::contextMenu(TQListBoxItem *i, const TQPoint &p)
      */
     if (!d->mName[0].isNull()) {
 
-        d->mAct[KBgChatPrivate::Talk]->setText(i18n("Talk to %1").arg(d->mName[0]));
+        d->mAct[KBgChatPrivate::Talk]->setText(i18n("Talk to %1").tqarg(d->mName[0]));
         d->mAct[KBgChatPrivate::Talk]->plug(d->mChat);
 
-        d->mAct[KBgChatPrivate::Inquire]->setText(i18n("Info on %1").arg(d->mName[0]));
+        d->mAct[KBgChatPrivate::Inquire]->setText(i18n("Info on %1").tqarg(d->mName[0]));
         d->mAct[KBgChatPrivate::Inquire]->plug(d->mChat);
 
         // invite menu is always the same
-        d->mChat->insertItem(i18n("Invite %1").arg(d->mName[0]), d->mInvt);
+        d->mChat->insertItem(i18n("Invite %1").tqarg(d->mName[0]), d->mInvt);
 
         d->mChat->insertSeparator();
 
         if (d->mGag.contains(d->mName[0]) <= 0) {
-            d->mAct[KBgChatPrivate::Gag]->setText(i18n("Gag %1").arg(d->mName[0]));
+            d->mAct[KBgChatPrivate::Gag]->setText(i18n("Gag %1").tqarg(d->mName[0]));
             d->mAct[KBgChatPrivate::Gag]->plug(d->mChat);
         } else {
-            d->mAct[KBgChatPrivate::Ungag]->setText(i18n("Ungag %1").arg(d->mName[0]));
+            d->mAct[KBgChatPrivate::Ungag]->setText(i18n("Ungag %1").tqarg(d->mName[0]));
             d->mAct[KBgChatPrivate::Ungag]->plug(d->mChat);
         }
     }
@@ -741,7 +741,7 @@ void KBgChat::slotGag()
     d->mGag.append(d->mName[0]);
 
     TQString msg("<font color=\"blue\">");
-    msg += i18n("You won't hear what %1 says and shouts.").arg(d->mName[0]);
+    msg += i18n("You won't hear what %1 says and shouts.").tqarg(d->mName[0]);
     msg += "</font>";
 
     addMessage(TQString(), msg);
@@ -763,7 +763,7 @@ void KBgChat::slotUngag()
     d->mGag.remove(d->mName[0]);
 
     TQString msg("<font color=\"blue\">");
-    msg += i18n("You will again hear what %1 says and shouts.").arg(d->mName[0]);
+    msg += i18n("You will again hear what %1 says and shouts.").tqarg(d->mName[0]);
     msg += "</font>";
 
     addMessage(TQString(), msg);