Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

5 files changed, 59 insertions, 59 deletions

diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp
index 1271a760..ca964cc8 100644
--- a/kmahjongg/Editor.cpp
+++ b/kmahjongg/Editor.cpp
@@ -85,10 +85,10 @@ Editor::Editor
    setCaption(kapp->makeStdCaption(i18n("Edit Board Layout")));
 
 
-   connect( drawFrame, TQT_SIGNAL(mousePressed(TQMouseEvent *) ),
-		TQT_SLOT(drawFrameMousePressEvent(TQMouseEvent *)));
-   connect( drawFrame, TQT_SIGNAL(mouseMoved(TQMouseEvent *) ),
-		TQT_SLOT(drawFrameMouseMovedEvent(TQMouseEvent *)));
+   connect( drawFrame, TQ_SIGNAL(mousePressed(TQMouseEvent *) ),
+		TQ_SLOT(drawFrameMousePressEvent(TQMouseEvent *)));
+   connect( drawFrame, TQ_SIGNAL(mouseMoved(TQMouseEvent *) ),
+		TQ_SLOT(drawFrameMouseMovedEvent(TQMouseEvent *)));
 
    statusChanged();
 
@@ -176,7 +176,7 @@ void Editor::setupToolbar()
      topToolbar->alignItemRight( ID_TOOL_STATUS, true );
 
     //addToolBar(topToolbar);
-   connect( topToolbar,  TQT_SIGNAL(clicked(int) ), TQT_SLOT( topToolbarOption(int) ) );
+   connect( topToolbar,  TQ_SIGNAL(clicked(int) ), TQ_SLOT( topToolbarOption(int) ) );
 
     topToolbar->updateRects(0);
      topToolbar->setFullSize(true);
diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp
index e926a4e7..acd1e5ba 100644
--- a/kmahjongg/HighScore.cpp
+++ b/kmahjongg/HighScore.cpp
@@ -149,7 +149,7 @@ HighScore::HighScore
 	combo->setMaximumSize( 32767, 32767 );
 	combo->setFocusPolicy( TQWidget::StrongFocus );
 	combo->setSizeLimit( 10 );
-	connect( combo, TQT_SIGNAL(activated(int)), TQT_SLOT(selectionChanged(int)) );
+	connect( combo, TQ_SIGNAL(activated(int)), TQ_SLOT(selectionChanged(int)) );
 
 
 	resize( 350+70,390+45 );
@@ -163,12 +163,12 @@ HighScore::HighScore
 
 	selectedLine = -1;	
 
-	connect(lineEdit, TQT_SIGNAL( textChanged(const TQString &)),
-					  TQT_SLOT( nameChanged(const TQString &)));
+	connect(lineEdit, TQ_SIGNAL( textChanged(const TQString &)),
+					  TQ_SLOT( nameChanged(const TQString &)));
 
 
-	connect(qtarch_PushButton_1, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
-	connect(resetBtn, TQT_SIGNAL(clicked()), TQT_SLOT(reset()));
+	connect(qtarch_PushButton_1, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
+	connect(resetBtn, TQ_SIGNAL(clicked()), TQ_SLOT(reset()));
 }
 
 // free up the table structures
diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp
index 8ae93977..cfc87b5a 100644
--- a/kmahjongg/Preview.cpp
+++ b/kmahjongg/Preview.cpp
@@ -30,10 +30,10 @@ Preview::Preview(TQWidget* parent) : KDialogBase(parent), m_tiles(true)
 	group = new TQHGroupBox(page);
 	
 	m_combo = new TQComboBox(false, group);
-	connect(m_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(selectionChanged(int)));
+	connect(m_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(selectionChanged(int)));
 
 	loadButton = new KPushButton(i18n("Load..."), group);
-	connect( loadButton, TQT_SIGNAL(clicked()), TQT_SLOT(load()) );
+	connect( loadButton, TQ_SIGNAL(clicked()), TQ_SLOT(load()) );
 	
 	m_drawFrame = new FrameImage(page);
 	m_drawFrame->setFixedSize(310, 236);
diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp
index 08e9f4e7..dd75e9b0 100644
--- a/kmahjongg/boardwidget.cpp
+++ b/kmahjongg/boardwidget.cpp
@@ -20,8 +20,8 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name )
     setBackgroundColor( TQColor( 0,0,0 ) );
 
     timer = new TQTimer(this);
-    connect( timer, TQT_SIGNAL(timeout()),
-             this, TQT_SLOT(helpMoveTimeout()) );
+    connect( timer, TQ_SIGNAL(timeout()),
+             this, TQ_SLOT(helpMoveTimeout()) );
 
     TimerState = Stop;
     gamePaused = false;
@@ -633,7 +633,7 @@ void BoardWidget::demoMoveTimeout()
                 break;
         }
         // restart timer
-        TQTimer::singleShot( ANIMSPEED, this, TQT_SLOT( demoMoveTimeout() ) );
+        TQTimer::singleShot( ANIMSPEED, this, TQ_SLOT( demoMoveTimeout() ) );
     }
 }
 
@@ -667,7 +667,7 @@ void BoardWidget::matchAnimationTimeout()
         }
     }
     if( TimerState == Match )
-        TQTimer::singleShot( ANIMSPEED, this, TQT_SLOT( matchAnimationTimeout() ) );
+        TQTimer::singleShot( ANIMSPEED, this, TQ_SLOT( matchAnimationTimeout() ) );
 }
 // ---------------------------------------------------------
 void BoardWidget::stopMatchAnimation()
diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp
index 57f43512..629794ab 100644
--- a/kmahjongg/kmahjongg.cpp
+++ b/kmahjongg/kmahjongg.cpp
@@ -80,37 +80,37 @@ KMahjongg::KMahjongg( TQWidget* parent, const char *name)
 
     bDemoModeActive = false;
 
-    connect( bw, TQT_SIGNAL( statusTextChanged(const TQString&, long) ),
-                 TQT_SLOT( showStatusText(const TQString&, long) ) );
+    connect( bw, TQ_SIGNAL( statusTextChanged(const TQString&, long) ),
+                 TQ_SLOT( showStatusText(const TQString&, long) ) );
 
-    connect( bw, TQT_SIGNAL( tileNumberChanged(int,int,int) ),
-                 TQT_SLOT( showTileNumber(int,int,int) ) );
+    connect( bw, TQ_SIGNAL( tileNumberChanged(int,int,int) ),
+                 TQ_SLOT( showTileNumber(int,int,int) ) );
 
-    connect( bw, TQT_SIGNAL( demoModeChanged(bool) ),
-                 TQT_SLOT( demoModeChanged(bool) ) );
+    connect( bw, TQ_SIGNAL( demoModeChanged(bool) ),
+                 TQ_SLOT( demoModeChanged(bool) ) );
 
-    connect( bw, TQT_SIGNAL( gameOver(unsigned short , unsigned short)), this,
-                TQT_SLOT( gameOver(unsigned short , unsigned short)));
+    connect( bw, TQ_SIGNAL( gameOver(unsigned short , unsigned short)), this,
+                TQ_SLOT( gameOver(unsigned short , unsigned short)));
 
 
-    connect(bw, TQT_SIGNAL(gameCalculated()),
-      this, TQT_SLOT(timerReset()));
+    connect(bw, TQ_SIGNAL(gameCalculated()),
+      this, TQ_SLOT(timerReset()));
 
     // Make connections for the preview load dialog
-    connect( previewLoad, TQT_SIGNAL( boardRedraw(bool) ),
-              bw,   TQT_SLOT( drawBoard(bool) ) );
+    connect( previewLoad, TQ_SIGNAL( boardRedraw(bool) ),
+              bw,   TQ_SLOT( drawBoard(bool) ) );
 
-    connect( previewLoad, TQT_SIGNAL( layoutChange() ),
-              this,   TQT_SLOT( newGame() ) );
+    connect( previewLoad, TQ_SIGNAL( layoutChange() ),
+              this,   TQ_SLOT( newGame() ) );
 
 
-    connect( previewLoad, TQT_SIGNAL( loadBackground(const TQString&, bool) ),
-              bw,   TQT_SLOT(loadBackground(const TQString&, bool) ) );
+    connect( previewLoad, TQ_SIGNAL( loadBackground(const TQString&, bool) ),
+              bw,   TQ_SLOT(loadBackground(const TQString&, bool) ) );
 
-    connect( previewLoad, TQT_SIGNAL( loadTileset(const TQString &) ),
-               bw,  TQT_SLOT(loadTileset(const TQString&) ) );
-    connect( previewLoad, TQT_SIGNAL( loadBoard(const TQString&) ),
-                 TQT_SLOT(loadBoardLayout(const TQString&) ) );
+    connect( previewLoad, TQ_SIGNAL( loadTileset(const TQString &) ),
+               bw,  TQ_SLOT(loadTileset(const TQString&) ) );
+    connect( previewLoad, TQ_SIGNAL( loadBoard(const TQString&) ),
+                 TQ_SLOT(loadBoardLayout(const TQString&) ) );
 
     startNewGame(  );
 
@@ -128,41 +128,41 @@ KMahjongg::~KMahjongg()
 void KMahjongg::setupTDEAction()
 {
     // game
-    KStdGameAction::gameNew(this, TQT_SLOT(newGame()), actionCollection());
-    KStdGameAction::load(this, TQT_SLOT(loadGame()), actionCollection());
-    KStdGameAction::save(this, TQT_SLOT(saveGame()), actionCollection());
-    KStdGameAction::quit(this, TQT_SLOT(close()), actionCollection());
-    KStdGameAction::restart(this, TQT_SLOT(restartGame()), actionCollection());
-    new TDEAction(i18n("New Numbered Game..."), "newnum", 0, this, TQT_SLOT(startNewNumeric()), actionCollection(), "game_new_numeric");
-    new TDEAction(i18n("Open Th&eme..."), 0, this, TQT_SLOT(openTheme()), actionCollection(), "game_open_theme");
-    new TDEAction(i18n("Open &Tileset..."), 0, this, TQT_SLOT(openTileset()), actionCollection(), "game_open_tileset");
-    new TDEAction(i18n("Open &Background..."), 0, this, TQT_SLOT(openBackground()), actionCollection(), "game_open_background");
-    new TDEAction(i18n("Open La&yout..."), 0, this, TQT_SLOT(openLayout()), actionCollection(), "game_open_layout");
-    new TDEAction(i18n("Sa&ve Theme..."), 0, this, TQT_SLOT(saveTheme()), actionCollection(), "game_save_theme");
+    KStdGameAction::gameNew(this, TQ_SLOT(newGame()), actionCollection());
+    KStdGameAction::load(this, TQ_SLOT(loadGame()), actionCollection());
+    KStdGameAction::save(this, TQ_SLOT(saveGame()), actionCollection());
+    KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection());
+    KStdGameAction::restart(this, TQ_SLOT(restartGame()), actionCollection());
+    new TDEAction(i18n("New Numbered Game..."), "newnum", 0, this, TQ_SLOT(startNewNumeric()), actionCollection(), "game_new_numeric");
+    new TDEAction(i18n("Open Th&eme..."), 0, this, TQ_SLOT(openTheme()), actionCollection(), "game_open_theme");
+    new TDEAction(i18n("Open &Tileset..."), 0, this, TQ_SLOT(openTileset()), actionCollection(), "game_open_tileset");
+    new TDEAction(i18n("Open &Background..."), 0, this, TQ_SLOT(openBackground()), actionCollection(), "game_open_background");
+    new TDEAction(i18n("Open La&yout..."), 0, this, TQ_SLOT(openLayout()), actionCollection(), "game_open_layout");
+    new TDEAction(i18n("Sa&ve Theme..."), 0, this, TQ_SLOT(saveTheme()), actionCollection(), "game_save_theme");
     // originally "file" ends here
-    KStdGameAction::hint(bw, TQT_SLOT(helpMove()), actionCollection());
-    new TDEAction(i18n("Shu&ffle"), "reload", 0, bw, TQT_SLOT(shuffle()), actionCollection(), "move_shuffle");
-    demoAction = KStdGameAction::demo(this, TQT_SLOT(demoMode()), actionCollection());
-    showMatchingTilesAction = new TDEToggleAction(i18n("Show &Matching Tiles"), 0, this, TQT_SLOT(showMatchingTiles()), actionCollection(), "options_show_matching_tiles");
+    KStdGameAction::hint(bw, TQ_SLOT(helpMove()), actionCollection());
+    new TDEAction(i18n("Shu&ffle"), "reload", 0, bw, TQ_SLOT(shuffle()), actionCollection(), "move_shuffle");
+    demoAction = KStdGameAction::demo(this, TQ_SLOT(demoMode()), actionCollection());
+    showMatchingTilesAction = new TDEToggleAction(i18n("Show &Matching Tiles"), 0, this, TQ_SLOT(showMatchingTiles()), actionCollection(), "options_show_matching_tiles");
     showMatchingTilesAction->setCheckedState(i18n("Hide &Matching Tiles"));
     showMatchingTilesAction->setChecked(Prefs::showMatchingTiles());
     bw->setShowMatch( Prefs::showMatchingTiles() );
-    KStdGameAction::highscores(this, TQT_SLOT(showHighscores()), actionCollection());
-    pauseAction = KStdGameAction::pause(this, TQT_SLOT(pause()), actionCollection());
+    KStdGameAction::highscores(this, TQ_SLOT(showHighscores()), actionCollection());
+    pauseAction = KStdGameAction::pause(this, TQ_SLOT(pause()), actionCollection());
 
     // TODO: store the background ; open on startup
     // TODO: same about layout
     // TODO: same about theme
 
     // move
-    undoAction = KStdGameAction::undo(this, TQT_SLOT(undo()), actionCollection());
-    redoAction = KStdGameAction::redo(this, TQT_SLOT(redo()), actionCollection());
+    undoAction = KStdGameAction::undo(this, TQ_SLOT(undo()), actionCollection());
+    redoAction = KStdGameAction::redo(this, TQ_SLOT(redo()), actionCollection());
 
     // edit
-    new TDEAction(i18n("&Board Editor"), 0, this, TQT_SLOT(slotBoardEditor()), actionCollection(), "edit_board_editor");
+    new TDEAction(i18n("&Board Editor"), 0, this, TQ_SLOT(slotBoardEditor()), actionCollection(), "edit_board_editor");
 
     // settings
-    KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection());
+    KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection());
     
     setupGUI();
 }
@@ -238,8 +238,8 @@ void KMahjongg::showSettings(){
 
   TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self(), KDialogBase::Swallow);
   dialog->addPage(new Settings(0, "General"), i18n("General"), "package_settings");
-  connect(dialog, TQT_SIGNAL(settingsChanged()), bw, TQT_SLOT(loadSettings()));
-  connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(setDisplayedWidth()));
+  connect(dialog, TQ_SIGNAL(settingsChanged()), bw, TQ_SLOT(loadSettings()));
+  connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(setDisplayedWidth()));
   dialog->show();
 }