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

8 files changed, 18 insertions, 18 deletions

diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
index 73db49ce..eff5b01c 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
@@ -55,9 +55,9 @@ static const char unapplied[] = I18N_NOOP(
     "Do you wish to continue?");
 
 KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent,
-  const char *name,  KConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/,
+  const char *name,  TDEConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/,
   bool /*modal*/)
-  : KConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help|User1, Ok, true), m_langSet(ls)
+  : TDEConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help|User1, Ok, true), m_langSet(ls)
 {
   m_config = config;
   m_queryManager = m;
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
index d86c0199..6d096c41 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
@@ -38,7 +38,7 @@ class kvoctrainDoc;
 class QueryManager;
 class KComboBox;
 
-class KVocTrainPrefs : public KConfigDialog
+class KVocTrainPrefs : public TDEConfigDialog
 {
   Q_OBJECT
   
@@ -48,7 +48,7 @@ public:
    * Creates a configuration dialog.
    */
   KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent=0,
-    const char *name=0, KConfigSkeleton *config=0, DialogType dialogType=IconList,
+    const char *name=0, TDEConfigSkeleton *config=0, DialogType dialogType=IconList,
     int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
 
   /**
@@ -95,7 +95,7 @@ private:
   ThresholdOptions * m_thresholdOptions;
   BlockOptions * m_blockOptions;
 
-  KConfigSkeleton * m_config;
+  TDEConfigSkeleton * m_config;
   LangSet & m_langSet;
   kvoctrainDoc * m_doc;
   KComboBox m_lessons;
diff --git a/kvoctrain/kvoctrain/kva_config.cpp b/kvoctrain/kvoctrain/kva_config.cpp
index ba88b13e..3df5d285 100644
--- a/kvoctrain/kvoctrain/kva_config.cpp
+++ b/kvoctrain/kvoctrain/kva_config.cpp
@@ -34,7 +34,7 @@
 
 void kvoctrainApp::saveOptions()
 {
-  KConfig *config = TDEApplication::kApplication()->config();
+  TDEConfig *config = TDEApplication::kApplication()->config();
   fileOpenRecent->saveEntries(config, "Recent Files");
 
   if (view)
@@ -75,7 +75,7 @@ void kvoctrainApp::saveLanguages()
 
 void kvoctrainApp::readOptions()
 {
-  KConfig *config = TDEApplication::kApplication()->config();
+  TDEConfig *config = TDEApplication::kApplication()->config();
   fileOpenRecent->loadEntries(config, "Recent Files");
   /*
   int ls = Prefs::numPreSetting();
@@ -115,7 +115,7 @@ void kvoctrainApp::readLanguages()
       languageSettings.keyboardLayout());
   }
 }
-void kvoctrainApp::saveProperties(KConfig *config )
+void kvoctrainApp::saveProperties(TDEConfig *config )
 {
   saveOptions();
   if (doc) {
@@ -133,7 +133,7 @@ void kvoctrainApp::saveProperties(KConfig *config )
 }
 
 
-void kvoctrainApp::readProperties(KConfig *config)
+void kvoctrainApp::readProperties(TDEConfig *config)
 {
   querymode = config->readBoolEntry(CFG_QUERYMODE, 0);
 
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index c67347c2..f17411c1 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -103,12 +103,12 @@ public:
   * opened file by a temporary filename provided by TDEApplication.
   * @see KMainWindow#saveProperties
   */
-  virtual void saveProperties(KConfig* );
+  virtual void saveProperties(TDEConfig* );
   /** reads the session config file and restores the application's state including the last opened files and documents by reading the
   * temporary files saved by saveProperties()
   * @see KMainWindow#readProperties
   */
-  virtual void readProperties(KConfig* );
+  virtual void readProperties(TDEConfig* );
 
   /** Whether the user has selected a range of items. **/
   bool hasSelection();
diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.h b/kvoctrain/kvoctrain/kvt-core/QueryManager.h
index 3277bd1b..52019689 100644
--- a/kvoctrain/kvoctrain/kvt-core/QueryManager.h
+++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.h
@@ -33,7 +33,7 @@ using namespace std;
 #include "prefs.h"
 
 class kvoctrainDoc;
-class KConfig;
+class TDEConfig;
 class kvoctrainExpr;
 class Prefs;
 
@@ -124,8 +124,8 @@ class QueryManager
 
   QueryManager ();
 
-  //void loadConfig (KConfig *);
-  //void saveConfig (KConfig *);
+  //void loadConfig (TDEConfig *);
+  //void saveConfig (TDEConfig *);
 
   static vector<TypeRelation> getRelation (bool only_maintypes);
   static void setTypeNames (vector<TQString> names);
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
index 647de685..23dec781 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
@@ -33,7 +33,7 @@ using namespace std;
 #include "kvoctraindoc.h"
 
 class kvoctrainDoc;
-class KConfig;
+class TDEConfig;
 class kvoctrainExpr;
 
 // internal usage labels, never change !
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index 24beec1f..e1a1efcc 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -100,7 +100,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
   connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
 
   TQString tmpfile;
-  if (KIO::NetAccess::download( url, tmpfile, 0 ))
+  if (TDEIO::NetAccess::download( url, tmpfile, 0 ))
   {
     TQFile f(tmpfile);
     if (!f.open(IO_ReadOnly))
@@ -177,7 +177,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
       }
     }
     f.close();
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
   }
 }
 
diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp
index 612c0bbd..bd692037 100644
--- a/kvoctrain/kvoctrain/main.cpp
+++ b/kvoctrain/kvoctrain/main.cpp
@@ -87,7 +87,7 @@ static const char version[]     = KVOCTRAIN_VERSION_STRING;
                       I18N_NOOP("Patch to implement Leitner learning method"));
 
    aboutData.addCredit("Anne-Marie Mahfouf",
-                       I18N_NOOP("Port to KConfig XT"));
+                       I18N_NOOP("Port to TDEConfig XT"));
 
   aboutData.addCredit(I18N_NOOP("KDE Team"),
                       I18N_NOOP("Many small enhancements"));