Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

6 files changed, 44 insertions, 44 deletions

diff --git a/kpoker/betbox.cpp b/kpoker/betbox.cpp
index 01d6fe3c..f8d80ea7 100644
--- a/kpoker/betbox.cpp
+++ b/kpoker/betbox.cpp
@@ -54,12 +54,12 @@ BetBox::BetBox(TQWidget* parent, const char* name)
   foldButton->setText(i18n("Fold"));
 
   //connects
-  connect(bet5Up,     TQT_SIGNAL(clicked()), TQT_SLOT(bet5UpClicked()));
-  connect(bet10Up,    TQT_SIGNAL(clicked()), TQT_SLOT(bet10UpClicked()));
-  connect(bet5Down,   TQT_SIGNAL(clicked()), TQT_SLOT(bet5DownClicked()));
-  connect(bet10Down,  TQT_SIGNAL(clicked()), TQT_SLOT(bet10DownClicked()));
-  connect(foldButton, TQT_SIGNAL(clicked()), TQT_SLOT(foldClicked()));
-  connect(adjustBet,  TQT_SIGNAL(clicked()), TQT_SLOT(adjustBetClicked()));
+  connect(bet5Up,     TQ_SIGNAL(clicked()), TQ_SLOT(bet5UpClicked()));
+  connect(bet10Up,    TQ_SIGNAL(clicked()), TQ_SLOT(bet10UpClicked()));
+  connect(bet5Down,   TQ_SIGNAL(clicked()), TQ_SLOT(bet5DownClicked()));
+  connect(bet10Down,  TQ_SIGNAL(clicked()), TQ_SLOT(bet10DownClicked()));
+  connect(foldButton, TQ_SIGNAL(clicked()), TQ_SLOT(foldClicked()));
+  connect(adjustBet,  TQ_SIGNAL(clicked()), TQ_SLOT(adjustBetClicked()));
 
   stopRaise();
 }
diff --git a/kpoker/kpaint.cpp b/kpoker/kpaint.cpp
index 29e11608..f061bc1c 100644
--- a/kpoker/kpaint.cpp
+++ b/kpoker/kpaint.cpp
@@ -115,7 +115,7 @@ CardWidget::CardWidget( TQWidget *parent, const char *name )
   m_held = false;
 
   setBackgroundMode( NoBackground ); // disables flickering
-  connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(ownClick()));
+  connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(ownClick()));
 
   setFixedSize(cardWidth, cardHeight);
 }
diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp
index 29da61d8..26330fce 100644
--- a/kpoker/kpoker.cpp
+++ b/kpoker/kpoker.cpp
@@ -255,7 +255,7 @@ void kpok::initWindow()
   // The draw button
   drawButton = new TQPushButton(this);
   drawButton->setText(i18n("&Deal"));
-  connect(drawButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(drawClick()));
+  connect(drawButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(drawClick()));
   inputLayout->addWidget(drawButton);
   inputLayout->addStretch(1);
 
@@ -291,20 +291,20 @@ void kpok::initWindow()
 
   // Timers
   blinkTimer = new TQTimer(this);
-  connect( blinkTimer, TQT_SIGNAL(timeout()), TQT_SLOT(bTimerEvent()) );
+  connect( blinkTimer, TQ_SIGNAL(timeout()), TQ_SLOT(bTimerEvent()) );
 
   waveTimer = new TQTimer(this);
-  connect( waveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(waveTimerEvent()) );
+  connect( waveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(waveTimerEvent()) );
 
   drawTimer = new TQTimer(this);
-  connect (drawTimer, TQT_SIGNAL(timeout()), TQT_SLOT(drawCardsEvent()) );
+  connect (drawTimer, TQ_SIGNAL(timeout()), TQ_SLOT(drawCardsEvent()) );
 
   // and now the betUp/Down Buttons
   betBox = new BetBox(this, 0);
   betLayout->addWidget(betBox);
-  connect(betBox, TQT_SIGNAL(betChanged(int)), this, TQT_SLOT(betChange(int)));
-  connect(betBox, TQT_SIGNAL(betAdjusted()),   this, TQT_SLOT(adjustBet()));
-  connect(betBox, TQT_SIGNAL(fold()),          this, TQT_SLOT(out()));
+  connect(betBox, TQ_SIGNAL(betChanged(int)), this, TQ_SLOT(betChange(int)));
+  connect(betBox, TQ_SIGNAL(betAdjusted()),   this, TQ_SLOT(adjustBet()));
+  connect(betBox, TQ_SIGNAL(fold()),          this, TQ_SLOT(out()));
 
   // some tips 
   TQToolTip::add(drawButton, i18n("Continue the round"));
@@ -644,7 +644,7 @@ void kpok::initPoker(unsigned int numPlayers)
   //
   // FIXME: Make CardWidget::toggleHeld() work.
   playerBox[0]->activateToggleHeld(); 
-  connect(playerBox[0], TQT_SIGNAL(toggleHeld()), this, TQT_SLOT(toggleHeld()));
+  connect(playerBox[0], TQ_SIGNAL(toggleHeld()), this, TQ_SLOT(toggleHeld()));
 
   // hide some things
   playerBox[0]->showHelds(false);
diff --git a/kpoker/newgamedlg.cpp b/kpoker/newgamedlg.cpp
index 21023ccd..b84b7f69 100644
--- a/kpoker/newgamedlg.cpp
+++ b/kpoker/newgamedlg.cpp
@@ -60,8 +60,8 @@ NewGameDlg::NewGameDlg(TQWidget* parent)
     readFromConfigLabel->hide();
   readFromConfigLabel->adjustSize();
   l->addWidget(readFromConfigLabel);
-  connect(readFromConfig, TQT_SIGNAL(toggled(bool)), 
-	  this,           TQT_SLOT(changeReadFromConfig(bool)));
+  connect(readFromConfig, TQ_SIGNAL(toggled(bool)), 
+	  this,           TQ_SLOT(changeReadFromConfig(bool)));
 
   players = new KIntNumInput(playerNr, plainPage());
   players->setRange(1, MAX_PLAYERS);
diff --git a/kpoker/playerbox.cpp b/kpoker/playerbox.cpp
index 8076554f..5bd4b939 100644
--- a/kpoker/playerbox.cpp
+++ b/kpoker/playerbox.cpp
@@ -176,8 +176,8 @@ void PlayerBox::paintCard(int nr)
 void PlayerBox::activateToggleHeld()
 {
   for (int i = 0; i < PokerHandSize; i++) {
-    connect(m_cardWidgets[i], TQT_SIGNAL(pClicked(CardWidget*)),
-	    this, TQT_SLOT(cardClicked(CardWidget*)));
+    connect(m_cardWidgets[i], TQ_SIGNAL(pClicked(CardWidget*)),
+	    this, TQ_SLOT(cardClicked(CardWidget*)));
   }
 }
 
diff --git a/kpoker/top.cpp b/kpoker/top.cpp
index 57c34add..129d450a 100644
--- a/kpoker/top.cpp
+++ b/kpoker/top.cpp
@@ -50,14 +50,14 @@ PokerWindow::PokerWindow()
   LHLabel = new TQLabel(statusBar());
   LHLabel->adjustSize();
 
-  connect(m_kpok, TQT_SIGNAL(changeLastHand(const TQString &, bool)), 
-	  this,   TQT_SLOT(setHand(const TQString &, bool)));
-  connect(m_kpok, TQT_SIGNAL(showClickToHold(bool)), 
-	  this,   TQT_SLOT(showClickToHold(bool)));
-  connect(m_kpok, TQT_SIGNAL(clearStatusBar()), 
-	  this,   TQT_SLOT(clearStatusBar()));
-  connect(m_kpok, TQT_SIGNAL(statusBarMessage(TQString)), 
-	  this,   TQT_SLOT(statusBarMessage(TQString)));
+  connect(m_kpok, TQ_SIGNAL(changeLastHand(const TQString &, bool)), 
+	  this,   TQ_SLOT(setHand(const TQString &, bool)));
+  connect(m_kpok, TQ_SIGNAL(showClickToHold(bool)), 
+	  this,   TQ_SLOT(showClickToHold(bool)));
+  connect(m_kpok, TQ_SIGNAL(clearStatusBar()), 
+	  this,   TQ_SLOT(clearStatusBar()));
+  connect(m_kpok, TQ_SIGNAL(statusBarMessage(TQString)), 
+	  this,   TQ_SLOT(statusBarMessage(TQString)));
 
   statusBar()->addWidget(LHLabel, 0, true);
   m_kpok->updateLHLabel();
@@ -79,47 +79,47 @@ PokerWindow::~PokerWindow()
 void PokerWindow::initTDEAction()
 {
   //Game
-  KStdGameAction::gameNew(m_kpok, TQT_SLOT(newGame()), actionCollection());
-  KStdGameAction::save(m_kpok, TQT_SLOT(saveGame()), actionCollection());
-  KStdGameAction::quit(this, TQT_SLOT(close()), actionCollection());
+  KStdGameAction::gameNew(m_kpok, TQ_SLOT(newGame()), actionCollection());
+  KStdGameAction::save(m_kpok, TQ_SLOT(saveGame()), actionCollection());
+  KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection());
 
   //Settings
   showMenubarAction =
-    KStdAction::showMenubar(this, TQT_SLOT(toggleMenubar()), actionCollection());
+    KStdAction::showMenubar(this, TQ_SLOT(toggleMenubar()), actionCollection());
    
   soundAction = new TDEToggleAction(i18n("Soun&d"), 0, m_kpok,
-				  TQT_SLOT(toggleSound()), actionCollection(), "options_sound");
+				  TQ_SLOT(toggleSound()), actionCollection(), "options_sound");
   if (m_kpok->getSound())
     m_kpok->toggleSound();
   blinkingAction = new TDEToggleAction(i18n("&Blinking Cards"), 0, m_kpok,
-				     TQT_SLOT(toggleBlinking()), actionCollection(), "options_blinking");
+				     TQ_SLOT(toggleBlinking()), actionCollection(), "options_blinking");
   if (m_kpok->getBlinking())
     m_kpok->toggleBlinking();
   adjustAction = new TDEToggleAction(i18n("&Adjust Bet is Default"), 0,
-				   m_kpok, TQT_SLOT(toggleAdjust()), actionCollection(), "options_adjust");
+				   m_kpok, TQ_SLOT(toggleAdjust()), actionCollection(), "options_adjust");
   if (m_kpok->getAdjust())
     m_kpok->toggleAdjust();
 
   showStatusbarAction =
-    KStdAction::showStatusbar(this, TQT_SLOT(toggleStatusbar()), actionCollection());
+    KStdAction::showStatusbar(this, TQ_SLOT(toggleStatusbar()), actionCollection());
 
-  KStdAction::saveOptions(this,     TQT_SLOT(saveOptions()), actionCollection());
-  KStdGameAction::carddecks(m_kpok, TQT_SLOT(slotCardDeck()), actionCollection());
-  KStdAction::preferences(m_kpok,   TQT_SLOT(slotPreferences()), actionCollection());
+  KStdAction::saveOptions(this,     TQ_SLOT(saveOptions()), actionCollection());
+  KStdGameAction::carddecks(m_kpok, TQ_SLOT(slotCardDeck()), actionCollection());
+  KStdAction::preferences(m_kpok,   TQ_SLOT(slotPreferences()), actionCollection());
 
   // Keyboard shortcuts.
   (void)new TDEAction(i18n("Draw"), TDEShortcut(TQt::Key_Return), m_kpok,
-		    TQT_SLOT(drawClick()), actionCollection(), "draw");
+		    TQ_SLOT(drawClick()), actionCollection(), "draw");
   (void)new TDEAction(i18n("Exchange Card 1"), TDEShortcut(TQt::Key_1), m_kpok,
-		    TQT_SLOT(exchangeCard1()), actionCollection(), "exchange_card_1");
+		    TQ_SLOT(exchangeCard1()), actionCollection(), "exchange_card_1");
   (void)new TDEAction(i18n("Exchange Card 2"), TDEShortcut(TQt::Key_2), m_kpok,
-		    TQT_SLOT(exchangeCard2()), actionCollection(), "exchange_card_2");
+		    TQ_SLOT(exchangeCard2()), actionCollection(), "exchange_card_2");
   (void)new TDEAction(i18n("Exchange Card 3"), TDEShortcut(TQt::Key_3), m_kpok,
-		    TQT_SLOT(exchangeCard3()), actionCollection(), "exchange_card_3");
+		    TQ_SLOT(exchangeCard3()), actionCollection(), "exchange_card_3");
   (void)new TDEAction(i18n("Exchange Card 4"), TDEShortcut(TQt::Key_4), m_kpok,
-		    TQT_SLOT(exchangeCard4()), actionCollection(), "exchange_card_4");
+		    TQ_SLOT(exchangeCard4()), actionCollection(), "exchange_card_4");
   (void)new TDEAction(i18n("Exchange Card 5"), TDEShortcut(TQt::Key_5), m_kpok,
-		    TQT_SLOT(exchangeCard5()), actionCollection(), "exchange_card_5");
+		    TQ_SLOT(exchangeCard5()), actionCollection(), "exchange_card_5");
 
   setupGUI( TDEMainWindow::Save | StatusBar | Keys | Create);
 }