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

10 files changed, 25 insertions, 25 deletions

diff --git a/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook b/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook
index 6fcfce7935d..feecfb86a24 100644
--- a/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook
@@ -1001,7 +1001,7 @@ class Cfg2k: public ThemeEngineConfig
 {
   Q_OBJECT
 public:
-  Cfg2k( KConfig * );
+  Cfg2k( TDEConfig * );
 };
 
 class ObjKsTheme;
@@ -1015,7 +1015,7 @@ public:
   {
     return( QString("KSplash2k") );
   }
-  inline const KDialogBase *config( KConfig *kc )
+  inline const KDialogBase *config( TDEConfig *kc )
   {
     return new Cfg2k( kc );
   }
@@ -1113,7 +1113,7 @@ private:
   if( !mTheme )
     return;
 
-  KConfig *cfg = mTheme->themeConfig();
+  TDEConfig *cfg = mTheme->themeConfig();
   if( !cfg )
     return;
 
@@ -1289,7 +1289,7 @@ theme_DATA = Theme.rc Preview.png
 
 K_EXPORT_COMPONENT_FACTORY( ksplash2k, KGenericFactory<Theme2k> );
 
-Cfg2k::Cfg2k( KConfig * )
+Cfg2k::Cfg2k( TDEConfig * )
 {}
 
 Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &args  )
@@ -1352,7 +1352,7 @@ void Theme2k::readSettings()
   if( !mTheme )
     return;
 
-  KConfig *cfg = mTheme->themeConfig();
+  TDEConfig *cfg = mTheme->themeConfig();
   if( !cfg )
     return;
 
diff --git a/tde-i18n-en_GB/messages/tdeartwork/klock.po b/tde-i18n-en_GB/messages/tdeartwork/klock.po
index 3dff3e22bd4..93ebba57a01 100644
--- a/tde-i18n-en_GB/messages/tdeartwork/klock.po
+++ b/tde-i18n-en_GB/messages/tdeartwork/klock.po
@@ -353,7 +353,7 @@ msgid ""
 "Copyright (c)  Ian Reinhart Geiser 2001"
 "<br>\n"
 "\n"
-"<p>KConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher "
+"<p>TDEConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher "
 "<nbetcher@usinternet.com> 2001</p>"
 msgstr ""
 "<h3>Particle Fountain</h3>\n"
@@ -361,7 +361,7 @@ msgstr ""
 "Copyright (c)  Ian Reinhart Geiser 2001"
 "<br>\n"
 "\n"
-"<p>KConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher "
+"<p>TDEConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher "
 "<nbetcher@usinternet.com> 2001</p>"
 
 #: kdesavers/gravity.cpp:40
@@ -375,7 +375,7 @@ msgid ""
 "Copyright (c)  Ian Reinhart Geiser 2001"
 "<br>\n"
 "\n"
-"<p>KConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher "
+"<p>TDEConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher "
 "<nbetcher@usinternet.com> 2001</p>"
 msgstr ""
 "<h3>Gravity</h3>\n"
@@ -383,7 +383,7 @@ msgstr ""
 "Copyright (c)  Ian Reinhart Geiser 2001"
 "<br>\n"
 "\n"
-"<p>KConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher "
+"<p>TDEConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher "
 "<nbetcher@usinternet.com> 2001</p>"
 
 #: kdesavers/kclock.cpp:54
diff --git a/tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po b/tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po
index b9ae4b0e435..f81fe692673 100644
--- a/tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po
+++ b/tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po
@@ -113,8 +113,8 @@ msgid "(c) 2000 - 2001 Matthias Elter"
 msgstr "(c) 2000 - 2001 Matthias Elter"
 
 #: kcmtaskbar.cpp:182
-msgid "KConfigXT conversion"
-msgstr "KConfigXT conversion"
+msgid "TDEConfigXT conversion"
+msgstr "TDEConfigXT conversion"
 
 #: kcmtaskbar.cpp:209 kcmtaskbar.cpp:210 kcmtaskbar.cpp:211
 msgid "Cycle Through Windows"
diff --git a/tde-i18n-en_GB/messages/tdebase/kicker.po b/tde-i18n-en_GB/messages/tdebase/kicker.po
index 64bdbeff1ab..8a31bd6ec10 100644
--- a/tde-i18n-en_GB/messages/tdebase/kicker.po
+++ b/tde-i18n-en_GB/messages/tdebase/kicker.po
@@ -626,11 +626,11 @@ msgstr "&Description:"
 #, no-c-format
 msgid ""
 "Whether this panel actually exists or not. Primarily to work around the fact "
-"that KConfigXT won't write a config file unless there is at least one "
+"that TDEConfigXT won't write a config file unless there is at least one "
 "non-default entry."
 msgstr ""
 "Whether this panel actually exists or not. Primarily to work around the fact "
-"that KConfigXT won't write a config file unless there is at least one "
+"that TDEConfigXT won't write a config file unless there is at least one "
 "non-default entry."
 
 #. i18n: file core/extensionSettings.kcfg line 18
diff --git a/tde-i18n-en_GB/messages/tdebase/kreadconfig.po b/tde-i18n-en_GB/messages/tdebase/kreadconfig.po
index d679a19f3b4..116908ce09e 100644
--- a/tde-i18n-en_GB/messages/tdebase/kreadconfig.po
+++ b/tde-i18n-en_GB/messages/tdebase/kreadconfig.po
@@ -40,8 +40,8 @@ msgid "KReadConfig"
 msgstr "KReadConfig"
 
 #: kreadconfig.cpp:48
-msgid "Read KConfig entries - for use in shell scripts"
-msgstr "Read KConfig entries - for use in shell scripts"
+msgid "Read TDEConfig entries - for use in shell scripts"
+msgstr "Read TDEConfig entries - for use in shell scripts"
 
 #: _translatorinfo.cpp:1
 msgid ""
diff --git a/tde-i18n-en_GB/messages/tdebase/kwriteconfig.po b/tde-i18n-en_GB/messages/tdebase/kwriteconfig.po
index 5d36d045fec..8571e300636 100644
--- a/tde-i18n-en_GB/messages/tdebase/kwriteconfig.po
+++ b/tde-i18n-en_GB/messages/tdebase/kwriteconfig.po
@@ -43,8 +43,8 @@ msgid "KWriteConfig"
 msgstr "KWriteConfig"
 
 #: kwriteconfig.cpp:30
-msgid "Write KConfig entries - for use in shell scripts"
-msgstr "Write KConfig entries - for use in shell scripts"
+msgid "Write TDEConfig entries - for use in shell scripts"
+msgstr "Write TDEConfig entries - for use in shell scripts"
 
 #: _translatorinfo.cpp:1
 msgid ""
diff --git a/tde-i18n-en_GB/messages/tdeedu/kiten.po b/tde-i18n-en_GB/messages/tdeedu/kiten.po
index 439b8b182c5..48fa9c3036e 100644
--- a/tde-i18n-en_GB/messages/tdeedu/kiten.po
+++ b/tde-i18n-en_GB/messages/tdeedu/kiten.po
@@ -430,8 +430,8 @@ msgid "svg icon"
 msgstr "svg icon"
 
 #: main.cpp:51
-msgid "Porting to KConfig XT, bug fixing"
-msgstr "Porting to KConfig XT, bug fixing"
+msgid "Porting to TDEConfig XT, bug fixing"
+msgstr "Porting to TDEConfig XT, bug fixing"
 
 #. i18n: file configdictionariesbase.ui line 16
 #: optiondialog.cpp:47 rc.cpp:24
diff --git a/tde-i18n-en_GB/messages/tdeedu/klettres.po b/tde-i18n-en_GB/messages/tdeedu/klettres.po
index f4c0aef054e..6b71a842c2f 100644
--- a/tde-i18n-en_GB/messages/tdeedu/klettres.po
+++ b/tde-i18n-en_GB/messages/tdeedu/klettres.po
@@ -337,8 +337,8 @@ msgid "Code for generating special characters' icons"
 msgstr "Code for generating special characters' icons"
 
 #: main.cpp:88
-msgid "Port to KConfig XT, coding help"
-msgstr "Port to KConfig XT, coding help"
+msgid "Port to TDEConfig XT, coding help"
+msgstr "Port to TDEConfig XT, coding help"
 
 #: main.cpp:90
 msgid "Kids and grown-up SVG icons"
diff --git a/tde-i18n-en_GB/messages/tdeedu/kvoctrain.po b/tde-i18n-en_GB/messages/tdeedu/kvoctrain.po
index 7a21d00e25e..197741121d7 100644
--- a/tde-i18n-en_GB/messages/tdeedu/kvoctrain.po
+++ b/tde-i18n-en_GB/messages/tdeedu/kvoctrain.po
@@ -2883,8 +2883,8 @@ msgid "Patch to implement Leitner learning method"
 msgstr "Patch to implement Leitner learning method"
 
 #: main.cpp:90
-msgid "Port to KConfig XT"
-msgstr "Port to KConfig XT"
+msgid "Port to TDEConfig XT"
+msgstr "Port to TDEConfig XT"
 
 #: main.cpp:92
 msgid "TDE Team"
diff --git a/tde-i18n-en_GB/messages/tdelibs/tdelibs.po b/tde-i18n-en_GB/messages/tdelibs/tdelibs.po
index b914c7b031a..b5626ba7604 100644
--- a/tde-i18n-en_GB/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-en_GB/messages/tdelibs/tdelibs.po
@@ -4318,8 +4318,8 @@ msgid "TDE .kcfg compiler"
 msgstr "TDE .kcfg compiler"
 
 #: tdecore/kconfig_compiler/kconfig_compiler.cpp:956
-msgid "KConfig Compiler"
-msgstr "KConfig Compiler"
+msgid "TDEConfig Compiler"
+msgstr "TDEConfig Compiler"
 
 #: tdecore/network/kresolver.cpp:558
 msgid "requested family not supported for this host name"