Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>

4 files changed, 60 insertions, 60 deletions

diff --git a/kbackgammon/engines/fibs/kbgfibs.cpp b/kbackgammon/engines/fibs/kbgfibs.cpp
index 4f30a87c..8561b9c2 100644
--- a/kbackgammon/engines/fibs/kbgfibs.cpp
+++ b/kbackgammon/engines/fibs/kbgfibs.cpp
@@ -2094,7 +2094,7 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen
 	/*
 	 * No connection, not playing, ready for login
 	 */
-	connection = new TQSocket(TQT_TQOBJECT(parent), "fibs connection");
+	connection = new TQSocket(parent, "fibs connection");
 	playing = false;
 	login = true;
 
diff --git a/kbackgammon/engines/fibs/kbgfibschat.cpp b/kbackgammon/engines/fibs/kbgfibschat.cpp
index 19a4a7a2..95f8577c 100644
--- a/kbackgammon/engines/fibs/kbgfibschat.cpp
+++ b/kbackgammon/engines/fibs/kbgfibschat.cpp
@@ -231,31 +231,31 @@ KBgChat::KBgChat(TQWidget *parent, const char *name)
     d->mAct[KBgChatPrivate::Inquire] = new TDEAction(i18n("Info On"),
                                                    TQIconSet(kapp->iconLoader()->loadIcon(
                                                                 "help.xpm", TDEIcon::Small)),
-                                                   0, TQT_TQOBJECT(this), TQT_SLOT(slotInquire()), actions);
+                                                   0, this, TQT_SLOT(slotInquire()), actions);
     d->mAct[KBgChatPrivate::Talk]    = new TDEAction(i18n("Talk To"),
                                                    TQIconSet(kapp->iconLoader()->loadIcon(
                                                                 PROG_NAME "-chat.png", TDEIcon::Small)),
-                                                   0, TQT_TQOBJECT(this), TQT_SLOT(slotTalk()), actions);
+                                                   0, this, TQT_SLOT(slotTalk()), actions);
 
-    d->mAct[KBgChatPrivate::InviteD]  = new TDEAction(i18n("Use Dialog"),    0, TQT_TQOBJECT(this),
+    d->mAct[KBgChatPrivate::InviteD]  = new TDEAction(i18n("Use Dialog"),    0, this,
                                                     TQT_SLOT(slotInviteD()),  actions);
-    d->mAct[KBgChatPrivate::Invite1]  = new TDEAction(i18n("1 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KBgChatPrivate::Invite1]  = new TDEAction(i18n("1 Point Match"), 0, this,
                                                     TQT_SLOT(slotInvite1()),  actions);
-    d->mAct[KBgChatPrivate::Invite2]  = new TDEAction(i18n("2 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KBgChatPrivate::Invite2]  = new TDEAction(i18n("2 Point Match"), 0, this,
                                                     TQT_SLOT(slotInvite2()),  actions);
-    d->mAct[KBgChatPrivate::Invite3]  = new TDEAction(i18n("3 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KBgChatPrivate::Invite3]  = new TDEAction(i18n("3 Point Match"), 0, this,
                                                     TQT_SLOT(slotInvite3()),  actions);
-    d->mAct[KBgChatPrivate::Invite4]  = new TDEAction(i18n("4 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KBgChatPrivate::Invite4]  = new TDEAction(i18n("4 Point Match"), 0, this,
                                                     TQT_SLOT(slotInvite4()),  actions);
-    d->mAct[KBgChatPrivate::Invite5]  = new TDEAction(i18n("5 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KBgChatPrivate::Invite5]  = new TDEAction(i18n("5 Point Match"), 0, this,
                                                     TQT_SLOT(slotInvite5()),  actions);
-    d->mAct[KBgChatPrivate::Invite6]  = new TDEAction(i18n("6 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KBgChatPrivate::Invite6]  = new TDEAction(i18n("6 Point Match"), 0, this,
                                                     TQT_SLOT(slotInvite6()),  actions);
-    d->mAct[KBgChatPrivate::Invite7]  = new TDEAction(i18n("7 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KBgChatPrivate::Invite7]  = new TDEAction(i18n("7 Point Match"), 0, this,
                                                     TQT_SLOT(slotInvite7()),  actions);
-    d->mAct[KBgChatPrivate::InviteU]  = new TDEAction(i18n("Unlimited"),     0, TQT_TQOBJECT(this),
+    d->mAct[KBgChatPrivate::InviteU]  = new TDEAction(i18n("Unlimited"),     0, this,
                                                     TQT_SLOT(slotInviteU()),  actions);
-    d->mAct[KBgChatPrivate::InviteR]  = new TDEAction(i18n("Resume"),        0, TQT_TQOBJECT(this),
+    d->mAct[KBgChatPrivate::InviteR]  = new TDEAction(i18n("Resume"),        0, this,
                                                     TQT_SLOT(slotInviteR()),  actions);
 
     d->mAct[KBgChatPrivate::InviteD]->plug(d->mInvt);
@@ -275,13 +275,13 @@ KBgChat::KBgChat(TQWidget *parent, const char *name)
     d->mAct[KBgChatPrivate::InviteU]->plug(d->mInvt);
     d->mAct[KBgChatPrivate::InviteR]->plug(d->mInvt);
 
-    d->mAct[KBgChatPrivate::Gag]      = new TDEAction(i18n("Gag"),   0, TQT_TQOBJECT(this), TQT_SLOT(slotGag()),     actions);
-    d->mAct[KBgChatPrivate::Ungag]    = new TDEAction(i18n("Ungag"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUngag()),   actions);
-    d->mAct[KBgChatPrivate::Cleargag] = new TDEAction(i18n("Clear Gag List"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleargag()), actions);
-    d->mAct[KBgChatPrivate::Copy]     = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions);
-    d->mAct[KBgChatPrivate::Clear]    = new TDEAction(i18n("Clear"),        0, TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actions);
-    d->mAct[KBgChatPrivate::Close]    = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(hide()), actions);
-    d->mAct[KBgChatPrivate::Silent]   = new TDEToggleAction(i18n("Silent"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSilent()), actions);
+    d->mAct[KBgChatPrivate::Gag]      = new TDEAction(i18n("Gag"),   0, this, TQT_SLOT(slotGag()),     actions);
+    d->mAct[KBgChatPrivate::Ungag]    = new TDEAction(i18n("Ungag"), 0, this, TQT_SLOT(slotUngag()),   actions);
+    d->mAct[KBgChatPrivate::Cleargag] = new TDEAction(i18n("Clear Gag List"), 0, this, TQT_SLOT(slotCleargag()), actions);
+    d->mAct[KBgChatPrivate::Copy]     = KStdAction::copy(this, TQT_SLOT(slotCopy()), actions);
+    d->mAct[KBgChatPrivate::Clear]    = new TDEAction(i18n("Clear"),        0, this, TQT_SLOT(slotClear()), actions);
+    d->mAct[KBgChatPrivate::Close]    = KStdAction::close(this, TQT_SLOT(hide()), actions);
+    d->mAct[KBgChatPrivate::Silent]   = new TDEToggleAction(i18n("Silent"), 0, this, TQT_SLOT(slotSilent()), actions);
 }
 
 
diff --git a/kbackgammon/engines/fibs/kplayerlist.cpp b/kbackgammon/engines/fibs/kplayerlist.cpp
index deffaa91..ab076c61 100644
--- a/kbackgammon/engines/fibs/kplayerlist.cpp
+++ b/kbackgammon/engines/fibs/kplayerlist.cpp
@@ -288,41 +288,41 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name)
     d->mAct[KFibsPlayerListPrivate::Info] = new TDEAction(i18n("Info"),
                                                         TQIconSet(kapp->iconLoader()->loadIcon
                                                                  ("help.xpm", TDEIcon::Small)),
-                                                        0, TQT_TQOBJECT(this), TQT_SLOT(slotInfo()),   actions);
+                                                        0, this, TQT_SLOT(slotInfo()),   actions);
     d->mAct[KFibsPlayerListPrivate::Talk] = new TDEAction(i18n("Talk"),
                                                         TQIconSet(kapp->iconLoader()->loadIcon
                                                                  (PROG_NAME "-chat.png", TDEIcon::Small)),
-                                                        0, TQT_TQOBJECT(this), TQT_SLOT(slotTalk()),   actions);
+                                                        0, this, TQT_SLOT(slotTalk()),   actions);
 
-    d->mAct[KFibsPlayerListPrivate::Look]     = new TDEAction(i18n("Look"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLook()),   actions);
-    d->mAct[KFibsPlayerListPrivate::Watch]    = new TDEAction(i18n("Watch"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWatch()),  actions);
-    d->mAct[KFibsPlayerListPrivate::Unwatch]  = new TDEAction(i18n("Unwatch"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnwatch()),actions);
-    d->mAct[KFibsPlayerListPrivate::BlindAct] = new TDEAction(i18n("Blind"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlind()),  actions);
-    d->mAct[KFibsPlayerListPrivate::Update]   = new TDEAction(i18n("Update"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdate()), actions);
+    d->mAct[KFibsPlayerListPrivate::Look]     = new TDEAction(i18n("Look"), 0, this, TQT_SLOT(slotLook()),   actions);
+    d->mAct[KFibsPlayerListPrivate::Watch]    = new TDEAction(i18n("Watch"), 0, this, TQT_SLOT(slotWatch()),  actions);
+    d->mAct[KFibsPlayerListPrivate::Unwatch]  = new TDEAction(i18n("Unwatch"), 0, this, TQT_SLOT(slotUnwatch()),actions);
+    d->mAct[KFibsPlayerListPrivate::BlindAct] = new TDEAction(i18n("Blind"), 0, this, TQT_SLOT(slotBlind()),  actions);
+    d->mAct[KFibsPlayerListPrivate::Update]   = new TDEAction(i18n("Update"), 0, this, TQT_SLOT(slotUpdate()), actions);
 
-    d->mAct[KFibsPlayerListPrivate::Reload] = KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(slotReload()), actions);
-    d->mAct[KFibsPlayerListPrivate::Mail]   = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(slotMail()),   actions);
-    d->mAct[KFibsPlayerListPrivate::Close]  = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(hide()), actions);
+    d->mAct[KFibsPlayerListPrivate::Reload] = KStdAction::redisplay(this, TQT_SLOT(slotReload()), actions);
+    d->mAct[KFibsPlayerListPrivate::Mail]   = KStdAction::mail(this, TQT_SLOT(slotMail()),   actions);
+    d->mAct[KFibsPlayerListPrivate::Close]  = KStdAction::close(this, TQT_SLOT(hide()), actions);
 
-    d->mAct[KFibsPlayerListPrivate::InviteD]  = new TDEAction(i18n("Use Dialog"),    0, TQT_TQOBJECT(this),
+    d->mAct[KFibsPlayerListPrivate::InviteD]  = new TDEAction(i18n("Use Dialog"),    0, this,
                                                             TQT_SLOT(slotInviteD()), actions);
-    d->mAct[KFibsPlayerListPrivate::Invite1]  = new TDEAction(i18n("1 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KFibsPlayerListPrivate::Invite1]  = new TDEAction(i18n("1 Point Match"), 0, this,
                                                             TQT_SLOT(slotInvite1()), actions);
-    d->mAct[KFibsPlayerListPrivate::Invite2]  = new TDEAction(i18n("2 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KFibsPlayerListPrivate::Invite2]  = new TDEAction(i18n("2 Point Match"), 0, this,
                                                             TQT_SLOT(slotInvite2()), actions);
-    d->mAct[KFibsPlayerListPrivate::Invite3]  = new TDEAction(i18n("3 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KFibsPlayerListPrivate::Invite3]  = new TDEAction(i18n("3 Point Match"), 0, this,
                                                             TQT_SLOT(slotInvite3()), actions);
-    d->mAct[KFibsPlayerListPrivate::Invite4]  = new TDEAction(i18n("4 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KFibsPlayerListPrivate::Invite4]  = new TDEAction(i18n("4 Point Match"), 0, this,
                                                             TQT_SLOT(slotInvite4()), actions);
-    d->mAct[KFibsPlayerListPrivate::Invite5]  = new TDEAction(i18n("5 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KFibsPlayerListPrivate::Invite5]  = new TDEAction(i18n("5 Point Match"), 0, this,
                                                             TQT_SLOT(slotInvite5()), actions);
-    d->mAct[KFibsPlayerListPrivate::Invite6]  = new TDEAction(i18n("6 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KFibsPlayerListPrivate::Invite6]  = new TDEAction(i18n("6 Point Match"), 0, this,
                                                             TQT_SLOT(slotInvite6()), actions);
-    d->mAct[KFibsPlayerListPrivate::Invite7]  = new TDEAction(i18n("7 Point Match"), 0, TQT_TQOBJECT(this),
+    d->mAct[KFibsPlayerListPrivate::Invite7]  = new TDEAction(i18n("7 Point Match"), 0, this,
                                                             TQT_SLOT(slotInvite7()), actions);
-    d->mAct[KFibsPlayerListPrivate::InviteU]  = new TDEAction(i18n("Unlimited"),     0, TQT_TQOBJECT(this),
+    d->mAct[KFibsPlayerListPrivate::InviteU]  = new TDEAction(i18n("Unlimited"),     0, this,
                                                             TQT_SLOT(slotInviteU()), actions);
-    d->mAct[KFibsPlayerListPrivate::InviteR]  = new TDEAction(i18n("Resume"),        0, TQT_TQOBJECT(this),
+    d->mAct[KFibsPlayerListPrivate::InviteR]  = new TDEAction(i18n("Resume"),        0, this,
                                                             TQT_SLOT(slotInviteR()), actions);
 
     /*
@@ -482,7 +482,7 @@ void KFibsPlayerList::getSetupPages(KTabCtl *nb, int space)
      */
     nb->addTab(w, i18n("&Playerlist"));
 
-    connect(nb, TQT_SIGNAL(applyButtonPressed()), TQT_TQOBJECT(this), TQT_SLOT(setupOk()));
+    connect(nb, TQT_SIGNAL(applyButtonPressed()), this, TQT_SLOT(setupOk()));
 }
 
 /*
diff --git a/kbackgammon/kbg.cpp b/kbackgammon/kbg.cpp
index dcb82e72..0b51b056 100644
--- a/kbackgammon/kbg.cpp
+++ b/kbackgammon/kbg.cpp
@@ -96,45 +96,45 @@ KBg::KBg()
 	/*
 	 * Create all actions needed by the application
 	 */
-	newAction = KStdGameAction::gameNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection());
+	newAction = KStdGameAction::gameNew(this, TQT_SLOT(openNew()), actionCollection());
     newAction->setEnabled(false);
-	KStdGameAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection());
-	KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()),  actionCollection());
+	KStdGameAction::print(this, TQT_SLOT(print()), actionCollection());
+	KStdGameAction::quit(this, TQT_SLOT(close()),  actionCollection());
 
 	TQStringList list;
 	for (int i = 0; i < MaxEngine; i++)
 		list.append(engineString[i]);
-	engineSet = new TDESelectAction(i18n("&Engine"), 0, TQT_TQOBJECT(this), TQT_SLOT(setupEngine()), actionCollection(),
+	engineSet = new TDESelectAction(i18n("&Engine"), 0, this, TQT_SLOT(setupEngine()), actionCollection(),
                                   "move_engine");
     engineSet->setItems(list);
 
     // AB: what the heck has this to do with redisplay? perhaps use reload instead?
-	loadAction = KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(load()), actionCollection(), "move_load");
+	loadAction = KStdAction::redisplay(this, TQT_SLOT(load()), actionCollection(), "move_load");
     loadAction->setEnabled(false);
-	undoAction = KStdGameAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection());
+	undoAction = KStdGameAction::undo(this, TQT_SLOT(undo()), actionCollection());
     undoAction->setEnabled(false);
-	redoAction = KStdGameAction::redo(TQT_TQOBJECT(this), TQT_SLOT(redo()), actionCollection());
+	redoAction = KStdGameAction::redo(this, TQT_SLOT(redo()), actionCollection());
     redoAction->setEnabled(false);
 
-	rollAction = KStdGameAction::roll(TQT_TQOBJECT(this), TQT_SLOT(roll()), actionCollection());
+	rollAction = KStdGameAction::roll(this, TQT_SLOT(roll()), actionCollection());
     rollAction->setEnabled(false);
-	endAction = KStdGameAction::endTurn(TQT_TQOBJECT(this), TQT_SLOT(done()), actionCollection());
+	endAction = KStdGameAction::endTurn(this, TQT_SLOT(done()), actionCollection());
     endAction->setEnabled(false);
     cubeAction = new TDEAction(i18n("Double Cube"), TQIconSet(kapp->iconLoader()->loadIcon
                                                           (PROG_NAME "-double.xpm", TDEIcon::Toolbar)),
-                              0, TQT_TQOBJECT(this), TQT_SLOT(cube()), actionCollection(), "move_cube");
+                              0, this, TQT_SLOT(cube()), actionCollection(), "move_cube");
     cubeAction->setEnabled(false);
 
-	KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()),     actionCollection());
-	KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(setupDlg()), actionCollection());
-	KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(saveConfig()), actionCollection());
+	KStdAction::showMenubar(this, TQT_SLOT(toggleMenubar()),     actionCollection());
+	KStdAction::preferences(this, TQT_SLOT(setupDlg()), actionCollection());
+	KStdAction::saveOptions(this, TQT_SLOT(saveConfig()), actionCollection());
 
 	TDEPopupMenu *p = (new TDEActionMenu(i18n("&Backgammon on the Web"),
 					 actionCollection(), "help_www"))->popupMenu();
 
-	(new TDEAction(helpTopic[FIBSHome][0], 0, TQT_TQOBJECT(this), TQT_SLOT(wwwFIBS()),
+	(new TDEAction(helpTopic[FIBSHome][0], 0, this, TQT_SLOT(wwwFIBS()),
 		     actionCollection(), "help_www_fibs"))->plug(p);
-	(new TDEAction(helpTopic[RuleHome][0], 0, TQT_TQOBJECT(this), TQT_SLOT(wwwRule()),
+	(new TDEAction(helpTopic[RuleHome][0], 0, this, TQT_SLOT(wwwRule()),
 		     actionCollection(), "help_www_rule"))->plug(p);
 
 	/*
@@ -148,7 +148,7 @@ KBg::KBg()
 	actionCmdLine->setAutoSized(true);
 
 	cmdLine->completionObject()->setOrder(TDECompletion::Weighted);
-	connect(cmdLine, TQT_SIGNAL(returnPressed(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(handleCmd(const TQString &)));
+	connect(cmdLine, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(handleCmd(const TQString &)));
 	/*
 	 * Done with the actions, create the XML-defined parts of the
 	 * user interface
@@ -274,7 +274,7 @@ void KBg::setupEngine()
 	newAction->setEnabled(engine[currEngine]->haveNewGame());
 
 	// engine -> this
-	connect(engine[currEngine], TQT_SIGNAL(statText(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(updateCaption(const TQString &)));
+	connect(engine[currEngine], TQT_SIGNAL(statText(const TQString &)), this, TQT_SLOT(updateCaption(const TQString &)));
 	connect(engine[currEngine], TQT_SIGNAL(infoText(const TQString &)), status, TQT_SLOT(write(const TQString &)));
 	connect(engine[currEngine], TQT_SIGNAL(allowCommand(int, bool)),   this, TQT_SLOT(allowCommand(int, bool)));
 
@@ -616,10 +616,10 @@ void KBg::setupDlg()
 	 */
 	connect(nb, TQT_SIGNAL(okClicked()),     this, TQT_SLOT(setupOk()));
 	connect(nb, TQT_SIGNAL(applyClicked()),  this, TQT_SLOT(setupOk()));
-	connect(nb, TQT_SIGNAL(cancelClicked()), TQT_TQOBJECT(this), TQT_SLOT(setupCancel()));
+	connect(nb, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(setupCancel()));
 	connect(nb, TQT_SIGNAL(defaultClicked()),this, TQT_SLOT(setupDefault()));
 
-	connect(nb, TQT_SIGNAL(finished()), TQT_TQOBJECT(this), TQT_SLOT(setupDone()));
+	connect(nb, TQT_SIGNAL(finished()), this, TQT_SLOT(setupDone()));
 
 	nb->resize(nb->minimumSize());
 	nb->show();