Rename KApplication to TDEApplication to avoid conflicts with KDE4

5 files changed, 14 insertions, 14 deletions

diff --git a/ksokoban/LevelCollection.cpp b/ksokoban/LevelCollection.cpp
index a562fb35..62b99384 100644
--- a/ksokoban/LevelCollection.cpp
+++ b/ksokoban/LevelCollection.cpp
@@ -143,7 +143,7 @@ LevelCollection::indexTextCollection() {
 void
 LevelCollection::loadPrefs() {
   if (id_ >= 0) {
-    KConfig *cfg=(KApplication::kApplication())->config();
+    KConfig *cfg=(TDEApplication::kApplication())->config();
     cfg->setGroup("settings");
 
     TQString key;
@@ -240,7 +240,7 @@ LevelCollection::LevelCollection(const TQString &_path, const TQString &_name,
 
 LevelCollection::~LevelCollection() {
   if (id_ >= 0) {
-    KConfig *cfg=(KApplication::kApplication())->config();
+    KConfig *cfg=(TDEApplication::kApplication())->config();
     cfg->setGroup ("settings");
 
     TQString key;
@@ -271,7 +271,7 @@ LevelCollection::levelCompleted() {
     TQString key;
     key.sprintf("status%d", id_);
 
-    KConfig *cfg=(KApplication::kApplication())->config();
+    KConfig *cfg=(TDEApplication::kApplication())->config();
     cfg->setGroup("settings");
     cfg->writeEntry(key, x, true, false, false);
     cfg->sync();
diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp
index d65073f6..cae4b8af 100644
--- a/ksokoban/MainWindow.cpp
+++ b/ksokoban/MainWindow.cpp
@@ -57,7 +57,7 @@ MainWindow::createCollectionMenu() {
   }
   checkedCollection_ = 0;
 
-  KConfig *cfg=(KApplication::kApplication())->config();
+  KConfig *cfg=(TDEApplication::kApplication())->config();
   cfg->setGroup("settings");
   int id = cfg->readNumEntry("collection", 10);
 
@@ -76,7 +76,7 @@ MainWindow::MainWindow() : KMainWindow(0), externalCollection_(0) {
 
   setEraseColor(TQColor(0,0,0));
 
-  KConfig *cfg=(KApplication::kApplication())->config();
+  KConfig *cfg=(TDEApplication::kApplication())->config();
   cfg->setGroup("Geometry");
   int width = cfg->readNumEntry("width", 750);
   int height = cfg->readNumEntry("height", 562);
@@ -107,7 +107,7 @@ MainWindow::MainWindow() : KMainWindow(0), externalCollection_(0) {
   game_->insertItem(TQIconSet(pixmap), i18n("&Redo"), playField_, TQT_SLOT(redo()), TQKeySequence( (KStdAccel::redo()).toString()));
   game_->insertSeparator();
   pixmap = SmallIcon("exit");
-  game_->insertItem(TQIconSet(pixmap), i18n("&Quit"), KApplication::kApplication(), TQT_SLOT(closeAllWindows()), TQKeySequence( (KStdAccel::quit()).toString()));
+  game_->insertItem(TQIconSet(pixmap), i18n("&Quit"), TDEApplication::kApplication(), TQT_SLOT(closeAllWindows()), TQKeySequence( (KStdAccel::quit()).toString()));
   menu_->insertItem(i18n("&Game"), game_);
 
   animation_ = new TQPopupMenu(0,"animation menu");
@@ -190,7 +190,7 @@ MainWindow::MainWindow() : KMainWindow(0), externalCollection_(0) {
 
 MainWindow::~MainWindow()
 {
-  KConfig *cfg=(KApplication::kApplication())->config();
+  KConfig *cfg=(TDEApplication::kApplication())->config();
 
   cfg->setGroup("Geometry");
   cfg->writeEntry("width", width());
@@ -297,7 +297,7 @@ MainWindow::changeCollection(int id)
 
 void
 MainWindow::loadLevels() {
-  KConfig *cfg=(KApplication::kApplication())->config();
+  KConfig *cfg=(TDEApplication::kApplication())->config();
   cfg->setGroup("settings");
   TQString lastFile = cfg->readPathEntry("lastLevelFile");
 
@@ -309,7 +309,7 @@ MainWindow::loadLevels() {
 
 void
 MainWindow::openURL(KURL _url) {
-  KConfig *cfg=(KApplication::kApplication())->config();
+  KConfig *cfg=(TDEApplication::kApplication())->config();
 
 //   int namepos = _url.path().findRev('/') + 1; // NOTE: findRev can return -1
 //   TQString levelName = _url.path().mid(namepos);
diff --git a/ksokoban/ModalLabel.cpp b/ksokoban/ModalLabel.cpp
index 6d8b40d9..3fd244ee 100644
--- a/ksokoban/ModalLabel.cpp
+++ b/ksokoban/ModalLabel.cpp
@@ -108,7 +108,7 @@ ModalLabel::eventFilter (TQObject *, TQEvent *e) {
 
 void
 ModalLabel::message (const TQString &text, TQWidget *parent) {
-  KApplication *app = KApplication::kApplication ();
+  TDEApplication *app = TDEApplication::kApplication ();
   ModalLabel cl (text, parent);
 
   while (!cl.completed_) app->processOneEvent ();
diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp
index fb95fcc1..4fa12157 100644
--- a/ksokoban/PlayField.cpp
+++ b/ksokoban/PlayField.cpp
@@ -61,7 +61,7 @@ PlayField::PlayField(TQWidget *parent, const char *name, WFlags f)
 
   highlightX_ = highlightY_ = 0;
 
-  KConfig *cfg = (KApplication::kApplication())->config();
+  KConfig *cfg = (TDEApplication::kApplication())->config();
   cfg->setGroup("settings");
 
   imageData_ = new StaticImage;
@@ -82,7 +82,7 @@ PlayField::PlayField(TQWidget *parent, const char *name, WFlags f)
 }
 
 PlayField::~PlayField() {
-  KConfig *cfg = (KApplication::kApplication())->config();
+  KConfig *cfg = (TDEApplication::kApplication())->config();
   cfg->setGroup("settings");
   cfg->writeEntry("animDelay", animDelay_, true, false, false);
 
@@ -586,7 +586,7 @@ PlayField::keyPressEvent(TQKeyEvent * e) {
     break;
 
   case Key_Q:
-    KApplication::kApplication()->closeAllWindows();
+    TDEApplication::kApplication()->closeAllWindows();
     break;
 
   case Key_Backspace:
diff --git a/ksokoban/main.cpp b/ksokoban/main.cpp
index dcd5be72..0cc11057 100644
--- a/ksokoban/main.cpp
+++ b/ksokoban/main.cpp
@@ -63,7 +63,7 @@ main (int argc, char **argv)
   TQApplication::setColorSpec(TQApplication::ManyColor);
 
 //   KUniqueApplication app;
-  KApplication app;
+  TDEApplication app;
 //   KImageIO::registerFormats();
 
   MainWindow *widget = new MainWindow();