Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

16 files changed, 76 insertions, 76 deletions

diff --git a/libksirtet/base/board.cpp b/libksirtet/base/board.cpp
index f29bdb15..816d15e3 100644
--- a/libksirtet/base/board.cpp
+++ b/libksirtet/base/board.cpp
@@ -54,7 +54,7 @@ BaseBoard::BaseBoard(bool graphic, TQWidget *parent)
           _next = new BlockInfo(*sequences);
         setBlockInfo(main, _next);
         
-        connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()));
+        connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()));
         
         Piece::info().loadColors();
         KZoomMainWindow::addWidget(this);
diff --git a/libksirtet/base/field.cpp b/libksirtet/base/field.cpp
index f443c96c..e750b67f 100644
--- a/libksirtet/base/field.cpp
+++ b/libksirtet/base/field.cpp
@@ -90,9 +90,9 @@ void BaseField::setMessage(const TQString &label, ButtonType type)
     if ( type!=NoButton ) {
         _button = new TQPushButton(i18n(BUTTON_TEXTS[type]), board);
         _button->setFocus();
-        const char *slot = (type==ResumeButton ? TQT_SLOT(pause())
-                            : TQT_SLOT(start()));
-        _button->connect(_button, TQT_SIGNAL(clicked()),
+        const char *slot = (type==ResumeButton ? TQ_SLOT(pause())
+                            : TQ_SLOT(start()));
+        _button->connect(_button, TQ_SIGNAL(clicked()),
                               _widget->parent(), slot);
         _boardLayout->addWidget(_button, 0, TQt::AlignCenter);
         _button->show();
diff --git a/libksirtet/base/kzoommainwindow.cpp b/libksirtet/base/kzoommainwindow.cpp
index c0c7fc92..a9bb2004 100644
--- a/libksirtet/base/kzoommainwindow.cpp
+++ b/libksirtet/base/kzoommainwindow.cpp
@@ -30,11 +30,11 @@ KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, const char *name
 {
   installEventFilter(this);
   
-  _zoomInAction = KStdAction::zoomIn(this, TQT_SLOT(zoomIn()), actionCollection());
+  _zoomInAction = KStdAction::zoomIn(this, TQ_SLOT(zoomIn()), actionCollection());
   _zoomOutAction =
-    KStdAction::zoomOut(this, TQT_SLOT(zoomOut()), actionCollection());
+    KStdAction::zoomOut(this, TQ_SLOT(zoomOut()), actionCollection());
   _menu =
-    KStdAction::showMenubar(this, TQT_SLOT(toggleMenubar()), actionCollection());
+    KStdAction::showMenubar(this, TQ_SLOT(toggleMenubar()), actionCollection());
 }
 
 void KZoomMainWindow::init(const char *popupName)
@@ -63,7 +63,7 @@ void KZoomMainWindow::addWidget(TQWidget *widget)
     static_cast<KZoomMainWindow *>(tlw->tqt_cast("KZoomMainWindow"));
   Q_ASSERT(zm);
   zm->_widgets.append(widget);
-  connect(widget, TQT_SIGNAL(destroyed()), zm, TQT_SLOT(widgetDestroyed()));
+  connect(widget, TQ_SIGNAL(destroyed()), zm, TQ_SLOT(widgetDestroyed()));
 }
 
 void KZoomMainWindow::widgetDestroyed()
diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp
index a1a938b9..3916afc2 100644
--- a/libksirtet/base/main.cpp
+++ b/libksirtet/base/main.cpp
@@ -24,20 +24,20 @@ BaseMainWindow::BaseMainWindow()
     KNotifyClient::startDaemon();
 
     // File & Popup
-    KStdGameAction::gameNew(this, TQT_SLOT(start()), actionCollection());
-    _pause = KStdGameAction::pause(this, TQT_SLOT(pause()), actionCollection());
+    KStdGameAction::gameNew(this, TQ_SLOT(start()), actionCollection());
+    _pause = KStdGameAction::pause(this, TQ_SLOT(pause()), actionCollection());
     _pause->setEnabled(false);
-    KStdGameAction::highscores(this, TQT_SLOT(showHighscores()),
+    KStdGameAction::highscores(this, TQ_SLOT(showHighscores()),
                                actionCollection());
-    KStdGameAction::quit(tqApp, TQT_SLOT(quit()), actionCollection());
+    KStdGameAction::quit(tqApp, TQ_SLOT(quit()), actionCollection());
 
     // Settings
-    KStdAction::preferences(this, TQT_SLOT(configureSettings()),
+    KStdAction::preferences(this, TQ_SLOT(configureSettings()),
                             actionCollection());
-    KStdAction::keyBindings(this, TQT_SLOT(configureKeys()), actionCollection());
-    KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()),
+    KStdAction::keyBindings(this, TQ_SLOT(configureKeys()), actionCollection());
+    KStdAction::configureNotifications(this, TQ_SLOT(configureNotifications()),
                                        actionCollection());
-    KStdGameAction::configureHighscores(this, TQT_SLOT(configureHighscores()),
+    KStdGameAction::configureHighscores(this, TQ_SLOT(configureHighscores()),
                                         actionCollection());
 
     _inter = bfactory->createInterface(this);
@@ -89,7 +89,7 @@ void BaseMainWindow::configureSettings()
     if (w) dialog->addPage(w, i18n("Colors"), "colorize");
 //    dialog->addPage(new BackgroundConfigWidget, i18n("Background"), "background");
     addConfig(dialog);
-    connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_SIGNAL(settingsChanged()));
+    connect(dialog, TQ_SIGNAL(settingsChanged()), TQ_SIGNAL(settingsChanged()));
     dialog->show();
 }
 
diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp
index d201d9fd..35d9d89f 100644
--- a/libksirtet/common/ai.cpp
+++ b/libksirtet/common/ai.cpp
@@ -89,7 +89,7 @@ AI::AI(uint tTime, uint oTime, const Data *DATA)
     : timer(this), thinkTime(tTime), orderTime(oTime), stopped(false),
       board(0)
 {
-    connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()));
+    connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()));
 
     for (uint i=0; DATA[i].name; i++) {
         Element element;
diff --git a/libksirtet/common/field.cpp b/libksirtet/common/field.cpp
index f1b9cbc9..85b16fd6 100644
--- a/libksirtet/common/field.cpp
+++ b/libksirtet/common/field.cpp
@@ -85,9 +85,9 @@ Field::Field(TQWidget *parent)
     vbl->addWidget(showNext, 0);
     vbl->addStretch(4);
 
-    connect(board, TQT_SIGNAL(scoreUpdated()), TQT_SLOT(scoreUpdatedSlot()));
-    connect(board, TQT_SIGNAL(levelUpdated()), TQT_SLOT(levelUpdated()));
-    connect(board, TQT_SIGNAL(removedUpdated()), TQT_SLOT(removedUpdated()));
+    connect(board, TQ_SIGNAL(scoreUpdated()), TQ_SLOT(scoreUpdatedSlot()));
+    connect(board, TQ_SIGNAL(levelUpdated()), TQ_SLOT(levelUpdated()));
+    connect(board, TQ_SIGNAL(removedUpdated()), TQ_SLOT(removedUpdated()));
 
     initVariableGUI();
 }
diff --git a/libksirtet/common/inter.cpp b/libksirtet/common/inter.cpp
index cc9a86ed..99c61e56 100644
--- a/libksirtet/common/inter.cpp
+++ b/libksirtet/common/inter.cpp
@@ -12,17 +12,17 @@
 
 
 const ActionData Interface::ACTION_DATA[Nb_Actions] = {
-    { I18N_NOOP("Move Left"),     "move left",     TQT_SLOT(moveLeft()),  0 },
-    { I18N_NOOP("Move Right"),    "move right",    TQT_SLOT(moveRight()), 0 },
-    { I18N_NOOP("Drop Down"),     "drop down",     TQT_SLOT(dropDownStart()),
-                                                   TQT_SLOT(dropDownStop()) },
-    { I18N_NOOP("One Line Down"), "one line down", TQT_SLOT(oneLineDown()), 0 },
-    { I18N_NOOP("Rotate Left"),   "rotate left",   TQT_SLOT(rotateLeft()),  0 },
-    { I18N_NOOP("Rotate Right"),  "rotate right",  TQT_SLOT(rotateRight()), 0 },
+    { I18N_NOOP("Move Left"),     "move left",     TQ_SLOT(moveLeft()),  0 },
+    { I18N_NOOP("Move Right"),    "move right",    TQ_SLOT(moveRight()), 0 },
+    { I18N_NOOP("Drop Down"),     "drop down",     TQ_SLOT(dropDownStart()),
+                                                   TQ_SLOT(dropDownStop()) },
+    { I18N_NOOP("One Line Down"), "one line down", TQ_SLOT(oneLineDown()), 0 },
+    { I18N_NOOP("Rotate Left"),   "rotate left",   TQ_SLOT(rotateLeft()),  0 },
+    { I18N_NOOP("Rotate Right"),  "rotate right",  TQ_SLOT(rotateRight()), 0 },
     { I18N_NOOP("Move to Left Column"), "move left total",
-                                                   TQT_SLOT(moveLeftTotal()), 0 },
+                                                   TQ_SLOT(moveLeftTotal()), 0 },
     { I18N_NOOP("Move to Right Column"), "move right total",
-                                                   TQT_SLOT(moveRightTotal()), 0 }
+                                                   TQ_SLOT(moveRightTotal()), 0 }
 };
 
 const int Interface::KEYCODE_ONE[Nb_Actions] = {
@@ -45,7 +45,7 @@ MPBoard *Interface::newBoard(uint i)
 {
     Field *f = static_cast<Field *>(cfactory->createField(this));
     f->settingsChanged();
-    connect(this, TQT_SIGNAL(settingsChanged()), f, TQT_SLOT(settingsChanged()));
+    connect(this, TQ_SIGNAL(settingsChanged()), f, TQ_SLOT(settingsChanged()));
     if ( i==0 ) _firstField = f;
     return f;
 }
diff --git a/libksirtet/common/main.cpp b/libksirtet/common/main.cpp
index 3553e9c1..0d0a75cb 100644
--- a/libksirtet/common/main.cpp
+++ b/libksirtet/common/main.cpp
@@ -25,22 +25,22 @@ void MainWindow::init()
     // Modes
     bool ama = ( bfactory->bbi.nbArcadeStages!=0 );
     TQString s = (ama ? i18n("&Single Human (Normal)") : i18n("&Single Human"));
-    (void)new TDEAction(s, 0, inter, TQT_SLOT(normalGame()),
+    (void)new TDEAction(s, 0, inter, TQ_SLOT(normalGame()),
                       actionCollection(), "mp_single_human");
     if (ama) (void)new TDEAction(i18n("&Single Human (Arcade)"), 0,
-                               inter, TQT_SLOT(arcadeGame()),
+                               inter, TQ_SLOT(arcadeGame()),
                                actionCollection(), "mp_arcade");
-    (void)new TDEAction(i18n("Human vs &Human"), 0, inter, TQT_SLOT(humanVsHuman()),
+    (void)new TDEAction(i18n("Human vs &Human"), 0, inter, TQ_SLOT(humanVsHuman()),
                       actionCollection(), "mp_human_vs_human");
     (void)new TDEAction(i18n("Human vs &Computer"), 0,
-                      inter, TQT_SLOT(humanVsComputer()),
+                      inter, TQ_SLOT(humanVsComputer()),
                       actionCollection(), "mp_human_vs_computer");
-    (void)new TDEAction(i18n("&More..."), 0, inter, TQT_SLOT(dialog()),
+    (void)new TDEAction(i18n("&More..."), 0, inter, TQ_SLOT(dialog()),
                       actionCollection(), "mp_more");
 
     buildGUI(inter);
-    connect(this, TQT_SIGNAL(settingsChanged()),
-            inter, TQT_SLOT(settingsChangedSlot()));
+    connect(this, TQ_SIGNAL(settingsChanged()),
+            inter, TQ_SLOT(settingsChangedSlot()));
 }
 
 void MainWindow::addKeys(KKeyDialog &d)
diff --git a/libksirtet/common/misc_ui.cpp b/libksirtet/common/misc_ui.cpp
index e9adf4cb..f4ba7203 100644
--- a/libksirtet/common/misc_ui.cpp
+++ b/libksirtet/common/misc_ui.cpp
@@ -38,7 +38,7 @@ Shadow::Shadow(BaseBoard *board, TQWidget *parent)
      _board(board), _show(false)
 {
     KZoomMainWindow::addWidget(this);
-    connect(board, TQT_SIGNAL(updatePieceConfigSignal()), TQT_SLOT(update()));
+    connect(board, TQ_SIGNAL(updatePieceConfigSignal()), TQ_SLOT(update()));
 }
 
 TQSize Shadow::sizeHint() const
@@ -130,7 +130,7 @@ void GiftPool::put(uint n)
 	if ( n==0 ) return;
 	if ( nb==0 && !ready )
         TQTimer::singleShot(cfactory->cbi.giftPoolTimeout,
-                           this, TQT_SLOT(timeout()));
+                           this, TQ_SLOT(timeout()));
 	uint e = TQMIN(nb+n, leds.size());
 	for (uint i=nb; i<e; i++) leds[i]->on();
 	uint f = TQMIN(nb+n-e, leds.size());
diff --git a/libksirtet/lib/internal.cpp b/libksirtet/lib/internal.cpp
index a3f07cbb..e508e4d9 100644
--- a/libksirtet/lib/internal.cpp
+++ b/libksirtet/lib/internal.cpp
@@ -76,8 +76,8 @@ Network::Network(MPInterface *_interface,
 	for (; it.current(); ++it) {
         rd.socket = it.current()->socket;
 		rd.socket->notifier()->setEnabled(TRUE);
-		connect(rd.socket->notifier(), TQT_SIGNAL(activated(int)),
-                TQT_SLOT(notifier(int)));
+		connect(rd.socket->notifier(), TQ_SIGNAL(activated(int)),
+                TQ_SLOT(notifier(int)));
 		uint nb = it.current()->bds.count();
 		Q_ASSERT( nb>=1 );
 		rd.array  = new BufferArray(nb);
@@ -155,8 +155,8 @@ LocalServer::LocalServer(MPInterface *_interface,
 						 uint _interval)
 : Local(_interface, _boards), Server(_interval)
 {
-	connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeoutSlot()));
-	connect(&ctimer, TQT_SIGNAL(timeout()), TQT_SLOT(congestionTimeoutSlot()));
+	connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeoutSlot()));
+	connect(&ctimer, TQ_SIGNAL(timeout()), TQ_SLOT(congestionTimeoutSlot()));
 	serverTimeout();
 }
 
@@ -167,8 +167,8 @@ NetworkServer::NetworkServer(MPInterface *_interface,
 : Network(_interface, _boards, rhd), Server(_interval),
   nbReceived(remotes.count())
 {
-	connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeoutSlot()));
-	connect(&ctimer, TQT_SIGNAL(timeout()), TQT_SLOT(congestionTimeoutSlot()));
+	connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeoutSlot()));
+	connect(&ctimer, TQ_SIGNAL(timeout()), TQ_SLOT(congestionTimeoutSlot()));
 	// to catch unexpected data
 	for (uint i=0; i<remotes.count(); i++) remotes[i].received = TRUE;
 	nbReceived = remotes.count();
diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp
index 88203601..7c246356 100644
--- a/libksirtet/lib/meeting.cpp
+++ b/libksirtet/lib/meeting.cpp
@@ -65,13 +65,13 @@ void NetMeeting::appendLine(const MeetingLineData &pld, bool server)
 {
 	MeetingLine *pl;
 	pl = new MeetingLine(pld.own, server, false, wl);
-	if (pld.own) connect(pl, TQT_SIGNAL(textChanged(const TQString &)),
-						 TQT_SLOT(textChanged(const TQString &)));
+	if (pld.own) connect(pl, TQ_SIGNAL(textChanged(const TQString &)),
+						 TQ_SLOT(textChanged(const TQString &)));
 	else message(i18n("A new client has just arrived (#%1)")
 				 .arg(wl->size()+1));
 	pl->setData(pld.ed);
-	connect(pl, TQT_SIGNAL(typeChanged(MeetingCheckBox::Type)),
-			TQT_SLOT(typeChanged(MeetingCheckBox::Type)));
+	connect(pl, TQ_SIGNAL(typeChanged(MeetingCheckBox::Type)),
+			TQ_SLOT(typeChanged(MeetingCheckBox::Type)));
 	wl->append(pl);
 	waiting();
 }
@@ -216,17 +216,17 @@ ServerNetMeeting::ServerNetMeeting(const cId &id,
 	TQPtrList<RemoteHostData> &arhd, TQWidget *parent, const char * name)
 : NetMeeting(id, r.socket, option, TRUE, parent, name), rhd(arhd)
 {
-	connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)), TQT_SLOT(newHost(int)));
+	connect(sm[0]->notifier(), TQ_SIGNAL(activated(int)), TQ_SLOT(newHost(int)));
 	players.append(Accepted); // server
 
 	// set server line
 	ExtData ed(r.bds, "", MeetingCheckBox::Ready);
 	spl->setData(ed);
-	connect(spl, TQT_SIGNAL(textChanged(const TQString &)),
-			TQT_SLOT(textChanged(const TQString &)));
+	connect(spl, TQ_SIGNAL(textChanged(const TQString &)),
+			TQ_SLOT(textChanged(const TQString &)));
 
 	// options signal
-	if (ow) connect(ow, TQT_SIGNAL(changed()), TQT_SLOT(optionsChanged()));
+	if (ow) connect(ow, TQ_SIGNAL(changed()), TQ_SLOT(optionsChanged()));
 }
 
 void ServerNetMeeting::writeToAll(uint i)
@@ -271,8 +271,8 @@ void ServerNetMeeting::newHost(int)
 	players.append(NewPlayer);
     Socket *socket = new Socket(s, true);
 	uint i = sm.append(socket, SocketManager::ReadWrite);
-	connect(sm[i]->notifier(), TQT_SIGNAL(activated(int)),
-            TQT_SLOT(readNotifier(int)));
+	connect(sm[i]->notifier(), TQ_SIGNAL(activated(int)),
+            TQ_SLOT(readNotifier(int)));
 	sm[i]->notifier()->setEnabled(TRUE);
 }
 
@@ -451,8 +451,8 @@ ClientNetMeeting::ClientNetMeeting(const cId &id,
 	    TQWidget *parent, const char * name)
 : NetMeeting(id, rhd.socket, option, FALSE, parent, name), bds(rhd.bds)
 {
-	connect(sm[0]->notifier(), TQT_SIGNAL(activated(int)),
-			TQT_SLOT(readNotifier(int)));
+	connect(sm[0]->notifier(), TQ_SIGNAL(activated(int)),
+			TQ_SLOT(readNotifier(int)));
 	players.append(NewPlayer); // server player
 
 	// Send id to server (Id flag + Id struct)
diff --git a/libksirtet/lib/miscui.cpp b/libksirtet/lib/miscui.cpp
index 97a7bfa4..7be010ee 100644
--- a/libksirtet/lib/miscui.cpp
+++ b/libksirtet/lib/miscui.cpp
@@ -16,12 +16,12 @@ MeetingCheckBox::MeetingCheckBox(Type type, bool owner, bool server,
     _ready = new TQCheckBox(i18n("Ready"), this);
     vbox->addWidget(_ready);
     _ready->setEnabled(owner);
-    connect(_ready, TQT_SIGNAL(clicked()), TQT_SLOT(changedSlot()));
+    connect(_ready, TQ_SIGNAL(clicked()), TQ_SLOT(changedSlot()));
 
     _excluded = new TQCheckBox(i18n("Excluded"), this);
     vbox->addWidget(_excluded);
     _excluded->setEnabled(server);
-    connect(_excluded, TQT_SIGNAL(clicked()), TQT_SLOT(changedSlot()));
+    connect(_excluded, TQ_SIGNAL(clicked()), TQ_SLOT(changedSlot()));
 
     setType(type);
 }
@@ -54,5 +54,5 @@ PlayerComboBox::PlayerComboBox(Type type, bool canBeEmpty, bool acceptAI,
     if (canBeEmpty) insertItem(i18n("None"));
     setCurrentItem(type);
 
-    connect(this, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed(int)));
+    connect(this, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed(int)));
 }
diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp
index 559f0d7e..a18b3d0b 100644
--- a/libksirtet/lib/mp_interface.cpp
+++ b/libksirtet/lib/mp_interface.cpp
@@ -155,7 +155,7 @@ void MPInterface::createLocalGame(const ConnectionData &cd)
 		d.ptr = newBoard(i);
 		hbl->addWidget(d.ptr);
 		d.ptr->show();
-		connect(d.ptr, TQT_SIGNAL(enableKeys(bool)), TQT_SLOT(enableKeys(bool)));
+		connect(d.ptr, TQ_SIGNAL(enableKeys(bool)), TQ_SLOT(enableKeys(bool)));
 		boards += d;
 	}
 
@@ -257,7 +257,7 @@ void MPInterface::hostDisconnected(uint, const TQString &msg)
 	if ( !disconnected ) { // to avoid multiple calls
 		disconnected = TRUE;
 		// the zero timer is used to be outside the "internal" class
-		TQTimer::singleShot(0, this, TQT_SLOT(singleHumanSlot()));
+		TQTimer::singleShot(0, this, TQ_SLOT(singleHumanSlot()));
 	}
 }
 
diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp
index 7058b8eb..004f1a78 100644
--- a/libksirtet/lib/mp_simple_interface.cpp
+++ b/libksirtet/lib/mp_simple_interface.cpp
@@ -73,7 +73,7 @@ void MPSimpleInterface::dataFromServer(TQDataStream &s)
 	switch (scf.value()) {
 	 case SC_Flag::Stop:
 		KMessageBox::information(this, i18n("Server has left game!"));
-		TQTimer::singleShot(0, this, TQT_SLOT(singleHuman()));
+		TQTimer::singleShot(0, this, TQ_SLOT(singleHuman()));
 		return;
 	 case SC_Flag::GameOver:
 		_readGameOverData(s);
diff --git a/libksirtet/lib/pline.cpp b/libksirtet/lib/pline.cpp
index f685181a..fd2d9200 100644
--- a/libksirtet/lib/pline.cpp
+++ b/libksirtet/lib/pline.cpp
@@ -21,7 +21,7 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine,
 	tcb = new MeetingCheckBox(MeetingCheckBox::Ready, isOwner, serverIsReader,
                               this);
 	if ( !XOR(isOwner, serverIsReader) ) tcb->setEnabled(FALSE);
-	else connect(tcb, TQT_SIGNAL(changed(int)), TQT_SLOT(_typeChanged(int)));
+	else connect(tcb, TQ_SIGNAL(changed(int)), TQ_SLOT(_typeChanged(int)));
 	hbl->addWidget(tcb);
 
     /* Name */
@@ -52,8 +52,8 @@ MeetingLine::MeetingLine(bool isOwner, bool serverIsReader, bool serverLine,
 	qle->setFont( TQFont("fixed", 12, TQFont::Bold) );
 	qle->setFixedSize(qle->fontMetrics().maxWidth()*TALKER_MAX_LENGTH,
 					  qle->sizeHint().height());
-	connect(qle, TQT_SIGNAL(textChanged(const TQString &)),
-			TQT_SLOT(_textChanged(const TQString &)));
+	connect(qle, TQ_SIGNAL(textChanged(const TQString &)),
+			TQ_SLOT(_textChanged(const TQString &)));
 	qle->setEnabled(isOwner);
 	hbl->addWidget(qle);
 }
@@ -95,7 +95,7 @@ PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt,
 
 	/* CheckBox */
 	pcb = new PlayerComboBox(type, canBeEmpty, acceptAI, this);
-	connect(pcb, TQT_SIGNAL(changed(int)), TQT_SLOT(typeChangedSlot(int)));
+	connect(pcb, TQ_SIGNAL(changed(int)), TQ_SLOT(typeChangedSlot(int)));
 	hbl->addWidget(pcb);
 
     /* Name */
@@ -107,7 +107,7 @@ PlayerLine::PlayerLine(PlayerComboBox::Type type, const TQString &txt,
 
 	/* settings button */
 	setting = new TQPushButton(i18n("Settings"), this);
-	connect(setting, TQT_SIGNAL(clicked()), TQT_SLOT(setSlot()));
+	connect(setting, TQ_SIGNAL(clicked()), TQ_SLOT(setSlot()));
 	hbl->addWidget(setting);
 
 	typeChangedSlot(type);
diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp
index 891a0c6d..8618d36d 100644
--- a/libksirtet/lib/wizard.cpp
+++ b/libksirtet/lib/wizard.cpp
@@ -49,7 +49,7 @@ void MPWizard::setupTypePage()
 	typePage->setMargin(KDialogBase::marginHint());
 
 	TQVButtonGroup *vbg = new TQVButtonGroup(typePage);
-	connect(vbg, TQT_SIGNAL(clicked(int)), TQT_SLOT(typeChanged(int)));
+	connect(vbg, TQ_SIGNAL(clicked(int)), TQ_SLOT(typeChanged(int)));
 	TQRadioButton *b;
 	b = new TQRadioButton(i18n("Create a local game"), vbg);
 	b = new TQRadioButton(i18n("Create a network game"), vbg);
@@ -82,10 +82,10 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi)
 
 	wl = new WidgetList<PlayerLine>(5, localPage);
 	TQSignalMapper *husm = new TQSignalMapper(this);
-	if (gi.humanSettingSlot) connect(husm, TQT_SIGNAL(mapped(int)),
+	if (gi.humanSettingSlot) connect(husm, TQ_SIGNAL(mapped(int)),
 									 gi.humanSettingSlot);
 	TQSignalMapper *aism = new TQSignalMapper(this);
-	if (gi.AISettingSlot) connect(aism, TQT_SIGNAL(mapped(int)), gi.AISettingSlot);
+	if (gi.AISettingSlot) connect(aism, TQ_SIGNAL(mapped(int)), gi.AISettingSlot);
 
     TDEConfigGroupSaver cg(kapp->config(), MP_GROUP);
 	TQString n;
@@ -101,18 +101,18 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi)
 
 		pl = new PlayerLine(type, n, gi.humanSettingSlot, gi.AISettingSlot,
 							i!=0, gi.AIAllowed, wl);
-		connect(pl, TQT_SIGNAL(typeChanged(int)), TQT_SLOT(lineTypeChanged(int)));
+		connect(pl, TQ_SIGNAL(typeChanged(int)), TQ_SLOT(lineTypeChanged(int)));
 		husm->setMapping(pl, i);
-		connect(pl, TQT_SIGNAL(setHuman()), husm, TQT_SLOT(map()));
+		connect(pl, TQ_SIGNAL(setHuman()), husm, TQ_SLOT(map()));
 		aism->setMapping(pl, i);
-		connect(pl, TQT_SIGNAL(setAI()), aism, TQT_SLOT(map()));
+		connect(pl, TQ_SIGNAL(setAI()), aism, TQ_SLOT(map()));
 		wl->append(pl);
 	}
 
 	((TQVBox *)localPage)->setSpacing(KDialogBase::spacingHint());
 
 //	keys = new TQPushButton(i18n("Configure Keys..."), localPage);
-//	connect(keys, TQT_SIGNAL(clicked()), TQT_SLOT(configureKeysSlot()));
+//	connect(keys, TQ_SIGNAL(clicked()), TQ_SLOT(configureKeysSlot()));
 
 	addPage(localPage, i18n("Local Player's Settings"));
 	setHelpEnabled(localPage, FALSE);