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

---
 .../modules/dbsearchengine/KDBSearchEngine.cpp     | 24 +++++++++++-----------
 .../modules/dbsearchengine/KDBSearchEngine.h       |  4 ++--
 .../kbabeldict/modules/dbsearchengine/database.cpp |  8 ++++----
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'kbabel/kbabeldict/modules/dbsearchengine')

diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 1a0ba180..72042e16 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -196,20 +196,20 @@ KDBSearchEngine::loadDatabase (TQString database, bool noask = false)
 				     ".db");
 
 		      // rename the old files
-		      KIO::NetAccess::copy (KURL (transFile + ",old"),
+		      TDEIO::NetAccess::copy (KURL (transFile + ",old"),
 					    KURL (transFile), 0);
-		      KIO::NetAccess::
+		      TDEIO::NetAccess::
 			  copy (KURL
 				(database + "/wordsindex." + lang +
 				 ".db,old"),
 				KURL (database + "/wordsindex." + lang +
 				      ".db"), 0);
-		      KIO::NetAccess::
+		      TDEIO::NetAccess::
 			  copy (KURL
 				(database + "/keysindex." + lang + ".db,old"),
 				KURL (database + "/keysindex." + lang +
 				      ".db"), 0);
-		      KIO::NetAccess::
+		      TDEIO::NetAccess::
 			  copy (KURL
 				(database + "/catalogsinfo." + lang +
 				 ".db,old"),
@@ -228,15 +228,15 @@ KDBSearchEngine::loadDatabase (TQString database, bool noask = false)
 	  else if (oldstuff)
 	    {
 		// rename the old files
-		KIO::NetAccess::copy (KURL (transFile + ",old"),
+		TDEIO::NetAccess::copy (KURL (transFile + ",old"),
 				      KURL (transFile), 0);
-		KIO::NetAccess::
+		TDEIO::NetAccess::
 		    copy (KURL (database + "/wordsindex." + lang + ".db,old"),
 			  KURL (database + "/wordsindex." + lang + ".db"), 0);
-		KIO::NetAccess::
+		TDEIO::NetAccess::
 		    copy (KURL (database + "/keysindex." + lang + ".db,old"),
 			  KURL (database + "/keysindex." + lang + ".db"), 0);
-		KIO::NetAccess::
+		TDEIO::NetAccess::
 		    copy (KURL
 			  (database + "/catalogsinfo." + lang + ".db,old"),
 			  KURL (database + "/catalogsinfo." + lang + ".db"), 0);
@@ -1106,10 +1106,10 @@ KDBSearchEngine::isReady () const
 
 
 void
-KDBSearchEngine::saveSettings (KConfigBase * config)
+KDBSearchEngine::saveSettings (TDEConfigBase * config)
 {
 // updateSettings();  //maybe with autoupdate
-    KConfigGroupSaver cgs (config, "KDBSearchEngine");
+    TDEConfigGroupSaver cgs (config, "KDBSearchEngine");
 #if KDE_IS_VERSION(3,1,3)
     config->writePathEntry ("Filename", dbname);
 #else
@@ -1145,11 +1145,11 @@ KDBSearchEngine::saveSettings (KConfigBase * config)
 
 
 void
-KDBSearchEngine::readSettings (KConfigBase * config)
+KDBSearchEngine::readSettings (TDEConfigBase * config)
 {
     TQString newName;
 
-    KConfigGroupSaver cgs (config, "KDBSearchEngine");
+    TDEConfigGroupSaver cgs (config, "KDBSearchEngine");
 
     TQString defaultLang;
     TQString oldLang = lang;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h
index d246c5a7..e7edb3c3 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h
@@ -191,8 +191,8 @@ public:
  virtual bool isReady() const ;
  virtual bool isSearching() const;
 
- virtual void saveSettings(KConfigBase *config);
- virtual void readSettings(KConfigBase *config);
+ virtual void saveSettings(TDEConfigBase *config);
+ virtual void readSettings(TDEConfigBase *config);
 
  virtual PrefWidget *preferencesWidget(TQWidget *parent);
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 699e3530..4ee016cd 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -440,19 +440,19 @@ DataBaseManager::openDataBase ()
 	  // use temporary file instead
 	  if (ret == 0)
 	    {
-		KIO::NetAccess::del (KURL::fromPathOrURL (transfilename));
+		TDEIO::NetAccess::del (KURL::fromPathOrURL (transfilename));
 		copy_hack (*transFile.file (), transfilenameFile);
 		transFile.unlink ();
 
-		KIO::NetAccess::del (KURL::fromPathOrURL (infofilename));
+		TDEIO::NetAccess::del (KURL::fromPathOrURL (infofilename));
 		copy_hack (*infoFile.file (), infofilenameFile);
 		infoFile.unlink ();
 
-		KIO::NetAccess::del (KURL::fromPathOrURL (wordsfilename));
+		TDEIO::NetAccess::del (KURL::fromPathOrURL (wordsfilename));
 		copy_hack (*wordsFile.file (), wordfilenameFile);
 		wordsFile.unlink ();
 
-		KIO::NetAccess::del (KURL::fromPathOrURL (keysfilename));
+		TDEIO::NetAccess::del (KURL::fromPathOrURL (keysfilename));
 		copy_hack (*keysFile.file (), keysfilenameFile);
 		keysFile.unlink ();
 
-- 
cgit v1.2.1