Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 7909152750670148360093b2519955fbfa555154)

7 files changed, 23 insertions, 23 deletions

diff --git a/libksirtet/base/kzoommainwindow.cpp b/libksirtet/base/kzoommainwindow.cpp
index 758d73d6..c0c7fc92 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(TQT_TQOBJECT(this), TQT_SLOT(zoomIn()), actionCollection());
+  _zoomInAction = KStdAction::zoomIn(this, TQT_SLOT(zoomIn()), actionCollection());
   _zoomOutAction =
-    KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(zoomOut()), actionCollection());
+    KStdAction::zoomOut(this, TQT_SLOT(zoomOut()), actionCollection());
   _menu =
-    KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()), actionCollection());
+    KStdAction::showMenubar(this, TQT_SLOT(toggleMenubar()), actionCollection());
 }
 
 void KZoomMainWindow::init(const char *popupName)
diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp
index e9f576f1..a1a938b9 100644
--- a/libksirtet/base/main.cpp
+++ b/libksirtet/base/main.cpp
@@ -24,20 +24,20 @@ BaseMainWindow::BaseMainWindow()
     KNotifyClient::startDaemon();
 
     // File & Popup
-    KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(start()), actionCollection());
-    _pause = KStdGameAction::pause(TQT_TQOBJECT(this), TQT_SLOT(pause()), actionCollection());
+    KStdGameAction::gameNew(this, TQT_SLOT(start()), actionCollection());
+    _pause = KStdGameAction::pause(this, TQT_SLOT(pause()), actionCollection());
     _pause->setEnabled(false);
-    KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighscores()),
+    KStdGameAction::highscores(this, TQT_SLOT(showHighscores()),
                                actionCollection());
-    KStdGameAction::quit(TQT_TQOBJECT(tqApp), TQT_SLOT(quit()), actionCollection());
+    KStdGameAction::quit(tqApp, TQT_SLOT(quit()), actionCollection());
 
     // Settings
-    KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configureSettings()),
+    KStdAction::preferences(this, TQT_SLOT(configureSettings()),
                             actionCollection());
-    KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), actionCollection());
-    KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()),
+    KStdAction::keyBindings(this, TQT_SLOT(configureKeys()), actionCollection());
+    KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()),
                                        actionCollection());
-    KStdGameAction::configureHighscores(TQT_TQOBJECT(this), TQT_SLOT(configureHighscores()),
+    KStdGameAction::configureHighscores(this, TQT_SLOT(configureHighscores()),
                                         actionCollection());
 
     _inter = bfactory->createInterface(this);
diff --git a/libksirtet/common/main.cpp b/libksirtet/common/main.cpp
index f869cb1c..3553e9c1 100644
--- a/libksirtet/common/main.cpp
+++ b/libksirtet/common/main.cpp
@@ -25,17 +25,17 @@ 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, TQT_TQOBJECT(inter), TQT_SLOT(normalGame()),
+    (void)new TDEAction(s, 0, inter, TQT_SLOT(normalGame()),
                       actionCollection(), "mp_single_human");
     if (ama) (void)new TDEAction(i18n("&Single Human (Arcade)"), 0,
-                               TQT_TQOBJECT(inter), TQT_SLOT(arcadeGame()),
+                               inter, TQT_SLOT(arcadeGame()),
                                actionCollection(), "mp_arcade");
-    (void)new TDEAction(i18n("Human vs &Human"), 0, TQT_TQOBJECT(inter), TQT_SLOT(humanVsHuman()),
+    (void)new TDEAction(i18n("Human vs &Human"), 0, inter, TQT_SLOT(humanVsHuman()),
                       actionCollection(), "mp_human_vs_human");
     (void)new TDEAction(i18n("Human vs &Computer"), 0,
-                      TQT_TQOBJECT(inter), TQT_SLOT(humanVsComputer()),
+                      inter, TQT_SLOT(humanVsComputer()),
                       actionCollection(), "mp_human_vs_computer");
-    (void)new TDEAction(i18n("&More..."), 0, TQT_TQOBJECT(inter), TQT_SLOT(dialog()),
+    (void)new TDEAction(i18n("&More..."), 0, inter, TQT_SLOT(dialog()),
                       actionCollection(), "mp_more");
 
     buildGUI(inter);
diff --git a/libksirtet/common/misc_ui.cpp b/libksirtet/common/misc_ui.cpp
index c95b1b6b..e9adf4cb 100644
--- a/libksirtet/common/misc_ui.cpp
+++ b/libksirtet/common/misc_ui.cpp
@@ -161,7 +161,7 @@ uint GiftPool::take()
 
 void GiftPool::reset()
 {
-    TQT_TQOBJECT(this)->killTimers();
+    this->killTimers();
     ready = false;
     nb = 0;
     for (uint i=0; i<leds.size(); i++) {
diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp
index 5d250680..b6cc99cd 100644
--- a/libksirtet/lib/keys.cpp
+++ b/libksirtet/lib/keys.cpp
@@ -49,7 +49,7 @@ void KeyData::createActionCollection(uint index, TQWidget *receiver)
         TQString name = TQString("%2 %3").arg(index+1).arg(_data[k].name);
         const char *slot = (_data[k].slotRelease ? 0 : _data[k].slot);
         TDEAction *a = new TDEAction(label, _keycodes[_cols.size()-1][index][k],
-                                 TQT_TQOBJECT(receiver), slot, _cols[index], name.utf8());
+                                 receiver, slot, _cols[index], name.utf8());
         a->setEnabled(false);
         if ( slot==0 ) {
             SpecialData data;
diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp
index 1ad8a572..559f0d7e 100644
--- a/libksirtet/lib/mp_interface.cpp
+++ b/libksirtet/lib/mp_interface.cpp
@@ -29,7 +29,7 @@ MPInterface::MPInterface(const MPGameInfo &_gameInfo,
     hbl = new TQHBoxLayout(this, 0, 5);
 	hbl->setResizeMode( TQLayout::Fixed );
 
-    _keyData = new KeyData(gameInfo.maxNbLocalPlayers, nbActions, data, TQT_TQOBJECT(this));
+    _keyData = new KeyData(gameInfo.maxNbLocalPlayers, nbActions, data, this);
 }
 
 MPInterface::~MPInterface()
diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp
index 68537602..891a0c6d 100644
--- a/libksirtet/lib/wizard.cpp
+++ b/libksirtet/lib/wizard.cpp
@@ -81,10 +81,10 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi)
 	localPage->setMargin(KDialogBase::marginHint());
 
 	wl = new WidgetList<PlayerLine>(5, localPage);
-	TQSignalMapper *husm = new TQSignalMapper(TQT_TQOBJECT(this));
+	TQSignalMapper *husm = new TQSignalMapper(this);
 	if (gi.humanSettingSlot) connect(husm, TQT_SIGNAL(mapped(int)),
 									 gi.humanSettingSlot);
-	TQSignalMapper *aism = new TQSignalMapper(TQT_TQOBJECT(this));
+	TQSignalMapper *aism = new TQSignalMapper(this);
 	if (gi.AISettingSlot) connect(aism, TQT_SIGNAL(mapped(int)), gi.AISettingSlot);
 
     TDEConfigGroupSaver cg(kapp->config(), MP_GROUP);
@@ -102,9 +102,9 @@ 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)));
-		husm->setMapping(TQT_TQOBJECT(pl), i);
+		husm->setMapping(pl, i);
 		connect(pl, TQT_SIGNAL(setHuman()), husm, TQT_SLOT(map()));
-		aism->setMapping(TQT_TQOBJECT(pl), i);
+		aism->setMapping(pl, i);
 		connect(pl, TQT_SIGNAL(setAI()), aism, TQT_SLOT(map()));
 		wl->append(pl);
 	}