1 files changed, 19 insertions, 19 deletions
diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp
index ef8c4481..e4147928 100644
--- a/ksokoban/MainWindow.cpp
+++ b/ksokoban/MainWindow.cpp
@@ -30,7 +30,7 @@
 #include <tdefiledialog.h>
 #include <tqframe.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kiconloader.h>
 #include <tqiconset.h>
@@ -49,15 +49,15 @@ 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);
   }
   checkedCollection_ = 0;
 
-  TDEConfig *cfg=(TDEApplication::kApplication())->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("settings");
   int id = cfg->readNumEntry("collection", 10);
 
@@ -76,7 +76,7 @@ MainWindow::MainWindow() : TDEMainWindow(0), externalCollection_(0) {
 
   setEraseColor(TQColor(0,0,0));
 
-  TDEConfig *cfg=(TDEApplication::kApplication())->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("Geometry");
   int width = cfg->readNumEntry("width", 750);
   int height = cfg->readNumEntry("height", 562);
@@ -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"), tdeApp, 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_);
 
@@ -190,7 +190,7 @@ MainWindow::MainWindow() : TDEMainWindow(0), externalCollection_(0) {
 
 MainWindow::~MainWindow()
 {
-  TDEConfig *cfg=(TDEApplication::kApplication())->config();
+  TDEConfig *cfg=tdeApp->config();
 
   cfg->setGroup("Geometry");
   cfg->writeEntry("width", width());
@@ -297,7 +297,7 @@ MainWindow::changeCollection(int id)
 
 void
 MainWindow::loadLevels() {
-  TDEConfig *cfg=(TDEApplication::kApplication())->config();
+  TDEConfig *cfg=tdeApp->config();
   cfg->setGroup("settings");
   TQString lastFile = cfg->readPathEntry("lastLevelFile");
 
@@ -309,7 +309,7 @@ MainWindow::loadLevels() {
 
 void
 MainWindow::openURL(KURL _url) {
-  TDEConfig *cfg=(TDEApplication::kApplication())->config();
+  TDEConfig *cfg=tdeApp->config();
 
 //   int namepos = _url.path().findRev('/') + 1; // NOTE: findRev can return -1
 //   TQString levelName = _url.path().mid(namepos);