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

24 files changed, 73 insertions, 73 deletions

diff --git a/libksirtet/base/board.cpp b/libksirtet/base/board.cpp
index 95293387..12193e31 100644
--- a/libksirtet/base/board.cpp
+++ b/libksirtet/base/board.cpp
@@ -16,7 +16,7 @@ FixedCanvasView::FixedCanvasView(TQWidget *parent, const char *name)
   : TQCanvasView(parent, name, WNoAutoErase)
 {}
 
-TQSize FixedCanvasView::tqsizeHint() const
+TQSize FixedCanvasView::sizeHint() const
 {
   if ( canvas()==0 ) return TQSize();
   return canvas()->size() + 2 * TQSize(frameWidth(), frameWidth());
@@ -24,7 +24,7 @@ TQSize FixedCanvasView::tqsizeHint() const
 
 void FixedCanvasView::adjustSize()
 {
-  setFixedSize(tqsizeHint());
+  setFixedSize(sizeHint());
 }
 
 //-----------------------------------------------------------------------------
diff --git a/libksirtet/base/board.h b/libksirtet/base/board.h
index b525ee5b..f78b8168 100644
--- a/libksirtet/base/board.h
+++ b/libksirtet/base/board.h
@@ -19,7 +19,7 @@ class KDE_EXPORT FixedCanvasView : public TQCanvasView
 public:
   FixedCanvasView(TQWidget *parent = 0, const char *name = 0);
   
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
   
 public slots:
   virtual void adjustSize();
diff --git a/libksirtet/base/field.cpp b/libksirtet/base/field.cpp
index 5f7cf10d..dde0ef0a 100644
--- a/libksirtet/base/field.cpp
+++ b/libksirtet/base/field.cpp
@@ -1,7 +1,7 @@
 #include "field.h"
 
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
@@ -41,8 +41,8 @@ void BaseField::init(bool AI, bool multiplayer, bool server, bool first,
     _flags.multiplayer = multiplayer;
     _flags.server = server;
     _flags.first = first;
-	TQString text = (AI ? i18n("%1\n(AI player)").tqarg(name)
-                    : (multiplayer ? i18n("%1\n(Human player)").tqarg(name)
+	TQString text = (AI ? i18n("%1\n(AI player)").arg(name)
+                    : (multiplayer ? i18n("%1\n(Human player)").arg(name)
                        : TQString()));
 	if ( first && !server ) text += i18n("\nWaiting for server");
 	setMessage(text, (first && server ? StartButton : NoButton));
@@ -81,7 +81,7 @@ void BaseField::setMessage(const TQString &label, ButtonType type)
         TQString str = (isArcade() ? i18n("Arcade game") + '\n'
                        : TQString()) + label;
         _label = new TQLabel(str, board);
-        _label->tqsetAlignment(TQt::AlignCenter);
+        _label->setAlignment(TQt::AlignCenter);
         _label->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
         _boardLayout->addWidget(_label, 0, TQt::AlignCenter);
         _label->show();
@@ -128,7 +128,7 @@ void BaseField::stop(bool gameover)
         if ( board->arcadeStage()==bfactory->bbi.nbArcadeStages )
             msg = i18n("The End");
         else {
-            msg = i18n("Stage #%1 done").tqarg(board->arcadeStage());
+            msg = i18n("Stage #%1 done").arg(board->arcadeStage());
             button = ProceedButton;
         }
     }
diff --git a/libksirtet/base/kzoommainwindow.cpp b/libksirtet/base/kzoommainwindow.cpp
index 1d0f5319..8d0521bc 100644
--- a/libksirtet/base/kzoommainwindow.cpp
+++ b/libksirtet/base/kzoommainwindow.cpp
@@ -58,7 +58,7 @@ void KZoomMainWindow::init(const char *popupName)
 void KZoomMainWindow::addWidget(TQWidget *widget)
 {
   widget->adjustSize();
-  TQWidget *tlw = widget->tqtopLevelWidget();
+  TQWidget *tlw = widget->topLevelWidget();
   KZoomMainWindow *zm = 
     static_cast<KZoomMainWindow *>(tlw->qt_cast("KZoomMainWindow"));
   Q_ASSERT(zm);
@@ -74,7 +74,7 @@ void KZoomMainWindow::widgetDestroyed()
 bool KZoomMainWindow::eventFilter(TQObject *o, TQEvent *e)
 {
   if ( e->type()==TQEvent::LayoutHint )
-    setFixedSize(tqminimumSize()); // because K/TQMainWindow
+    setFixedSize(minimumSize()); // because K/TQMainWindow
                                  // does not manage fixed central widget
                                  // with hidden menubar...
   return KMainWindow::eventFilter(o, e);
diff --git a/libksirtet/base/kzoommainwindow.h b/libksirtet/base/kzoommainwindow.h
index 18e85ddb..3b70eae4 100644
--- a/libksirtet/base/kzoommainwindow.h
+++ b/libksirtet/base/kzoommainwindow.h
@@ -52,7 +52,7 @@ public:
 
   /** Add a widget to be managed i.e. the adjustSize() method of the
    * widget is called whenever the zoom is changed.
-   * This function assumes that the tqtopLevelWidget() is the KZoomMainWindow.
+   * This function assumes that the topLevelWidget() is the KZoomMainWindow.
    */
   static void addWidget(TQWidget *widget);
                   
diff --git a/libksirtet/base/settings.cpp b/libksirtet/base/settings.cpp
index a695d746..2d8db301 100644
--- a/libksirtet/base/settings.cpp
+++ b/libksirtet/base/settings.cpp
@@ -3,7 +3,7 @@
 
 #include <tqlabel.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqhgroupbox.h>
 
diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp
index 3960291e..4e397cdd 100644
--- a/libksirtet/common/ai.cpp
+++ b/libksirtet/common/ai.cpp
@@ -6,7 +6,7 @@
 #include <tqlabel.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgrid.h>
 #include <tqwhatsthis.h>
 
@@ -343,14 +343,14 @@ TQCString AIConfig::coefficientKey(const char *name)
 
 double AIConfig::coefficient(const AI::Data &data)
 {
-    KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Coefficient_%1").tqarg(data.name) );
+    KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Coefficient_%1").arg(data.name) );
     assert(item);
     return item->property().toDouble();
 }
 
 int AIConfig::trigger(const AI::Data &data)
 {
-    KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Trigger_%1").tqarg(data.name) );
+    KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Trigger_%1").arg(data.name) );
     assert(item);
     return item->property().toInt();
 }
diff --git a/libksirtet/common/field.cpp b/libksirtet/common/field.cpp
index 8b1d3f7b..f8cff64a 100644
--- a/libksirtet/common/field.cpp
+++ b/libksirtet/common/field.cpp
@@ -3,7 +3,7 @@
 
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kprogress.h>
@@ -39,7 +39,7 @@ Field::Field(TQWidget *parent)
 
     // level progress
     levelLabel = new TQLabel(this);
-    levelLabel->tqsetAlignment(AlignCenter);
+    levelLabel->setAlignment(AlignCenter);
     lcds->addWidget(levelLabel, 5, 0);
     toLevel = new KProgress(this);
     toLevel->setTextEnabled(true);
@@ -77,7 +77,7 @@ Field::Field(TQWidget *parent)
     vbl->addStretch(1);
 
     labShowNext = new TQLabel(i18n("Next Tile"), this);
-    labShowNext->tqsetAlignment(AlignCenter);
+    labShowNext->setAlignment(AlignCenter);
     vbl->addWidget(labShowNext, 0);
     showNext = new ShowNextPiece(board, this);
     _snRootPixmap = new KCanvasRootPixmap(showNext);
diff --git a/libksirtet/common/highscores.cpp b/libksirtet/common/highscores.cpp
index fb1642c0..bd9be550 100644
--- a/libksirtet/common/highscores.cpp
+++ b/libksirtet/common/highscores.cpp
@@ -23,13 +23,13 @@ void CommonHighscores::convertLegacy(uint)
     KConfigGroupSaver cg(kapp->config(), "High Scores");
     for (uint i=0; i<10; i++) {
         TQString name
-            = cg.config()->readEntry(TQString("name%1").tqarg(i), TQString());
+            = cg.config()->readEntry(TQString("name%1").arg(i), TQString());
         if ( name.isNull() ) break;
         if ( name.isEmpty() ) name = i18n("anonymous");
         uint score
-            = cg.config()->readUnsignedNumEntry(TQString("score%1").tqarg(i), 0);
+            = cg.config()->readUnsignedNumEntry(TQString("score%1").arg(i), 0);
         uint level
-            = cg.config()->readUnsignedNumEntry(TQString("level%1").tqarg(i), 1);
+            = cg.config()->readUnsignedNumEntry(TQString("level%1").arg(i), 1);
         Score s(Won);
         s.setScore(score);
         s.setData("name", name);
diff --git a/libksirtet/common/misc_ui.cpp b/libksirtet/common/misc_ui.cpp
index 6638e67a..376c0c57 100644
--- a/libksirtet/common/misc_ui.cpp
+++ b/libksirtet/common/misc_ui.cpp
@@ -41,7 +41,7 @@ Shadow::Shadow(BaseBoard *board, TQWidget *parent)
     connect(board, TQT_SIGNAL(updatePieceConfigSignal()), TQT_SLOT(update()));
 }
 
-TQSize Shadow::tqsizeHint() const
+TQSize Shadow::sizeHint() const
 {
 	return TQSize(_xOffset + _board->matrix().width() * BasePrefs::blockSize(),
 				 SHADOW_HEIGHT);
@@ -86,11 +86,11 @@ class Led : public TQWidget
 
 	TQSizePolicy sizePolicy() const
 		{ return TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); }
-	TQSize tqsizeHint() const { return TQSize(LED_WIDTH, LED_HEIGHT); }
+	TQSize sizeHint() const { return TQSize(LED_WIDTH, LED_HEIGHT); }
 
-	void on()  { if (!_on) { _on = TRUE; tqrepaint(); } }
-	void off() { if (_on)  {_on = FALSE; tqrepaint(); } }
-	void setColor(const TQColor &c) { if (c!=col) { col = c; tqrepaint(); } }
+	void on()  { if (!_on) { _on = TRUE; repaint(); } }
+	void off() { if (_on)  {_on = FALSE; repaint(); } }
+	void setColor(const TQColor &c) { if (c!=col) { col = c; repaint(); } }
 
  protected:
 	void paintEvent(TQPaintEvent *) {
@@ -114,9 +114,9 @@ GiftPool::GiftPool(TQWidget *parent)
         leds.insert(i, new Led(yellow, this));
 }
 
-TQSize GiftPool::tqsizeHint() const
+TQSize GiftPool::sizeHint() const
 {
-	TQSize s = (leds.size() ? leds[0]->tqsizeHint() : TQSize());
+	TQSize s = (leds.size() ? leds[0]->sizeHint() : TQSize());
 	return TQSize((s.width()+LED_SPACING)*leds.size()-LED_SPACING, s.height());
 }
 
@@ -182,7 +182,7 @@ PlayerProgress::PlayerProgress(BaseBoard *board, TQWidget *parent,
   KZoomMainWindow::addWidget(this);
 }
 
-TQSize PlayerProgress::tqsizeHint() const
+TQSize PlayerProgress::sizeHint() const
 {
   return TQSize(10, _board->matrix().height() * BasePrefs::blockSize())
     + 2 * TQSize(frameWidth(), frameWidth());
diff --git a/libksirtet/common/misc_ui.h b/libksirtet/common/misc_ui.h
index 708bd484..181e0b2f 100644
--- a/libksirtet/common/misc_ui.h
+++ b/libksirtet/common/misc_ui.h
@@ -27,7 +27,7 @@ class LIBKSIRTET_EXPORT Shadow : public TQWidget
  public:
     Shadow(BaseBoard *, TQWidget *parent);
 
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     virtual TQSizePolicy sizePolicy() const;
     void setDisplay(bool show);
 
@@ -49,7 +49,7 @@ class LIBKSIRTET_EXPORT GiftPool : public TQHBox
  public:
     GiftPool(TQWidget *parent);
 
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     virtual TQSizePolicy sizePolicy() const;
 
     void reset();
@@ -75,7 +75,7 @@ class LIBKSIRTET_EXPORT PlayerProgress : public KGameProgress
 public:
   PlayerProgress(BaseBoard *board, TQWidget *parent = 0, const char *name = 0);
   
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
   virtual TQSizePolicy sizePolicy() const;
   
 private:
diff --git a/libksirtet/common/settings.cpp b/libksirtet/common/settings.cpp
index 058de034..e54799dc 100644
--- a/libksirtet/common/settings.cpp
+++ b/libksirtet/common/settings.cpp
@@ -2,7 +2,7 @@
 #include "settings.moc"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
 
diff --git a/libksirtet/lib/defines.cpp b/libksirtet/lib/defines.cpp
index 7eef441e..baf91083 100644
--- a/libksirtet/lib/defines.cpp
+++ b/libksirtet/lib/defines.cpp
@@ -6,7 +6,7 @@ void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *parent)
 {
     TQString str;
     if ( msg2.isNull() ) str = msg1;
-    else str = i18n("%1:\n%2").tqarg(msg1).tqarg(msg2);
+    else str = i18n("%1:\n%2").arg(msg1).arg(msg2);
     KMessageBox::error(parent, str);
 }
 
diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp
index 599f7372..acf4d7ac 100644
--- a/libksirtet/lib/keys.cpp
+++ b/libksirtet/lib/keys.cpp
@@ -46,7 +46,7 @@ void KeyData::createActionCollection(uint index, TQWidget *receiver)
     _cols[index] = new KActionCollection(receiver, this);
     for (uint k=0; k<_data.size(); k++) {
         TQString label = i18n(_data[k].label);
-        TQString name = TQString("%2 %3").tqarg(index+1).tqarg(_data[k].name);
+        TQString name = TQString("%2 %3").arg(index+1).arg(_data[k].name);
         const char *slot = (_data[k].slotRelease ? 0 : _data[k].slot);
         KAction *a = new KAction(label, _keycodes[_cols.size()-1][index][k],
                                  TQT_TQOBJECT(receiver), slot, _cols[index], name.utf8());
@@ -78,8 +78,8 @@ void KeyData::setEnabled(uint index, bool enabled)
 void KeyData::addKeys(KKeyDialog &d)
 {
     for (uint i=0; i<_cols.size(); i++)
-        d.insert(_cols[i], i18n("Shortcuts for player #%1/%2").tqarg(i+1)
-                 .tqarg(_cols.size()));
+        d.insert(_cols[i], i18n("Shortcuts for player #%1/%2").arg(i+1)
+                 .arg(_cols.size()));
 }
 
 void KeyData::save()
diff --git a/libksirtet/lib/keys.h b/libksirtet/lib/keys.h
index a5227a9b..52099228 100644
--- a/libksirtet/lib/keys.h
+++ b/libksirtet/lib/keys.h
@@ -37,7 +37,7 @@ class KeyData : public TQObject
     TQMap<KAction *, SpecialData>           _specActions;
 
     TQString group() const
-        { return TQString("Keys (%1 humans)").tqarg(_cols.size()); }
+        { return TQString("Keys (%1 humans)").arg(_cols.size()); }
 };
 
 #endif // KEYS_H
diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp
index 5e0e679f..e35a6cbc 100644
--- a/libksirtet/lib/meeting.cpp
+++ b/libksirtet/lib/meeting.cpp
@@ -23,7 +23,7 @@ NetMeeting::NetMeeting(const cId &_id, Socket *socket,
 	sm.append(socket, SocketManager::ReadWrite);
 	sm[0]->notifier()->setEnabled(TRUE);
 
-/* top tqlayout */
+/* top layout */
 	TQVBoxLayout *top = new TQVBoxLayout(plainPage(), spacingHint());
 	top->setResizeMode(TQLayout::Fixed);
 
@@ -37,7 +37,7 @@ NetMeeting::NetMeeting(const cId &_id, Socket *socket,
 	top->addWidget(wl);
 
 	labWait = new TQLabel(i18n("Waiting for clients"), plainPage());
-	labWait->tqsetAlignment(AlignCenter);
+	labWait->setAlignment(AlignCenter);
 	top->addWidget(labWait);
 
 	// options widget
@@ -68,7 +68,7 @@ void NetMeeting::appendLine(const MeetingLineData &pld, bool server)
 	if (pld.own) connect(pl, TQT_SIGNAL(textChanged(const TQString &)),
 						 TQT_SLOT(textChanged(const TQString &)));
 	else message(i18n("A new client has just arrived (#%1)")
-				 .tqarg(wl->size()+1));
+				 .arg(wl->size()+1));
 	pl->setData(pld.ed);
 	connect(pl, TQT_SIGNAL(typeChanged(MeetingCheckBox::Type)),
 			TQT_SLOT(typeChanged(MeetingCheckBox::Type)));
@@ -241,7 +241,7 @@ void ServerNetMeeting::writeToAll(uint i)
 void ServerNetMeeting::netError(uint i, const TQString &type)
 {
 	Q_ASSERT( i!=0 );
-	disconnectHost(i, i18n("%1 client #%2: disconnect it").tqarg(type).tqarg(i));
+	disconnectHost(i, i18n("%1 client #%2: disconnect it").arg(type).arg(i));
 }
 
 void ServerNetMeeting::disconnectHost(uint i, const TQString &str)
@@ -265,7 +265,7 @@ void ServerNetMeeting::newHost(int)
     int res = sm[0]->accept(s);
     if ( res!=0 ) {
         message(i18n("Failed to accept incoming client:\n%1")
-                .tqarg(socketError(s)));
+                .arg(socketError(s)));
         return;
     }
 	players.append(NewPlayer);
@@ -301,7 +301,7 @@ void ServerNetMeeting::idFlag(uint i)
 
 void ServerNetMeeting::endFlag(uint i)
 {
-	disconnectHost(i, i18n("Client #%1 has left").tqarg(i));
+	disconnectHost(i, i18n("Client #%1 has left").arg(i));
 }
 
 void ServerNetMeeting::newFlag(uint i)
@@ -462,7 +462,7 @@ ClientNetMeeting::ClientNetMeeting(const cId &id,
 
 void ClientNetMeeting::netError(uint, const TQString &str)
 {
-	cleanReject(i18n("%1 server: aborting connection.").tqarg(str));
+	cleanReject(i18n("%1 server: aborting connection.").arg(str));
 }
 
 void ClientNetMeeting::writeToAll(uint)
@@ -529,7 +529,7 @@ void ClientNetMeeting::delFlag(uint)
 	sm[0]->readingStream() >> k;
 	CHECK_READ(0);
 	removeLine(k-1);
-	message(i18n("Client %1 has left").tqarg(k));
+	message(i18n("Client %1 has left").arg(k));
 }
 
 void ClientNetMeeting::textChanged(const TQString &text)
diff --git a/libksirtet/lib/miscui.cpp b/libksirtet/lib/miscui.cpp
index dde70adb..ca6030c7 100644
--- a/libksirtet/lib/miscui.cpp
+++ b/libksirtet/lib/miscui.cpp
@@ -1,7 +1,7 @@
 #include "miscui.h"
 #include "miscui.moc"
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 
diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp
index e28ebdf8..a0a5c10b 100644
--- a/libksirtet/lib/mp_interface.cpp
+++ b/libksirtet/lib/mp_interface.cpp
@@ -2,7 +2,7 @@
 #include "mp_interface.moc"
 
 #include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -100,14 +100,14 @@ void MPInterface::specialLocalGame(uint nbHumans, uint nbAIs)
 		bd.type = (i<nbHumans ? PlayerComboBox::Human : PlayerComboBox::AI);
 		bd.name = TQString();
 		t = (PlayerComboBox::Type)
-			cg.config()->readNumEntry(TQString(MP_PLAYER_TYPE).tqarg(i),
+			cg.config()->readNumEntry(TQString(MP_PLAYER_TYPE).arg(i),
 						   	          PlayerComboBox::None);
 		if ( bd.type==t )
-			bd.name = cg.config()->readEntry(TQString(MP_PLAYER_NAME).tqarg(i),
+			bd.name = cg.config()->readEntry(TQString(MP_PLAYER_NAME).arg(i),
 									         TQString());
 		if ( bd.name.isNull() )
-			bd.name = (i<nbHumans ? i18n("Human %1").tqarg(i+1)
-					   : i18n("AI %1").tqarg(i-nbHumans+1));
+			bd.name = (i<nbHumans ? i18n("Human %1").arg(i+1)
+					   : i18n("AI %1").arg(i-nbHumans+1));
 		cd.rhd.bds += bd;
 	}
 	cd.server  = TRUE;
diff --git a/libksirtet/lib/mp_option.h b/libksirtet/lib/mp_option.h
index bca42bfa..f0e0f6cc 100644
--- a/libksirtet/lib/mp_option.h
+++ b/libksirtet/lib/mp_option.h
@@ -28,7 +28,7 @@
  * changed. In addition you'll need to implement the method @ref #saveData
  * to save the configuration in the config file ; so that it will be available
  * for the initialisation of @ref LocalBoard.
- * It seems a good idea that the widget have the same tqlayout
+ * It seems a good idea that the widget have the same layout
  * on both (server and client) sides but with the inner widgets all disabled 
  * on the client side.
  */
diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp
index 17515fb0..1b83be40 100644
--- a/libksirtet/lib/mp_simple_interface.cpp
+++ b/libksirtet/lib/mp_simple_interface.cpp
@@ -9,7 +9,7 @@
 
 
 #define PAUSE_ACTION \
-    ((KToggleAction *)((KMainWindow *)tqtopLevelWidget())->action("game_pause"))
+    ((KToggleAction *)((KMainWindow *)topLevelWidget())->action("game_pause"))
 
 MPSimpleInterface::MPSimpleInterface(const MPGameInfo &gi,
                                      uint nbActions, const ActionData *data,
diff --git a/libksirtet/lib/pline.cpp b/libksirtet/lib/pline.cpp
index 3a63a0b0..86fde398 100644
--- a/libksirtet/lib/pline.cpp
+++ b/libksirtet/lib/pline.cpp
@@ -14,7 +14,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine,
 {
 	setFrameStyle(Panel | (serverLine ? Raised : Plain));
 
-	// Top tqlayout
+	// Top layout
 	hbl = new TQHBoxLayout(this, THIN_BORDER + frameWidth());
 
 	/* TriCheckBox */
@@ -26,7 +26,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine,
 
     /* Name */
 	lname = new TQLabel(" ", this);
-	lname->tqsetAlignment(AlignCenter);
+	lname->setAlignment(AlignCenter);
 	lname->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
 	lname->setLineWidth(2);
 	lname->setMidLineWidth(3);
@@ -34,7 +34,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine,
     f.setBold(TRUE);
     lname->setFont(f);
 	lname->setFixedSize(lname->fontMetrics().maxWidth()*NAME_MAX_LENGTH,
-						lname->tqsizeHint().height());
+						lname->sizeHint().height());
 	hbl->addWidget(lname);
 	hbl->addStretch(1);
 
@@ -51,7 +51,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine,
 	qle->setMaxLength(TALKER_MAX_LENGTH);
 	qle->setFont( TQFont("fixed", 12, TQFont::Bold) );
 	qle->setFixedSize(qle->fontMetrics().maxWidth()*TALKER_MAX_LENGTH,
-					  qle->tqsizeHint().height());
+					  qle->sizeHint().height());
 	connect(qle, TQT_SIGNAL(textChanged(const TQString &)),
 			TQT_SLOT(_textChanged(const TQString &)));
 	qle->setEnabled(isOwner);
@@ -66,8 +66,8 @@ void MeetingLine::setData(const ExtData &ed)
 		if ( bds[i].type==PlayerComboBox::Human ) nbh++;
 		else if ( bds[i].type==PlayerComboBox::AI ) nba++;
 	}
-	labH->setText(i18n("Hu=%1").tqarg(nbh));
-	labAI->setText(i18n("AI=%1").tqarg(nba));
+	labH->setText(i18n("Hu=%1").arg(nbh));
+	labAI->setText(i18n("AI=%1").arg(nba));
  	lname->setText(bds[0].name);
 	setType(ed.type);
 	setText(ed.text);
@@ -89,7 +89,7 @@ PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt,
 {
 	setFrameStyle(Panel | Raised);
 
-	// Top tqlayout
+	// Top layout
 	TQHBoxLayout *hbl;
 	hbl = new TQHBoxLayout(this, THIN_BORDER + frameWidth());
 
@@ -102,7 +102,7 @@ PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt,
 	edit = new TQLineEdit(txt, this);
 	edit->setMaxLength(NAME_MAX_LENGTH);
 	edit->setFixedSize(edit->fontMetrics().maxWidth()*(NAME_MAX_LENGTH+2),
-					   edit->tqsizeHint().height());
+					   edit->sizeHint().height());
 	hbl->addWidget(edit);
 
 	/* settings button */
diff --git a/libksirtet/lib/pline.h b/libksirtet/lib/pline.h
index 5bba6c4b..4927d16d 100644
--- a/libksirtet/lib/pline.h
+++ b/libksirtet/lib/pline.h
@@ -6,7 +6,7 @@
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <tqptrlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "types.h"
 
diff --git a/libksirtet/lib/types.cpp b/libksirtet/lib/types.cpp
index 86f7bfba..9d2149d8 100644
--- a/libksirtet/lib/types.cpp
+++ b/libksirtet/lib/types.cpp
@@ -23,13 +23,13 @@ TQString cId::errorMessage(const cId &id) const
 	 case Accepted: return TQString();
 	 case LibIdClash:
 		return i18n("The MultiPlayer library of the server is incompatible")
-			+ str.tqarg(libId).tqarg(id.libId);
+			+ str.arg(libId).arg(id.libId);
 	 case GameNameClash:
 		return i18n("Trying to connect a server for another game type")
-			+ str.tqarg(gameName).tqarg(id.gameName);
+			+ str.arg(gameName).arg(id.gameName);
 	 case GameIdClash:
 		return i18n("The server game version is incompatible")
-			+ str.tqarg(gameId).tqarg(id.gameId);
+			+ str.arg(gameId).arg(id.gameId);
 	}
 	Q_ASSERT(0);
 	return TQString();
diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp
index 29508e26..a3fd4f2b 100644
--- a/libksirtet/lib/wizard.cpp
+++ b/libksirtet/lib/wizard.cpp
@@ -94,10 +94,10 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi)
 	Q_ASSERT( gi.maxNbLocalPlayers>0 );
 	for (uint i=0; i<gi.maxNbLocalPlayers; i++) {
 		type = (PlayerComboBox::Type)
-			cg.config()->readNumEntry(TQString(MP_PLAYER_TYPE).tqarg(i),
+			cg.config()->readNumEntry(TQString(MP_PLAYER_TYPE).arg(i),
    			            (i==0 ? PlayerComboBox::Human : PlayerComboBox::None));
-		n = cg.config()->readEntry(TQString(MP_PLAYER_NAME).tqarg(i),
-                             i18n("Player #%1").tqarg(i));
+		n = cg.config()->readEntry(TQString(MP_PLAYER_NAME).arg(i),
+                             i18n("Player #%1").arg(i));
 
 		pl = new PlayerLine(type, n, gi.humanSettingSlot, gi.AISettingSlot,
 							i!=0, gi.AIAllowed, wl);
@@ -122,7 +122,7 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi)
 TQString MPWizard::name(uint i) const
 {
 	TQString s = wl->widget(i)->name();
-	if ( s.length()==0 ) s = i18n("Player #%1").tqarg(i);
+	if ( s.length()==0 ) s = i18n("Player #%1").arg(i);
 	return s;
 }
 
@@ -177,7 +177,7 @@ void MPWizard::accept()
         // do lookup
         int res = socket->lookup();
         if ( checkSocket(res, socket, i18n("Error looking up for \"%1\"")
-                         .tqarg(host), this) ) {
+                         .arg(host), this) ) {
             delete socket;
             return;
         }
@@ -206,9 +206,9 @@ void MPWizard::accept()
 
 	cg.config()->writeEntry(MP_GAMETYPE, (int)type);
 	for (uint i=0; i<wl->size(); i++) {
-		cg.config()->writeEntry(TQString(MP_PLAYER_TYPE).tqarg(i),
+		cg.config()->writeEntry(TQString(MP_PLAYER_TYPE).arg(i),
 						  (int)wl->widget(i)->type());
-		cg.config()->writeEntry(TQString(MP_PLAYER_NAME).tqarg(i), name(i));
+		cg.config()->writeEntry(TQString(MP_PLAYER_NAME).arg(i), name(i));
 	}
 
 	KWizard::accept();