Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

9 files changed, 46 insertions, 46 deletions

diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp
index 14b7978d..69853517 100644
--- a/kpat/dealer.cpp
+++ b/kpat/dealer.cpp
@@ -83,7 +83,7 @@ Dealer::Dealer( TDEMainWindow* _parent , const char* _name )
 
     demotimer = new TQTimer(this);
 
-    connect(demotimer, TQT_SIGNAL(timeout()), TQT_SLOT(demo()));
+    connect(demotimer, TQ_SIGNAL(timeout()), TQ_SLOT(demo()));
 
     assert(!s_instance);
     s_instance = this;
@@ -115,7 +115,7 @@ void Dealer::setupActions() {
     if (actions() & Dealer::Hint) {
 
         ahint = new TDEAction( i18n("&Hint"), TQString::fromLatin1("wizard"), Key_H, this,
-                             TQT_SLOT(hint()),
+                             TQ_SLOT(hint()),
                              parent()->actionCollection(), "game_hint");
         actionlist.append(ahint);
     } else
@@ -123,7 +123,7 @@ void Dealer::setupActions() {
 
     if (actions() & Dealer::Demo) {
         ademo = new TDEToggleAction( i18n("&Demo"), TQString::fromLatin1("1rightarrow"), CTRL+Key_D, this,
-                                   TQT_SLOT(toggleDemo()),
+                                   TQ_SLOT(toggleDemo()),
                                    parent()->actionCollection(), "game_demo");
         actionlist.append(ademo);
     } else
@@ -131,7 +131,7 @@ void Dealer::setupActions() {
 
     if (actions() & Dealer::Redeal) {
         aredeal = new TDEAction (i18n("&Redeal"), TQString::fromLatin1("queue"), 0, this,
-                               TQT_SLOT(redeal()),
+                               TQ_SLOT(redeal()),
                                parent()->actionCollection(), "game_redeal");
         actionlist.append(aredeal);
     } else
@@ -650,7 +650,7 @@ void Dealer::startNew()
     if (!towait)
         takeState();
     else
-        connect(towait, TQT_SIGNAL(stoped(Card*)), TQT_SLOT(slotTakeState(Card *)));
+        connect(towait, TQ_SIGNAL(stoped(Card*)), TQ_SLOT(slotTakeState(Card *)));
     resizeEvent(0);
 }
 
@@ -791,13 +791,13 @@ void Dealer::takeState()
                 ademo->setEnabled( false );
             if ( aredeal )
                 aredeal->setEnabled( false );
-            TQTimer::singleShot(400, this, TQT_SIGNAL(gameLost()));
+            TQTimer::singleShot(400, this, TQ_SIGNAL(gameLost()));
             toldAboutLostGame = true;
             return;
         }
     }
     if (!demoActive() && !waiting())
-            TQTimer::singleShot(TIME_BETWEEN_MOVES, this, TQT_SLOT(startAutoDrop()));
+            TQTimer::singleShot(TIME_BETWEEN_MOVES, this, TQ_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, this, TQT_SLOT(startAutoDrop()));
+    TQTimer::singleShot(TIME_BETWEEN_MOVES, this, TQ_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, this, TQT_SLOT(startAutoDrop()));
+            TQTimer::singleShot(TIME_BETWEEN_MOVES, this, TQ_SLOT(startAutoDrop()));
             return true;
         }
 
@@ -1034,7 +1034,7 @@ bool Dealer::startAutoDrop()
             t->move(x, y);
             kdDebug(11111) << "autodrop " << t->name() << endl;
             t->moveTo(int(t->source()->x()), int(t->source()->y()), int(t->z()), STEPS_AUTODROP);
-            connect(t, TQT_SIGNAL(stoped(Card*)), TQT_SLOT(waitForAutoDrop(Card*)));
+            connect(t, TQ_SIGNAL(stoped(Card*)), TQ_SLOT(waitForAutoDrop(Card*)));
             return true;
         }
     }
@@ -1269,7 +1269,7 @@ Card *Dealer::demoNewCards()
 void Dealer::newDemoMove(Card *m)
 {
     towait = m;
-    connect(m, TQT_SIGNAL(stoped(Card*)), TQT_SLOT(waitForDemo(Card*)));
+    connect(m, TQ_SIGNAL(stoped(Card*)), TQ_SLOT(waitForDemo(Card*)));
 }
 
 void Dealer::waitForDemo(Card *t)
diff --git a/kpat/fortyeight.cpp b/kpat/fortyeight.cpp
index 64bd8a2f..50af4e01 100644
--- a/kpat/fortyeight.cpp
+++ b/kpat/fortyeight.cpp
@@ -35,7 +35,7 @@ Fortyeight::Fortyeight( TDEMainWindow* parent, const char* name)
     const int dist_x = cardMap::CARDX() * 11 / 10 + 1;
     const int dist_y = cardMap::CARDY() * 11 / 10 + 1;
 
-    connect(deck, TQT_SIGNAL(clicked(Card*)), TQT_SLOT(deckClicked(Card*)));
+    connect(deck, TQ_SIGNAL(clicked(Card*)), TQ_SLOT(deckClicked(Card*)));
     deck->move(10 + cardMap::CARDX() * 82 / 10, 10 + cardMap::CARDX() * 56 / 10);
     deck->setZ(20);
 
diff --git a/kpat/freecell.cpp b/kpat/freecell.cpp
index 1e7b8b92..5f3ccca0 100644
--- a/kpat/freecell.cpp
+++ b/kpat/freecell.cpp
@@ -313,7 +313,7 @@ void FreecellBase::resumeSolution()
     }
 
     solver_ret = freecell_solver_user_resume_solution(solver_instance);
-    TQTimer::singleShot(0, this, TQT_SLOT(resumeSolution()));
+    TQTimer::singleShot(0, this, TQ_SLOT(resumeSolution()));
 
 }
 MoveHint *FreecellBase::translateMove(void *m) {
@@ -602,7 +602,7 @@ void FreecellBase::moveCards(CardList &c, FreecellPile *from, Pile *to)
 
     from->moveCardsBack(c);
     waitfor = c.first();
-    connect(waitfor, TQT_SIGNAL(stoped(Card*)), TQT_SLOT(waitForMoving(Card*)));
+    connect(waitfor, TQ_SIGNAL(stoped(Card*)), TQ_SLOT(waitForMoving(Card*)));
 
     PileList fcs;
 
@@ -625,7 +625,7 @@ void FreecellBase::moveCards(CardList &c, FreecellPile *from, Pile *to)
     movePileToPile(c, to, fss, fcs, 0, c.count(), 0);
 
     if (!waitfor->animated())
-        TQTimer::singleShot(0, this, TQT_SLOT(startMoving()));
+        TQTimer::singleShot(0, this, TQ_SLOT(startMoving()));
 }
 
 struct MoveAway {
@@ -707,7 +707,7 @@ void FreecellBase::startMoving()
     mh->pile()->moveCardsBack(empty, true);
     waitfor = mh->card();
     kdDebug(11111) << "wait for moving end " << mh->card()->name() << endl;
-    connect(mh->card(), TQT_SIGNAL(stoped(Card*)), TQT_SLOT(waitForMoving(Card*)));
+    connect(mh->card(), TQ_SIGNAL(stoped(Card*)), TQ_SLOT(waitForMoving(Card*)));
     delete mh;
 }
 
diff --git a/kpat/golf.cpp b/kpat/golf.cpp
index 0e7adf9f..83e34c38 100644
--- a/kpat/golf.cpp
+++ b/kpat/golf.cpp
@@ -27,7 +27,7 @@ Golf::Golf( TDEMainWindow* parent, const char* _name)
 
     deck = Deck::new_deck( this);
     deck->move(10, pile_dist);
-    connect(deck, TQT_SIGNAL(clicked(Card*)), TQT_SLOT(deckClicked(Card*)));
+    connect(deck, TQ_SIGNAL(clicked(Card*)), TQ_SLOT(deckClicked(Card*)));
 
     for( int r = 0; r < 7; r++ ) {
         stack[r]=new Pile(1+r, this);
diff --git a/kpat/gypsy.cpp b/kpat/gypsy.cpp
index ea4727fa..77e6d55b 100644
--- a/kpat/gypsy.cpp
+++ b/kpat/gypsy.cpp
@@ -12,7 +12,7 @@ Gypsy::Gypsy( TDEMainWindow* parent, const char *name )
     deck = Deck::new_deck(this, 2);
     deck->move(10 + dist_x / 2 + 8*dist_x, 10 + 45 * cardMap::CARDY() / 10);
 
-    connect(deck, TQT_SIGNAL(clicked(Card*)), TQT_SLOT(slotClicked(Card *)));
+    connect(deck, TQ_SIGNAL(clicked(Card*)), TQ_SLOT(slotClicked(Card *)));
 
     for (int i=0; i<8; i++) {
         target[i] = new Pile(i+1, this);
diff --git a/kpat/mod3.cpp b/kpat/mod3.cpp
index a6e42a00..25488962 100644
--- a/kpat/mod3.cpp
+++ b/kpat/mod3.cpp
@@ -37,7 +37,7 @@ Mod3::Mod3( TDEMainWindow* parent, const char* _name)
     deck = Deck::new_deck( this, 2);
     deck->move(8 + dist_x * 8 + 20, 8 + dist_y * 3 + margin);
 
-    connect(deck, TQT_SIGNAL(clicked(Card*)), TQT_SLOT(deckClicked(Card*)));
+    connect(deck, TQ_SIGNAL(clicked(Card*)), TQ_SLOT(deckClicked(Card*)));
 
     aces = new Pile(50, this);
     aces->move(16 + dist_x * 8, 8 + dist_y / 2);
diff --git a/kpat/napoleon.cpp b/kpat/napoleon.cpp
index 053b158e..dc23bc1d 100644
--- a/kpat/napoleon.cpp
+++ b/kpat/napoleon.cpp
@@ -26,7 +26,7 @@ Napoleon::Napoleon( TDEMainWindow* parent, const char* _name )
   : Dealer( parent, _name )
 {
     deck = Deck::new_deck( this );
-    connect(deck, TQT_SIGNAL(clicked(Card *)), TQT_SLOT(deal1(Card*)));
+    connect(deck, TQ_SIGNAL(clicked(Card *)), TQ_SLOT(deal1(Card*)));
 
     pile = new Pile( 1, this );
     pile->setAddFlags( Pile::disallow );
diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp
index a2405e54..a726082d 100644
--- a/kpat/pwidget.cpp
+++ b/kpat/pwidget.cpp
@@ -59,29 +59,29 @@ pWidget::pWidget()
 {
     current_pwidget = this;
     // TDECrash::setEmergencySaveFunction(::saveGame);
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection(), "game_exit");
+    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection(), "game_exit");
 
-    undo = KStdAction::undo(this, TQT_SLOT(undoMove()),
+    undo = KStdAction::undo(this, TQ_SLOT(undoMove()),
                      actionCollection(), "undo_move");
     undo->setEnabled(false);
-    (void)KStdAction::openNew(this, TQT_SLOT(newGame()),
+    (void)KStdAction::openNew(this, TQ_SLOT(newGame()),
                               actionCollection(), "new_game");
-    (void)KStdAction::open(this, TQT_SLOT(openGame()),
+    (void)KStdAction::open(this, TQ_SLOT(openGame()),
                            actionCollection(), "open");
-    recent = KStdAction::openRecent(this, TQT_SLOT(openGame(const KURL&)),
+    recent = KStdAction::openRecent(this, TQ_SLOT(openGame(const KURL&)),
                                     actionCollection(), "open_recent");
     recent->loadEntries(TDEGlobal::config());
-    (void)KStdAction::saveAs(this, TQT_SLOT(saveGame()),
+    (void)KStdAction::saveAs(this, TQ_SLOT(saveGame()),
                            actionCollection(), "save");
-    (void)new TDEAction(i18n("&Choose Game..."), 0, this, TQT_SLOT(chooseGame()),
+    (void)new TDEAction(i18n("&Choose Game..."), 0, this, TQ_SLOT(chooseGame()),
                       actionCollection(), "choose_game");
     (void)new TDEAction(i18n("Restart &Game"), TQString::fromLatin1("reload"), 0,
-                      this, TQT_SLOT(restart()),
+                      this, TQ_SLOT(restart()),
                       actionCollection(), "restart_game");
-    (void)KStdAction::help(this, TQT_SLOT(helpGame()), actionCollection(), "help_game");
+    (void)KStdAction::help(this, TQ_SLOT(helpGame()), actionCollection(), "help_game");
 
     games = new TDESelectAction(i18n("&Game Type"), 0, this,
-                              TQT_SLOT(newGameType()),
+                              TQ_SLOT(newGameType()),
                               actionCollection(), "game_type");
     TQStringList list;
     TQValueList<DealerInfo*>::ConstIterator it;
@@ -105,7 +105,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, this,
-                              TQT_SLOT(changeWallpaper()),
+                              TQ_SLOT(changeWallpaper()),
                               actionCollection(), "wallpaper");
     list.clear();
     wallpaperlist.clear();
@@ -132,16 +132,16 @@ pWidget::pWidget()
     (void)new cardMap(midcolor);
 
     backs = new TDEAction(i18n("&Switch Cards..."), 0, this,
-                        TQT_SLOT(changeBackside()),
+                        TQ_SLOT(changeBackside()),
                         actionCollection(), "backside");
-	 stats = new TDEAction(i18n("&Statistics"), 0, this, TQT_SLOT(showStats()),
+	 stats = new TDEAction(i18n("&Statistics"), 0, this, TQ_SLOT(showStats()),
 			 actionCollection(),"game_stats");
 
     animation = new TDEToggleAction(i18n( "&Animation on Startup" ),
-                                  0, this, TQT_SLOT(animationChanged()),
+                                  0, this, TQ_SLOT(animationChanged()),
                                   actionCollection(), "animation");
     dropaction = new TDEToggleAction(i18n("&Enable Autodrop"),
-                                   0, this, TQT_SLOT(enableAutoDrop()),
+                                   0, this, TQ_SLOT(enableAutoDrop()),
                                    actionCollection(), "enable_autodrop");
     dropaction->setCheckedState(i18n("Disable Autodrop"));
 
@@ -347,11 +347,11 @@ void pWidget::newGameType()
             name = name.replace(TQRegExp("[&']"), "");
             name = name.replace(TQRegExp("[ ]"), "_").lower();
             dill->setAnchorName("game_" + name);
-            connect(dill, TQT_SIGNAL(saveGame()), TQT_SLOT(saveGame()));
-            connect(dill, TQT_SIGNAL(gameInfo(const TQString&)),
-                    TQT_SLOT(slotGameInfo(const TQString &)));
-            connect(dill, TQT_SIGNAL(updateMoves()),
-                    TQT_SLOT(slotUpdateMoves()));
+            connect(dill, TQ_SIGNAL(saveGame()), TQ_SLOT(saveGame()));
+            connect(dill, TQ_SIGNAL(gameInfo(const TQString&)),
+                    TQ_SLOT(slotGameInfo(const TQString &)));
+            connect(dill, TQ_SIGNAL(updateMoves()),
+                    TQ_SLOT(slotUpdateMoves()));
             dill->setGameId(id);
             dill->setupActions();
             dill->setBackgroundPixmap(background, midcolor);
@@ -365,9 +365,9 @@ void pWidget::newGameType()
         dill = DealerInfoList::self()->games().first()->createGame(this);
     }
 
-    connect(dill, TQT_SIGNAL(undoPossible(bool)), TQT_SLOT(undoPossible(bool)));
-    connect(dill, TQT_SIGNAL(gameWon(bool)), TQT_SLOT(gameWon(bool)));
-    connect(dill, TQT_SIGNAL(gameLost()), TQT_SLOT(gameLost()));
+    connect(dill, TQ_SIGNAL(undoPossible(bool)), TQ_SLOT(undoPossible(bool)));
+    connect(dill, TQ_SIGNAL(gameWon(bool)), TQ_SLOT(gameWon(bool)));
+    connect(dill, TQ_SIGNAL(gameLost()), TQ_SLOT(gameLost()));
 
     dill->setAutoDropEnabled(dropaction->isChecked());
 
@@ -455,7 +455,7 @@ void pWidget::gameWon(bool withhelp)
 #if TEST_SOLVER == 0
     KMessageBox::information(this, congrats, i18n("Congratulations!"));
 #endif
-    TQTimer::singleShot(0, this, TQT_SLOT(newGame()));
+    TQTimer::singleShot(0, this, TQ_SLOT(newGame()));
 #if TEST_SOLVER == 1
     dill->demo();
 #endif
@@ -491,7 +491,7 @@ void pWidget::gameLost()
 				   KStdGuiItem::cont(),
 				   dontAskAgainName) == KMessageBox::Yes) {
 
-        TQTimer::singleShot(0, this, TQT_SLOT(newGame()));
+        TQTimer::singleShot(0, this, TQ_SLOT(newGame()));
     }
 }
 
diff --git a/kpat/spider.cpp b/kpat/spider.cpp
index 383f96a2..03b9847d 100644
--- a/kpat/spider.cpp
+++ b/kpat/spider.cpp
@@ -68,7 +68,7 @@ Spider::Spider(int suits, TDEMainWindow* parent, const char* _name)
         redeals[column]->setCheckIndex(0);
         redeals[column]->setAddFlags(Pile::disallow);
         redeals[column]->setRemoveFlags(Pile::disallow);
-        connect(redeals[column], TQT_SIGNAL(clicked(Card*)), TQT_SLOT(deckClicked(Card*)));
+        connect(redeals[column], TQ_SIGNAL(clicked(Card*)), TQ_SLOT(deckClicked(Card*)));
     }
 
     // The 10 playing piles