Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

2 files changed, 14 insertions, 14 deletions

diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp
index ef8c4481..e66de3fb 100644
--- a/ksokoban/MainWindow.cpp
+++ b/ksokoban/MainWindow.cpp
@@ -49,8 +49,8 @@ void
 MainWindow::createCollectionMenu() {
   collection_ = new TQPopupMenu(0,"collection menu");
   collection_->setCheckable(true);
-  //connect(collection_, TQT_SIGNAL(activated(int)), playField_, TQT_SLOT(changeCollection(int)));
-  connect(collection_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeCollection(int)));
+  //connect(collection_, TQ_SIGNAL(activated(int)), playField_, TQ_SLOT(changeCollection(int)));
+  connect(collection_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeCollection(int)));
 
   for (int i=0; i<internalCollections_.collections(); i++) {
     collection_->insertItem(internalCollections_[i]->name(), i);
@@ -90,30 +90,30 @@ MainWindow::MainWindow() : TDEMainWindow(0), externalCollection_(0) {
 
   game_ = new TQPopupMenu(0,"game menu");
   pixmap = SmallIcon("document-open");
-  game_->insertItem(TQIconSet(pixmap), i18n("&Load Levels..."), this, TQT_SLOT(loadLevels()));
+  game_->insertItem(TQIconSet(pixmap), i18n("&Load Levels..."), this, TQ_SLOT(loadLevels()));
   pixmap = SmallIcon("forward");
-  game_->insertItem(TQIconSet(pixmap), i18n("&Next Level"), playField_, TQT_SLOT(nextLevel()), Key_N);
+  game_->insertItem(TQIconSet(pixmap), i18n("&Next Level"), playField_, TQ_SLOT(nextLevel()), Key_N);
   pixmap = SmallIcon("back");
-  game_->insertItem(TQIconSet(pixmap), i18n("&Previous Level"), playField_, TQT_SLOT(previousLevel()), Key_P);
+  game_->insertItem(TQIconSet(pixmap), i18n("&Previous Level"), playField_, TQ_SLOT(previousLevel()), Key_P);
   pixmap = SmallIcon("reload");
-  game_->insertItem(TQIconSet(pixmap), i18n("Re&start Level"), playField_, TQT_SLOT(restartLevel()), Key_Escape);
+  game_->insertItem(TQIconSet(pixmap), i18n("Re&start Level"), playField_, TQ_SLOT(restartLevel()), Key_Escape);
 
   createCollectionMenu();
   game_->insertItem(i18n("&Level Collection"), collection_);
 
   pixmap = SmallIcon("edit-undo");
-  game_->insertItem(TQIconSet(pixmap), i18n("&Undo"), playField_, TQT_SLOT(undo()),TQKeySequence( (TDEStdAccel::undo()).toString()));
+  game_->insertItem(TQIconSet(pixmap), i18n("&Undo"), playField_, TQ_SLOT(undo()),TQKeySequence( (TDEStdAccel::undo()).toString()));
   pixmap = SmallIcon("edit-redo");
-  game_->insertItem(TQIconSet(pixmap), i18n("&Redo"), playField_, TQT_SLOT(redo()), TQKeySequence( (TDEStdAccel::redo()).toString()));
+  game_->insertItem(TQIconSet(pixmap), i18n("&Redo"), playField_, TQ_SLOT(redo()), TQKeySequence( (TDEStdAccel::redo()).toString()));
   game_->insertSeparator();
   pixmap = SmallIcon("system-log-out");
-  game_->insertItem(TQIconSet(pixmap), i18n("&Quit"), TDEApplication::kApplication(), TQT_SLOT(closeAllWindows()), TQKeySequence( (TDEStdAccel::quit()).toString()));
+  game_->insertItem(TQIconSet(pixmap), i18n("&Quit"), TDEApplication::kApplication(), TQ_SLOT(closeAllWindows()), TQKeySequence( (TDEStdAccel::quit()).toString()));
   menu_->insertItem(i18n("&Game"), game_);
 
   animation_ = new TQPopupMenu(0,"animation menu");
   animation_->setCheckable(true);
-  connect(animation_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateAnimMenu(int)));
-  connect(animation_, TQT_SIGNAL(activated(int)), playField_, TQT_SLOT(changeAnim(int)));
+  connect(animation_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateAnimMenu(int)));
+  connect(animation_, TQ_SIGNAL(activated(int)), playField_, TQ_SLOT(changeAnim(int)));
   animation_->insertItem(i18n("&Slow"), 3);
   animation_->insertItem(i18n("&Medium"), 2);
   animation_->insertItem(i18n("&Fast"), 1);
@@ -145,7 +145,7 @@ MainWindow::MainWindow() : TDEMainWindow(0), externalCollection_(0) {
   setBM_->setAccel(CTRL+Key_9, 9);
   setBM_->insertItem(TQIconSet(pixmap), i18n("(unused)"), 10);
   setBM_->setAccel(CTRL+Key_0, 10);
-  connect(setBM_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setBookmark(int)));
+  connect(setBM_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setBookmark(int)));
   bookmarkMenu_->insertItem(i18n("&Set Bookmark"), setBM_);
 
   pixmap = SmallIcon("bookmark");
@@ -170,7 +170,7 @@ MainWindow::MainWindow() : TDEMainWindow(0), externalCollection_(0) {
   goToBM_->setAccel(Key_9, 9);
   goToBM_->insertItem(TQIconSet(pixmap), i18n("(unused)"), 10);
   goToBM_->setAccel(Key_0, 10);
-  connect(goToBM_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(goToBookmark(int)));
+  connect(goToBM_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(goToBookmark(int)));
   bookmarkMenu_->insertItem(i18n("&Go to Bookmark"), goToBM_);
   menu_->insertItem(i18n("&Bookmarks"), bookmarkMenu_);
 
diff --git a/ksokoban/main.cpp b/ksokoban/main.cpp
index 4dd605eb..0cf04828 100644
--- a/ksokoban/main.cpp
+++ b/ksokoban/main.cpp
@@ -76,7 +76,7 @@ main (int argc, char **argv)
   }
   args->clear();
 
-  TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()));
+  TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit()));
 
   int rc = app.exec();