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

3 files changed, 10 insertions, 10 deletions

diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index a4bca7e52..a0f79c270 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -69,7 +69,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang)
     _files.clear();
 
     // open config file
-    KConfig *config = new KConfig("khelpcenterrc");
+    TDEConfig *config = new TDEConfig("khelpcenterrc");
     config->setGroup("Scope");
 
     // add KDE help dirs
@@ -241,8 +241,8 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent)
     progress->setState(1);
 
     // run htdig ------------------------------------------------------
-    KConfig *config = new KConfig("khelpcenterrc", true);
-    KConfigGroupSaver saver(config, "htdig");
+    TDEConfig *config = new TDEConfig("khelpcenterrc", true);
+    TDEConfigGroupSaver saver(config, "htdig");
     TQString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"));
 
     if (exe.isEmpty())
@@ -430,8 +430,8 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
   TQString result = dataPath(_lang)+"/result.html";
 
   // run htsearch ----------------------------------------------------
-  KConfig *config = new KConfig("khelpcenterrc", true);
-  KConfigGroupSaver saver(config, "htdig");
+  TDEConfig *config = new TDEConfig("khelpcenterrc", true);
+  TDEConfigGroupSaver saver(config, "htdig");
   TQString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch"));
   if (exe.isEmpty())
   {
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 7bb403b06..588be7142 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -35,7 +35,7 @@
 
 
 KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name), indexProc(0)
+  : TDECModule(parent, name), indexProc(0)
 {
   TQVBoxLayout *vbox = new TQVBoxLayout(this, 5);
 
@@ -253,7 +253,7 @@ void KHTMLSearchConfig::configChanged()
 
 void KHTMLSearchConfig::load()
 {
-  KConfig *config = new KConfig("khelpcenterrc", true);
+  TDEConfig *config = new TDEConfig("khelpcenterrc", true);
 
   config->setGroup("htdig");
   htdigBin->lineEdit()->setText(config->readPathEntry("htdig", kapp->dirs()->findExe("htdig")));
@@ -281,7 +281,7 @@ void KHTMLSearchConfig::load()
 
 void KHTMLSearchConfig::save()
 {
-  KConfig *config= new KConfig("khelpcenterrc", false);
+  TDEConfig *config= new TDEConfig("khelpcenterrc", false);
 
   config->setGroup("htdig");
   config->writePathEntry("htdig", htdigBin->lineEdit()->text());
@@ -362,7 +362,7 @@ void KHTMLSearchConfig::indexTerminated(TDEProcess *)
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_htmlsearch(TQWidget *parent, const char *name)
+  KDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name)
   {
     TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch");
     return new KHTMLSearchConfig(parent, name);
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h
index 1b9c0b0f8..c4073388f 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.h
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h
@@ -33,7 +33,7 @@ class TDEProcess;
 class KLanguageCombo;
 class KURLRequester;
 
-class KHTMLSearchConfig : public KCModule
+class KHTMLSearchConfig : public TDECModule
 {
   Q_OBJECT