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

22 files changed, 136 insertions, 136 deletions

diff --git a/languages/cpp/app_templates/kapp/README b/languages/cpp/app_templates/kapp/README
index a94ee3db..1db7896b 100644
--- a/languages/cpp/app_templates/kapp/README
+++ b/languages/cpp/app_templates/kapp/README
@@ -42,7 +42,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For more details, consult :
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index f3872d04..cc77371d 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -69,7 +69,7 @@ void %{APPNAME}::load(const KURL& url)
 
     #if 0
     // download the contents
-    if (KIO::NetAccess::download(url, target))
+    if (TDEIO::NetAccess::download(url, target))
     {
         // set our caption
         setCaption(url);
@@ -78,7 +78,7 @@ void %{APPNAME}::load(const KURL& url)
         loadFile(target);
 
         // and remove the temp file
-        KIO::NetAccess::removeTempFile(target);
+        TDEIO::NetAccess::removeTempFile(target);
     }
     #endif
 
@@ -104,7 +104,7 @@ void %{APPNAME}::setupActions()
                                   actionCollection(), "custom_action");
 }
 
-void %{APPNAME}::saveProperties(KConfig *config)
+void %{APPNAME}::saveProperties(TDEConfig *config)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
@@ -119,7 +119,7 @@ void %{APPNAME}::saveProperties(KConfig *config)
     }
 }
 
-void %{APPNAME}::readProperties(KConfig *config)
+void %{APPNAME}::readProperties(TDEConfig *config)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h
index 8c40e1fc..2085e6e6 100644
--- a/languages/cpp/app_templates/kapp/app.h
+++ b/languages/cpp/app_templates/kapp/app.h
@@ -55,14 +55,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    void saveProperties(KConfig *);
+    void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    void readProperties(KConfig *);
+    void readProperties(TDEConfig *);
 
 
 private slots:
diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp
index bb15b923..2c8d9271 100644
--- a/languages/cpp/app_templates/kcmodule/module.cpp
+++ b/languages/cpp/app_templates/kcmodule/module.cpp
@@ -12,7 +12,7 @@ typedef KGenericFactory<%{APPNAME}, TQWidget> %{APPNAME}Factory;
 K_EXPORT_COMPONENT_FACTORY( kcm_%{APPNAME}, %{APPNAME}Factory("kcm%{APPNAMELC}"))
 
 %{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name, const TQStringList&)
-    : KCModule(parent, name), myAboutData(0)
+    : TDECModule(parent, name), myAboutData(0)
 {
     // place widgets here
     load();
@@ -46,7 +46,7 @@ void %{APPNAME}::save()
 
 int %{APPNAME}::buttons()
 {
-    return KCModule::Default|KCModule::Apply|KCModule::Help;
+    return TDECModule::Default|TDECModule::Apply|TDECModule::Help;
 }
 
 
diff --git a/languages/cpp/app_templates/kcmodule/module.h b/languages/cpp/app_templates/kcmodule/module.h
index e9b97c38..169ff030 100644
--- a/languages/cpp/app_templates/kcmodule/module.h
+++ b/languages/cpp/app_templates/kcmodule/module.h
@@ -6,7 +6,7 @@
 #include <kcmodule.h>
 #include <kaboutdata.h>
 
-class %{APPNAME}: public KCModule
+class %{APPNAME}: public TDECModule
 {
     Q_OBJECT
   
diff --git a/languages/cpp/app_templates/kconfig35/README b/languages/cpp/app_templates/kconfig35/README
index 4047745e..6f91629b 100644
--- a/languages/cpp/app_templates/kconfig35/README
+++ b/languages/cpp/app_templates/kconfig35/README
@@ -46,7 +46,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For that, you will need to write two simple configuration files 
diff --git a/languages/cpp/app_templates/kconfig35/app.cpp b/languages/cpp/app_templates/kconfig35/app.cpp
index e18b4148..0fb99ee1 100644
--- a/languages/cpp/app_templates/kconfig35/app.cpp
+++ b/languages/cpp/app_templates/kconfig35/app.cpp
@@ -73,7 +73,7 @@ void %{APPNAMELC}::optionsPreferences()
 	//
 	// compare the names of the widgets in the .ui file 
 	// to the names of the variables in the .kcfg file
-        KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
+        TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
         dialog->addPage(new Prefs(), i18n("General"), "package_settings");
         connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged()));
         dialog->show();
diff --git a/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate b/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate
index 5786904e..3f5a2a81 100644
--- a/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate
+++ b/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate
@@ -1,26 +1,26 @@
 # TDE Config File
 [General]
-Name=KConfig XT for TDE 3.5
-Name[ca]=KConfig XT per a TDE 3.5
-Name[de]=KConfigXT-Anwendung für TDE 3.5
-Name[el]=Εφαρμογή KConfig XT για το TDE 3.5
-Name[es]=KConfig XT para TDE 3.5
-Name[et]=KConfig XT TDE 3.5 jaoks
-Name[fr]=Application KConfig XT pour TDE 3.5
-Name[hu]=KConfig XT a TDE 3.5-höz
-Name[it]=KConfig XT per TDE 3.5
-Name[ja]=TDE 3.5 用 KConfig XT
-Name[nds]=KConfig-XT-Programm för TDE 3.5
-Name[nl]=KConfig XT voor TDE 3.5
-Name[pl]=Program KConfig XT dla TDE 3.5
-Name[pt]=Aplicação do KConfig XT para o TDE 3.5
-Name[pt_BR]=Aplicação do KConfig XT para o TDE 3.5
-Name[ru]=Приложение TDE 3.5 с KConfig XT
-Name[sk]=KConfig XT pre TDE 3.5
-Name[sr]=KConfig XT програм за TDE 3.5
-Name[sr@Latn]=KConfig XT program za TDE 3.5
-Name[sv]=KConfig XT för TDE 3.5
-Name[zh_TW]=TDE 3.5 的 KConfig XT 應用程式
+Name=TDEConfig XT for TDE 3.5
+Name[ca]=TDEConfig XT per a TDE 3.5
+Name[de]=TDEConfigXT-Anwendung für TDE 3.5
+Name[el]=Εφαρμογή TDEConfig XT για το TDE 3.5
+Name[es]=TDEConfig XT para TDE 3.5
+Name[et]=TDEConfig XT TDE 3.5 jaoks
+Name[fr]=Application TDEConfig XT pour TDE 3.5
+Name[hu]=TDEConfig XT a TDE 3.5-höz
+Name[it]=TDEConfig XT per TDE 3.5
+Name[ja]=TDE 3.5 用 TDEConfig XT
+Name[nds]=TDEConfig-XT-Programm för TDE 3.5
+Name[nl]=TDEConfig XT voor TDE 3.5
+Name[pl]=Program TDEConfig XT dla TDE 3.5
+Name[pt]=Aplicação do TDEConfig XT para o TDE 3.5
+Name[pt_BR]=Aplicação do TDEConfig XT para o TDE 3.5
+Name[ru]=Приложение TDE 3.5 с TDEConfig XT
+Name[sk]=TDEConfig XT pre TDE 3.5
+Name[sr]=TDEConfig XT програм за TDE 3.5
+Name[sr@Latn]=TDEConfig XT program za TDE 3.5
+Name[sv]=TDEConfig XT för TDE 3.5
+Name[zh_TW]=TDE 3.5 的 TDEConfig XT 應用程式
 Category=C++/TDE
 Icon=kxt.png
 Comment=Generates a simple TDE application with one widget and a configuration dialog compatible with TDE 3.5 only
@@ -221,25 +221,25 @@ Dest=%{dest}/configure.in.in
 
 [MSG]
 Type=message
-Comment=A TDE 3.5 KConfig XT application was created in %{dest}
-Comment[ca]=Una aplicació KConfig XT per al TDE ha estat creada en %{dest}
-Comment[da]=Et TDE 3.5 KConfig XT-program blev oprettet i %{dest}
-Comment[de]=Eine KConfig-XT-Anwendung für TDE 3.5 wurde in %{dest} erstellt.
-Comment[el]=Μια εφαρμογή KConfig XT του TDE 3.5 δημιουργήθηκε στο %{dest}
-Comment[es]=Una aplicación KConfig XT para TDE 3.5 ha sido creada en %{dest}
-Comment[et]=TDE 3.5 KConfig XT rakendus loodi asukohta %{dest}
-Comment[fr]=Une application KConfig XT pour TDE 3.5 a été créée dans %{dest}
-Comment[hu]=Létrejött egy KConfig XT-alapú TDE 3.5-alkalmazás itt: %{dest}
-Comment[it]=È stata creata un'applicazione KConfig XT per TDE 3.5 in %{dest}
-Comment[ja]=TDE 3.5 用 KConfig XT アプリケーションを %{dest} に作成しました
-Comment[nds]=In %{dest} wöör en KConfig-XT-Programm för TDE 3.5 opstellt
-Comment[nl]=Een TDE 3.5 KConfig XT-toepassing is aangemaakt in %{dest}
-Comment[pl]=Program KConfig XT dla TDE 3.5 został utworzony w %{dest}
-Comment[pt]=Foi criada uma aplicação do KConfig XT para o TDE 3.5 em %{dest}
-Comment[pt_BR]=Foi criada uma aplicação do KConfig XT para o TDE 3.5 em %{dest}
-Comment[ru]=Приложение TDE с KConfig XT создано в %{dest}
-Comment[sk]=KConfig XT pre TDE 3.5 bola vytvorená v %{dest}
-Comment[sr]=KConfig XT програм за TDE 3.5 направљен је у %{dest}
-Comment[sr@Latn]=KConfig XT program za TDE 3.5 napravljen je u %{dest}
-Comment[sv]=Ett TDE 3.5 KConfig XT-program skapades i %{dest}
-Comment[zh_TW]=一個 TDE 3.5 上的 KConfig XT 應用程式已建立於 %{dest}
+Comment=A TDE 3.5 TDEConfig XT application was created in %{dest}
+Comment[ca]=Una aplicació TDEConfig XT per al TDE ha estat creada en %{dest}
+Comment[da]=Et TDE 3.5 TDEConfig XT-program blev oprettet i %{dest}
+Comment[de]=Eine TDEConfig-XT-Anwendung für TDE 3.5 wurde in %{dest} erstellt.
+Comment[el]=Μια εφαρμογή TDEConfig XT του TDE 3.5 δημιουργήθηκε στο %{dest}
+Comment[es]=Una aplicación TDEConfig XT para TDE 3.5 ha sido creada en %{dest}
+Comment[et]=TDE 3.5 TDEConfig XT rakendus loodi asukohta %{dest}
+Comment[fr]=Une application TDEConfig XT pour TDE 3.5 a été créée dans %{dest}
+Comment[hu]=Létrejött egy TDEConfig XT-alapú TDE 3.5-alkalmazás itt: %{dest}
+Comment[it]=È stata creata un'applicazione TDEConfig XT per TDE 3.5 in %{dest}
+Comment[ja]=TDE 3.5 用 TDEConfig XT アプリケーションを %{dest} に作成しました
+Comment[nds]=In %{dest} wöör en TDEConfig-XT-Programm för TDE 3.5 opstellt
+Comment[nl]=Een TDE 3.5 TDEConfig XT-toepassing is aangemaakt in %{dest}
+Comment[pl]=Program TDEConfig XT dla TDE 3.5 został utworzony w %{dest}
+Comment[pt]=Foi criada uma aplicação do TDEConfig XT para o TDE 3.5 em %{dest}
+Comment[pt_BR]=Foi criada uma aplicação do TDEConfig XT para o TDE 3.5 em %{dest}
+Comment[ru]=Приложение TDE с TDEConfig XT создано в %{dest}
+Comment[sk]=TDEConfig XT pre TDE 3.5 bola vytvorená v %{dest}
+Comment[sr]=TDEConfig XT програм за TDE 3.5 направљен је у %{dest}
+Comment[sr@Latn]=TDEConfig XT program za TDE 3.5 napravljen je u %{dest}
+Comment[sv]=Ett TDE 3.5 TDEConfig XT-program skapades i %{dest}
+Comment[zh_TW]=一個 TDE 3.5 上的 TDEConfig XT 應用程式已建立於 %{dest}
diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp
index bb91d42e..d2e09025 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.cpp
+++ b/languages/cpp/app_templates/kde4app/kapp4.cpp
@@ -75,10 +75,10 @@ void %{APPNAME}::optionsPreferences()
     // compare the names of the widgets in the .ui file
     // to the names of the variables in the .kcfg file
     //avoid to have 2 dialogs shown
-    if ( KConfigDialog::showDialog( "settings" ) )  {
+    if ( TDEConfigDialog::showDialog( "settings" ) )  {
         return;
     }
-    KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self());
+    TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self());
     TQWidget *generalSettingsDlg = new TQWidget;
     ui_prefs_base.setupUi(generalSettingsDlg);
     dialog->addPage(generalSettingsDlg, i18n("General"), "package_setting");
diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h
index 4266f8eb..ba7157a3 100644
--- a/languages/cpp/app_templates/kicker/applet.h
+++ b/languages/cpp/app_templates/kicker/applet.h
@@ -101,7 +101,7 @@ protected:
     void resizeEvent(TQResizeEvent *);
 
 private:
-    KConfig *ksConfig;
+    TDEConfig *ksConfig;
     TQWidget *mainView;
 };
 
diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/kioslave/slave.cpp
index 3dbd8cac..3c780e7f 100644
--- a/languages/cpp/app_templates/kioslave/slave.cpp
+++ b/languages/cpp/app_templates/kioslave/slave.cpp
@@ -23,7 +23,7 @@
 
 #include "%{APPNAMELC}.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 
 kio_%{APPNAMELC}Protocol::kio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket)
diff --git a/languages/cpp/app_templates/kioslave/slave.h b/languages/cpp/app_templates/kioslave/slave.h
index bdfef93c..07bf9c6e 100644
--- a/languages/cpp/app_templates/kioslave/slave.h
+++ b/languages/cpp/app_templates/kioslave/slave.h
@@ -11,7 +11,7 @@
 
 class TQCString;
 
-class kio_%{APPNAMELC}Protocol : public KIO::SlaveBase
+class kio_%{APPNAMELC}Protocol : public TDEIO::SlaveBase
 {
 public:
     kio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket);
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp
index 1a306aee..c5d30f14 100644
--- a/languages/cpp/app_templates/kpartapp/app.cpp
+++ b/languages/cpp/app_templates/kpartapp/app.cpp
@@ -88,14 +88,14 @@ void %{APPNAME}::setupActions()
     KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
-void %{APPNAME}::saveProperties(KConfig* /*config*/)
+void %{APPNAME}::saveProperties(TDEConfig* /*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
     // later when this app is restored
 }
 
-void %{APPNAME}::readProperties(KConfig* /*config*/)
+void %{APPNAME}::readProperties(TDEConfig* /*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h
index f2dd9bb3..91207694 100644
--- a/languages/cpp/app_templates/kpartapp/app.h
+++ b/languages/cpp/app_templates/kpartapp/app.h
@@ -44,14 +44,14 @@ protected:
      * This method is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    void saveProperties(KConfig *);
+    void saveProperties(TDEConfig *);
 
     /**
-     * This method is called when this app is restored.  The KConfig
+     * This method is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    void readProperties(KConfig *);
+    void readProperties(TDEConfig *);
 
 private slots:
     void fileNew();
diff --git a/languages/cpp/app_templates/kscons_kmdi/README b/languages/cpp/app_templates/kscons_kmdi/README
index a8de4e35..bf4edf71 100644
--- a/languages/cpp/app_templates/kscons_kmdi/README
+++ b/languages/cpp/app_templates/kscons_kmdi/README
@@ -67,7 +67,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For that, you will need to write two simple configuration files 
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
index dd297ed7..30e6647c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
@@ -103,7 +103,7 @@
 	setAutoSaveSettings();
 
 	// Read the dock config only if the app was started at least only once - kmdi is tricky
-        KConfig *cfg = new KConfig("%{APPNAMELC}_dockposrc");
+        TDEConfig *cfg = new TDEConfig("%{APPNAMELC}_dockposrc");
         if (cfg->readNumEntry("%{APPNAMELC}_main_dock_settings", 0) == 1) manager()->readConfig(cfg);
         cfg->writeEntry("%{APPNAMELC}_main_dock_settings", 1);
         delete cfg;
@@ -114,7 +114,7 @@
 %{APPNAMELC}kmdi::~%{APPNAMELC}kmdi()
 {
 	// Write the dock config on exit
-        KConfig *cfg = new KConfig("%{APPNAMELC}_dockposrc");
+        TDEConfig *cfg = new TDEConfig("%{APPNAMELC}_dockposrc");
         manager()->writeConfig(cfg);
         delete cfg;
 	delete m_console;
@@ -315,10 +315,10 @@ void %{APPNAMELC}kmdi::optionsPreferences()
 	//
 	// compare the names of the widgets in the .ui file 
 	// to the names of the variables in the .kcfg file
-	if (KConfigDialog::showDialog("settings"))
+	if (TDEConfigDialog::showDialog("settings"))
 		return;	
 
-	KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
+	TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
 	dialog->addPage(new prefs(), i18n("General"), "package_settings");
 	connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged()));
 	dialog->show();
diff --git a/languages/cpp/app_templates/kscons_kxt/README b/languages/cpp/app_templates/kscons_kxt/README
index a8de4e35..bf4edf71 100644
--- a/languages/cpp/app_templates/kscons_kxt/README
+++ b/languages/cpp/app_templates/kscons_kxt/README
@@ -67,7 +67,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For that, you will need to write two simple configuration files 
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index 750fd94c..bbf648ea 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -138,7 +138,7 @@ void %{APPNAME}::optionsPreferences()
 	//
 	// compare the names of the widgets in the .ui file 
 	// to the names of the variables in the .kcfg file
-        KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
+        TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
         dialog->addPage(new Prefs(), i18n("General"), "package_settings");
         connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged()));
         dialog->show();
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
index 569c69a3..12699c32 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
+++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
@@ -48,7 +48,7 @@ extern "C"
 //! read settings from config file
 void %{APPNAME}Setup::readSettings()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "Settings" );
     /// @todo
     // Add your config options here...
@@ -59,7 +59,7 @@ void %{APPNAME}Setup::readSettings()
 //! Ok pressed - save settings and exit
 void %{APPNAME}Setup::slotOkPressed()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "Settings" );
     /// @todo
     // Add your config options here.
@@ -89,7 +89,7 @@ void %{APPNAME}Setup::slotCancelPressed()
 //! read configuration settings from config file
 void %{APPNAME}::readSettings()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "Settings" );
     /// @todo
     // Add your config options here...
diff --git a/languages/cpp/app_templates/kxt/README b/languages/cpp/app_templates/kxt/README
index 3c887a42..a7775d6a 100644
--- a/languages/cpp/app_templates/kxt/README
+++ b/languages/cpp/app_templates/kxt/README
@@ -42,7 +42,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For that, you will need to write two simple configuration files 
diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index 81a1118c..ef50718c 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -133,7 +133,7 @@ void %{APPNAMELC}::optionsPreferences()
 	//
 	// compare the names of the widgets in the .ui file 
 	// to the names of the variables in the .kcfg file
-        KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
+        TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
         dialog->addPage(new Prefs(), i18n("General"), "package_settings");
         connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged()));
         dialog->show();
diff --git a/languages/cpp/app_templates/kxt/kxt.kdevtemplate b/languages/cpp/app_templates/kxt/kxt.kdevtemplate
index 4f82fa17..159affe6 100644
--- a/languages/cpp/app_templates/kxt/kxt.kdevtemplate
+++ b/languages/cpp/app_templates/kxt/kxt.kdevtemplate
@@ -1,34 +1,34 @@
 # TDE Config File
 [General]
-Name=KConfig XT application
-Name[ca]=Aplicació KConfig XT
-Name[da]=KConfig XT program
-Name[de]=KConfigXT-Anwendung
-Name[el]=Εφαρμογή KConfig XT
-Name[es]=Aplicación KConfig XT
-Name[et]=KConfig XT rakendus
-Name[eu]=KConfig XT aplikazioa
-Name[fa]=کاربرد KConfig XT
-Name[fr]=Application KConfig XT
-Name[ga]=Feidhmchlár XT KConfig
-Name[gl]=Aplicación KConfig XT
-Name[hu]=KConfig XT-alapú alkalmazás
-Name[it]=Applicazione KConfig XT
-Name[ja]=KConfig XT アプリケーション
-Name[nds]=KConfig-XT-Programm
-Name[ne]=KConfig XT अनुप्रयोग
-Name[nl]=KConfig XT-toepassing
-Name[pl]=Program KConfig XT
-Name[pt]=Aplicação do KConfig XT
-Name[pt_BR]=Aplicação do KConfig XT
-Name[ru]=Приложение TDE с KConfig XT
-Name[sk]=KConfig XT aplikácia
-Name[sr]=KConfig XT програм
-Name[sr@Latn]=KConfig XT program
-Name[sv]=KConfig XT-program
-Name[tr]=KConfig XT uygulaması
-Name[zh_CN]=KConfig XT 应用程序
-Name[zh_TW]=KConfig XT 應用程式
+Name=TDEConfig XT application
+Name[ca]=Aplicació TDEConfig XT
+Name[da]=TDEConfig XT program
+Name[de]=TDEConfigXT-Anwendung
+Name[el]=Εφαρμογή TDEConfig XT
+Name[es]=Aplicación TDEConfig XT
+Name[et]=TDEConfig XT rakendus
+Name[eu]=TDEConfig XT aplikazioa
+Name[fa]=کاربرد TDEConfig XT
+Name[fr]=Application TDEConfig XT
+Name[ga]=Feidhmchlár XT TDEConfig
+Name[gl]=Aplicación TDEConfig XT
+Name[hu]=TDEConfig XT-alapú alkalmazás
+Name[it]=Applicazione TDEConfig XT
+Name[ja]=TDEConfig XT アプリケーション
+Name[nds]=TDEConfig-XT-Programm
+Name[ne]=TDEConfig XT अनुप्रयोग
+Name[nl]=TDEConfig XT-toepassing
+Name[pl]=Program TDEConfig XT
+Name[pt]=Aplicação do TDEConfig XT
+Name[pt_BR]=Aplicação do TDEConfig XT
+Name[ru]=Приложение TDE с TDEConfig XT
+Name[sk]=TDEConfig XT aplikácia
+Name[sr]=TDEConfig XT програм
+Name[sr@Latn]=TDEConfig XT program
+Name[sv]=TDEConfig XT-program
+Name[tr]=TDEConfig XT uygulaması
+Name[zh_CN]=TDEConfig XT 应用程序
+Name[zh_TW]=TDEConfig XT 應用程式
 Category=C++/TDE
 Icon=kxt.png
 Comment=Generates a simple TDE application with one widget and a configuration dialog
@@ -238,32 +238,32 @@ Dest=%{dest}/configure.in.in
 
 [MSG]
 Type=message
-Comment=A KConfig XT application was created in %{dest}
-Comment[ca]=Una aplicació KConfig XT ha estat creada en %{dest}
-Comment[da]=Et KConfig XT-program blev oprettet i %{dest}
-Comment[de]=Eine KConfig-XT-Anwendung wurde in %{dest} erstellt
-Comment[el]=Μια εφαρμογή KConfig XT δημιουργήθηκε στο %{dest}
-Comment[es]=Una aplicación KConfig XT ha sido creada en %{dest}
-Comment[et]=A KConfig XT rakendus loodi asukohta %{dest}
-Comment[eu]=KConfig XT aplikazio bat sortu da hemen: %{dest}
-Comment[fa]=یک کاربرد KConfig XT در %{dest} ایجاد شد
-Comment[fr]=Une application KConfig XT a été créée dans %{dest}
-Comment[ga]=Cruthaíodh feidhmchlár XT KConfig i %{dest}
-Comment[gl]=Creouse unha aplicación KConfig XT en %{dest}
-Comment[hu]=Létrejött egy KConfig XT-alapú alkalmazás itt: %{dest}
-Comment[it]=È stata creata un'applicazione KConfig XT in %{dest}
-Comment[ja]=KConfig XT アプリケーションを %{dest} に作成しました
-Comment[nds]=In %{dest} wöör en KConfig-XT-Programm opstellt
-Comment[ne]=KConfig XT अनुप्रयोग %{dest} मा सिर्जना गरियो
-Comment[nl]=Een KConfig XT-toepassing is aangemaakt in %{dest}
-Comment[pl]=Program KConfig XT został utworzony w %{dest}
-Comment[pt]=Foi criada uma aplicação do KConfig XT em %{dest}
-Comment[pt_BR]=Foi criada uma aplicação do KConfig XT em %{dest}
-Comment[ru]=Приложение TDE с KConfig XT создано в %{dest}
-Comment[sk]=KConfig XT aplikácia bola vytvorená v %{dest}
-Comment[sr]=KConfig XT програм је направљен у %{dest}
-Comment[sr@Latn]=KConfig XT program je napravljen u %{dest}
-Comment[sv]=Ett KConfig XT-program skapades i %{dest}
-Comment[tr]=Bir KConfig XT uygulaması %{dest} içinde yaratıldı.
-Comment[zh_CN]=在 %{dest} 中创建了 KConfig XT 应用程序
-Comment[zh_TW]=一個 KConfig XT 應用程式已建立於 %{dest}
+Comment=A TDEConfig XT application was created in %{dest}
+Comment[ca]=Una aplicació TDEConfig XT ha estat creada en %{dest}
+Comment[da]=Et TDEConfig XT-program blev oprettet i %{dest}
+Comment[de]=Eine TDEConfig-XT-Anwendung wurde in %{dest} erstellt
+Comment[el]=Μια εφαρμογή TDEConfig XT δημιουργήθηκε στο %{dest}
+Comment[es]=Una aplicación TDEConfig XT ha sido creada en %{dest}
+Comment[et]=A TDEConfig XT rakendus loodi asukohta %{dest}
+Comment[eu]=TDEConfig XT aplikazio bat sortu da hemen: %{dest}
+Comment[fa]=یک کاربرد TDEConfig XT در %{dest} ایجاد شد
+Comment[fr]=Une application TDEConfig XT a été créée dans %{dest}
+Comment[ga]=Cruthaíodh feidhmchlár XT TDEConfig i %{dest}
+Comment[gl]=Creouse unha aplicación TDEConfig XT en %{dest}
+Comment[hu]=Létrejött egy TDEConfig XT-alapú alkalmazás itt: %{dest}
+Comment[it]=È stata creata un'applicazione TDEConfig XT in %{dest}
+Comment[ja]=TDEConfig XT アプリケーションを %{dest} に作成しました
+Comment[nds]=In %{dest} wöör en TDEConfig-XT-Programm opstellt
+Comment[ne]=TDEConfig XT अनुप्रयोग %{dest} मा सिर्जना गरियो
+Comment[nl]=Een TDEConfig XT-toepassing is aangemaakt in %{dest}
+Comment[pl]=Program TDEConfig XT został utworzony w %{dest}
+Comment[pt]=Foi criada uma aplicação do TDEConfig XT em %{dest}
+Comment[pt_BR]=Foi criada uma aplicação do TDEConfig XT em %{dest}
+Comment[ru]=Приложение TDE с TDEConfig XT создано в %{dest}
+Comment[sk]=TDEConfig XT aplikácia bola vytvorená v %{dest}
+Comment[sr]=TDEConfig XT програм је направљен у %{dest}
+Comment[sr@Latn]=TDEConfig XT program je napravljen u %{dest}
+Comment[sv]=Ett TDEConfig XT-program skapades i %{dest}
+Comment[tr]=Bir TDEConfig XT uygulaması %{dest} içinde yaratıldı.
+Comment[zh_CN]=在 %{dest} 中创建了 TDEConfig XT 应用程序
+Comment[zh_TW]=一個 TDEConfig XT 應用程式已建立於 %{dest}