From 2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:32:59 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 ksokoban/LevelCollection.cpp |  6 +++---
 ksokoban/MainWindow.cpp      | 14 +++++++-------
 ksokoban/PlayField.cpp       |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'ksokoban')

diff --git a/ksokoban/LevelCollection.cpp b/ksokoban/LevelCollection.cpp
index 62b99384..55995afa 100644
--- a/ksokoban/LevelCollection.cpp
+++ b/ksokoban/LevelCollection.cpp
@@ -143,7 +143,7 @@ LevelCollection::indexTextCollection() {
 void
 LevelCollection::loadPrefs() {
   if (id_ >= 0) {
-    KConfig *cfg=(TDEApplication::kApplication())->config();
+    TDEConfig *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=(TDEApplication::kApplication())->config();
+    TDEConfig *cfg=(TDEApplication::kApplication())->config();
     cfg->setGroup ("settings");
 
     TQString key;
@@ -271,7 +271,7 @@ LevelCollection::levelCompleted() {
     TQString key;
     key.sprintf("status%d", id_);
 
-    KConfig *cfg=(TDEApplication::kApplication())->config();
+    TDEConfig *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 cae4b8af..5c19e5e1 100644
--- a/ksokoban/MainWindow.cpp
+++ b/ksokoban/MainWindow.cpp
@@ -57,7 +57,7 @@ MainWindow::createCollectionMenu() {
   }
   checkedCollection_ = 0;
 
-  KConfig *cfg=(TDEApplication::kApplication())->config();
+  TDEConfig *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=(TDEApplication::kApplication())->config();
+  TDEConfig *cfg=(TDEApplication::kApplication())->config();
   cfg->setGroup("Geometry");
   int width = cfg->readNumEntry("width", 750);
   int height = cfg->readNumEntry("height", 562);
@@ -190,7 +190,7 @@ MainWindow::MainWindow() : KMainWindow(0), externalCollection_(0) {
 
 MainWindow::~MainWindow()
 {
-  KConfig *cfg=(TDEApplication::kApplication())->config();
+  TDEConfig *cfg=(TDEApplication::kApplication())->config();
 
   cfg->setGroup("Geometry");
   cfg->writeEntry("width", width());
@@ -297,7 +297,7 @@ MainWindow::changeCollection(int id)
 
 void
 MainWindow::loadLevels() {
-  KConfig *cfg=(TDEApplication::kApplication())->config();
+  TDEConfig *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=(TDEApplication::kApplication())->config();
+  TDEConfig *cfg=(TDEApplication::kApplication())->config();
 
 //   int namepos = _url.path().findRev('/') + 1; // NOTE: findRev can return -1
 //   TQString levelName = _url.path().mid(namepos);
@@ -320,12 +320,12 @@ MainWindow::openURL(KURL _url) {
     levelFile = _url.path();
   } else {
 //     levelFile = locateLocal("appdata", "levels/" + levelName);
-    if(!KIO::NetAccess::download( _url, levelFile ) )
+    if(!TDEIO::NetAccess::download( _url, levelFile ) )
 	  return;
   }
 
   LevelCollection *tmpCollection = new LevelCollection(levelFile, levelName);
-  KIO::NetAccess::removeTempFile(levelFile );
+  TDEIO::NetAccess::removeTempFile(levelFile );
 
   if (tmpCollection->noOfLevels() < 1) {
     KMessageBox::sorry(this, i18n("No levels found in file"));
diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp
index e0fce7fa..10c6c197 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 = (TDEApplication::kApplication())->config();
+  TDEConfig *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 = (TDEApplication::kApplication())->config();
+  TDEConfig *cfg = (TDEApplication::kApplication())->config();
   cfg->setGroup("settings");
   cfg->writeEntry("animDelay", animDelay_, true, false, false);
 
-- 
cgit v1.2.1