Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

14 files changed, 45 insertions, 45 deletions

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 ();
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
index 04c0ffde..d81dcc93 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
@@ -276,9 +276,9 @@ PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *parent)
     return pw;
 }
 
-void KDBSearchEngine2::saveSettings(KConfigBase *config)
+void KDBSearchEngine2::saveSettings(TDEConfigBase *config)
 {
- KConfigGroupSaver cgs(config,"KDBSearchEngine2");
+ TDEConfigGroupSaver cgs(config,"KDBSearchEngine2");
     
  
  
@@ -318,7 +318,7 @@ void KDBSearchEngine2::saveSettings(KConfigBase *config)
     }
 }
 
-void KDBSearchEngine2::readSettings(KConfigBase *config)
+void KDBSearchEngine2::readSettings(TDEConfigBase *config)
 {
     
     /*TQString defaultDir;
@@ -331,7 +331,7 @@ void KDBSearchEngine2::readSettings(KConfigBase *config)
      defaultDir += "kbabeldict/dbsearchengine2";
  }
 */
-    KConfigGroupSaver cgs(config,"KDBSearchEngine2");
+    TDEConfigGroupSaver cgs(config,"KDBSearchEngine2");
     
     // dbDirectory=config->readEntry("DBDirectory",defaultDir);
     autoAdd=config->readBoolEntry("AutoAdd",true);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h
index 29615e9e..9f8d804c 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h
@@ -43,8 +43,8 @@ class KDBSearchEngine2 : public SearchEngine
     bool isReady() const {return iAmReady; }
     
 
-    void saveSettings(KConfigBase *config);
-    void readSettings(KConfigBase *config);
+    void saveSettings(TDEConfigBase *config);
+    void readSettings(TDEConfigBase *config);
 
 
     TQString translate(const TQString text);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index 923d9897..9ba90514 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -33,7 +33,7 @@ MessagesSource::MessagesSource()
 {
     //FIXMR: check if we should put something in that constructor
 }
-void MessagesSource::writeConfig(KConfigBase *config)
+void MessagesSource::writeConfig(TDEConfigBase *config)
 {	
     config->writeEntry("Location",location.url());
     config->writeEntry("LocationType",type);
@@ -42,7 +42,7 @@ void MessagesSource::writeConfig(KConfigBase *config)
     config->writeEntry("Status",status);
 }
 
-void MessagesSource::readConfig(KConfigBase *config)
+void MessagesSource::readConfig(TDEConfigBase *config)
 {
     location=config->readEntry("Location");
     type=config->readNumEntry("LocationType",0);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
index 9aaf2dce..be3ff8d7 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
@@ -31,7 +31,7 @@
 
 #include "sourcedialog.h"
 
-class KConfigBase;
+class TDEConfigBase;
 
 class MessagesSource
 {
@@ -39,8 +39,8 @@ class MessagesSource
     
     public: 
     MessagesSource();
-    void writeConfig(KConfigBase *config);
-    void readConfig(KConfigBase *config);
+    void writeConfig(TDEConfigBase *config);
+    void readConfig(TDEConfigBase *config);
     void setDialogValues(SourceDialog *sd);
     void getDialogValues(SourceDialog *sd);
     
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index fad15a21..8101c377 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -86,7 +86,7 @@ bool PoAuxiliary::isSearching() const
 }
 
 
-void PoAuxiliary::saveSettings(KConfigBase *config)
+void PoAuxiliary::saveSettings(TDEConfigBase *config)
 {
     if(autoUpdate && prefWidget && prefWidget->settingsChanged())
     {
@@ -97,7 +97,7 @@ void PoAuxiliary::saveSettings(KConfigBase *config)
     config->writeEntry("IgnoreFuzzy",ignoreFuzzy);
 }
 
-void PoAuxiliary::readSettings(KConfigBase *config)
+void PoAuxiliary::readSettings(TDEConfigBase *config)
 {    
     bool needLoading=false;
 
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h
index eaa8b890..c04a8db4 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h
@@ -62,8 +62,8 @@ public:
 
     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/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 078d853a..e7a82d9a 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -113,7 +113,7 @@ bool PoCompendium::isSearching() const
 }
 
 
-void PoCompendium::saveSettings(KConfigBase *config )
+void PoCompendium::saveSettings(TDEConfigBase *config )
 {
     if(autoUpdate && prefWidget && prefWidget->settingsChanged())
     {
@@ -133,7 +133,7 @@ void PoCompendium::saveSettings(KConfigBase *config )
     config->writeEntry("Compendium", url);
 }
 
-void PoCompendium::readSettings(KConfigBase *config)
+void PoCompendium::readSettings(TDEConfigBase *config)
 {    
     caseSensitive = config->readBoolEntry("CaseSensitive", false);
     ignoreFuzzy = config->readBoolEntry("IgnoreFuzzy",true);
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h
index ef6eec63..deb1a16d 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h
@@ -45,7 +45,7 @@
 #include <tqptrlist.h>
 
 class CompendiumPreferencesWidget;
-class KConfigBase;
+class TDEConfigBase;
 class TQTimer;
 
 class PoCompendium : public SearchEngine
@@ -65,8 +65,8 @@ public:
 
 	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/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 7f2bc8b6..913402d8 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -107,7 +107,7 @@ bool TmxCompendium::isSearching() const
 }
 
 
-void TmxCompendium::saveSettings(KConfigBase *config)
+void TmxCompendium::saveSettings(TDEConfigBase *config)
 {
     if(autoUpdate && prefWidget && prefWidget->settingsChanged())
     {
@@ -126,7 +126,7 @@ void TmxCompendium::saveSettings(KConfigBase *config)
     config->writeEntry("Compendium", url);
 }
 
-void TmxCompendium::readSettings(KConfigBase *config)
+void TmxCompendium::readSettings(TDEConfigBase *config)
 {    
     caseSensitive = config->readBoolEntry("CaseSensitive", false);
     wholeWords = config->readBoolEntry("WholeWords",true);
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h
index 8f75f5e6..992c5d93 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h
@@ -44,7 +44,7 @@
 #include <tqguardedptr.h>
 
 class TmxCompendiumPreferencesWidget;
-class KConfigBase;
+class TDEConfigBase;
 class TQTimer;
 
 class TmxCompendium : public SearchEngine
@@ -63,8 +63,8 @@ public:
 
 	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/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 0c186b57..0f849e9c 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -83,7 +83,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
     
     TQString target;
     
-    if( KIO::NetAccess::download( url, target ) )
+    if( TDEIO::NetAccess::download( url, target ) )
     {
 	TQFile f( target );
 	if ( !f.open( IO_ReadOnly ) )
@@ -96,7 +96,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
 	    _errorMsg = i18n( "Cannot parse XML data." );
 	}
 	f.close();
-	KIO::NetAccess::removeTempFile(target);
+	TDEIO::NetAccess::removeTempFile(target);
     } else {
 	_error = true;
 	_errorMsg = i18n( "Cannot open the file." );