Replace various '#define' strings - part 6

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

2 files changed, 24 insertions, 24 deletions

diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp
index 2eb3c705..14b7978d 100644
--- a/kpat/dealer.cpp
+++ b/kpat/dealer.cpp
@@ -114,7 +114,7 @@ void Dealer::setupActions() {
 
     if (actions() & Dealer::Hint) {
 
-        ahint = new TDEAction( i18n("&Hint"), TQString::fromLatin1("wizard"), Key_H, TQT_TQOBJECT(this),
+        ahint = new TDEAction( i18n("&Hint"), TQString::fromLatin1("wizard"), Key_H, this,
                              TQT_SLOT(hint()),
                              parent()->actionCollection(), "game_hint");
         actionlist.append(ahint);
@@ -122,7 +122,7 @@ void Dealer::setupActions() {
         ahint = 0;
 
     if (actions() & Dealer::Demo) {
-        ademo = new TDEToggleAction( i18n("&Demo"), TQString::fromLatin1("1rightarrow"), CTRL+Key_D, TQT_TQOBJECT(this),
+        ademo = new TDEToggleAction( i18n("&Demo"), TQString::fromLatin1("1rightarrow"), CTRL+Key_D, this,
                                    TQT_SLOT(toggleDemo()),
                                    parent()->actionCollection(), "game_demo");
         actionlist.append(ademo);
@@ -130,7 +130,7 @@ void Dealer::setupActions() {
         ademo = 0;
 
     if (actions() & Dealer::Redeal) {
-        aredeal = new TDEAction (i18n("&Redeal"), TQString::fromLatin1("queue"), 0, TQT_TQOBJECT(this),
+        aredeal = new TDEAction (i18n("&Redeal"), TQString::fromLatin1("queue"), 0, this,
                                TQT_SLOT(redeal()),
                                parent()->actionCollection(), "game_redeal");
         actionlist.append(aredeal);
@@ -791,13 +791,13 @@ void Dealer::takeState()
                 ademo->setEnabled( false );
             if ( aredeal )
                 aredeal->setEnabled( false );
-            TQTimer::singleShot(400, TQT_TQOBJECT(this), TQT_SIGNAL(gameLost()));
+            TQTimer::singleShot(400, this, TQT_SIGNAL(gameLost()));
             toldAboutLostGame = true;
             return;
         }
     }
     if (!demoActive() && !waiting())
-            TQTimer::singleShot(TIME_BETWEEN_MOVES, TQT_TQOBJECT(this), TQT_SLOT(startAutoDrop()));
+            TQTimer::singleShot(TIME_BETWEEN_MOVES, this, TQT_SLOT(startAutoDrop()));
 
     emit undoPossible(undoList.count() > 1 && !waiting());
 }
@@ -998,7 +998,7 @@ void Dealer::setWaiting(bool w)
 void Dealer::setAutoDropEnabled(bool a)
 {
     _autodrop = a;
-    TQTimer::singleShot(TIME_BETWEEN_MOVES, TQT_TQOBJECT(this), TQT_SLOT(startAutoDrop()));
+    TQTimer::singleShot(TIME_BETWEEN_MOVES, this, TQT_SLOT(startAutoDrop()));
 }
 
 bool Dealer::startAutoDrop()
@@ -1010,7 +1010,7 @@ bool Dealer::startAutoDrop()
 
     for (TQCanvasItemList::ConstIterator it = list.begin(); it != list.end(); ++it)
         if ((*it)->animated()) {
-            TQTimer::singleShot(TIME_BETWEEN_MOVES, TQT_TQOBJECT(this), TQT_SLOT(startAutoDrop()));
+            TQTimer::singleShot(TIME_BETWEEN_MOVES, this, TQT_SLOT(startAutoDrop()));
             return true;
         }
 
diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp
index 2eb38fc1..a2405e54 100644
--- a/kpat/pwidget.cpp
+++ b/kpat/pwidget.cpp
@@ -59,28 +59,28 @@ pWidget::pWidget()
 {
     current_pwidget = this;
     // TDECrash::setEmergencySaveFunction(::saveGame);
-    KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection(), "game_exit");
+    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection(), "game_exit");
 
-    undo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undoMove()),
+    undo = KStdAction::undo(this, TQT_SLOT(undoMove()),
                      actionCollection(), "undo_move");
     undo->setEnabled(false);
-    (void)KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newGame()),
+    (void)KStdAction::openNew(this, TQT_SLOT(newGame()),
                               actionCollection(), "new_game");
-    (void)KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openGame()),
+    (void)KStdAction::open(this, TQT_SLOT(openGame()),
                            actionCollection(), "open");
-    recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openGame(const KURL&)),
+    recent = KStdAction::openRecent(this, TQT_SLOT(openGame(const KURL&)),
                                     actionCollection(), "open_recent");
     recent->loadEntries(TDEGlobal::config());
-    (void)KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveGame()),
+    (void)KStdAction::saveAs(this, TQT_SLOT(saveGame()),
                            actionCollection(), "save");
-    (void)new TDEAction(i18n("&Choose Game..."), 0, TQT_TQOBJECT(this), TQT_SLOT(chooseGame()),
+    (void)new TDEAction(i18n("&Choose Game..."), 0, this, TQT_SLOT(chooseGame()),
                       actionCollection(), "choose_game");
     (void)new TDEAction(i18n("Restart &Game"), TQString::fromLatin1("reload"), 0,
-                      TQT_TQOBJECT(this), TQT_SLOT(restart()),
+                      this, TQT_SLOT(restart()),
                       actionCollection(), "restart_game");
-    (void)KStdAction::help(TQT_TQOBJECT(this), TQT_SLOT(helpGame()), actionCollection(), "help_game");
+    (void)KStdAction::help(this, TQT_SLOT(helpGame()), actionCollection(), "help_game");
 
-    games = new TDESelectAction(i18n("&Game Type"), 0, TQT_TQOBJECT(this),
+    games = new TDESelectAction(i18n("&Game Type"), 0, this,
                               TQT_SLOT(newGameType()),
                               actionCollection(), "game_type");
     TQStringList list;
@@ -104,7 +104,7 @@ pWidget::pWidget()
 
     TDEGlobal::dirs()->addResourceType("wallpaper", TDEStandardDirs::kde_default("data") + "kpat/backgrounds/");
     TDEGlobal::dirs()->addResourceType("wallpaper", TDEStandardDirs::kde_default("data") + "ksnake/backgrounds/");
-    wallpapers = new TDESelectAction(i18n("&Change Background"), 0, TQT_TQOBJECT(this),
+    wallpapers = new TDESelectAction(i18n("&Change Background"), 0, this,
                               TQT_SLOT(changeWallpaper()),
                               actionCollection(), "wallpaper");
     list.clear();
@@ -131,17 +131,17 @@ pWidget::pWidget()
 
     (void)new cardMap(midcolor);
 
-    backs = new TDEAction(i18n("&Switch Cards..."), 0, TQT_TQOBJECT(this),
+    backs = new TDEAction(i18n("&Switch Cards..."), 0, this,
                         TQT_SLOT(changeBackside()),
                         actionCollection(), "backside");
-	 stats = new TDEAction(i18n("&Statistics"), 0, TQT_TQOBJECT(this), TQT_SLOT(showStats()),
+	 stats = new TDEAction(i18n("&Statistics"), 0, this, TQT_SLOT(showStats()),
 			 actionCollection(),"game_stats");
 
     animation = new TDEToggleAction(i18n( "&Animation on Startup" ),
-                                  0, TQT_TQOBJECT(this), TQT_SLOT(animationChanged()),
+                                  0, this, TQT_SLOT(animationChanged()),
                                   actionCollection(), "animation");
     dropaction = new TDEToggleAction(i18n("&Enable Autodrop"),
-                                   0, TQT_TQOBJECT(this), TQT_SLOT(enableAutoDrop()),
+                                   0, this, TQT_SLOT(enableAutoDrop()),
                                    actionCollection(), "enable_autodrop");
     dropaction->setCheckedState(i18n("Disable Autodrop"));
 
@@ -455,7 +455,7 @@ void pWidget::gameWon(bool withhelp)
 #if TEST_SOLVER == 0
     KMessageBox::information(this, congrats, i18n("Congratulations!"));
 #endif
-    TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(newGame()));
+    TQTimer::singleShot(0, this, TQT_SLOT(newGame()));
 #if TEST_SOLVER == 1
     dill->demo();
 #endif
@@ -491,7 +491,7 @@ void pWidget::gameLost()
 				   KStdGuiItem::cont(),
 				   dontAskAgainName) == KMessageBox::Yes) {
 
-        TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(newGame()));
+        TQTimer::singleShot(0, this, TQT_SLOT(newGame()));
     }
 }