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

260 files changed, 1004 insertions, 1004 deletions

diff --git a/kcontrol/TODO b/kcontrol/TODO
index 201b265ed..2e791d895 100644
--- a/kcontrol/TODO
+++ b/kcontrol/TODO
@@ -80,7 +80,7 @@ The desktop file is called "kcm_fonts" with "Name=Fonts" and "Categories=X-TDE-s
 
 * Remove old categories, for example X-TDE-settings-peripherals.
 
-* Convert all options in "Internet & Network/Preferences" to KConfigXT and then remove the KCM.
+* Convert all options in "Internet & Network/Preferences" to TDEConfigXT and then remove the KCM.
 
 * Remove "KDE Components" and put the KCMs elsewhere, most of them in "System". Wake up: a non KDE hacker can't differentiate between KDE and other parts of the system.
 
@@ -112,12 +112,12 @@ The desktop file is called "kcm_fonts" with "Name=Fonts" and "Categories=X-TDE-s
 * A lot, perhaps even the majority, violate the HIG by not displaying 
 properly in 800x600 (is it 800x600 or 1024x768?). For a start, someone needs to iterate through all KCMs and file bug reports for each missbehaving. See the KDE UI Guidelines.
 
-* KCMs needs to be converted to KConfigXT and use the global kdeglobals KConfigXT object.
+* KCMs needs to be converted to TDEConfigXT and use the global kdeglobals TDEConfigXT object.
 
 * Tons of KCMs and applications have options for selecting binaries which they use(frontends etc.). We need to be a little consistent here and adopt a general policy in this issue.
 If a binary is not in $PATH it is the distributors fault and not KDE. The reason we have a GUI is so people don't have to know about this kinds of internals. The options doesn't mean anything because users use KDE, they're not in run level 3("WTF? cdparanoia? diff? What's that?"). PATH options("Where to search for X") should be removed - it is up to the distributor. Options for selecting what binary to use should be moved out to KConfEdit - they have a use but are very rarely used.
 
-* Rewrite kcmshell to the new KCModuleProxy and fix bugs. Move it to tdelibs.
+* Rewrite kcmshell to the new TDECModuleProxy and fix bugs. Move it to tdelibs.
 
 --------------------------------------------------------------------------
 
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 01b5090de..48c649c9a 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -122,7 +122,7 @@ int KAccessApp::newInstance()
 
 void KAccessApp::readSettings()
 {
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
 
   // bell ---------------------------------------------------------------
 
@@ -790,7 +790,7 @@ void KAccessApp::applyChanges() {
    unsigned int enabled  = requestedFeatures & ~features;
    unsigned int disabled = features & ~requestedFeatures;
 
-   KConfig *config = TDEGlobal::config();
+   TDEConfig *config = TDEGlobal::config();
    config->setGroup("Keyboard");
 
    if (enabled & XkbSlowKeysMask)
@@ -823,7 +823,7 @@ void KAccessApp::yesClicked() {
       dialog->deleteLater();
    dialog = 0;
 
-   KConfig *config = TDEGlobal::config();
+   TDEConfig *config = TDEGlobal::config();
    config->setGroup("Keyboard");
    switch (showModeCombobox->currentItem()) {
       case 0:
@@ -854,7 +854,7 @@ void KAccessApp::noClicked() {
    dialog = 0;
    requestedFeatures = features;
 
-   KConfig *config = TDEGlobal::config();
+   TDEConfig *config = TDEGlobal::config();
    config->setGroup("Keyboard");
    switch (showModeCombobox->currentItem()) {
       case 0:
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 64cb290e9..218dbfbb4 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -101,7 +101,7 @@ void ExtendedIntNumInput::slotSliderValueChanged(int val)
 	m_spin->setValue ((int)floor(0.5 + linearVal));
 }
 
-static bool needToRunKAccessDaemon( KConfig *config )
+static bool needToRunKAccessDaemon( TDEConfig *config )
 {
 	// We always start the KAccess Daemon, if it is not needed,
 	// it will terminate itself after configuring the AccessX
@@ -222,7 +222,7 @@ TQString mouseKeysShortcut (Display *display) {
 }
 
 KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
-  : KCModule(parent, "kcmaccess")
+  : TDECModule(parent, "kcmaccess")
 {
 
   TDEAboutData *about =
@@ -602,7 +602,7 @@ void KAccessConfig::load()
 
 void KAccessConfig::load( bool useDefaults )
 {
-  KConfig *config = new KConfig("kaccessrc", true, false);
+  TDEConfig *config = new TDEConfig("kaccessrc", true, false);
 
   config->setGroup("Bell");
   config->setReadDefaults( useDefaults );
@@ -657,7 +657,7 @@ void KAccessConfig::load( bool useDefaults )
 
 void KAccessConfig::save()
 {
-  KConfig *config= new KConfig("kaccessrc", false);
+  TDEConfig *config= new TDEConfig("kaccessrc", false);
 
   config->setGroup("Bell");
 
@@ -707,7 +707,7 @@ void KAccessConfig::save()
       customBell->isChecked() ||
       visibleBell->isChecked())
   {
-    KConfig cfg("kdeglobals", false, false);
+    TDEConfig cfg("kdeglobals", false, false);
     cfg.setGroup("General");
     cfg.writeEntry("UseSystemBell", true);
     cfg.sync();
@@ -783,7 +783,7 @@ void KAccessConfig::checkAccess()
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_access(TQWidget *parent, const char *name)
+  KDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name)
   {
     return new KAccessConfig(parent, name);
   }
@@ -793,7 +793,7 @@ extern "C"
    */
   KDE_EXPORT void init_access()
   {
-    KConfig *config = new KConfig("kaccessrc", true, false);
+    TDEConfig *config = new TDEConfig("kaccessrc", true, false);
     bool run = needToRunKAccessDaemon( config );
 
     delete config;
diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h
index fac04aef4..0553979bc 100644
--- a/kcontrol/access/kcmaccess.h
+++ b/kcontrol/access/kcmaccess.h
@@ -57,7 +57,7 @@ class ExtendedIntNumInput : public KIntNumInput
 		int sliderMax;
 };
 
-class KAccessConfig : public KCModule
+class KAccessConfig : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/accessibility/accessibility.cpp b/kcontrol/accessibility/accessibility.cpp
index b22df15ff..b9dd2a734 100644
--- a/kcontrol/accessibility/accessibility.cpp
+++ b/kcontrol/accessibility/accessibility.cpp
@@ -38,8 +38,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_accessibility, AccessibilityFactory("kcmaccessib
  * This function checks if the kaccess daemon needs to be run
  * This function will be deprecated since the kaccess daemon will be part of kded
  */
-// static bool needToRunKAccessDaemon( KConfig *config ){
-//    KConfigGroup group( config, "Bell" );
+// static bool needToRunKAccessDaemon( TDEConfig *config ){
+//    TDEConfigGroup group( config, "Bell" );
 //
 //    if(!group.readBoolEntry("SystemBell", true)){
 //       return true;
@@ -85,7 +85,7 @@ void AccessibilityConfig::load( bool useDefaults )
 {
    kdDebug() << "Running: AccessibilityConfig::load()" << endl;
    
-   KConfig *bell = new KConfig("bellrc", true);
+   TDEConfig *bell = new TDEConfig("bellrc", true);
   
    bell->setReadDefaults( useDefaults );
 
@@ -114,7 +114,7 @@ void AccessibilityConfig::load( bool useDefaults )
 void AccessibilityConfig::save(){
    kdDebug() << "Running: AccessibilityConfig::save()" << endl;
    
-   KConfig *bell = new KConfig("bellrc");
+   TDEConfig *bell = new TDEConfig("bellrc");
    
    bell->setGroup("General");
    bell->writeEntry("SystemBell", systemBell->isChecked());
diff --git a/kcontrol/accessibility/accessibilityconfigwidget.ui b/kcontrol/accessibility/accessibilityconfigwidget.ui
index 773303a1b..43914c62d 100644
--- a/kcontrol/accessibility/accessibilityconfigwidget.ui
+++ b/kcontrol/accessibility/accessibilityconfigwidget.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AccessibilityConfigWidget</class>
 <author>José Pablo Ezequiel Fernández &lt;[email protected]&gt;</author>
-<widget class="KCModule">
+<widget class="TDECModule">
     <property name="name">
         <cstring>AccessibilityConfigWidget</cstring>
     </property>
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index c6a012fe7..feea9b1d1 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -55,7 +55,7 @@
 extern "C" {
 	KDE_EXPORT void init_arts();
 
-    KDE_EXPORT KCModule *create_arts(TQWidget *parent, const char* /*name*/)
+    KDE_EXPORT TDECModule *create_arts(TQWidget *parent, const char* /*name*/)
 	{
 		TDEGlobal::locale()->insertCatalogue("kcmarts");
 		return new KArtsModule(parent, "kcmarts" );
@@ -64,7 +64,7 @@ extern "C" {
 
 static bool startArts()
 {
-	KConfig *config = new KConfig("kcmartsrc", true, false);
+	TDEConfig *config = new TDEConfig("kcmartsrc", true, false);
 
 	config->setGroup("Arts");
 	bool startServer = config->readBoolEntry("StartServer",true);
@@ -139,7 +139,7 @@ void KArtsModule::slotProcessArtsdOutput(TDEProcess*, char* buf, int len)
 }
 
 KArtsModule::KArtsModule(TQWidget *parent, const char *name)
-  : KCModule(parent, name), configChanged(false)
+  : TDECModule(parent, name), configChanged(false)
 {
 	setButtons(Default|Apply);
 
@@ -157,7 +157,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
 
 	general = new generalTab(tab);
 	hardware = new hardwareTab(tab);
-	//mixer = KCModuleLoader::loadModule("kmixcfg", tab);
+	//mixer = TDECModuleLoader::loadModule("kmixcfg", tab);
 	//midi = new KMidConfig(tab, "kmidconfig");
 
 	general->layout()->setMargin( KDialog::marginHint() );
@@ -211,7 +211,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
 
 	};
 
-	config = new KConfig("kcmartsrc");
+	config = new TDEConfig("kcmartsrc");
 	load();
 
 	suspendTime->setRange( 1, 999, 1, true );
@@ -306,7 +306,7 @@ void KArtsModule::load( bool useDefaults )
 //	config->setGroup( "Mixer" );
 //	general->volumeSystray->setChecked( config->readBoolEntry( "VolumeControlOnSystray", true ) );
 
-	KConfig *midiConfig = new KConfig( "kcmmidirc", true );
+	TDEConfig *midiConfig = new TDEConfig( "kcmmidirc", true );
 
 	midiConfig->setGroup( "Configuration" );
 	hardware->midiDevice->setCurrentItem( midiConfig->readNumEntry( "midiDevice", 0 ) );
@@ -376,7 +376,7 @@ void KArtsModule::saveParams( void )
 //	config->setGroup( "Mixer" );
 //	config->writeEntry( "VolumeControlOnSystray", general->volumeSystray->isChecked() );
 
-	KConfig *midiConfig = new KConfig( "kcmmidirc", false );
+	TDEConfig *midiConfig = new TDEConfig( "kcmmidirc", false );
 
 	midiConfig->setGroup( "Configuration" );
 	midiConfig->writeEntry( "midiDevice", hardware->midiDevice->currentItem() );
@@ -385,7 +385,7 @@ void KArtsModule::saveParams( void )
 
 	delete midiConfig;
     
-    KConfig *knotifyConfig = new KConfig(  "knotifyrc", false );
+    TDEConfig *knotifyConfig = new TDEConfig(  "knotifyrc", false );
     
     knotifyConfig->setGroup(  "StartProgress" );
     knotifyConfig->writeEntry(  "Arts Init", startServer->isChecked() );
diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h
index 4e4b4fd81..fe30b4961 100644
--- a/kcontrol/arts/arts.h
+++ b/kcontrol/arts/arts.h
@@ -46,7 +46,7 @@
 class TDEProcess;
 class DeviceManager;
 
-class KArtsModule : public KCModule
+class KArtsModule : public TDECModule
 {
   Q_OBJECT
 
@@ -90,7 +90,7 @@ private:
   KIntNumInput *suspendTime;
   generalTab *general;
   hardwareTab *hardware;
-  KConfig *config;
+  TDEConfig *config;
   DeviceManager *deviceManager;
   int latestProcessStatus;
   int fragmentCount;
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index da216aaf3..5eae86c62 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -88,7 +88,7 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
 
    if (m_multidesktop)
    {
-      KConfig cfg(desktopConfigname(), false, false);
+      TDEConfig cfg(desktopConfigname(), false, false);
       cfg.setGroup( "General" );
       if (!cfg.readBoolEntry( "Enabled", true ))
       {
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 2905d7ac7..448eda455 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -66,7 +66,7 @@
 
 #define NR_PREDEF_PATTERNS 6
 
-BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
+BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
   : BGDialog_UI(parent, "BGDialog")
 {
    m_pGlobals = new TDEGlobalBackgroundSettings(_config);
@@ -1244,7 +1244,7 @@ void BGDialog::slotGetNewStuff()
    //FIXME set this to a server when we get one
    //should really be in a .rc file but could be either
    //kcmshellrc or kcontrolrc
-   KConfig* config = TDEGlobal::config();
+   TDEConfig* config = TDEGlobal::config();
    config->setGroup("KNewStuff");
    config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" );
    config->writeEntry( "StandardResource", "wallpaper" );
diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h
index 86e10a039..2a76acd52 100644
--- a/kcontrol/background/bgdialog.h
+++ b/kcontrol/background/bgdialog.h
@@ -36,7 +36,7 @@ class BGDialog : public BGDialog_UI
 {
    Q_OBJECT
 public:
-   BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop = true);
+   BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop = true);
    ~BGDialog();
 
    void load( bool useDefaults );
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 2c3da199f..164616c14 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -47,7 +47,7 @@
 /**** KBackgroundRenderer ****/
 
 
-KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config)
+KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config)
     : KBackgroundSettings(desk, screen, drawBackgroundPerScreen, config)
 {
     m_State = 0;
@@ -1019,7 +1019,7 @@ void KBackgroundRenderer::saveCacheFile()
 }
 
 //BEGIN class KVirtualBGRenderer
-KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
+KVirtualBGRenderer::KVirtualBGRenderer( int desk, TDEConfig *config )
 {
     m_pPixmap = 0l;
     m_desk = desk;
@@ -1038,7 +1038,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
         else
             configname.sprintf("kdesktop-screen-%drc", screen_number);
 
-        m_pConfig = new KConfig(configname, false, false);
+        m_pConfig = new TDEConfig(configname, false, false);
         m_bDeleteConfig = true;
     } else {
         m_pConfig = config;
diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h
index ee798894e..b10f4033c 100644
--- a/kcontrol/background/bgrender.h
+++ b/kcontrol/background/bgrender.h
@@ -23,7 +23,7 @@ class TQRect;
 class TQString;
 class TQTimer;
 
-class KConfig;
+class TDEConfig;
 class TDEProcess;
 class KTempFile;
 class KShellProcess;
@@ -42,7 +42,7 @@ class KBackgroundRenderer:
     Q_OBJECT
 
 public:
-    KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config=0);
+    KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config=0);
     ~KBackgroundRenderer();
     
     void load(int desk, int screen, bool drawBackgroundPerScreen, bool reparseConfig=true);
@@ -124,7 +124,7 @@ class KVirtualBGRenderer : public QObject
 {
     Q_OBJECT
 public:
-    KVirtualBGRenderer(int desk, KConfig *config=0l);
+    KVirtualBGRenderer(int desk, TDEConfig *config=0l);
     ~KVirtualBGRenderer();
     
     KBackgroundRenderer * renderer(unsigned screen);
@@ -162,7 +162,7 @@ private:
     TQSize renderSize(int screen); // the size the renderer should be
     void initRenderers();
     
-    KConfig *m_pConfig;
+    TDEConfig *m_pConfig;
     float m_scaleX;
     float m_scaleY;
     int m_desk;
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index d51995299..7bc17a215 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -415,7 +415,7 @@ TQStringList KBackgroundProgram::list()
 /**** KBackgroundSettings ****/
 
 
-KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config)
+KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config)
     : KBackgroundPattern(),
       KBackgroundProgram()
 {
@@ -501,7 +501,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou
         else
             configname.sprintf("kdesktop-screen-%drc", screen_number);
 
-        m_pConfig = new KConfig(configname, false, false);
+        m_pConfig = new TDEConfig(configname, false, false);
         m_bDeleteConfig = true;
     } else {
         m_pConfig = config;
@@ -1065,7 +1065,7 @@ void KBackgroundSettings::setEnabled(const bool enable)
 
 /**** TDEGlobalBackgroundSettings ****/
 
-TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(KConfig *_config)
+TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(TDEConfig *_config)
 {
     m_pConfig = _config;
 
diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h
index 03aa171e7..d007f5753 100644
--- a/kcontrol/background/bgsettings.h
+++ b/kcontrol/background/bgsettings.h
@@ -19,7 +19,7 @@
 template <class TQString, class T> class TQMap;
 class KStandardDirs;
 class KSimpleConfig;
-class KConfig;
+class TDEConfig;
 class TQString;
 class TQImage;
 
@@ -156,7 +156,7 @@ public:
      * mode) will be treated as one big display, and the "screen" paramater
      * will be ignored.
      */
-    KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config);
+    KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config);
     ~KBackgroundSettings();
 
     void copyConfig(const KBackgroundSettings*);
@@ -282,7 +282,7 @@ private:
     int m_CurrentWallpaper;
     TQString m_CurrentWallpaperName;
 
-    KConfig *m_pConfig;
+    TDEConfig *m_pConfig;
     KStandardDirs *m_pDirs;
     bool m_bDeleteConfig;
     bool m_bEnabled;
@@ -305,7 +305,7 @@ public:
 class TDEGlobalBackgroundSettings
 {
 public:
-    TDEGlobalBackgroundSettings(KConfig *config);
+    TDEGlobalBackgroundSettings(TDEConfig *config);
 
     TQString deskName(int desk);
     //void setDeskName(int desk, TQString name);
@@ -347,7 +347,7 @@ public:
 
     void readSettings();
     void writeSettings();
-    KConfig* getConfig() { return m_pConfig; }
+    TDEConfig* getConfig() { return m_pConfig; }
 
 private:
     bool dirty;
@@ -363,7 +363,7 @@ private:
     bool m_shadowEnabled;
     int m_textLines;
     int m_textWidth;
-    KConfig *m_pConfig;
+    TDEConfig *m_pConfig;
     bool m_bDeleteConfig;
     TQValueVector<bool> m_bDrawBackgroundPerScreen; // m_bDrawBackgroundPerScreen[desk]
 };
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index aab1f7bba..06d84ff86 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -42,7 +42,7 @@ KBackground::~KBackground( )
 }
 
 KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList &/* */)
-    : KCModule(KBackGndFactory::instance(), parent, name)
+    : TDECModule(KBackGndFactory::instance(), parent, name)
 {
     int screen_number = 0;
     if (tqt_xdisplay())
@@ -52,7 +52,7 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
 	configname = "kdesktoprc";
     else
 	configname.sprintf("kdesktop-screen-%drc", screen_number);
-    m_pConfig = new KConfig(configname, false, false);
+    m_pConfig = new TDEConfig(configname, false, false);
 
     TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_base = new BGDialog(this, m_pConfig);
diff --git a/kcontrol/background/main.h b/kcontrol/background/main.h
index 100d9c2b9..a879becd8 100644
--- a/kcontrol/background/main.h
+++ b/kcontrol/background/main.h
@@ -12,13 +12,13 @@
 
 #include <kcmodule.h>
 
-class KConfig;
+class TDEConfig;
 class BGDialog;
 
 /**
  * The Desktop/Background tab in kcontrol.
  */
-class KBackground: public KCModule
+class KBackground: public TDECModule
 {
     Q_OBJECT
 
@@ -33,7 +33,7 @@ public:
 
 private:
     BGDialog      *m_base;
-    KConfig       *m_pConfig;
+    TDEConfig       *m_pConfig;
 };
 
 
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index eff4eb2aa..0c04a8aa4 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -40,7 +40,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_bell(TQWidget *parent, const char *)
+  KDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *)
   {
     return new KBellConfig(parent, "kcmbell");
   }
@@ -52,7 +52,7 @@ extern "C"
 
     XGetKeyboardControl(kapp->getDisplay(), &kbd);
 
-    KConfig config("kcmbellrc", true, false);
+    TDEConfig config("kcmbellrc", true, false);
     config.setGroup("General");
 
     kbdc.bell_percent = config.readNumEntry("Volume", kbd.bell_percent);
@@ -65,7 +65,7 @@ extern "C"
 }
 
 KBellConfig::KBellConfig(TQWidget *parent, const char *name):
-    KCModule(parent, name)
+    TDECModule(parent, name)
 {
   TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
@@ -160,7 +160,7 @@ void KBellConfig::load( bool useDefaults )
   m_pitch->setValue(kbd.bell_pitch);
   m_duration->setValue(kbd.bell_duration);
 
-  KConfig cfg("kdeglobals", false, false);
+  TDEConfig cfg("kdeglobals", false, false);
   cfg.setReadDefaults(  useDefaults );
   cfg.setGroup("General");
   m_useBell->setChecked(cfg.readBoolEntry("UseSystemBell", false));
@@ -183,7 +183,7 @@ void KBellConfig::save()
                          KBBellPercent | KBBellPitch | KBBellDuration,
                          &kbd);
 
-  KConfig config("kcmbellrc", false, false);
+  TDEConfig config("kcmbellrc", false, false);
   config.setGroup("General");
   config.writeEntry("Volume",bellVolume);
   config.writeEntry("Pitch",bellPitch);
@@ -191,14 +191,14 @@ void KBellConfig::save()
 
   config.sync();
 
-  KConfig cfg("kdeglobals", false, false);
+  TDEConfig cfg("kdeglobals", false, false);
   cfg.setGroup("General");
   cfg.writeEntry("UseSystemBell", m_useBell->isChecked());
   cfg.sync();
   
   if (!m_useBell->isChecked())
   {
-    KConfig config("kaccessrc", false);
+    TDEConfig config("kaccessrc", false);
 
     config.setGroup("Bell");
     config.writeEntry("SystemBell", false);
diff --git a/kcontrol/bell/bell.h b/kcontrol/bell/bell.h
index 0abc1a371..da7d184bc 100644
--- a/kcontrol/bell/bell.h
+++ b/kcontrol/bell/bell.h
@@ -27,7 +27,7 @@ class TQCheckBox;
 class KIntNumInput;
 class TQPushButton;
 
-class KBellConfig : public KCModule
+class KBellConfig : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index e291387c0..663b4735e 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -240,7 +240,7 @@ void Dtime::configChanged(){
 
 void Dtime::load()
 {
-  KConfig config("kcmclockrc", true, false);
+  TDEConfig config("kcmclockrc", true, false);
   config.setGroup("NTP");
   timeServerList->insertStringList(TQStringList::split(',', config.readEntry("servers",
     i18n("Public Time Server (pool.ntp.org),\
@@ -263,7 +263,7 @@ oceania.pool.ntp.org"))));
 
 void Dtime::save()
 {
-  KConfig config("kcmclockrc", false, false);
+  TDEConfig config("kcmclockrc", false, false);
   config.setGroup("NTP");
 
   // Save the order, but don't duplicate!
diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp
index 5885c2594..1908e8010 100644
--- a/kcontrol/clock/main.cpp
+++ b/kcontrol/clock/main.cpp
@@ -40,7 +40,7 @@ typedef KGenericFactory<KclockModule, TQWidget> KlockModuleFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_clock, KlockModuleFactory("kcmkclock"))
 
 KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(KlockModuleFactory::instance(), parent, name)
+  : TDECModule(KlockModuleFactory::instance(), parent, name)
 {
   TDEAboutData *about =
   new TDEAboutData(I18N_NOOP("kcmclock"), I18N_NOOP("TDE Clock Control Module"),
diff --git a/kcontrol/clock/main.h b/kcontrol/clock/main.h
index 8e178291a..82e501dfc 100644
--- a/kcontrol/clock/main.h
+++ b/kcontrol/clock/main.h
@@ -28,7 +28,7 @@ class Tzone;
 class TQTabWidget;
 
 
-class KclockModule : public KCModule
+class KclockModule : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp
index 9498a062a..541f0cf83 100644
--- a/kcontrol/clock/tzone.cpp
+++ b/kcontrol/clock/tzone.cpp
@@ -176,7 +176,7 @@ void Tzone::save()
 		//After the KDE 3.2 release, need to add an error message
 	}
 	else
-		if (!KIO::NetAccess::file_copy(KURL(tz),KURL("/etc/localtime")))
+		if (!TDEIO::NetAccess::file_copy(KURL(tz),KURL("/etc/localtime")))
 			KMessageBox::error( 0,  i18n("Error setting new timezone."),
                         		    i18n("Timezone Error"));
 
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 8bf7607ce..32fa1125f 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -93,7 +93,7 @@ TQPixmap mkColorPreview(const WidgetCanvas *cs)
 /**** KColorScheme ****/
 
 KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringList &)
-    : KCModule(KolorFactory::instance(), parent, name)
+    : TDECModule(KolorFactory::instance(), parent, name)
 {
     nSysSchemes = 2;
 
@@ -110,7 +110,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
        " Non-TDE applications may also obey some or all of the color"
        " settings, if this option is enabled."));
 
-    KConfig *cfg = new KConfig("kcmdisplayrc");
+    TDEConfig *cfg = new TDEConfig("kcmdisplayrc");
     cfg->setGroup("X11");
     useRM = cfg->readBoolEntry("useResourceManager", true);
     delete cfg;
@@ -308,7 +308,7 @@ void KColorScheme::load()
 }
 void KColorScheme::load( bool useDefaults )
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setReadDefaults(  useDefaults );
     config->setGroup("KDE");
     sCurrentScheme = config->readEntry("colorScheme");
@@ -324,7 +324,7 @@ void KColorScheme::load( bool useDefaults )
     sb->setValue(cs->contrast);
     sb->blockSignals(false);
 
-    KConfig cfg("kcmdisplayrc", true, false);
+    TDEConfig cfg("kcmdisplayrc", true, false);
     cfg.setGroup("X11");
     bool exportColors = cfg.readBoolEntry("exportKDEColors", true);
     cbExportColors->setChecked(exportColors);
@@ -335,7 +335,7 @@ void KColorScheme::load( bool useDefaults )
 
 void KColorScheme::save()
 {
-    KConfig *cfg = TDEGlobal::config();
+    TDEConfig *cfg = TDEGlobal::config();
     cfg->setGroup( "General" );
     cfg->writeEntry("background", cs->back, true, true);
     cfg->writeEntry("selectBackground", cs->select, true, true);
@@ -383,7 +383,7 @@ void KColorScheme::save()
     config->sync();
     delete config;
 
-    KConfig cfg2("kcmdisplayrc", false, false);
+    TDEConfig cfg2("kcmdisplayrc", false, false);
     cfg2.setGroup("X11");
     bool exportColors = cbExportColors->isChecked();
     cfg2.writeEntry("exportKDEColors", exportColors);
@@ -587,9 +587,9 @@ void KColorScheme::slotImport()
 		return;
 
 	//kdDebug() << "Location: " << location << endl;
-	if (!KIO::NetAccess::file_copy(file, KURL( location+file.fileName( false ) ) ) )
+	if (!TDEIO::NetAccess::file_copy(file, KURL( location+file.fileName( false ) ) ) )
 	{
-		KMessageBox::error(this, KIO::NetAccess::lastErrorString(),i18n("Import failed."));
+		KMessageBox::error(this, TDEIO::NetAccess::lastErrorString(),i18n("Import failed."));
 		return;
 	}
 	else
@@ -700,7 +700,7 @@ void KColorScheme::slotWidgetColor(int indx)
     if (wcCombo->currentItem() != indx)
         wcCombo->setCurrentItem( indx );
 
-    // Do not emit KCModule::changed()
+    // Do not emit TDECModule::changed()
     colorButton->blockSignals( true );
 
     TQColor col = color(indx);
@@ -734,7 +734,7 @@ void KColorScheme::slotShadeSortColumnChanged(bool b)
  */
 void KColorScheme::readScheme( int index )
 {
-    KConfigBase* config;
+    TDEConfigBase* config;
 
     TQColor widget(239, 239, 239);
     TQColor trinity4Blue(103,141,178);
diff --git a/kcontrol/colors/colorscm.h b/kcontrol/colors/colorscm.h
index c2e19d421..edc14325d 100644
--- a/kcontrol/colors/colorscm.h
+++ b/kcontrol/colors/colorscm.h
@@ -27,14 +27,14 @@ class KLineEdit;
 class TQPalette;
 class KListBox;
 class KColorButton;
-class KConfig;
+class TDEConfig;
 class KStdDirs;
 class KColorSchemeList;
 
 /**
  * The Desktop/Colors tab in kcontrol.
  */
-class KColorScheme: public KCModule
+class KColorScheme: public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index db39d21be..a0e59323d 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -278,7 +278,7 @@ void WidgetCanvas::drawSampleWidgets()
     int textLen, tmp;
     int highlightVal, lowlightVal;
 
-    KConfig * c = new KConfig("kcmfonts");
+    TDEConfig * c = new TDEConfig("kcmfonts");
 
     // Keep in sync with kglobalsettings.
 
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index 616c98a50..c2d5305c5 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -61,13 +61,13 @@ void CfgComponent::slotComponentChanged(const TQString&) {
 	emit changed(true);
 }
 
-void CfgComponent::save(KConfig *cfg) {
+void CfgComponent::save(TDEConfig *cfg) {
 		// yes, this can happen if there are NO KTrader offers for this component
 		if (!m_lookupDict[ComponentSelector->currentText()])
 			return;
 
 		TQString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure");
-		KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null"));
+		TDEConfig *store = new TDEConfig(cfg->readPathEntry("storeInFile","null"));
 		store->setGroup(cfg->readEntry("valueSection"));
 		store->writePathEntry(cfg->readEntry("valueName","kcm_componenchooser_null"),*m_lookupDict[ComponentSelector->currentText()]);
 		store->sync();
@@ -75,7 +75,7 @@ void CfgComponent::save(KConfig *cfg) {
 		emit changed(false);
 }
 
-void CfgComponent::load(KConfig *cfg) {
+void CfgComponent::load(TDEConfig *cfg) {
 
 	ComponentSelector->clear();
 	m_lookupDict.clear();
@@ -93,7 +93,7 @@ void CfgComponent::load(KConfig *cfg) {
 		m_revLookupDict.insert((*tit)->desktopEntryName(),new TQString((*tit)->name()));
 	}
 
-	KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null"));
+	TDEConfig *store = new TDEConfig(cfg->readPathEntry("storeInFile","null"));
         store->setGroup(cfg->readEntry("valueSection"));
 	TQString setting=store->readEntry(cfg->readEntry("valueName","kcm_componenchooser_null"));
         delete store;
@@ -139,7 +139,7 @@ void CfgEmailClient::defaults()
     load(0L);
 }
 
-void CfgEmailClient::load(KConfig *)
+void CfgEmailClient::load(TDEConfig *)
 {
 	TQString emailClient = pSettings->getSetting(KEMailSettings::ClientProgram);
 	bool useKMail = (emailClient.isEmpty());
@@ -169,7 +169,7 @@ void CfgEmailClient::selectEmailClient()
 	TQString client = dlg.text();
 
 	// get the preferred Terminal Application 
-	KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
+	TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
 	TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
 	preferredTerminal += TQString::fromLatin1(" -e ");
 	
@@ -184,7 +184,7 @@ void CfgEmailClient::selectEmailClient()
 }
 
 
-void CfgEmailClient::save(KConfig *)
+void CfgEmailClient::save(TDEConfig *)
 {
 	if (kmailCB->isChecked())
 	{
@@ -234,8 +234,8 @@ void CfgTerminalEmulator::defaults()
 }
 
 
-void CfgTerminalEmulator::load(KConfig *) {
-	KConfig *config = new KConfig("kdeglobals", true);
+void CfgTerminalEmulator::load(TDEConfig *) {
+	TDEConfig *config = new TDEConfig("kdeglobals", true);
 	config->setGroup("General");
 	TQString terminal = config->readPathEntry("TerminalApplication","konsole");
 	if (terminal == "konsole")
@@ -253,9 +253,9 @@ void CfgTerminalEmulator::load(KConfig *) {
 	emit changed(false);
 }
 
-void CfgTerminalEmulator::save(KConfig *) {
+void CfgTerminalEmulator::save(TDEConfig *) {
 
-	KConfig *config = new KConfig("kdeglobals");
+	TDEConfig *config = new TDEConfig("kdeglobals");
 	config->setGroup("General");
 	config->writePathEntry("TerminalApplication",terminalCB->isChecked()?"konsole":terminalLE->text(), true, true);
 	config->sync();
@@ -306,8 +306,8 @@ void CfgBrowser::defaults()
 }
 
 
-void CfgBrowser::load(KConfig *) {
-	KConfig *config = new KConfig("kdeglobals", true);
+void CfgBrowser::load(TDEConfig *) {
+	TDEConfig *config = new TDEConfig("kdeglobals", true);
 	config->setGroup("General");
 	TQString exec = config->readEntry("BrowserApplication");
 	if (exec.isEmpty())
@@ -340,9 +340,9 @@ void CfgBrowser::load(KConfig *) {
 	emit changed(false);
 }
 
-void CfgBrowser::save(KConfig *) {
+void CfgBrowser::save(TDEConfig *) {
 
-	KConfig *config = new KConfig("kdeglobals");
+	TDEConfig *config = new TDEConfig("kdeglobals");
 	config->setGroup("General");
 	TQString exec;
 	if (radioExec->isChecked())
diff --git a/kcontrol/componentchooser/componentchooser.h b/kcontrol/componentchooser/componentchooser.h
index af5d688ab..0407989cf 100644
--- a/kcontrol/componentchooser/componentchooser.h
+++ b/kcontrol/componentchooser/componentchooser.h
@@ -28,7 +28,7 @@
 
 class TQListBoxItem;
 class KEMailSettings;
-class KConfig;
+class TDEConfig;
 
 /* The CfgPlugin  class is an exception. It is LGPL. It will be parted of the plugin interface
 	which I plan for KDE 3.2.
@@ -38,8 +38,8 @@ class CfgPlugin
 public:
 	CfgPlugin(){};
 	virtual ~CfgPlugin(){};
-	virtual void load(KConfig *cfg)=0;
-	virtual void save(KConfig *cfg)=0;
+	virtual void load(TDEConfig *cfg)=0;
+	virtual void save(TDEConfig *cfg)=0;
 	virtual void defaults()=0;
 };
 
@@ -50,8 +50,8 @@ Q_OBJECT
 public:
 	CfgComponent(TQWidget *parent);
 	virtual ~CfgComponent();
-	virtual void load(KConfig *cfg);
-	virtual void save(KConfig *cfg);
+	virtual void load(TDEConfig *cfg);
+	virtual void save(TDEConfig *cfg);
 	virtual void defaults();
 
 protected:
@@ -70,8 +70,8 @@ Q_OBJECT
 public:
 	CfgEmailClient(TQWidget *parent);
 	virtual ~CfgEmailClient();
-	virtual void load(KConfig *cfg);
-	virtual void save(KConfig *cfg);
+	virtual void load(TDEConfig *cfg);
+	virtual void save(TDEConfig *cfg);
 	virtual void defaults();
 
 private:
@@ -90,8 +90,8 @@ Q_OBJECT
 public:
 	CfgTerminalEmulator(TQWidget *parent);
 	virtual ~CfgTerminalEmulator();
-	virtual void load(KConfig *cfg);
-	virtual void save(KConfig *cfg);
+	virtual void load(TDEConfig *cfg);
+	virtual void save(TDEConfig *cfg);
 	virtual void defaults();
 
 protected slots:
@@ -108,8 +108,8 @@ Q_OBJECT
 public:
 	CfgBrowser(TQWidget *parent);
 	virtual ~CfgBrowser();
-	virtual void load(KConfig *cfg);
-	virtual void save(KConfig *cfg);
+	virtual void load(TDEConfig *cfg);
+	virtual void save(TDEConfig *cfg);
 	virtual void defaults();
 
 protected slots:
diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp
index 2e80ad145..84425a7b1 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.cpp
+++ b/kcontrol/componentchooser/kcm_componentchooser.cpp
@@ -23,7 +23,7 @@
 
 
 KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ):
-	KCModule(parent,name) {
+	TDECModule(parent,name) {
 
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 	m_chooser=new ComponentChooser(this,"ComponentChooser");
@@ -55,7 +55,7 @@ void KCMComponentChooser::defaults(){
 
 extern "C"
 {
-    KDE_EXPORT KCModule *create_componentchooser( TQWidget *parent, const char * )
+    KDE_EXPORT TDECModule *create_componentchooser( TQWidget *parent, const char * )
     {
         TDEGlobal::locale()->insertCatalogue("kcmcomponentchooser");
         return new KCMComponentChooser( parent, "kcmcomponentchooser" );
diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h
index f2c68b3bd..905c0a9b5 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.h
+++ b/kcontrol/componentchooser/kcm_componentchooser.h
@@ -22,7 +22,7 @@
 
 class TDEAboutData;
 
-class KCMComponentChooser : public KCModule
+class KCMComponentChooser : public TDECModule
 {
     Q_OBJECT
 public:
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index 6bdc6478f..c718184ba 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -217,7 +217,7 @@ TQString CAItem::configName() const
 
 
 KCryptoConfig::KCryptoConfig(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(KryptoFactory::instance(), parent, name)
+  : TDECModule(KryptoFactory::instance(), parent, name)
 {
 TQGridLayout *grid;
 TQBoxLayout *top = new TQVBoxLayout(this);
@@ -307,7 +307,7 @@ TQString whatstr;
 #endif
 
   // no need to parse kdeglobals.
-  config = new KConfig("cryptodefaults", false, false);
+  config = new TDEConfig("cryptodefaults", false, false);
   policies = new KSimpleConfig("ksslpolicies", false);
   pcerts = new KSimpleConfig("ksslcertificates", false);
   authcfg = new KSimpleConfig("ksslauthmap", false);
@@ -1009,7 +1009,7 @@ void KCryptoConfig::load( bool useDefaults )
   }
 
   groups = _signers->list();
-  KConfig sigcfg("ksslcalist", true, false);
+  TDEConfig sigcfg("ksslcalist", true, false);
   caList->clear();
   for (TQStringList::Iterator i = groups.begin();
                              i != groups.end();
@@ -2066,7 +2066,7 @@ void KCryptoConfig::slotCARestore() {
 
 
   TQStringList groups = _signers->list();
-  KConfig sigcfg("ksslcalist", true, false);
+  TDEConfig sigcfg("ksslcalist", true, false);
 
   for (TQStringList::Iterator i = groups.begin();
                              i != groups.end();
diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h
index 514012e71..efcef6072 100644
--- a/kcontrol/crypto/crypto.h
+++ b/kcontrol/crypto/crypto.h
@@ -215,7 +215,7 @@ private:
 
 
 
-class KCryptoConfig : public KCModule
+class KCryptoConfig : public TDECModule
 {
   Q_OBJECT
 public:
@@ -352,9 +352,9 @@ private:
   KSSLSigners *_signers;
   TQLabel *cHash;
 
-  KConfig *config;
+  TDEConfig *config;
   KSimpleConfig *policies, *pcerts, *authcfg;
-  KConfig *cacfg;
+  TDEConfig *cacfg;
 
   bool ___lehack;       // to hack around a lineedit problem
 };
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index e956edccb..4b1ba47ea 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -26,7 +26,7 @@ typedef KGenericFactory<CSSConfig, TQWidget> CSSFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_css, CSSFactory("kcmcss") )
 
 CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(CSSFactory::instance(), parent, name)
+  : TDECModule(CSSFactory::instance(), parent, name)
 {
   customDialogBase = new KDialogBase(this, "customCSSDialog", true, TQString::null, 
         KDialogBase::Close, KDialogBase::Close, true );
@@ -104,7 +104,7 @@ void CSSConfig::load()
 
 void CSSConfig::load( bool useDefaults )
 {
-  KConfig *c = new KConfig("kcmcssrc", false, false);
+  TDEConfig *c = new TDEConfig("kcmcssrc", false, false);
   c->setReadDefaults( useDefaults );
 
   c->setGroup("Stylesheet");
@@ -151,7 +151,7 @@ void CSSConfig::load( bool useDefaults )
 void CSSConfig::save()
 {
   // write to config file
-  KConfig *c = new KConfig("kcmcssrc", false, false);
+  TDEConfig *c = new TDEConfig("kcmcssrc", false, false);
 
   c->setGroup("Stylesheet");
   if (configDialog->useDefault->isChecked())
@@ -200,7 +200,7 @@ void CSSConfig::save()
     }
 
   // make konqueror use the right stylesheet
-  c = new KConfig("konquerorrc", false, false);
+  c = new TDEConfig("konquerorrc", false, false);
 
   c->setGroup("HTML Settings");
   c->writeEntry("UserStyleSheetEnabled", !configDialog->useDefault->isChecked());
diff --git a/kcontrol/css/kcmcss.h b/kcontrol/css/kcmcss.h
index 164f22dae..585452b3e 100644
--- a/kcontrol/css/kcmcss.h
+++ b/kcontrol/css/kcmcss.h
@@ -29,7 +29,7 @@ class CSSCustomDialog;
 class KDialogBase;
 
 
-class CSSConfig : public KCModule
+class CSSConfig : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp
index 189d4723b..f9a27ca92 100644
--- a/kcontrol/display/display.cpp
+++ b/kcontrol/display/display.cpp
@@ -31,7 +31,7 @@ typedef KGenericFactory<KCMDisplay, TQWidget> DisplayFactory;
 K_EXPORT_COMPONENT_FACTORY ( kcm_display, DisplayFactory( "display" ) )
 
 KCMDisplay::KCMDisplay( TQWidget *parent, const char *name, const TQStringList& )
-    : KCModule( parent, name )
+    : TDECModule( parent, name )
     , m_changed(false)
 {
   m_tabs = new TQTabWidget( this );
@@ -56,7 +56,7 @@ void KCMDisplay::addTab( const TQString &name, const TQString &label )
   TQWidget *page = new TQWidget( m_tabs, name.latin1() );
   TQVBoxLayout *top = new TQVBoxLayout( page, KDialog::marginHint() );
 
-  KCModule *kcm = KCModuleLoader::loadModule( name, page );
+  TDECModule *kcm = TDECModuleLoader::loadModule( name, page );
 
   if ( kcm )
   {
@@ -72,20 +72,20 @@ void KCMDisplay::addTab( const TQString &name, const TQString &label )
 
 void KCMDisplay::load()
 {
-  for (TQMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it)
+  for (TQMap<TDECModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it)
     it.key()->load();
 }
 
 void KCMDisplay::save()
 {
-  for (TQMap<KCModule*, bool>::Iterator it = m_modules.begin(); it != m_modules.end(); ++it)
+  for (TQMap<TDECModule*, bool>::Iterator it = m_modules.begin(); it != m_modules.end(); ++it)
     if (it.data())
       it.key()->save();
 }
 
 void KCMDisplay::moduleChanged( bool isChanged )
 {
-  TQMap<KCModule*, bool>::Iterator currentModule = m_modules.find(static_cast<KCModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())))));
+  TQMap<TDECModule*, bool>::Iterator currentModule = m_modules.find(static_cast<TDECModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())))));
   Q_ASSERT(currentModule != m_modules.end());
   if (currentModule.data() == isChanged)
     return;
@@ -94,7 +94,7 @@ void KCMDisplay::moduleChanged( bool isChanged )
 
   bool c = false;
   
-  for (TQMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) {
+  for (TQMap<TDECModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) {
     if (it.data()) {
       c = true;
       break;
diff --git a/kcontrol/display/display.h b/kcontrol/display/display.h
index 5696717ff..bb5d44e6f 100644
--- a/kcontrol/display/display.h
+++ b/kcontrol/display/display.h
@@ -24,7 +24,7 @@
 
 class TQTabWidget;
 
-class KCMDisplay : public KCModule
+class KCMDisplay : public TDECModule
 {
   Q_OBJECT
 
@@ -40,7 +40,7 @@ class KCMDisplay : public KCModule
     void addTab( const TQString &name, const TQString &label );
     
     TQTabWidget *m_tabs;
-    TQMap<KCModule*, bool> m_modules;
+    TQMap<TDECModule*, bool> m_modules;
     bool m_changed;
 };
 
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 7a7ccc318..046ad9e16 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -740,7 +740,7 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) {
 /**** KDisplayConfig ****/
 
 KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0)
+  : TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0)
 {
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
@@ -1905,13 +1905,13 @@ void KDisplayConfig::processLockoutControls() {
 	base->loadExistingProfile->hide();		// Same as above
 }
 
-KCModule* KDisplayConfig::addTab( const TQString name, const TQString label )
+TDECModule* KDisplayConfig::addTab( const TQString name, const TQString label )
 {
 	// [FIXME] This is incomplete...Apply may not work...
 	TQWidget *page = new TQWidget( base->mainTabContainerWidget, name.latin1() );
 	TQVBoxLayout *top = new TQVBoxLayout( page, KDialog::marginHint() );
 
-	KCModule *kcm = KCModuleLoader::loadModule( name, page );
+	TDECModule *kcm = TDECModuleLoader::loadModule( name, page );
 
 	if ( kcm )
 	{
diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h
index 62e53209f..af3e971ee 100644
--- a/kcontrol/displayconfig/displayconfig.h
+++ b/kcontrol/displayconfig/displayconfig.h
@@ -40,13 +40,13 @@
 #include "monitorworkspace.h"
 #include "displayconfigbase.h"
 
-class KConfig;
+class TDEConfig;
 class KPopupMenu;
 class KListViewItem;
 
 typedef TQMap< TQString, TQPtrList< SingleScreenData > > ScreenConfigurationMap;
 
-class KDisplayConfig : public KCModule, public DCOPObject
+class KDisplayConfig : public TDECModule, public DCOPObject
 {
   K_DCOP
   Q_OBJECT
@@ -70,8 +70,8 @@ k_dcop:
 
 private:
 
-	KConfig *config;
-	KCModule *iccTab;
+	TDEConfig *config;
+	TDECModule *iccTab;
 	bool _ok;
 	Display *randr_display;
 	ScreenInfo *randr_screen_info;
@@ -91,7 +91,7 @@ private:
 	TQString startupProfileName;
 	int realResolutionSliderValue();
 	void setRealResolutionSliderValue(int index);
-	KCModule* addTab( const TQString name, const TQString label );
+	TDECModule* addTab( const TQString name, const TQString label );
 	void moveMonitor(DraggableMonitor* monitor, int realx, int realy);
 	bool applyMonitorLayoutRules(void);
 	bool applyMonitorLayoutRules(DraggableMonitor* primary_monitor);
diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index 67ddea42e..fdb6ebf6f 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ConfigDialog</class>
-<widget class="KCModule">
+<widget class="TDECModule">
     <property name="name">
         <cstring>ConfigDialog</cstring>
     </property>
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index 8cb993476..37940be95 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -85,7 +85,7 @@ KCMDnssd::~KCMDnssd()
 void KCMDnssd::save()
 {
 	setCursor(TQCursor(Qt::BusyCursor));
-	KCModule::save();
+	TDECModule::save();
 	if (geteuid()==0 && m_wdchanged) saveMdnsd(); 
 	domain->setFileWriteMode(0644); // this should be readable for everyone
 	domain->writeEntry("PublishDomain",domainedit->text());
@@ -132,7 +132,7 @@ void KCMDnssd::load()
 	} else if (exitStatus == 2) { // custom setup
 	  enableZeroconf->setEnabled(false);
 	}
-	KCModule::load();
+	TDECModule::load();
 }
 
 // hack to work around not working isModified() for KPasswordEdit
diff --git a/kcontrol/ebrowsing/filteropts.cpp b/kcontrol/ebrowsing/filteropts.cpp
index a9c7801d6..d2f0f66f8 100644
--- a/kcontrol/ebrowsing/filteropts.cpp
+++ b/kcontrol/ebrowsing/filteropts.cpp
@@ -30,7 +30,7 @@
 #include "filteropts.h"
 
 FilterOptions::FilterOptions(TQWidget *parent, const char *name)
-    		  :KCModule(parent, name)
+    		  :TDECModule(parent, name)
 {
 
     TQGridLayout *lay = new TQGridLayout(this, 1, 1, 10, 5);
diff --git a/kcontrol/ebrowsing/filteropts.h b/kcontrol/ebrowsing/filteropts.h
index c8338c031..144525e9b 100644
--- a/kcontrol/ebrowsing/filteropts.h
+++ b/kcontrol/ebrowsing/filteropts.h
@@ -27,7 +27,7 @@
 
 class TQListBox;
 
-class FilterOptions : public KCModule
+class FilterOptions : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/ebrowsing/main.cpp b/kcontrol/ebrowsing/main.cpp
index 7e259a26b..9eeec46e1 100644
--- a/kcontrol/ebrowsing/main.cpp
+++ b/kcontrol/ebrowsing/main.cpp
@@ -41,7 +41,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kurifilt, KURIFactory("kcmkurifilt") )
 class FilterOptions;
 
 KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQStringList &)
-                 :KCModule(KURIFactory::instance(), parent, name)
+                 :TDECModule(KURIFactory::instance(), parent, name)
 {
 
     filter = KURIFilter::self();
@@ -66,11 +66,11 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
 
     modules.setAutoDelete(true);
 
-    TQMap<TQString,KCModule*> helper;
+    TQMap<TQString,TDECModule*> helper;
     TQPtrListIterator<KURIFilterPlugin> it = filter->pluginsIterator();
     for (; it.current(); ++it)
     {
-        KCModule *module = it.current()->configModule(this, 0);
+        TDECModule *module = it.current()->configModule(this, 0);
         if (module)
         {
             modules.append(module);
@@ -83,7 +83,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
     {
         TQTabWidget *tab = new TQTabWidget(this);
 
-        TQMapIterator<TQString,KCModule*> it2;
+        TQMapIterator<TQString,TDECModule*> it2;
         for (it2 = helper.begin(); it2 != helper.end(); ++it2)
         {
             tab->addTab(it2.data(), it2.key());
@@ -103,7 +103,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
 
 void KURIFilterModule::load()
 {
-    TQPtrListIterator<KCModule> it(modules);
+    TQPtrListIterator<TDECModule> it(modules);
     for (; it.current(); ++it)
     {
 	  it.current()->load();
@@ -112,7 +112,7 @@ void KURIFilterModule::load()
 
 void KURIFilterModule::save()
 {
-    TQPtrListIterator<KCModule> it(modules);
+    TQPtrListIterator<TDECModule> it(modules);
     for (; it.current(); ++it)
     {
 	  it.current()->save();
@@ -121,7 +121,7 @@ void KURIFilterModule::save()
 
 void KURIFilterModule::defaults()
 {
-    TQPtrListIterator<KCModule> it(modules);
+    TQPtrListIterator<TDECModule> it(modules);
     for (; it.current(); ++it)
     {
 	  it.current()->defaults();
diff --git a/kcontrol/ebrowsing/main.h b/kcontrol/ebrowsing/main.h
index 8508b0a0b..94780c995 100644
--- a/kcontrol/ebrowsing/main.h
+++ b/kcontrol/ebrowsing/main.h
@@ -29,7 +29,7 @@
 
 class KURIFilter;
 
-class KURIFilterModule : public KCModule {
+class KURIFilterModule : public TDECModule {
     Q_OBJECT
 
 public:
@@ -45,7 +45,7 @@ private:
 
     TQWidget *widget;
     FilterOptions *opts;
-    TQPtrList<KCModule> modules;
+    TQPtrList<TDECModule> modules;
 };
 
 #endif
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index 2c04835c9..3073250f7 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -76,7 +76,7 @@ private:
 };
 
 FilterOptions::FilterOptions(TDEInstance *instance, TQWidget *parent, const char *name)
-              :KCModule(instance, parent, name)
+              :TDECModule(instance, parent, name)
 {
     TQVBoxLayout *mainLayout = new TQVBoxLayout( this, KDialog::marginHint(),
         KDialog::spacingHint());
@@ -114,7 +114,7 @@ void FilterOptions::load( bool useDefaults )
     // Clear state first.
     m_dlg->lvSearchProviders->clear();
 
-    KConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false );
+    TDEConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false );
 
     config.setReadDefaults( useDefaults );
 
@@ -207,7 +207,7 @@ void FilterOptions::setDelimiter (char sep)
 
 void FilterOptions::save()
 {
-  KConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false );
+  TDEConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false );
 
   config.setGroup("General");
   config.writeEntry("EnableWebShortcuts", m_dlg->cbEnableShortcuts->isChecked());
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
index 6352dfea5..2150e4883 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
@@ -30,7 +30,7 @@ class FilterOptionsUI;
 class SearchProvider;
 class SearchProviderItem;
 
-class FilterOptions : public KCModule
+class FilterOptions : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index f46b5c8ac..c57d3e080 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -521,7 +521,7 @@ void KURISearchFilterEngine::loadConfig()
   PIDDBG << "Keywords Engine: Loading config..." << endl;
 
   // Load the config.
-  KConfig config( name() + "rc", false, false );
+  TDEConfig config( name() + "rc", false, false );
   config.setGroup( "General" );
 
   m_cKeywordDelimiter = config.readNumEntry("KeywordDelimiter", ':');
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
index 8f56a0538..a8c8dbda9 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
@@ -77,7 +77,7 @@ bool KURISearchFilter::filterURI( KURIFilterData &data ) const
   return false;
 }
 
-KCModule *KURISearchFilter::configModule(TQWidget *parent, const char *) const
+TDECModule *KURISearchFilter::configModule(TQWidget *parent, const char *) const
 {
   return new FilterOptions( KURISearchFilterFactory::instance(), parent, "kcmkurifilt");
 }
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
index 7ad52849b..f72d38340 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
@@ -39,7 +39,7 @@ public:
     ~KURISearchFilter();
 
     virtual bool filterURI( KURIFilterData& ) const;
-    virtual KCModule *configModule(TQWidget *parent = 0, const char *name = 0) const;
+    virtual TDECModule *configModule(TQWidget *parent = 0, const char *name = 0) const;
     virtual TQString configName() const;
 
 k_dcop:
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
index 7e077ecb0..c394de693 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
@@ -533,7 +533,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
   return false;
 }
 
-KCModule* KShortURIFilter::configModule( TQWidget*, const char* ) const
+TDECModule* KShortURIFilter::configModule( TQWidget*, const char* ) const
 {
     return 0; //new KShortURIOptions( parent, name );
 }
@@ -545,7 +545,7 @@ TQString KShortURIFilter::configName() const
 
 void KShortURIFilter::configure()
 {
-  KConfig config( name() + QFL1("rc"), false, false );
+  TDEConfig config( name() + QFL1("rc"), false, false );
   m_bVerbose = config.readBoolEntry( "Verbose", false );
 
   if ( m_bVerbose )
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
index db5f9027d..33ba20cad 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
@@ -84,7 +84,7 @@ public:
          *
          * @return the config module
          */
-    virtual KCModule* configModule( TQWidget*, const char* ) const;
+    virtual TDECModule* configModule( TQWidget*, const char* ) const;
 
 public:
 k_dcop:
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index 40495aaa3..a6fb21887 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -85,13 +85,13 @@ static const int DFLT_OFF   = 60;
 
 extern "C" {
 
-    KDE_EXPORT KCModule *create_energy(TQWidget *parent, char *) {
+    KDE_EXPORT TDECModule *create_energy(TQWidget *parent, char *) {
 	return new KEnergy(parent, "kcmenergy");
     }
 
     KDE_EXPORT void init_energy() {
 #ifdef HAVE_DPMS
-        KConfig *cfg = new KConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
+        TDEConfig *cfg = new TDEConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
         cfg->setGroup("DisplayEnergy");
 
 	Display *dpy = tqt_xdisplay();
@@ -132,7 +132,7 @@ extern "C" {
 /**** KEnergy ****/
 
 KEnergy::KEnergy(TQWidget *parent, const char *name)
-    : KCModule(parent, name)
+    : TDECModule(parent, name)
 {
     m_bChanged = false;
     m_bEnabled = false;
@@ -221,11 +221,11 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons
     top->addStretch();
 
     if (m_bDPMS)
-       setButtons( KCModule::Help | KCModule::Default | KCModule::Apply );
+       setButtons( TDECModule::Help | TDECModule::Default | TDECModule::Apply );
     else
-       setButtons( KCModule::Help );
+       setButtons( TDECModule::Help );
 
-    m_pConfig = new KConfig("kcmdisplayrc", false /*readwrite*/, false /*no globals*/);
+    m_pConfig = new TDEConfig("kcmdisplayrc", false /*readwrite*/, false /*no globals*/);
     m_pConfig->setGroup("DisplayEnergy");
 
     load();
diff --git a/kcontrol/energy/energy.h b/kcontrol/energy/energy.h
index c50d027ba..8faeaca1a 100644
--- a/kcontrol/energy/energy.h
+++ b/kcontrol/energy/energy.h
@@ -19,14 +19,14 @@
 
 class TQCheckBox;
 class KIntNumInput;
-class KConfig;
+class TDEConfig;
 
 extern "C" void init_energy();
 
 /**
  * The Desktop/Energy tab in kcontrol.
  */
-class KEnergy: public KCModule
+class KEnergy: public TDECModule
 {
     Q_OBJECT
 
@@ -62,7 +62,7 @@ private:
     KIntNumInput *m_pStandbySlider;
     KIntNumInput *m_pSuspendSlider;
     KIntNumInput *m_pOffSlider;
-    KConfig *m_pConfig;
+    TDEConfig *m_pConfig;
 };
 
 #endif // __Energy_h_Included__
diff --git a/kcontrol/filetypes/control.cpp b/kcontrol/filetypes/control.cpp
index 9736e9c9b..5a0fd097b 100644
--- a/kcontrol/filetypes/control.cpp
+++ b/kcontrol/filetypes/control.cpp
@@ -2,7 +2,7 @@
 
 extern "C"
 {
-	  KDE_EXPORT KCModule *create_filetypes(TQWidget *parent, const char *)
+	  KDE_EXPORT TDECModule *create_filetypes(TQWidget *parent, const char *)
           {
         return new FileTypesView(parent, "filetypes");
 	  }
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index 6d8ee9860..07b023532 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -25,7 +25,7 @@
 #include <ksycoca.h>
 
 FileTypesView::FileTypesView(TQWidget *p, const char *name)
-  : KCModule(p, name)
+  : TDECModule(p, name)
 {
   m_konqConfig = KSharedConfig::openConfig("konquerorrc", false, false);
 
diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h
index 2db123398..db1116b29 100644
--- a/kcontrol/filetypes/filetypesview.h
+++ b/kcontrol/filetypes/filetypesview.h
@@ -21,7 +21,7 @@ class FileTypeDetails;
 class FileGroupDetails;
 class TQWidgetStack;
 
-class FileTypesView : public KCModule
+class FileTypesView : public TDECModule
 {
   Q_OBJECT
 public:
diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp
index 618c8d825..df59d4b31 100644
--- a/kcontrol/filetypes/typeslistitem.cpp
+++ b/kcontrol/filetypes/typeslistitem.cpp
@@ -273,9 +273,9 @@ void TypesListItem::sync()
 
   if (isMimeTypeDirty())
   {
-    // We must use KConfig otherwise config.deleteEntry doesn't
+    // We must use TDEConfig otherwise config.deleteEntry doesn't
     // properly cancel out settings already present in system files.
-    KConfig config( m_mimetype->desktopEntryPath(), false, false, "mime" );
+    TDEConfig config( m_mimetype->desktopEntryPath(), false, false, "mime" );
     config.setDesktopGroup();
 
     config.writeEntry("Type", "MimeType");
@@ -293,7 +293,7 @@ void TypesListItem::sync()
     m_bNewItem = false;
   }
 
-  KConfig profile("profilerc", false, false);
+  TDEConfig profile("profilerc", false, false);
 
   // Deleting current contents in profilerc relating to
   // this service type
@@ -357,15 +357,15 @@ void TypesListItem::sync()
         if ( mimeTypeList.contains( name() ) ) {
           // The mimetype is listed explicitly in the .desktop files, so
           // just remove it and we're done
-          KConfig *desktop;
+          TDEConfig *desktop;
           if ( !isApplication )
           {
-            desktop = new KConfig(pService->desktopEntryPath(), false, false, "services");
+            desktop = new TDEConfig(pService->desktopEntryPath(), false, false, "services");
           }
           else
           {
             TQString path = pService->locateLocal();
-            KConfig orig(pService->desktopEntryPath(), true, false, "apps");
+            TDEConfig orig(pService->desktopEntryPath(), true, false, "apps");
             desktop = orig.copyTo(path);
           }
           desktop->setDesktopGroup();
@@ -452,7 +452,7 @@ KMimeType::Ptr TypesListItem::findImplicitAssociation(const TQString &desktop)
     return 0;
 }
 
-void TypesListItem::saveServices( KConfig & profile, TQStringList services, const TQString & genericServiceType )
+void TypesListItem::saveServices( TDEConfig & profile, TQStringList services, const TQString & genericServiceType )
 {
   TQStringList::Iterator it(services.begin());
   for (int i = services.count(); it != services.end(); ++it, i--) {
@@ -482,15 +482,15 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons
 
     if (!mimeTypeList.contains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList))
     {
-      KConfig *desktop;
+      TDEConfig *desktop;
       if ( pService->type() == TQString("Service") )
       {
-        desktop = new KConfig(pService->desktopEntryPath(), false, false, "services");
+        desktop = new TDEConfig(pService->desktopEntryPath(), false, false, "services");
       }
       else
       {
         TQString path = pService->locateLocal();
-        KConfig orig(pService->desktopEntryPath(), true, false, "apps");
+        TDEConfig orig(pService->desktopEntryPath(), true, false, "apps");
         desktop = orig.copyTo(path);
       }
 
diff --git a/kcontrol/filetypes/typeslistitem.h b/kcontrol/filetypes/typeslistitem.h
index 1946d9ab7..671604961 100644
--- a/kcontrol/filetypes/typeslistitem.h
+++ b/kcontrol/filetypes/typeslistitem.h
@@ -96,7 +96,7 @@ public:
 
 private:
   void getServiceOffers( TQStringList & appServices, TQStringList & embedServices ) const;
-  void saveServices( KConfig & profile, TQStringList services, const TQString & servicetype2 );
+  void saveServices( TDEConfig & profile, TQStringList services, const TQString & servicetype2 );
   void initMeta( const TQString & major );
   void init(KMimeType::Ptr mimetype);
   static int readAutoEmbed( KMimeType::Ptr mimetype );
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 93d76c28e..7efe76b6d 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -158,14 +158,14 @@ void FontUseItem::setDefault()
 
 void FontUseItem::readFont( bool useDefaults )
 {
-  KConfigBase *config;
+  TDEConfigBase *config;
 
   bool deleteme = false;
   if (_rcfile.isEmpty())
     config = TDEGlobal::config();
   else
   {
-    config = new KConfig(_rcfile, true);
+    config = new TDEConfig(_rcfile, true);
     deleteme = true;
   }
 
@@ -179,7 +179,7 @@ void FontUseItem::readFont( bool useDefaults )
 
 void FontUseItem::writeFont()
 {
-  KConfigBase *config;
+  TDEConfigBase *config;
 
   if (_rcfile.isEmpty()) {
     config = TDEGlobal::config();
@@ -326,7 +326,7 @@ bool FontAASettings::load( bool useDefaults )
 
   if(!xft.getHintStyle(hStyle) || KXftConfig::Hint::NotSet==hStyle)
   {
-    KConfig kglobals("kdeglobals", false, false);
+    TDEConfig kglobals("kdeglobals", false, false);
 
     kglobals.setReadDefaults( useDefaults );
 
@@ -350,7 +350,7 @@ bool FontAASettings::load( bool useDefaults )
 bool FontAASettings::save( bool useAA )
 {
   KXftConfig xft(KXftConfig::constStyleSettings);
-  KConfig    kglobals("kdeglobals", false, false);
+  TDEConfig    kglobals("kdeglobals", false, false);
 
   kglobals.setGroup("General");
 
@@ -507,7 +507,7 @@ static TQCString desktopConfigName()
 }
 
 KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
-    :   KCModule(FontFactory::instance(), parent, name)
+    :   TDECModule(FontFactory::instance(), parent, name)
 {
   TQStringList nameGroupKeyRc;
 
@@ -693,7 +693,7 @@ void KFonts::load( bool useDefaults )
   useAA_original = useAA = aaSettings->load( useDefaults ) ? AAEnabled : AADisabled;
   cbAA->setCurrentItem( useAA );
 
-  KConfig cfgfonts("kcmfonts", true);
+  TDEConfig cfgfonts("kcmfonts", true);
   cfgfonts.setGroup("General");
   int dpicfg = cfgfonts.readNumEntry( "forceFontDPI", 0 );
   DPISetting dpi = dpicfg == 120 ? DPI120 : dpicfg == 96 ? DPI96 : DPINone;
@@ -715,7 +715,7 @@ void KFonts::save()
       i->writeFont();
   TDEGlobal::config()->sync();
 
-  KConfig cfgfonts("kcmfonts");
+  TDEConfig cfgfonts("kcmfonts");
   cfgfonts.setGroup("General");
   DPISetting dpi = static_cast< DPISetting >( comboForceDpi->currentItem());
   const int dpi2value[] = { 0, 96, 120 };
diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h
index b75a82fa4..d69035b4c 100644
--- a/kcontrol/fonts/fonts.h
+++ b/kcontrol/fonts/fonts.h
@@ -89,7 +89,7 @@ private:
 /**
  * The Desktop/fonts tab in kcontrol.
  */
-class KFonts : public KCModule
+class KFonts : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index a63eb84ea..b1bae281a 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -61,7 +61,7 @@ KSimpleConfig *systemconfig;
 /**** TDEHWManager ****/
 
 TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(TDEHWManagerFactory::instance(), parent, name)
+  : TDECModule(TDEHWManagerFactory::instance(), parent, name)
 {
 	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 	config = new KSimpleConfig( TQString::fromLatin1( "hwmanagerrc" ));
diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h
index 1847f4f33..7e395d0a3 100644
--- a/kcontrol/hwmanager/hwmanager.h
+++ b/kcontrol/hwmanager/hwmanager.h
@@ -34,11 +34,11 @@
 #include "devicepropsdlg.h"
 #include "deviceiconview.h"
 
-class KConfig;
+class TDEConfig;
 class KPopupMenu;
 class KListViewItem;
 
-class TDEHWManager : public KCModule, public DCOPObject
+class TDEHWManager : public TDECModule, public DCOPObject
 {
 	K_DCOP
 	Q_OBJECT
@@ -65,7 +65,7 @@ private slots:
 private:
 	TDEHWManagerBase *base;
 
-	KConfig *config;
+	TDEConfig *config;
 };
 
 #endif
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index 56af11adc..c65699489 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -61,7 +61,7 @@ KSimpleConfig *systemconfig;
 /**** KICCConfig ****/
 
 KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(KICCCFactory::instance(), parent, name), iccFileArray(NULL)
+  : TDECModule(KICCCFactory::instance(), parent, name), iccFileArray(NULL)
 {
 
   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h
index d113e5d84..74fe1b49d 100644
--- a/kcontrol/iccconfig/iccconfig.h
+++ b/kcontrol/iccconfig/iccconfig.h
@@ -31,11 +31,11 @@
 
 #include "iccconfigbase.h"
 
-class KConfig;
+class TDEConfig;
 class KPopupMenu;
 class KListViewItem;
 
-class KICCConfig : public KCModule, public DCOPObject
+class KICCConfig : public TDECModule, public DCOPObject
 {
   K_DCOP
     Q_OBJECT
@@ -59,7 +59,7 @@ public:
 
 private:
 
-  KConfig *config;
+  TDEConfig *config;
   bool _ok;
   Display *randr_display;
   ScreenInfo *randr_screen_info;
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index 8f9e46fbc..cd529485c 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -35,7 +35,7 @@
 /**** KIconConfig ****/
 
 KIconConfig::KIconConfig(TQWidget *parent, const char *name)
-    : KCModule(parent, name)
+    : TDECModule(parent, name)
 {
 
     TQGridLayout *top = new TQGridLayout(this, 4, 2,
@@ -289,7 +289,7 @@ void KIconConfig::read()
     mpKickerConfig->setGroup("General");
     mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);
 
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED));
     mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT));
 }
@@ -473,7 +473,7 @@ void KIconConfig::save()
     mpKickerConfig->setGroup("General");
     mpKickerConfig->writeEntry("panelIconWidth", mQuickLaunchSize);
 
-    KConfigGroup g( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true);
     g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true);
 
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index cc94b6e8b..3c824af33 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -35,7 +35,7 @@ class TQTabWidget;
 class TQWidget;
 
 class KColorButton;
-class KConfig;
+class TDEConfig;
 class KIconEffect;
 class KIconLoader;
 class KIconTheme;
@@ -53,7 +53,7 @@ struct Effect
 /**
  * The General Icons tab in kcontrol.
  */
-class KIconConfig: public KCModule
+class KIconConfig: public TDECModule
 {
     Q_OBJECT
 
@@ -106,7 +106,7 @@ private:
     KIconEffect *mpEffect;
     KIconTheme *mpTheme;
     KIconLoader *mpLoader;
-    KConfig *mpConfig;
+    TDEConfig *mpConfig;
     KSimpleConfig *mpSystrayConfig;
     KSimpleConfig *mpKickerConfig;
 
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 6e8824cce..835962ff6 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -52,7 +52,7 @@
 #include "iconthemes.h"
 
 IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
   TQVBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(),
                                            KDialog::spacingHint());
@@ -160,7 +160,7 @@ void IconThemesConfig::installNewTheme()
   TQString themeTmpFile;
   // themeTmpFile contains the name of the downloaded file
 
-  if (!KIO::NetAccess::download(themeURL, themeTmpFile, this)) {
+  if (!TDEIO::NetAccess::download(themeURL, themeTmpFile, this)) {
     TQString sorryText;
     if (themeURL.isLocalFile())
        sorryText = i18n("Unable to find the icon theme archive %1.");
@@ -176,7 +176,7 @@ void IconThemesConfig::installNewTheme()
     TQString invalidArch(i18n("The file is not a valid icon theme archive."));
     KMessageBox::error(this, invalidArch);
 
-    KIO::NetAccess::removeTempFile(themeTmpFile);
+    TDEIO::NetAccess::removeTempFile(themeTmpFile);
     return;
   }
 
@@ -189,7 +189,7 @@ void IconThemesConfig::installNewTheme()
     KMessageBox::error(this, somethingWrong);
   }
 
-  KIO::NetAccess::removeTempFile(themeTmpFile);
+  TDEIO::NetAccess::removeTempFile(themeTmpFile);
 
   TDEGlobal::instance()->newIconLoader();
   loadThemes();
@@ -296,11 +296,11 @@ void IconThemesConfig::removeSelectedTheme()
 
   KIconTheme icontheme(m_themeNames[selected->text(0)]);
 
-  // delete the index file before the async KIO::del so loadThemes() will
+  // delete the index file before the async TDEIO::del so loadThemes() will
   // ignore that dir.
   unlink(TQFile::encodeName(icontheme.dir()+"/index.theme").data());
   unlink(TQFile::encodeName(icontheme.dir()+"/index.desktop").data());
-  KIO::del(KURL( icontheme.dir() ));
+  TDEIO::del(KURL( icontheme.dir() ));
 
   TDEGlobal::instance()->newIconLoader();
 
diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h
index 6c13bba98..8eb9716fe 100644
--- a/kcontrol/icons/iconthemes.h
+++ b/kcontrol/icons/iconthemes.h
@@ -30,7 +30,7 @@ class TQCheckBox;
 class TQStringList;
 
 
-class IconThemesConfig : public KCModule
+class IconThemesConfig : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp
index 2ced51361..8a9b564ac 100644
--- a/kcontrol/icons/main.cpp
+++ b/kcontrol/icons/main.cpp
@@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_icons, IconsFactory("kcmicons") )
 /**** IconModule ****/
 
 IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(IconsFactory::instance(), parent, name)
+  : TDECModule(IconsFactory::instance(), parent, name)
 {
   TQVBoxLayout *layout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
diff --git a/kcontrol/icons/main.h b/kcontrol/icons/main.h
index f9c1efc27..431f40254 100644
--- a/kcontrol/icons/main.h
+++ b/kcontrol/icons/main.h
@@ -29,7 +29,7 @@
 #include <tqtabwidget.h>
 #include <kcmodule.h>
 
-class IconModule : public KCModule
+class IconModule : public TDECModule
 {
   Q_OBJECT
 
@@ -47,8 +47,8 @@ protected slots:
 private:
   TQTabWidget   *tab;
 
-  KCModule *tab1;
-  KCModule *tab2;
+  TDECModule *tab1;
+  TDECModule *tab2;
 };
 
 
diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp
index 0837209d6..666b914ab 100644
--- a/kcontrol/info/info.cpp
+++ b/kcontrol/info/info.cpp
@@ -399,7 +399,7 @@ TQString KInfoListWidget::quickHelp() const
 
 KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const char *name,
                                  bool _getlistbox(TQListView *lbox))
-    : KCModule(parent, name),
+    : TDECModule(parent, name),
       title(_title)
 {
     TDEAboutData *about =
@@ -411,7 +411,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
     about->addAuthor("Helge Deller", 0, "[email protected]");
     setAboutData( about );
 
-    setButtons(KCModule::Help);
+    setButtons(TDECModule::Help);
     getlistbox 	= _getlistbox;
     GetInfo_ErrorString = 0;
     TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
diff --git a/kcontrol/info/info.h b/kcontrol/info/info.h
index 80f200d2a..d26c7ba1f 100644
--- a/kcontrol/info/info.h
+++ b/kcontrol/info/info.h
@@ -32,7 +32,7 @@ bool GetInfo_XServer_and_Video( TQListView *lBox );
 bool GetInfo_CD_ROM( TQListView *lBox ); /* New CD-ROM Info */
 extern bool GetInfo_OpenGL( TQListView *lBox );
 
-class KInfoListWidget : public KCModule
+class KInfoListWidget : public TDECModule
 {
 public:
   KInfoListWidget(const TQString &_title, TQWidget *parent, const char *name=0, bool _getlistbox (TQListView *)=0);
diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp
index 02fd98b1d..22efcd6d3 100644
--- a/kcontrol/info/info_netbsd.cpp
+++ b/kcontrol/info/info_netbsd.cpp
@@ -43,7 +43,7 @@
 #include <tqtextstream.h>
 
 #include <kdebug.h>
-#include <kio/global.h> /* for KIO::convertSize() */
+#include <kio/global.h> /* for TDEIO::convertSize() */
 
 typedef struct
   {
@@ -295,9 +295,9 @@ bool GetInfo_Partitions (TQListView *lbox)
 		big[1] *= mnt->f_bavail; // FIXME: use f_bfree if root?
 
 		// convert to strings
-		vv[0] = KIO::convertSize(big[0]);
+		vv[0] = TDEIO::convertSize(big[0]);
 		vv[1] = TQString::fromLatin1("%1 (%2%%)")
-				.arg(KIO::convertSize(big[1]))
+				.arg(TDEIO::convertSize(big[1]))
 				.arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0);
 
 		// FIXME: these two are large enough to punctuate
diff --git a/kcontrol/info/main.cpp b/kcontrol/info/main.cpp
index 689ac25b7..780b6532e 100644
--- a/kcontrol/info/main.cpp
+++ b/kcontrol/info/main.cpp
@@ -34,7 +34,7 @@
 extern "C"
 {
 
-  KDE_EXPORT KCModule *create_cpu(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_cpu(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_CPU_AVAILABLE
     return new KInfoListWidget(i18n("Processor(s)"), parent, "kcminfo", GetInfo_CPU);
@@ -43,7 +43,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT KCModule *create_irq(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_irq(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_IRQ_AVAILABLE
     return new KInfoListWidget(i18n("Interrupt"), parent, "kcminfo", GetInfo_IRQ);
@@ -52,7 +52,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT KCModule *create_pci(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_pci(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_PCI_AVAILABLE
     return new KInfoListWidget(i18n("PCI"), parent, "kcminfo", GetInfo_PCI);
@@ -61,7 +61,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT KCModule *create_dma(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_dma(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_DMA_AVAILABLE
     return new KInfoListWidget(i18n("DMA-Channel"), parent, "kcminfo", GetInfo_DMA);
@@ -70,7 +70,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT KCModule *create_ioports(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_ioports(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_IOPORTS_AVAILABLE
     return new KInfoListWidget(i18n("I/O-Port"), parent, "kcminfo", GetInfo_IO_Ports);
@@ -79,7 +79,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT KCModule *create_sound(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_sound(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_SOUND_AVAILABLE
     return new KInfoListWidget(i18n("Soundcard"), parent, "kcminfo", GetInfo_Sound);
@@ -88,7 +88,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT KCModule *create_scsi(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_scsi(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_SCSI_AVAILABLE
     return new KInfoListWidget(i18n("SCSI"), parent, "kcminfo", GetInfo_SCSI);
@@ -97,7 +97,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT KCModule *create_devices(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_devices(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_DEVICES_AVAILABLE
     return new KInfoListWidget(i18n("Devices"), parent, "kcminfo", GetInfo_Devices);
@@ -106,7 +106,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT KCModule *create_partitions(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_partitions(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_PARTITIONS_AVAILABLE
     return new KInfoListWidget(i18n("Partitions"), parent, "kcminfo", GetInfo_Partitions);
@@ -115,7 +115,7 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT KCModule *create_xserver(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_xserver(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_XSERVER_AVAILABLE
     return new KInfoListWidget(i18n("X-Server"), parent, "kcminfo", GetInfo_XServer_and_Video);
@@ -124,12 +124,12 @@ extern "C"
 #endif
   }
 
-  KDE_EXPORT KCModule *create_memory(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_memory(TQWidget *parent, const char * /*name*/)
   { 
     return new KMemoryWidget(parent, "kcminfo");
   }
 
-  KDE_EXPORT KCModule *create_opengl(TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_opengl(TQWidget *parent, const char * )
   { 
 #ifdef INFO_OPENGL_AVAILABLE
     return new KInfoListWidget(i18n("OpenGL"), parent, "kcminfo", GetInfo_OpenGL);
@@ -139,7 +139,7 @@ extern "C"
   }
 
 /* create_cdinfo function for CD-ROM Info ~Jahshan */
-  KDE_EXPORT KCModule *create_cdinfo(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_cdinfo(TQWidget *parent, const char * /*name*/)
   { 
 #ifdef INFO_CD_ROM_AVAILABLE
     return new KInfoListWidget(i18n("CD-ROM Info"), parent, "kcminfo", GetInfo_CD_ROM);
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index 49cb03dde..d6cd750ec 100644
--- a/kcontrol/info/memory.cpp
+++ b/kcontrol/info/memory.cpp
@@ -88,7 +88,7 @@ static TQString formatted_unit(t_memsize value)
 }
 
 KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
-:  KCModule(parent, name)
+:  TDECModule(parent, name)
 {
 
     TDEAboutData *about =
diff --git a/kcontrol/info/memory.h b/kcontrol/info/memory.h
index 1387f5ac3..aaeb56f86 100644
--- a/kcontrol/info/memory.h
+++ b/kcontrol/info/memory.h
@@ -27,7 +27,7 @@ typedef unsigned long t_memsize;
 #define COLOR_USED_RAM    TQColor(220,200,88)
 #define COLOR_FREE_MEMORY TQColor(127,255,212)
 
-class KMemoryWidget:public KCModule {
+class KMemoryWidget:public TDECModule {
   Q_OBJECT 
 	  
   public:
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index ed3975fc9..dcef9b85e 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -93,7 +93,7 @@ void ThemePage::save()
 	bool whiteCursor = selectedTheme.right( 5 ) == "White";
 	bool largeCursor = selectedTheme.left( 5 ) == "Large";
 
-	KConfig c( "kcminputrc" );
+	TDEConfig c( "kcminputrc" );
 	c.setGroup( "Mouse" );
 	c.writeEntry( "LargeCursor", largeCursor );
 	c.writeEntry( "WhiteCursor", whiteCursor );
@@ -116,7 +116,7 @@ void ThemePage::load( bool useDefaults )
 {
 	bool largeCursor, whiteCursor;
 
-	KConfig c( "kcminputrc" );
+	TDEConfig c( "kcminputrc" );
 
 	c.setReadDefaults( useDefaults );
 
@@ -179,14 +179,14 @@ void ThemePage::fixCursorFile()
 	// Run mkfontdir to update fonts.dir in that dir.
 
 	TDEGlobal::dirs()->addResourceType( "font", "share/fonts/" );
-	KIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") );
+	TDEIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") );
 	TQString overrideDir = TQDir::homeDirPath() + "/.fonts/kde-override/";
 
 	KURL installedFont;
 	installedFont.setPath( overrideDir + "cursor.pcf.gz" );
 
 	if ( currentTheme == "SmallBlack" )
-		KIO::NetAccess::del( installedFont, this );
+		TDEIO::NetAccess::del( installedFont, this );
 	else {
 		KURL source;
 
@@ -197,7 +197,7 @@ void ThemePage::fixCursorFile()
 		else if ( currentTheme == "SmallWhite" )
 			source.setPath( locate("data", "kcminput/cursor_small_white.pcf.gz") );
 
-		KIO::NetAccess::file_copy( source, installedFont, -1, true );
+		TDEIO::NetAccess::file_copy( source, installedFont, -1, true );
 	}
 
 	TQString cmd = TDEGlobal::dirs()->findExe( "mkfontdir" );
diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp
index 23defa614..39b8948ae 100644
--- a/kcontrol/input/logitechmouse.cpp
+++ b/kcontrol/input/logitechmouse.cpp
@@ -233,7 +233,7 @@ void LogitechMouse::applyChanges()
     }
 }
 
-void LogitechMouse::save(KConfig * /*config*/)
+void LogitechMouse::save(TDEConfig * /*config*/)
 {
     kdDebug() << "Logitech mouse settings not saved - not implemented yet" << endl;
 }
diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h
index 1eae2d60f..60780758a 100644
--- a/kcontrol/input/logitechmouse.h
+++ b/kcontrol/input/logitechmouse.h
@@ -52,7 +52,7 @@ public:
     LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, TQWidget* parent = 0, const char* name = 0 );
     ~LogitechMouse();
     void applyChanges();
-    void save(KConfig *config);
+    void save(TDEConfig *config);
 
 protected slots:
     void setChannel1();
diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp
index 439e5f676..0ab009ec9 100644
--- a/kcontrol/input/main.cpp
+++ b/kcontrol/input/main.cpp
@@ -41,14 +41,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_mouse(TQWidget *parent, const char *)
+  KDE_EXPORT TDECModule *create_mouse(TQWidget *parent, const char *)
   {
     return new MouseConfig(parent, "kcminput");
   }
 
   KDE_EXPORT void init_mouse()
   {
-    KConfig *config = new KConfig("kcminputrc", true, false); // Read-only, no globals
+    TDEConfig *config = new TDEConfig("kcminputrc", true, false); // Read-only, no globals
     MouseSettings settings;
     settings.load(config);
     settings.apply(true); // force
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index ed43ef858..9253a1910 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -75,7 +75,7 @@
 #undef Below
 
 MouseConfig::MouseConfig (TQWidget * parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
 
 
@@ -483,7 +483,7 @@ void MouseConfig::load()
 void MouseConfig::load( bool useDefaults )
 {
 
-  KConfig config( "kcminputrc", true );
+  TDEConfig config( "kcminputrc", true );
 
   config.setReadDefaults( useDefaults );
 
@@ -516,7 +516,7 @@ void MouseConfig::load( bool useDefaults )
   slotClick();
 
 
-  KConfig ac("kaccessrc", true);
+  TDEConfig ac("kaccessrc", true);
 
   ac.setGroup("Mouse");
   mouseKeys->setChecked(ac.readBoolEntry("MouseKeys", false));
@@ -568,10 +568,10 @@ void MouseConfig::save()
   settings->reverseScrollPolarity = tab1->cbScrollPolarity->isChecked();
 
   settings->apply();
-  KConfig config( "kcminputrc" );
+  TDEConfig config( "kcminputrc" );
   settings->save(&config);
 
-  KConfig ac("kaccessrc", false);
+  TDEConfig ac("kaccessrc", false);
 
   ac.setGroup("Mouse");
 
@@ -593,7 +593,7 @@ void MouseConfig::save()
   // restart kaccess
   kapp->startServiceByDesktopName("kaccess");
 
-  KCModule::changed(false);
+  TDECModule::changed(false);
 
 }
 
@@ -624,7 +624,7 @@ void MouseConfig::slotHandedChanged(int val){
   settings->m_handedNeedsApply = true;
 }
 
-void MouseSettings::load(KConfig *config)
+void MouseSettings::load(TDEConfig *config)
 {
   int accel_num, accel_den, threshold;
   double accel;
@@ -799,7 +799,7 @@ void MouseSettings::apply(bool force)
   #endif
 }
 
-void MouseSettings::save(KConfig *config)
+void MouseSettings::save(TDEConfig *config)
 {
   config->setGroup("Mouse");
   config->writeEntry("Acceleration",accelRate);
diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h
index bee04d5ea..809ac4817 100644
--- a/kcontrol/input/mouse.h
+++ b/kcontrol/input/mouse.h
@@ -62,8 +62,8 @@ class TQTabWidget;
 class MouseSettings
 {
 public:
-  void save(KConfig *);
-  void load(KConfig *);
+  void save(TDEConfig *);
+  void load(TDEConfig *);
   void apply(bool force=false);
 public:
  int num_buttons;
@@ -89,7 +89,7 @@ public:
  #endif
 };
 
-class MouseConfig : public KCModule
+class MouseConfig : public TDECModule
 {
   Q_OBJECT
 public:
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index d716b9ab5..a0f0ef0cf 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -139,7 +139,7 @@ void ThemePage::save()
 	if ( currentTheme == selectedTheme )
 		return;
 
-	KConfig c( "kcminputrc" );
+	TDEConfig c( "kcminputrc" );
 	c.setGroup( "Mouse" );
 	c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null );
 
@@ -162,7 +162,7 @@ void ThemePage::load( bool useDefaults )
 	currentTheme = theme;
 
 	// Get the name of the theme TDE is configured to use
-	KConfig c( "kcminputrc" );
+	TDEConfig c( "kcminputrc" );
 	c.setReadDefaults( useDefaults );
 	c.setGroup( "Mouse" );
 	currentTheme = c.readEntry( "cursorTheme", currentTheme );
@@ -221,7 +221,7 @@ void ThemePage::installClicked()
 		return;
 
 	TQString tmpFile;
-	if ( !KIO::NetAccess::download( url, tmpFile, this ) ) {
+	if ( !TDEIO::NetAccess::download( url, tmpFile, this ) ) {
 		TQString text;
 
 		if ( url.isLocalFile() )
@@ -238,7 +238,7 @@ void ThemePage::installClicked()
 		KMessageBox::error( this, i18n( "The file %1 does not appear to be a valid "
 				"cursor theme archive.").arg( url.fileName() ) );
 
-	KIO::NetAccess::removeTempFile( tmpFile );
+	TDEIO::NetAccess::removeTempFile( tmpFile );
 }
 
 
@@ -257,7 +257,7 @@ void ThemePage::removeClicked()
 	// Delete the theme from the harddrive
         KURL u;
         u.setPath( themeInfo[  selectedTheme ]->path );
-	KIO::del( u );
+	TDEIO::del( u );
 
 	// Remove the theme from the listview and from the themeinfo dict
 	delete listview->findItem( selectedTheme, DirColumn );
@@ -268,7 +268,7 @@ void ThemePage::removeClicked()
 	//  Since it's possible to substitute cursors in a system theme by adding a local
 	//  theme with the same name, we shouldn't remove the theme from the list if it's
 	//  still available elsewhere. This could be solved by calling insertThemes() here,
-	//  but since KIO::del() is an asynchronos operation, the theme we're deleting will
+	//  but since TDEIO::del() is an asynchronos operation, the theme we're deleting will
 	//  be readded to the list again before KIO has removed it.
 }
 
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
index 6ed69774b..9ee3d93f9 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
@@ -49,12 +49,12 @@ typedef KGenericFactory<KCMIOSlaveInfo, TQWidget> SlaveFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_ioslaveinfo, SlaveFactory("kcmioslaveinfo") )
 
 KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStringList &)
-               :KCModule(SlaveFactory::instance(), parent,name),m_ioslavesLb(0),m_tfj(0)
+               :TDECModule(SlaveFactory::instance(), parent,name),m_ioslavesLb(0),m_tfj(0)
 {
    TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
    setQuickHelp( i18n("<h1>IO slaves</h1> Gives you an overview of the installed ioslaves."));
-   setButtons( KCModule::Help );
+   setButtons( TDECModule::Help );
 
    TQLabel* label=new TQLabel(i18n("Available IO slaves:"),this);
    TQHBox *hbox=new TQHBox(this);
@@ -80,7 +80,7 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin
    m_ioslavesLb->sort();
    m_ioslavesLb->setSelected(0, true);
 
-   setButtons(KCModule::Help);
+   setButtons(TDECModule::Help);
 
    TDEAboutData *about =
    new TDEAboutData(I18N_NOOP("kcmioslaveinfo"),
@@ -94,7 +94,7 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin
 
 }
 
-void KCMIOSlaveInfo::slaveHelp( KIO::Job *, const TQByteArray &data)
+void KCMIOSlaveInfo::slaveHelp( TDEIO::Job *, const TQByteArray &data)
 {
     if ( data.size() == 0 ) { // EOF
         int index = helpData.find( "<meta http-equiv=\"Content-Type\"" );
@@ -111,7 +111,7 @@ void KCMIOSlaveInfo::slaveHelp( KIO::Job *, const TQByteArray &data)
     helpData += data;
 }
 
-void KCMIOSlaveInfo::slotResult(KIO::Job *)
+void KCMIOSlaveInfo::slotResult(TDEIO::Job *)
 {
    m_tfj = 0;
 }
@@ -129,9 +129,9 @@ void KCMIOSlaveInfo::showInfo(const TQString& protocol)
    if (!file.isEmpty())
    {
        helpData.truncate( 0 );
-       m_tfj = KIO::get( KURL( TQString("help:/kioslave/%1.html").arg( protocol ) ), true, false );
-       connect( m_tfj, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( KIO::Job *, const TQByteArray &) ) );
-       connect( m_tfj, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) );
+       m_tfj = TDEIO::get( KURL( TQString("help:/kioslave/%1.html").arg( protocol ) ), true, false );
+       connect( m_tfj, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( TDEIO::Job *, const TQByteArray &) ) );
+       connect( m_tfj, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) );
        return;
    }
    m_info->setText(i18n("Some info about protocol %1:/ ...").arg(protocol));
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h
index 9537d6cc7..b587c39ec 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.h
@@ -36,9 +36,9 @@
 class KIOTimeoutControl;
 class TQTabWidget;
 class TQSpinBox;
-class KConfig;
+class TDEConfig;
 
-class KCMIOSlaveInfo : public KCModule
+class KCMIOSlaveInfo : public TDECModule
 {
     Q_OBJECT
 public:
@@ -48,14 +48,14 @@ protected:
     KListBox *m_ioslavesLb;
     KTextBrowser *m_info;
     TQCString helpData;
-    KIO::Job *m_tfj;
+    TDEIO::Job *m_tfj;
 
 protected slots:
 
     void showInfo(const TQString& protocol);
     void showInfo(TQListBoxItem *item);
-    void slaveHelp( KIO::Job *, const TQByteArray &data);
-    void slotResult( KIO::Job * );
+    void slaveHelp( TDEIO::Job *, const TQByteArray &data);
+    void slotResult( TDEIO::Job * );
 
 };
 #endif
diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp
index 9a622c667..f97fe8e51 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -67,7 +67,7 @@ extern "C"
 //---------------------------------------------------------------------------------------------
 
 joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(JoystickFactory::instance(), parent, name)
+  : TDECModule(JoystickFactory::instance(), parent, name)
 {
   setAboutData( new TDEAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0",
                                I18N_NOOP("TDE Control Center Module to test Joysticks"),
@@ -97,7 +97,7 @@ joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
 
   setMinimumSize(joyWidget->minimumSize());
 
-  setButtons(KCModule::Default);
+  setButtons(TDECModule::Default);
 }
 
 //---------------------------------------------------------------------------------------------
diff --git a/kcontrol/joystick/joystick.h b/kcontrol/joystick/joystick.h
index 0f412efb3..2a201b28f 100644
--- a/kcontrol/joystick/joystick.h
+++ b/kcontrol/joystick/joystick.h
@@ -25,7 +25,7 @@
 
 class JoyWidget;
 
-class joystick: public KCModule
+class joystick: public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h
index 37a9b8537..af1dc3019 100644
--- a/kcontrol/kcontrol/aboutwidget.h
+++ b/kcontrol/kcontrol/aboutwidget.h
@@ -24,7 +24,7 @@
 #include <tqlistview.h>
 #include <tqhbox.h>
 
-class KCModuleInfo;
+class TDECModuleInfo;
 class TQPixmap;
 class KPixmap;
 class ConfigModule;
diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp
index 723895de3..e99cfa799 100644
--- a/kcontrol/kcontrol/kcrootonly.cpp
+++ b/kcontrol/kcontrol/kcrootonly.cpp
@@ -24,7 +24,7 @@
 #include "kcrootonly.h"
 
 KCRootOnly::KCRootOnly(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
    TQVBoxLayout *layout=new TQVBoxLayout(this);
    TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>"
diff --git a/kcontrol/kcontrol/kcrootonly.h b/kcontrol/kcontrol/kcrootonly.h
index b52fab34b..e167c4452 100644
--- a/kcontrol/kcontrol/kcrootonly.h
+++ b/kcontrol/kcontrol/kcrootonly.h
@@ -4,7 +4,7 @@
 
 #include <kcmodule.h>
 
-class KCRootOnly: public KCModule {
+class KCRootOnly: public TDECModule {
 public:
 	KCRootOnly(TQWidget *parent, const char *name);
 };
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 7edc8bd43..ad61b11c1 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -65,7 +65,7 @@ KControlApp::KControlApp()
   connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest()));
 
   TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel);
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("General");
   // Initial size is:
   // never bigger than workspace as reported by desk
@@ -88,7 +88,7 @@ KControlApp::~KControlApp()
 {
   if (toplevel)
     {
-      KConfig *config = TDEGlobal::config();
+      TDEConfig *config = TDEGlobal::config();
       config->setGroup("General");
       TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop());
       config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp
index 687b3a412..98135a27f 100644
--- a/kcontrol/kcontrol/moduleIface.cpp
+++ b/kcontrol/kcontrol/moduleIface.cpp
@@ -43,7 +43,7 @@ TQPalette ModuleIface::getPalette(){
 }
 
 TQString ModuleIface::getStyle() {
-	KConfig config(  "kdeglobals" );
+	TDEConfig config(  "kdeglobals" );
 	config.setGroup( "General" );
 	return config.readEntry("widgetStyle");
 }
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 592eb52c2..047fa75e6 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -47,7 +47,7 @@ template class TQPtrList<ConfigModule>;
 
 
 ConfigModule::ConfigModule(const KService::Ptr &s)
-  : KCModuleInfo(s), _changed(false), _module(0), _embedWidget(0),
+  : TDECModuleInfo(s), _changed(false), _module(0), _embedWidget(0),
     _rootProcess(0), _embedLayout(0), _embedFrame(0), _embedStack(0)
 {
 }
@@ -64,12 +64,12 @@ ProxyWidget *ConfigModule::module()
 
   bool run_as_root = needsRootPrivileges() && (getuid() != 0);
 
-  KCModule *modWidget = 0;
+  TDECModule *modWidget = 0;
 
   if (run_as_root && isHiddenByDefault())
      modWidget = new KCRootOnly(0, "root_only");
   else
-      modWidget = KCModuleLoader::loadModule(*this);
+      modWidget = TDECModuleLoader::loadModule(*this);
 
   if (modWidget)
     {
@@ -110,7 +110,7 @@ void ConfigModule::deleteClient()
   delete _embedLayout;
   _embedLayout = 0;
 
-  KCModuleLoader::unloadModule(*this);
+  TDECModuleLoader::unloadModule(*this);
   _changed = false;
 }
 
diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h
index bb612e376..f2bce1d6d 100644
--- a/kcontrol/kcontrol/modules.h
+++ b/kcontrol/kcontrol/modules.h
@@ -28,7 +28,7 @@
 template<class ConfigModule> class TQPtrList;
 class TQStringList;
 class TDEAboutData;
-class KCModule;
+class TDECModule;
 class ProxyWidget;
 class TDEProcess;
 class QXEmbed;
@@ -36,7 +36,7 @@ class TQVBoxLayout;
 class TQVBox;
 class TQWidgetStack;
 
-class ConfigModule : public TQObject, public KCModuleInfo
+class ConfigModule : public TQObject, public TDECModuleInfo
 {
   Q_OBJECT
 
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index 7e3f30de4..5d540d2c6 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -103,13 +103,13 @@ RootInfoWidget::RootInfoWidget(TQWidget *parent, const char *name = 0)
 class ProxyView : public TQScrollView
 {
 public:
-    ProxyView(KCModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name);
+    ProxyView(TDECModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name);
 
 private:
     virtual void resizeEvent(TQResizeEvent *);
 
     TQWidget *contentWidget;
-    KCModule    *client;
+    TDECModule    *client;
     bool scroll;
 };
 
@@ -124,7 +124,7 @@ public:
 };
 
 
-ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool run_as_root, const char *name)
+ProxyView::ProxyView(TDECModule *_client, const TQString&, TQWidget *parent, bool run_as_root, const char *name)
     : TQScrollView(parent, name), client(_client)
 {
   setResizePolicy(TQScrollView::AutoOneFit);
@@ -157,7 +157,7 @@ void ProxyView::resizeEvent(TQResizeEvent *e)
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name,
+ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
              bool run_as_root)
   : TQWidget(0, name)
   , _client(client)
@@ -215,10 +215,10 @@ ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name,
 
   // only enable the requested buttons
   int b = _client->buttons();
-  trinity_setVisible(_handbook, (b & KCModule::Help));
-  trinity_setVisible(_default, mayModify && (b & KCModule::Default));
-  trinity_setVisible(_apply, mayModify && (b & KCModule::Apply));
-  trinity_setVisible(_reset, mayModify && (b & KCModule::Apply));
+  trinity_setVisible(_handbook, (b & TDECModule::Help));
+  trinity_setVisible(_default, mayModify && (b & TDECModule::Default));
+  trinity_setVisible(_apply, mayModify && (b & TDECModule::Apply));
+  trinity_setVisible(_reset, mayModify && (b & TDECModule::Apply));
   trinity_setVisible(_root, run_as_root);
 
   // disable initial buttons
diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h
index e1cff0351..bb951ccdf 100644
--- a/kcontrol/kcontrol/proxywidget.h
+++ b/kcontrol/kcontrol/proxywidget.h
@@ -28,7 +28,7 @@ class TQWidget;
 class TQPushButton;
 class TQFrame;
 
-class KCModule;
+class TDECModule;
 class TDEAboutData;
 
 #include "dockcontainer.h"
@@ -42,7 +42,7 @@ class ProxyWidget : public TQWidget
 
 public:
 
-  ProxyWidget(KCModule *client, TQString title, const char *name=0, bool run_as_root = false);
+  ProxyWidget(TDECModule *client, TQString title, const char *name=0, bool run_as_root = false);
   ~ProxyWidget();
 
   TQString quickHelp() const;
@@ -73,7 +73,7 @@ private:
 
   TQPushButton *_handbook, *_default, *_apply, *_reset, *_root;
   TQFrame      *_sep;
-  KCModule    *_client;
+  TDECModule    *_client;
     ProxyView *view;
 
 };
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 62b23591a..fbfc86cd7 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -57,7 +57,7 @@ TopLevel::TopLevel(const char* name)
   report_bug = 0;
 
   // read settings
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("Index");
   TQString viewmode = config->readEntry("ViewMode", "Tree");
 
@@ -196,7 +196,7 @@ TopLevel::TopLevel(const char* name)
 
 TopLevel::~TopLevel()
 {
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("Index");
   if (KCGlobal::viewMode() == Tree)
     config->writeEntry("ViewMode", "Tree");
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index af606f5fd..eeccfb362 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kded, KDEDFactory( "kcmkded" ) )
 
 
 KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) :
-	KCModule( KDEDFactory::instance(), parent, name )
+	TDECModule( KDEDFactory::instance(), parent, name )
 {
 	TDEAboutData *about =
 		new TDEAboutData( I18N_NOOP( "kcmkded" ), I18N_NOOP( "TDE Service Manager" ),
@@ -110,7 +110,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
 	load();
 }
 
-void setModuleGroup(KConfig *config, const TQString &filename)
+void setModuleGroup(TDEConfig *config, const TQString &filename)
 {
 	TQString module = filename;
 	int i = module.findRev('/');
@@ -123,13 +123,13 @@ void setModuleGroup(KConfig *config, const TQString &filename)
 	config->setGroup(TQString("Module-%1").arg(module));
 }
 
-bool KDEDConfig::autoloadEnabled(KConfig *config, const TQString &filename)
+bool KDEDConfig::autoloadEnabled(TDEConfig *config, const TQString &filename)
 {
 	setModuleGroup(config, filename);
 	return config->readBoolEntry("autoload", true);
 }
 
-void KDEDConfig::setAutoloadEnabled(KConfig *config, const TQString &filename, bool b)
+void KDEDConfig::setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b)
 {
 	setModuleGroup(config, filename);
 	return config->writeEntry("autoload", b);
@@ -141,7 +141,7 @@ void KDEDConfig::load() {
 
 
 void KDEDConfig::load( bool useDefaults ) {
-	KConfig kdedrc("kdedrc", true, false);
+	TDEConfig kdedrc("kdedrc", true, false);
    kdedrc.setReadDefaults( useDefaults );
 
 	_lvStartup->clear();
@@ -190,13 +190,13 @@ void KDEDConfig::save() {
 			TQString::fromLatin1( "kded/*.desktop" ),
 			true, true, files );
 
-	KConfig kdedrc("kdedrc", false, false);
+	TDEConfig kdedrc("kdedrc", false, false);
 
 	for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
 
 		if ( KDesktopFile::isDesktopFile( *it ) ) {
 
-			KConfig file( *it, false, false, "services" );
+			TDEConfig file( *it, false, false, "services" );
 			file.setGroup("Desktop Entry");
 
 			if (file.readBoolEntry("X-TDE-Kded-autoload")){
diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h
index 1e9e42e72..86f5aaf94 100644
--- a/kcontrol/kded/kcmkded.h
+++ b/kcontrol/kded/kcmkded.h
@@ -28,7 +28,7 @@ class KListView;
 class TQStringList;
 class TQPushButton;
 
-class KDEDConfig : public KCModule
+class KDEDConfig : public TDECModule
 {
 Q_OBJECT
 public:
@@ -49,8 +49,8 @@ protected slots:
 	void slotItemChecked(TQCheckListItem *item);
 	void getServiceStatus();
 
-        bool autoloadEnabled(KConfig *config, const TQString &filename);
-        void setAutoloadEnabled(KConfig *config, const TQString &filename, bool b);
+        bool autoloadEnabled(TDEConfig *config, const TQString &filename);
+        void setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b);
 
 private:
 	KListView *_lvLoD;
diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h
index ef8ff9f33..a50d7a41d 100644
--- a/kcontrol/keys/kaccelaction.h
+++ b/kcontrol/keys/kaccelaction.h
@@ -33,8 +33,8 @@
 class KAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /*
 	KAccelAction holds information an a given action, such as "Run Command"
@@ -156,7 +156,7 @@ class KAccelActions
 
 	void clear();
 	bool init( const KAccelActions& );
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	void updateShortcuts( KAccelActions& );
 
@@ -176,8 +176,8 @@ class KAccelActions
 	KAccelAction* insert( const TQString& sName, const TQString& sLabel );
 	bool remove( const TQString& sAction );
 
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	void emitKeycodeChanged();
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 539c67215..88f3aabe0 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -179,7 +179,7 @@ KKeyModule::~KKeyModule (){
     delete sFileList;
 }
 
-bool KKeyModule::writeSettings( const TQString& sGroup, KConfig* pConfig )
+bool KKeyModule::writeSettings( const TQString& sGroup, TDEConfig* pConfig )
 {
 	kc->commitChanges();
 	actions.writeActions( sGroup, pConfig, true, false );
@@ -279,8 +279,8 @@ void KKeyModule::readScheme( int index )
   //else if( index == 2 )
   //  kc->allDefault( true );
   else {
-    KConfigBase* config = 0;
-    if( index == 0 )	config = new KConfig( "kdeglobals" );
+    TDEConfigBase* config = 0;
+    if( index == 0 )	config = new TDEConfig( "kdeglobals" );
     //else		config = new KSimpleConfig( *sFileList->at( index ), true );
 
     actions.readActions( (index == 0) ? KeySet : KeyScheme, config );
@@ -472,7 +472,7 @@ void KKeyModule::init()
   kdDebug(125) << "KKeyModule::init()\n";
 
   /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
-  KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+  TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
   TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
   KAccel::useFourModifierKeys( fourMods == "true" );
   bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h
index cecadf328..5595e76e2 100644
--- a/kcontrol/keys/keyconfig.h
+++ b/kcontrol/keys/keyconfig.h
@@ -41,7 +41,7 @@ public:
         virtual void defaults();
         static void init();
 
-	bool writeSettings( const TQString& sGroup, KConfig* pConfig );
+	bool writeSettings( const TQString& sGroup, TDEConfig* pConfig );
 	bool writeSettingsGlobal( const TQString& sGroup );
 
 public slots:
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index 456818bed..0c6d13c4d 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -49,7 +49,7 @@ o Pre-set scheme   <Remove Scheme>
 Global Shortcuts
 */
 KeyModule::KeyModule( TQWidget *parent, const char *name )
-: KCModule( parent, name )
+: TDECModule( parent, name )
 {
     setQuickHelp( i18n("<h1>Keyboard Shortcuts</h1> Using shortcuts you can configure certain actions to be"
     " triggered when you press a key or a combination of keys, e.g. Ctrl+C is normally bound to"
@@ -129,7 +129,7 @@ void KeyModule::resizeEvent( TQResizeEvent * )
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/)
   {
 	// What does this do?  Why not insert klipper and kxkb, too? --ellis, 2002/01/15
 	TDEGlobal::locale()->insertCatalogue("twin");
@@ -142,7 +142,7 @@ extern "C"
   {
 	kdDebug(125) << "KeyModule::initModifiers()" << endl;
 
-	KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 	bool bMacSwap = TDEGlobal::config()->readBoolEntry( "Mac Modifier Swap", false );
 	if( bMacSwap )
 		ModifiersModule::setupMacModifierKeys();
@@ -153,7 +153,7 @@ extern "C"
 	kdDebug(125) << "KeyModule::init()\n";
 
 	/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
-	KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 	TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
 	KAccel::useFourModifierKeys( fourMods == "true" );
 	bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
@@ -179,7 +179,7 @@ extern "C"
   // This is needed to be able to check for conflicts with global keys in app's keyconfig
   // dialogs, kdeglobals is empty as long as you don't apply any change in controlcenter/keys.
   // However, avoid writing at every KDE startup, just update them after every rebuild of this file.
-        KConfigGroup group( TDEGlobal::config(), "Global Shortcuts" );
+        TDEConfigGroup group( TDEGlobal::config(), "Global Shortcuts" );
         if( group.readEntry( "Defaults timestamp" ) != __DATE__ __TIME__ ) {
 	    kdDebug(125) << "KeyModule::init() - Read Config Bindings\n";
 	    // Check for old group,
diff --git a/kcontrol/keys/main.h b/kcontrol/keys/main.h
index f0b18c43d..eec44060f 100644
--- a/kcontrol/keys/main.h
+++ b/kcontrol/keys/main.h
@@ -31,7 +31,7 @@ class CommandShortcutsModule;
 class ShortcutsModule;
 class ModifiersModule;
 
-class KeyModule : public KCModule
+class KeyModule : public TDECModule
 {
 	Q_OBJECT
  public:
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 05802de74..6da5c94f1 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -61,7 +61,7 @@ ModifiersModule::ModifiersModule( TQWidget *parent, const char *name )
 
 void ModifiersModule::load( bool useDefaults )
 {
-   KConfig *c = TDEGlobal::config();
+   TDEConfig *c = TDEGlobal::config();
 
    c->setReadDefaults( useDefaults );
 
@@ -82,7 +82,7 @@ void ModifiersModule::save()
 {
 	kdDebug(125) << "ModifiersModule::save()" << endl;
 
-	KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 
 	if( m_plblCtrl->text() != "Ctrl" )
 		TDEGlobal::config()->writeEntry( "Label Ctrl", m_plblCtrl->text(), true, true );
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index 814703b0f..c5db61ecc 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -76,7 +76,7 @@ namespace KFI
 {
 
 CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
-            : KCModule(parent, "kfontinst"),
+            : TDECModule(parent, "kfontinst"),
 #ifdef HAVE_XFT
               itsPreview(NULL),
 #endif
@@ -464,8 +464,8 @@ void CKCmFontInst::removeFonts()
 
         if(doIt)
         {
-            KIO::DeleteJob *job = KIO::del(urls, false, true);
-            connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(delResult(KIO::Job *)));
+            TDEIO::DeleteJob *job = TDEIO::del(urls, false, true);
+            connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(delResult(TDEIO::Job *)));
             job->setWindow(this);
             job->setAutoErrorHandlingEnabled(true, this);
         }
@@ -558,7 +558,7 @@ static TQString family(const TQString &name)
 
 void CKCmFontInst::updateInformation(int, int fonts)
 {
-    KIO::filesize_t size=0;
+    TDEIO::filesize_t size=0;
     TQString         text(i18n("One Font", "%n Fonts", fonts));
     TQStringList     families;
 
@@ -579,14 +579,14 @@ void CKCmFontInst::updateInformation(int, int fonts)
     if(fonts>0)
     {
         text+=" ";
-        text+=i18n("(%1 Total)").arg(KIO::convertSize(size));
+        text+=i18n("(%1 Total)").arg(TDEIO::convertSize(size));
     }
     text+=" - ";
     text+=i18n("One Family", "%n Families", families.count());
     itsStatusLabel->setText(text);
 }
 
-void CKCmFontInst::delResult(KIO::Job *job)
+void CKCmFontInst::delResult(TDEIO::Job *job)
 {
     //
     // To speed up font deletion, we dont rescan font list each time - so after this has completed, we need
@@ -596,11 +596,11 @@ void CKCmFontInst::delResult(KIO::Job *job)
 
     stream << KFI::SPECIAL_RESCAN;
 
-    KIO::NetAccess::synchronousRun(KIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
+    TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
     jobResult(job);
 }
 
-void CKCmFontInst::jobResult(KIO::Job *job)
+void CKCmFontInst::jobResult(TDEIO::Job *job)
 {
     //
     // Force an update of the view. For some reason the view is not automatically updated when
@@ -636,8 +636,8 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest)
             copy+=associatedUrls;
         }
 
-        KIO::CopyJob *job=KIO::copy(copy, dest, true);
-        connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(jobResult(KIO::Job *)));
+        TDEIO::CopyJob *job=TDEIO::copy(copy, dest, true);
+        connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(jobResult(TDEIO::Job *)));
         job->setWindow(this);
         job->setAutoErrorHandlingEnabled(true, this);
     }
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
index b304e0a1a..1483ee4de 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
@@ -56,7 +56,7 @@ class KFileItem;
 namespace KFI
 {
 
-class CKCmFontInst : public KCModule
+class CKCmFontInst : public TDECModule
 {
     Q_OBJECT
 
@@ -84,8 +84,8 @@ class CKCmFontInst : public KCModule
     void    dropped(const KFileItem *i, TQDropEvent *e, const KURL::List &urls);
     void    infoMessage(const TQString &msg);
     void    updateInformation(int dirs, int fonts);
-    void    delResult(KIO::Job *job);
-    void    jobResult(KIO::Job *job);
+    void    delResult(TDEIO::Job *job);
+    void    jobResult(TDEIO::Job *job);
 
     private:
 
@@ -106,7 +106,7 @@ class CKCmFontInst : public KCModule
     KParts::ReadOnlyPart *itsPreview;
 #endif
     TQSplitter            *itsSplitter;
-    KConfig              itsConfig;
+    TDEConfig              itsConfig;
     bool                 itsEmbeddedAdmin;
     TQLabel               *itsStatusLabel;
 };
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
index df50e81a3..03158eff7 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
@@ -614,13 +614,13 @@ void CKFileFontView::contentsDropEvent(TQDropEvent *e)
     }
 }
 
-void CKFileFontView::readConfig(KConfig *kc, const TQString &group)
+void CKFileFontView::readConfig(TDEConfig *kc, const TQString &group)
 {
     restoreLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group);
     slotSortingChanged(sortColumn());
 }
 
-void CKFileFontView::writeConfig(KConfig *kc, const TQString &group)
+void CKFileFontView::writeConfig(TDEConfig *kc, const TQString &group)
 {
     saveLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group);
 }
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
index b4766c5c4..c160175be 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
@@ -142,8 +142,8 @@ class CKFileFontView : public KListView, public KFileView
     virtual KFileItem * prevItem(const KFileItem *i) const;
     virtual void        insertItem( KFileItem *i);
 
-    void                readConfig(KConfig *kc, const TQString &group);
-    void                writeConfig(KConfig *kc, const TQString &group);
+    void                readConfig(TDEConfig *kc, const TQString &group);
+    void                writeConfig(TDEConfig *kc, const TQString &group);
 
     // implemented to get noticed about sorting changes (for sortingIndicator)
     virtual void        setSorting(TQDir::SortSpec s);
diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
index 8b8a88167..c4a0d26b1 100644
--- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
@@ -63,7 +63,7 @@ CSettingsDialog::CSettingsDialog(TQWidget *parent)
                                   "that this will also slow down the installation process.</p><p>As most applications can, and do, embed "
                                   "the fonts into the PostScript before sending this to Ghostscript, this option can safely be disabled."));
 
-    KConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE);
+    TDEConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE);
 
     itsDoX->setChecked(cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X));
     itsDoGs->setChecked(cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS));
@@ -71,7 +71,7 @@ CSettingsDialog::CSettingsDialog(TQWidget *parent)
 
 void CSettingsDialog::slotOk()
 {
-    KConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE);
+    TDEConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE);
 
     bool oldDoX=cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X),
          oldDoGs=cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS);
@@ -90,7 +90,7 @@ void CSettingsDialog::slotOk()
 
         stream << KFI::SPECIAL_RECONFIG;
 
-        KIO::NetAccess::synchronousRun(KIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
+        TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this);
     }
 
     hide();
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
index a4f09cb56..46339fc4f 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
+++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
@@ -327,7 +327,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
 
     what=0;
 
-    if(!fontsProt && !fileProt && KIO::NetAccess::download(url, fName, NULL))
+    if(!fontsProt && !fileProt && TDEIO::NetAccess::download(url, fName, NULL))
     {
         downloaded=true;
         url=KURL(fName);
@@ -413,7 +413,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
         }
 
         if(downloaded)
-            KIO::NetAccess::removeTempFile(fName);
+            TDEIO::NetAccess::removeTempFile(fName);
     }
 
     return status;
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index 15531901f..c7c03d107 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -231,16 +231,16 @@ static int getSize(TQValueList<FcPattern *> &patterns)
     return size;
 }
 
-static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s=TQString::null)
+static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s=TQString::null)
 {
-    KIO::UDSAtom atom;
+    TDEIO::UDSAtom atom;
     atom.m_uds = ID;
     atom.m_long = l;
     atom.m_str = s;
     entry.append(atom);
 }
 
-static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, const TQString &path, bool sys)
+static bool createFolderUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, const TQString &path, bool sys)
 {
     KFI_DBUG << "createFolderUDSEntry " << name << ' ' << path << ' ' << sys << ' ' << endl;
 
@@ -251,7 +251,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con
 
     if(-1!=KDE_lstat(cPath, &buff))
     {
-        addAtom(entry, KIO::UDS_NAME, 0, name);
+        addAtom(entry, TDEIO::UDS_NAME, 0, name);
 
         if (S_ISLNK(buff.st_mode))
         {
@@ -262,49 +262,49 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con
             if(n!= -1)
                 buffer2[n]='\0';
 
-            addAtom(entry, KIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
+            addAtom(entry, TDEIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
 
             if(-1==KDE_stat(cPath, &buff))
             {
                 // It is a link pointing to nowhere
-                addAtom(entry, KIO::UDS_FILE_TYPE, S_IFMT - 1);
-                addAtom(entry, KIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO);
-                addAtom(entry, KIO::UDS_SIZE, 0);
+                addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFMT - 1);
+                addAtom(entry, TDEIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO);
+                addAtom(entry, TDEIO::UDS_SIZE, 0);
                 goto notype;
             }
         }
 
-        addAtom(entry, KIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT);
-        addAtom(entry, KIO::UDS_ACCESS, buff.st_mode&07777);
-        addAtom(entry, KIO::UDS_SIZE, buff.st_size);
+        addAtom(entry, TDEIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT);
+        addAtom(entry, TDEIO::UDS_ACCESS, buff.st_mode&07777);
+        addAtom(entry, TDEIO::UDS_SIZE, buff.st_size);
 
         notype:
-        addAtom(entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime);
+        addAtom(entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime);
 
         struct passwd *user = getpwuid(buff.st_uid);
-        addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
+        addAtom(entry, TDEIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
 
         struct group *grp = getgrgid(buff.st_gid);
-        addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
+        addAtom(entry, TDEIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
 
-        addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime);
-        addAtom(entry, KIO::UDS_MIME_TYPE, 0, sys
+        addAtom(entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime);
+        addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, sys
                                                 ? KFI_KIO_FONTS_PROTOCOL"/system-folder" 
                                                 : KFI_KIO_FONTS_PROTOCOL"/folder");
-        addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
+        addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
         TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
         return true;
     }
     else if (sys && !Misc::root())   // Default system fonts folder does not actually exist yet!
     {
         KFI_DBUG << "Default system folder (" << path << ") does not yet exist, so create dummy entry" << endl;
-        addAtom(entry, KIO::UDS_NAME, 0, name);
-        addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
-        addAtom(entry, KIO::UDS_ACCESS, 0744);
-        addAtom(entry, KIO::UDS_USER, 0, "root");
-        addAtom(entry, KIO::UDS_GROUP, 0, "root");
-        addAtom(entry, KIO::UDS_MIME_TYPE, 0, KFI_KIO_FONTS_PROTOCOL"/system-folder");
-        addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
+        addAtom(entry, TDEIO::UDS_NAME, 0, name);
+        addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
+        addAtom(entry, TDEIO::UDS_ACCESS, 0744);
+        addAtom(entry, TDEIO::UDS_USER, 0, "root");
+        addAtom(entry, TDEIO::UDS_GROUP, 0, "root");
+        addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KFI_KIO_FONTS_PROTOCOL"/system-folder");
+        addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
 
         return true;
     }
@@ -313,7 +313,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con
     return false;
 }
 
-static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQValueList<FcPattern *> &patterns, bool sys)
+static bool createFontUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, TQValueList<FcPattern *> &patterns, bool sys)
 {
     KFI_DBUG << "createFontUDSEntry " << name << ' ' << patterns.count() << endl;
 
@@ -344,7 +344,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
 
     end=sortedPatterns.end();
     entry.clear();
-    addAtom(entry, KIO::UDS_SIZE, getSize(patterns));
+    addAtom(entry, TDEIO::UDS_SIZE, getSize(patterns));
 
     for(it=sortedPatterns.begin(); it!=end; ++it)
     {
@@ -354,7 +354,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
 
         if(-1!=KDE_lstat(cPath, &buff))
         {
-            addAtom(entry, KIO::UDS_NAME, 0, name);
+            addAtom(entry, TDEIO::UDS_NAME, 0, name);
 
             if (S_ISLNK(buff.st_mode))
             {
@@ -366,32 +366,32 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
                 if(n!= -1)
                     buffer2[n]='\0';
 
-                addAtom(entry, KIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
+                addAtom(entry, TDEIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2));
 
                 if(-1==KDE_stat(cPath, &buff))
                 {
                     // It is a link pointing to nowhere
-                    addAtom(entry, KIO::UDS_FILE_TYPE, S_IFMT - 1);
-                    addAtom(entry, KIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO);
+                    addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFMT - 1);
+                    addAtom(entry, TDEIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO);
                     goto notype;
                 }
             }
 
-            addAtom(entry, KIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT);
-            addAtom(entry, KIO::UDS_ACCESS, buff.st_mode&07777);
+            addAtom(entry, TDEIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT);
+            addAtom(entry, TDEIO::UDS_ACCESS, buff.st_mode&07777);
 
             notype:
-            addAtom(entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime);
+            addAtom(entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime);
 
             struct passwd *user = getpwuid(buff.st_uid);
-            addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
+            addAtom(entry, TDEIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1());
 
             struct group *grp = getgrgid(buff.st_gid);
-            addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
+            addAtom(entry, TDEIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
 
-            addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime);
-            addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
-            addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
+            addAtom(entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime);
+            addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
+            addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
 
             TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
 
@@ -404,7 +404,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
                 url+=name+TQString::fromLatin1(constMultipleExtension);
             else
                 url+=Misc::getFile(path);
-            addAtom(entry, KIO::UDS_URL, 0, url);
+            addAtom(entry, TDEIO::UDS_URL, 0, url);
             return true;  // This file was OK, so use its values...
         }
     }
@@ -706,7 +706,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
 }
 
 CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app)
-         : KIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app),
+         : TDEIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app),
            itsRoot(Misc::root()),
            itsUsingFcFpe(false),
            itsUsingXfsFpe(false),
@@ -830,7 +830,7 @@ void CKioFonts::listDir(const KURL &url)
 
     if(updateFontList() && checkUrl(url, true))
     {
-        KIO::UDSEntry entry;
+        TDEIO::UDSEntry entry;
         int           size=0;
 
         if(itsRoot || TQStringList::split('/', url.path(), false).count()!=0)
@@ -861,7 +861,7 @@ void CKioFonts::listDir(const KURL &url)
             listEntry(entry, false);
         }
 
-        listEntry(size ? entry : KIO::UDSEntry(), true);
+        listEntry(size ? entry : TDEIO::UDSEntry(), true);
         finished();
     }
 
@@ -878,12 +878,12 @@ void CKioFonts::stat(const KURL &url)
 
         if(path.isEmpty())
         {
-            error(KIO::ERR_COULD_NOT_STAT, url.prettyURL());
+            error(TDEIO::ERR_COULD_NOT_STAT, url.prettyURL());
             return;
         }
 
         TQStringList   pathList(TQStringList::split('/', path, false));
-        KIO::UDSEntry entry;
+        TDEIO::UDSEntry entry;
         bool          err=false;
 
         switch(pathList.count())
@@ -901,7 +901,7 @@ void CKioFonts::stat(const KURL &url)
                         err=!createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true);
                     else
                     {
-                        error(KIO::ERR_SLAVE_DEFINED,
+                        error(TDEIO::ERR_SLAVE_DEFINED,
                               i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
                         return;
                     }
@@ -912,7 +912,7 @@ void CKioFonts::stat(const KURL &url)
 
         if(err)
         {
-            error(KIO::ERR_DOES_NOT_EXIST, url.prettyURL());
+            error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL());
             return;
         }
 
@@ -921,7 +921,7 @@ void CKioFonts::stat(const KURL &url)
     }
 }
 
-bool CKioFonts::createStatEntry(KIO::UDSEntry &entry, const KURL &url, EFolder folder)
+bool CKioFonts::createStatEntry(TDEIO::UDSEntry &entry, const KURL &url, EFolder folder)
 {
     KFI_DBUG << "createStatEntry " << url.path() << endl;
 
@@ -1003,17 +1003,17 @@ void CKioFonts::get(const KURL &url)
         KFI_DBUG << "real: " << realPathC << endl;
     
         if (-2==KDE_stat(realPathC.data(), &buff))
-            error(EACCES==errno ? KIO::ERR_ACCESS_DENIED : KIO::ERR_DOES_NOT_EXIST, url.prettyURL());
+            error(EACCES==errno ? TDEIO::ERR_ACCESS_DENIED : TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL());
         else if (S_ISDIR(buff.st_mode))
-            error(KIO::ERR_IS_DIRECTORY, url.prettyURL());
+            error(TDEIO::ERR_IS_DIRECTORY, url.prettyURL());
         else if (!S_ISREG(buff.st_mode))
-            error(KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
+            error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
         else
         {
             int fd = KDE_open(realPathC.data(), O_RDONLY);
 
             if (fd < 0)
-                error(KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
+                error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
             else
             {
                 // Determine the mimetype of the file to be retrieved, and emit it.
@@ -1022,7 +1022,7 @@ void CKioFonts::get(const KURL &url)
     
                 totalSize(buff.st_size);
     
-                KIO::filesize_t processed=0;
+                TDEIO::filesize_t processed=0;
                 char            buffer[MAX_IPC_SIZE];
                 TQByteArray      array;
     
@@ -1033,7 +1033,7 @@ void CKioFonts::get(const KURL &url)
                     {
 			if (errno == EINTR)
 				continue;
-                        error(KIO::ERR_COULD_NOT_READ, url.prettyURL());
+                        error(TDEIO::ERR_COULD_NOT_READ, url.prettyURL());
                         close(fd);
                         if(multiple)
                             ::unlink(realPathC);
@@ -1068,7 +1068,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
 
     if(isHidden(u))
     {
-        error(KIO::ERR_WRITE_ACCESS_DENIED, u.prettyURL());
+        error(TDEIO::ERR_WRITE_ACCESS_DENIED, u.prettyURL());
         return;
     }
 
@@ -1088,7 +1088,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
 
     if (destExists && !overwrite && !resume)
     {
-        error(KIO::ERR_FILE_ALREADY_EXIST, url.prettyURL());
+        error(TDEIO::ERR_FILE_ALREADY_EXIST, url.prettyURL());
         return;
     }
 
@@ -1098,7 +1098,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
  
         if(passwd.isEmpty())
         {
-            error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+            error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
             return;
         }
     }
@@ -1150,7 +1150,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
             }
             else
             {
-                error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+                error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
                 return;
             }
         }
@@ -1165,7 +1165,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
             }
             else
             {
-                error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER)));
+                error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER)));
                 return;
             }
         }
@@ -1205,7 +1205,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
                      partExists = false;
                  else
                  {
-                     error(KIO::ERR_CANNOT_DELETE_PARTIAL, destPart);
+                     error(TDEIO::ERR_CANNOT_DELETE_PARTIAL, destPart);
                      return false;
                  }
         }
@@ -1236,7 +1236,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
 
     if (fd < 0)
     {
-        error(EACCES==errno ? KIO::ERR_WRITE_ACCESS_DENIED : KIO::ERR_CANNOT_OPEN_FOR_WRITING, dest);
+        error(EACCES==errno ? TDEIO::ERR_WRITE_ACCESS_DENIED : TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dest);
         return false;
     }
 
@@ -1252,12 +1252,12 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
         {
             if(ENOSPC==errno) // disk full
             {
-                error(KIO::ERR_DISK_FULL, destOrig);
+                error(TDEIO::ERR_DISK_FULL, destOrig);
                 result = -2; // means: remove dest file
             }
             else
             {
-                error(KIO::ERR_COULD_NOT_WRITE, destOrig);
+                error(TDEIO::ERR_COULD_NOT_WRITE, destOrig);
                 result = -1;
             }
         }
@@ -1288,14 +1288,14 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
 
     if (close(fd))
     {
-        error(KIO::ERR_COULD_NOT_WRITE, destOrig);
+        error(TDEIO::ERR_COULD_NOT_WRITE, destOrig);
         return false;
     }
 
     // after full download rename the file back to original name
     if (markPartial && ::rename(destC.data(), destOrigC.data()))
     {
-        error(KIO::ERR_CANNOT_RENAME_PARTIAL, destOrig);
+        error(TDEIO::ERR_CANNOT_RENAME_PARTIAL, destOrig);
         return false;
     }
 
@@ -1313,7 +1313,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
 
     if(isHidden(d))
     {
-        error(KIO::ERR_WRITE_ACCESS_DENIED, d.prettyURL());
+        error(TDEIO::ERR_WRITE_ACCESS_DENIED, d.prettyURL());
         return;
     }
 
@@ -1390,7 +1390,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
                     }
                     else
                     {
-                        error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+                        error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
                         return;
                     }
                 }
@@ -1407,7 +1407,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
 
                         if(-1==KDE_stat(realSrc.data(), &buffSrc))
                         {
-                            error(EACCES==errno ? KIO::ERR_ACCESS_DENIED : KIO::ERR_DOES_NOT_EXIST, src.prettyURL());
+                            error(EACCES==errno ? TDEIO::ERR_ACCESS_DENIED : TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL());
                             return;
                         }
 
@@ -1415,7 +1415,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
     
                         if (srcFd<0)
                         {
-                            error(KIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
+                            error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
                             return;
                         }
     
@@ -1428,14 +1428,14 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
     
                         if (destFd<0)
                         {
-                            error(EACCES==errno ? KIO::ERR_WRITE_ACCESS_DENIED : KIO::ERR_CANNOT_OPEN_FOR_WRITING, dest.prettyURL());
+                            error(EACCES==errno ? TDEIO::ERR_WRITE_ACCESS_DENIED : TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dest.prettyURL());
                             close(srcFd);
                             return;
                         }
     
                         totalSize(buffSrc.st_size);
 
-                        KIO::filesize_t processed = 0;
+                        TDEIO::filesize_t processed = 0;
                         char            buffer[MAX_IPC_SIZE];
                         TQByteArray      array;
     
@@ -1447,7 +1447,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
                             {
 				if (errno == EINTR)
 					continue;
-                                error(KIO::ERR_COULD_NOT_READ, src.prettyURL());
+                                error(TDEIO::ERR_COULD_NOT_READ, src.prettyURL());
                                 close(srcFd);
                                 close(destFd);
                                 return;
@@ -1461,11 +1461,11 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
                                 close(destFd);
                                 if (ENOSPC==errno) // disk full
                                 {
-                                    error(KIO::ERR_DISK_FULL, dest.prettyURL());
+                                    error(TDEIO::ERR_DISK_FULL, dest.prettyURL());
                                     remove(realDest.data());
                                 }
                                 else
-                                    error(KIO::ERR_COULD_NOT_WRITE, dest.prettyURL());
+                                    error(TDEIO::ERR_COULD_NOT_WRITE, dest.prettyURL());
                                 return;
                             }
     
@@ -1477,7 +1477,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
     
                         if(close(destFd))
                         {
-                            error(KIO::ERR_COULD_NOT_WRITE, dest.prettyURL());
+                            error(TDEIO::ERR_COULD_NOT_WRITE, dest.prettyURL());
                             return;
                         }
     
@@ -1512,9 +1512,9 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
     KFI_DBUG << "rename " << src.prettyURL() << " - " << d.prettyURL() << ", " << overwrite << endl;
 
     if(src.directory()==d.directory())
-        error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, fonts cannot be renamed."));
+        error(TDEIO::ERR_SLAVE_DEFINED, i18n("Sorry, fonts cannot be renamed."));
     else if(itsRoot) // Should never happen...
-        error(KIO::ERR_UNSUPPORTED_ACTION, unsupportedActionErrorString(mProtocol, KIO::CMD_RENAME));
+        error(TDEIO::ERR_UNSUPPORTED_ACTION, unsupportedActionErrorString(mProtocol, TDEIO::CMD_RENAME));
     else
     {
         //
@@ -1595,7 +1595,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
                     }
                     else
                     {
-                        error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+                        error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
                         return;
                     }
                 }
@@ -1656,7 +1656,7 @@ void CKioFonts::del(const KURL &url, bool)
             if(doRootCmd(cmd))
                 modified(FOLDER_SYS, clearList, modifiedDirs);
             else
-                error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
+                error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS)));
         }
         else
         {
@@ -1666,10 +1666,10 @@ void CKioFonts::del(const KURL &url, bool)
 
                 if (0!=unlink(TQFile::encodeName(file).data()))
                     error(EACCES==errno || EPERM==errno
-                            ? KIO::ERR_ACCESS_DENIED
+                            ? TDEIO::ERR_ACCESS_DENIED
                             : EISDIR==errno
-                                    ? KIO::ERR_IS_DIRECTORY
-                                    : KIO::ERR_CANNOT_DELETE,
+                                    ? TDEIO::ERR_IS_DIRECTORY
+                                    : TDEIO::ERR_CANNOT_DELETE,
                           file);
                 else
                 {
@@ -1760,7 +1760,7 @@ void CKioFonts::special(const TQByteArray &a)
                 finished();
                 break;
             default:
-                error( KIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd));
+                error( TDEIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd));
         }
     }
     else
@@ -1899,7 +1899,7 @@ void CKioFonts::doModified()
 TQString CKioFonts::getRootPasswd(bool askPasswd)
 {
     KFI_DBUG << "getRootPasswd" << endl;
-    KIO::AuthInfo authInfo;
+    TDEIO::AuthInfo authInfo;
     SuProcess     proc(SYS_USER);
     bool          error=false;
     int           attempts=0;
@@ -2064,7 +2064,7 @@ bool CKioFonts::updateFontList()
 
     if(NULL==itsFontList)
     {
-        error(KIO::ERR_SLAVE_DEFINED, i18n("Internal fontconfig error."));
+        error(TDEIO::ERR_SLAVE_DEFINED, i18n("Internal fontconfig error."));
         return false;
     }
 
@@ -2099,7 +2099,7 @@ TQValueList<FcPattern *> * CKioFonts::getEntries(const KURL &url)
     if(it!=itsFolders[getFolder(url)].fontMap.end())
         return &(it.data());
 
-    error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\".").arg(url.prettyURL()));
+    error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\".").arg(url.prettyURL()));
     return NULL;
 }
 
@@ -2143,7 +2143,7 @@ bool CKioFonts::checkFile(const TQString &file)
         return true;
     }
 
-    error(KIO::ERR_SLAVE_DEFINED, i18n("<p>Only fonts may be installed.</p><p>If installing a fonts package (*%1), then "
+    error(TDEIO::ERR_SLAVE_DEFINED, i18n("<p>Only fonts may be installed.</p><p>If installing a fonts package (*%1), then "
                                        "extract the components, and install individually.</p>").arg(constMultipleExtension));
     return false;
 }
@@ -2205,24 +2205,24 @@ bool CKioFonts::getSourceFiles(const KURL &src, TQStringList &files)
 
             if (-1==KDE_stat(realSrc.data(), &buffSrc))
             {
-                error(EACCES==errno ? KIO::ERR_ACCESS_DENIED : KIO::ERR_DOES_NOT_EXIST, src.prettyURL());
+                error(EACCES==errno ? TDEIO::ERR_ACCESS_DENIED : TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL());
                 return false;
             }
             if(S_ISDIR(buffSrc.st_mode))
             {
-                error(KIO::ERR_IS_DIRECTORY, src.prettyURL());
+                error(TDEIO::ERR_IS_DIRECTORY, src.prettyURL());
                 return false;
             }
             if(S_ISFIFO(buffSrc.st_mode) || S_ISSOCK(buffSrc.st_mode))
             {
-                error(KIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
+                error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
                 return false;
             }
         }
     }
     else
     {
-        error(KIO::ERR_DOES_NOT_EXIST, src.prettyURL());
+        error(TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL());
         return false;
     }
 
@@ -2234,7 +2234,7 @@ bool CKioFonts::checkDestFile(const KURL &src, const KURL &dest, EFolder destFol
     if(!overwrite && (Misc::fExists(itsFolders[destFolder].location+src.fileName()) ||
                       Misc::fExists(itsFolders[destFolder].location+modifyName(src.fileName())) ) )
     {
-        error(KIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
+        error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
         return false;
     }
 
@@ -2250,7 +2250,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map,
        dest.directory()==src.directory())  // Check whether confirmUrl changed a "cp fonts:/System fonts:/"
                                            // to "cp fonts:/System fonts:/System"
     {
-        error(KIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
+        error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
         return false;
     }
 
@@ -2262,7 +2262,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map,
         for(; fIt!=fEnd; ++fIt)
             if(NULL!=getEntry(destFolder, fIt.data()) || NULL!=getEntry(destFolder, modifyName(fIt.data())))
             {
-                error(KIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
+                error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL());
                 return false;
             }
     }
@@ -2320,7 +2320,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFol
                                                        "The other affected fonts are:</p><ul>%1</ul><p>\n Do you wish to "
                                                        "delete all of these?</p>").arg(out)))
         {
-            error(KIO::ERR_USER_CANCELED, url.prettyURL());
+            error(TDEIO::ERR_USER_CANCELED, url.prettyURL());
             return false;
         }
     }
@@ -2368,7 +2368,7 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
         else
             if(!isSysFolder(sect) && !isUserFolder(sect))
             {
-                error(KIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".")
+                error(TDEIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".")
                       .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS)));
                 return false;
             }
@@ -2388,7 +2388,7 @@ bool CKioFonts::checkAllowed(const KURL &u)
            ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
            ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
         {
-            error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
+            error(TDEIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
                   .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \
             return false;
         }
@@ -2460,7 +2460,7 @@ void CKioFonts::reparseConfig()
 
     if(itsRoot)
     {
-        KConfig cfg(KFI_ROOT_CFG_FILE);
+        TDEConfig cfg(KFI_ROOT_CFG_FILE);
         bool    doX=cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X),
                 doGs=cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS);
 
@@ -2483,7 +2483,7 @@ void CKioFonts::reparseConfig()
     }
     else
     {
-        KConfig rootCfg(KFI_ROOT_CFG_FILE);
+        TDEConfig rootCfg(KFI_ROOT_CFG_FILE);
         bool    rootDoX=rootCfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X),
                 rootDoGs=rootCfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS);
 
@@ -2517,7 +2517,7 @@ void CKioFonts::reparseConfig()
         if(0==itsNrsKfiParams[1])
             itsNrsKfiParams[0]=0;
 
-        KConfig cfg(KFI_CFG_FILE);
+        TDEConfig cfg(KFI_CFG_FILE);
         bool    doX=cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X),
                 doGs=cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS);
 
diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h
index 66a2b01b9..1de87f5f1 100644
--- a/kcontrol/kfontinst/kio/KioFonts.h
+++ b/kcontrol/kfontinst/kio/KioFonts.h
@@ -44,7 +44,7 @@
 namespace KFI
 {
 
-class CKioFonts : public KIO::SlaveBase
+class CKioFonts : public TDEIO::SlaveBase
 {
     private:
 
@@ -101,7 +101,7 @@ class CKioFonts : public KIO::SlaveBase
 
     void listDir(const KURL &url);
     void stat(const KURL &url);
-    bool createStatEntry(KIO::UDSEntry &entry, const KURL &url, EFolder folder);
+    bool createStatEntry(TDEIO::UDSEntry &entry, const KURL &url, EFolder folder);
     void get(const KURL &url);
     void put(const KURL &url, int mode, bool overwrite, bool resume);
     void copy(const KURL &src, const KURL &dest, int mode, bool overwrite);
diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp
index 3c2320588..57fb765f1 100644
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@@ -687,7 +687,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
 
 TQString CFcEngine::getPreviewString()
 {
-    KConfig cfg(KFI_UI_CFG_FILE);
+    TDEConfig cfg(KFI_UI_CFG_FILE);
 
     cfg.setGroup(KFI_PREVIEW_GROUP);
 
@@ -700,7 +700,7 @@ TQString CFcEngine::getPreviewString()
 
 void CFcEngine::setPreviewString(const TQString &str)
 {
-    KConfig cfg(KFI_UI_CFG_FILE);
+    TDEConfig cfg(KFI_UI_CFG_FILE);
 
     cfg.setGroup(KFI_PREVIEW_GROUP);
     cfg.writeEntry(KFI_PREVIEW_STRING_KEY, str);
@@ -911,17 +911,17 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
     //
     if(KFI_KIO_FONTS_PROTOCOL==url.protocol())
     {
-        KIO::UDSEntry udsEntry;
+        TDEIO::UDSEntry udsEntry;
         TQString       name;
 
         FcInitReinitialize();
-        if(KIO::NetAccess::stat(url, udsEntry, NULL))  // Need to stat the url to get its font name...
+        if(TDEIO::NetAccess::stat(url, udsEntry, NULL))  // Need to stat the url to get its font name...
         {
-            KIO::UDSEntry::Iterator it(udsEntry.begin()),
+            TDEIO::UDSEntry::Iterator it(udsEntry.begin()),
                                     end(udsEntry.end());
 
             for( ; it != end; ++it)
-                if (KIO::UDS_NAME==(*it).m_uds)
+                if (TDEIO::UDS_NAME==(*it).m_uds)
                 {
                     name=(*it).m_str;
                     break;
diff --git a/kcontrol/kfontinst/lib/KfiConstants.h b/kcontrol/kfontinst/lib/KfiConstants.h
index fa7f6f1a0..e50acb5fb 100644
--- a/kcontrol/kfontinst/lib/KfiConstants.h
+++ b/kcontrol/kfontinst/lib/KfiConstants.h
@@ -21,7 +21,7 @@
 #define KFI_DEFAULT_CFG_X            true
 #define KFI_DEFAULT_CFG_GS           false
 
-// KIO::special
+// TDEIO::special
 
 namespace KFI
 {
diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp
index fe6054cd5..a2c150a08 100644
--- a/kcontrol/kfontinst/lib/Misc.cpp
+++ b/kcontrol/kfontinst/lib/Misc.cpp
@@ -190,11 +190,11 @@ void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, TQWidg
     for(e=0; afm[e]; ++e)
     {
         KURL statUrl(url);
-        KIO::UDSEntry uds;
+        TDEIO::UDSEntry uds;
 
         statUrl.setPath(changeExt(url.path(), afm[e]));
 
-        if(localFile ? fExists(statUrl.path()) : KIO::NetAccess::stat(statUrl, uds, widget))
+        if(localFile ? fExists(statUrl.path()) : TDEIO::NetAccess::stat(statUrl, uds, widget))
         {
             list.append(statUrl);
             gotAfm=true;
@@ -206,10 +206,10 @@ void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, TQWidg
         for(e=0; pfm[e]; ++e)
         {
             KURL          statUrl(url);
-            KIO::UDSEntry uds;
+            TDEIO::UDSEntry uds;
 
             statUrl.setPath(changeExt(url.path(), pfm[e]));
-            if(localFile ? fExists(statUrl.path()) : KIO::NetAccess::stat(statUrl, uds, widget))
+            if(localFile ? fExists(statUrl.path()) : TDEIO::NetAccess::stat(statUrl, uds, widget))
             {
                 list.append(statUrl);
                 break;
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index 7d9d9d3f4..1eeb2396c 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -141,7 +141,7 @@ bool CFontViewPart::openURL(const KURL &url)
 
 bool CFontViewPart::openFile()
 {
-    // NOTE: Cant do the real open here, as dont seem to be able to use KIO::NetAccess functions during initial start-up.
+    // NOTE: Cant do the real open here, as dont seem to be able to use TDEIO::NetAccess functions during initial start-up.
     // Bug report 111535 indicates that calling "konqueror <font>" crashes.
     TQTimer::singleShot(0, this, TQT_SLOT(timeout()));
     return true;
@@ -165,17 +165,17 @@ void CFontViewPart::timeout()
         if(Misc::root())
         {
             destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url);
-            itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
+            itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
         }
         else
         {
             destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
-            if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
+            if(TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
                 itsShowInstallButton=false;
             else
             {
                 destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
-                itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
+                itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
             }
         }
     }
@@ -220,7 +220,7 @@ void CFontViewPart::install()
     {
         KURL destUrl(getDest(m_url, KMessageBox::No==resp));
 
-        if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget()))
+        if(TDEIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget()))
         {
             //
             // OK file copied, now look for any AFM or PFM file...
@@ -236,7 +236,7 @@ void CFontViewPart::install()
                 for(it=urls.begin(); it!=end; ++it)
                 {
                     destUrl=getDest(*it, KMessageBox::No==resp);
-                    KIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget());
+                    TDEIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget());
                 }
             }
 
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
index 28dbd0f1f..f4b57bde0 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
@@ -72,7 +72,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
             itsPreview->openURL(openURL);
 
         TQSize             defSize(450, 380);
-        KConfigGroupSaver saver(kapp->config(), CFG_GROUP);
+        TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
 
         resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize));
         show();
@@ -83,7 +83,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
 
 CFontViewerAppMainWindow::~CFontViewerAppMainWindow()
 {
-    KConfigGroupSaver saver(kapp->config(), CFG_GROUP);
+    TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP);
     kapp->config()->writeEntry(CFG_SIZE_KEY, size());
     kapp->config()->sync();
 }
diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp
index 7e02b0da9..a56625e4a 100644
--- a/kcontrol/kicker/advancedDialog.cpp
+++ b/kcontrol/kicker/advancedDialog.cpp
@@ -78,7 +78,7 @@ advancedDialog::~advancedDialog()
 
 void advancedDialog::load()
 {
-    KConfig c(KickerConfig::the()->configName(), false, false);
+    TDEConfig c(KickerConfig::the()->configName(), false, false);
     c.setGroup("General");
 
     bool fadedOut = c.readBoolEntry("FadeOutAppletHandles", true);
@@ -112,7 +112,7 @@ void advancedDialog::load()
 
 void advancedDialog::save()
 {
-    KConfig c(KickerConfig::the()->configName(), false, false);
+    TDEConfig c(KickerConfig::the()->configName(), false, false);
 
     c.setGroup("General");
     c.writeEntry("FadeOutAppletHandles",
@@ -149,7 +149,7 @@ void advancedDialog::save()
 
         // set config group
         c.setGroup(group);
-        KConfig extConfig(c.readEntry("ConfigFile"));
+        TDEConfig extConfig(c.readEntry("ConfigFile"));
         extConfig.setGroup("General");
         extConfig.writeEntry("FadeOutAppletHandles",
                              m_advancedWidget->fadeOutHandles->isChecked());
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index f2b7cc1b4..73fa16d5c 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -94,7 +94,7 @@ void AppletTab::load()
 
 void AppletTab::load( bool useDefaults )
 {
-  KConfig c(KickerConfig::the()->configName(), false, false);
+  TDEConfig c(KickerConfig::the()->configName(), false, false);
   c.setReadDefaults( useDefaults );
   c.setGroup("General");
 
@@ -153,7 +153,7 @@ void AppletTab::load( bool useDefaults )
 
 void AppletTab::save()
 {
-    KConfig c(KickerConfig::the()->configName(), false, false);
+    TDEConfig c(KickerConfig::the()->configName(), false, false);
   c.setGroup("General");
 
   int level = 0;
diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp
index 91e19e2d3..037159d93 100644
--- a/kcontrol/kicker/extensionInfo.cpp
+++ b/kcontrol/kicker/extensionInfo.cpp
@@ -121,7 +121,7 @@ void ExtensionInfo::load()
     if (_customSizeMax < _customSizeMin) _customSizeMax = _customSizeMin;
     if (_customSize < _customSizeMin) _customSize = _customSizeMin;
 
-    KConfig c(_configFile);
+    TDEConfig c(_configFile);
     c.setGroup("General");
 
     _position           = c.readNumEntry ("Position",            _position);
@@ -159,7 +159,7 @@ void ExtensionInfo::load()
 
 void ExtensionInfo::configChanged()
 {
-    KConfig c(_configFile);
+    TDEConfig c(_configFile);
     c.setGroup("General");
 
     // check to see if the new value is different from both
@@ -223,7 +223,7 @@ void ExtensionInfo::setDefaults()
 
 void ExtensionInfo::save()
 {
-    KConfig c(_configFile);
+    TDEConfig c(_configFile);
     c.setGroup("General");
 
     c.writeEntry("Position",            _position);
diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp
index 935fa5902..810024479 100644
--- a/kcontrol/kicker/hidingconfig.cpp
+++ b/kcontrol/kicker/hidingconfig.cpp
@@ -29,7 +29,7 @@
 #include "hidingconfig.moc"
 
 HidingConfig::HidingConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
     TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new HidingTab(this);
@@ -58,7 +58,7 @@ void HidingConfig::notChanged()
 void HidingConfig::load()
 {
     m_widget->load();
-    KCModule::load();
+    TDECModule::load();
 }
 
 void HidingConfig::aboutToNotifyKicker()
@@ -69,7 +69,7 @@ void HidingConfig::aboutToNotifyKicker()
     // which is send before Kicker is notified.
     // See comment in save().
     m_widget->save();
-    KCModule::save();
+    TDECModule::save();
 }
 
 void HidingConfig::save()
@@ -85,9 +85,9 @@ void HidingConfig::save()
 void HidingConfig::defaults()
 {
     m_widget->defaults();
-    KCModule::defaults();
+    TDECModule::defaults();
 
-    // KConfigDialogManager may queue an changed(false) signal,
+    // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
     TQTimer::singleShot(0, this, TQT_SLOT(changed()));
diff --git a/kcontrol/kicker/hidingconfig.h b/kcontrol/kicker/hidingconfig.h
index 647be9631..342da29b9 100644
--- a/kcontrol/kicker/hidingconfig.h
+++ b/kcontrol/kicker/hidingconfig.h
@@ -22,7 +22,7 @@
 
 class HidingTab;
 
-class HidingConfig : public KCModule
+class HidingConfig : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp
index 7475ad7b0..49c0cf56a 100644
--- a/kcontrol/kicker/lookandfeelconfig.cpp
+++ b/kcontrol/kicker/lookandfeelconfig.cpp
@@ -29,7 +29,7 @@
 #include "lookandfeelconfig.moc"
 
 LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
     TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new LookAndFeelTab(this);
@@ -57,7 +57,7 @@ void LookAndFeelConfig::notChanged()
 
 void LookAndFeelConfig::load()
 {
-    KCModule::load();
+    TDECModule::load();
     m_widget->load();
 }
 
@@ -68,7 +68,7 @@ void LookAndFeelConfig::aboutToNotifyKicker()
     // This slot is triggered by the signal,
     // which is send before Kicker is notified.
     // See comment in save().
-    KCModule::save();
+    TDECModule::save();
     m_widget->save();
 }
 
@@ -84,10 +84,10 @@ void LookAndFeelConfig::save()
 
 void LookAndFeelConfig::defaults()
 {
-    KCModule::defaults();
+    TDECModule::defaults();
     m_widget->defaults();
 
-    // KConfigDialogManager may queue an changed(false) signal,
+    // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
     TQTimer::singleShot(0, this, TQT_SLOT(changed()));
diff --git a/kcontrol/kicker/lookandfeelconfig.h b/kcontrol/kicker/lookandfeelconfig.h
index 7b91cc52f..c3190ce08 100644
--- a/kcontrol/kicker/lookandfeelconfig.h
+++ b/kcontrol/kicker/lookandfeelconfig.h
@@ -22,7 +22,7 @@
 
 class LookAndFeelTab;
 
-class LookAndFeelConfig : public KCModule
+class LookAndFeelConfig : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp
index b2e6a79dc..4d063b54e 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.cpp
+++ b/kcontrol/kicker/lookandfeeltab_impl.cpp
@@ -129,7 +129,7 @@ void LookAndFeelTab::previewBackground(const TQString& themepath, bool isNew)
             KickerLib::colorize(tmpImg);
         theme_preview.convertFromImage(tmpImg);
         if(!theme_preview.isNull()) {
-            // avoid getting changed(true) from KConfigDialogManager for the default value
+            // avoid getting changed(true) from TDEConfigDialogManager for the default value
             if( KickerSettings::backgroundTheme() == themepath )
                 KickerSettings::setBackgroundTheme( theme );
             kcfg_BackgroundTheme->lineEdit()->setText(theme);
@@ -154,7 +154,7 @@ void LookAndFeelTab::load()
 
 void LookAndFeelTab::load(bool useDefaults)
 {
-    KConfig config(KickerConfig::the()->configName(), false, false);
+    TDEConfig config(KickerConfig::the()->configName(), false, false);
 
     config.setReadDefaults( useDefaults );
 
@@ -227,7 +227,7 @@ void LookAndFeelTab::load(bool useDefaults)
 
 void LookAndFeelTab::save()
 {
-    KConfig config(KickerConfig::the()->configName(), false, false);
+    TDEConfig config(KickerConfig::the()->configName(), false, false);
 
     config.setGroup("General");
 
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp
index 16e52c8ec..23766ce28 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.cpp
+++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp
@@ -29,7 +29,7 @@
 #include <kdialog.h>
 
 LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
 
     TDEAboutData *about =
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.h b/kcontrol/kicker/lookandfeeltab_kcm.h
index 085f87e43..ecf7ff0e6 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.h
+++ b/kcontrol/kicker/lookandfeeltab_kcm.h
@@ -22,7 +22,7 @@
 
 class LookAndFeelTab;
 
-class LookAndFeelConfig : public KCModule
+class LookAndFeelConfig : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index 5fa5ceb06..dda2f08db 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -171,7 +171,7 @@ void KickerConfig::notifyKicker()
     kapp->dcopClient()->send(appname, appname, "configure()", data);
 }
 
-void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool reloadIfExists)
+void KickerConfig::setupExtensionInfo(TDEConfig& config, bool checkExists, bool reloadIfExists)
 {
     config.setGroup("General");
     TQStringList elist = config.readListEntry("Extensions2");
@@ -353,7 +353,7 @@ TQString KickerConfig::quickHelp() const
 
 TDEAboutData *KickerConfig::aboutData()
 {
-    // the TDEAboutDatas are deleted by the KCModules
+    // the TDEAboutDatas are deleted by the TDECModules
     TDEAboutData *about
           = new TDEAboutData(I18N_NOOP("kcmkicker"),
                            I18N_NOOP("TDE Panel Control Module"),
@@ -371,9 +371,9 @@ TDEAboutData *KickerConfig::aboutData()
 
 extern "C"
 {
-    KDE_EXPORT KCModule *create_kicker(TQWidget *parent, const char *name)
+    KDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name)
     {
-        KCModuleContainer *container = new KCModuleContainer(parent, "kcmkicker");
+        TDECModuleContainer *container = new TDECModuleContainer(parent, "kcmkicker");
         container->addModule("kicker_config_arrangement");
         container->addModule("kicker_config_hiding");
         container->addModule("kicker_config_menus");
@@ -381,26 +381,26 @@ extern "C"
         return container;
     }
 
-    KDE_EXPORT KCModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
+    KDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/)
     {
         TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
                                          "kicker/extensions");
         return new PositionConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT KCModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
+    KDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/)
     {
         TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
                                          "kicker/extensions");
         return new HidingConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT KCModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
+    KDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/)
     {
         return new MenuConfig(parent, "kcmkicker");
     }
 
-    KDE_EXPORT KCModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
+    KDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/)
     {
         KImageIO::registerFormats();
         TDEGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") +
diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h
index bbc567273..45364c366 100644
--- a/kcontrol/kicker/main.h
+++ b/kcontrol/kicker/main.h
@@ -65,7 +65,7 @@ signals:
 
 protected:
     void init();
-    void setupExtensionInfo(KConfig& c, bool checkExists, bool reloadIfExists = false);
+    void setupExtensionInfo(TDEConfig& c, bool checkExists, bool reloadIfExists = false);
 
 protected slots:
     void configChanged(const TQString&);
diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp
index 03ca57582..b477cd76d 100644
--- a/kcontrol/kicker/menuconfig.cpp
+++ b/kcontrol/kicker/menuconfig.cpp
@@ -29,7 +29,7 @@
 #include "menuconfig.moc"
 
 MenuConfig::MenuConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
     TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new MenuTab(this);
@@ -58,7 +58,7 @@ void MenuConfig::notChanged()
 void MenuConfig::load()
 {
     m_widget->load();
-    KCModule::load();
+    TDECModule::load();
 }
 
 void MenuConfig::aboutToNotifyKicker()
@@ -69,7 +69,7 @@ void MenuConfig::aboutToNotifyKicker()
     // which is send before Kicker is notified.
     // See comment in save().
     m_widget->save();
-    KCModule::save();
+    TDECModule::save();
 }
 
 void MenuConfig::save()
@@ -85,9 +85,9 @@ void MenuConfig::save()
 void MenuConfig::defaults()
 {
     m_widget->defaults();
-    KCModule::defaults();
+    TDECModule::defaults();
 
-    // KConfigDialogManager may queue an changed(false) signal,
+    // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changedm,
     // while we manage some of the widgets ourselves
     TQTimer::singleShot(0, this, TQT_SLOT(changed()));
diff --git a/kcontrol/kicker/menuconfig.h b/kcontrol/kicker/menuconfig.h
index 490684076..30178b18c 100644
--- a/kcontrol/kicker/menuconfig.h
+++ b/kcontrol/kicker/menuconfig.h
@@ -22,7 +22,7 @@
 
 class MenuTab;
 
-class MenuConfig : public KCModule
+class MenuConfig : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 5b08627cb..652f75aa7 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -93,8 +93,8 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
     kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
     btnCustomKMenuIcon->setPixmap(kmenu_icon);
 
-    KConfig *config;
-    config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
+    TDEConfig *config;
+    config = new TDEConfig(TQString::fromLatin1("kdeglobals"), false, false);
     config->setGroup(TQString::fromLatin1("RecentDocuments"));
     maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10));
 
@@ -267,8 +267,8 @@ void MenuTab::save()
     c->sync();
 
     // Save recent documents
-    KConfig *config;
-    config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
+    TDEConfig *config;
+    config = new TDEConfig(TQString::fromLatin1("kdeglobals"), false, false);
     config->setGroup(TQString::fromLatin1("RecentDocuments"));
     config->writeEntry("MaxEntries", maxrecentdocs->value());
     config->sync();
diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp
index 6e5dcdeb2..4eafcf677 100644
--- a/kcontrol/kicker/positionconfig.cpp
+++ b/kcontrol/kicker/positionconfig.cpp
@@ -29,7 +29,7 @@
 #include "positionconfig.moc"
 
 PositionConfig::PositionConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name)
+  : TDECModule(parent, name)
 {
     TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new PositionTab(this);
@@ -58,7 +58,7 @@ void PositionConfig::notChanged()
 void PositionConfig::load()
 {
     m_widget->load();
-    KCModule::load();
+    TDECModule::load();
 }
 
 void PositionConfig::aboutToNotifyKicker()
@@ -69,7 +69,7 @@ void PositionConfig::aboutToNotifyKicker()
     // which is send before Kicker is notified.
     // See comment in save().
     m_widget->save();
-    KCModule::save();
+    TDECModule::save();
 }
 
 void PositionConfig::save()
@@ -85,9 +85,9 @@ void PositionConfig::save()
 void PositionConfig::defaults()
 {
     m_widget->defaults();
-    KCModule::defaults();
+    TDECModule::defaults();
 
-    // KConfigDialogManager may queue an changed(false) signal,
+    // TDEConfigDialogManager may queue an changed(false) signal,
     // so we make sure, that the module is labeled as changed,
     // while we manage some of the widgets ourselves
     TQTimer::singleShot(0, this, TQT_SLOT(changed()));
diff --git a/kcontrol/kicker/positionconfig.h b/kcontrol/kicker/positionconfig.h
index bf29473b4..13d026f3b 100644
--- a/kcontrol/kicker/positionconfig.h
+++ b/kcontrol/kicker/positionconfig.h
@@ -22,7 +22,7 @@
 
 class PositionTab;
 
-class PositionConfig : public KCModule
+class PositionConfig : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/kio/cache.cpp b/kcontrol/kio/cache.cpp
index 1537ade1d..eab4e54dd 100644
--- a/kcontrol/kio/cache.cpp
+++ b/kcontrol/kio/cache.cpp
@@ -39,7 +39,7 @@
 #include "cache_ui.h"
 
 KCacheConfigDialog::KCacheConfigDialog( TQWidget* parent )
-                   :KCModule( parent, "kcmkio" )
+                   :TDECModule( parent, "kcmkio" )
 {
   TQVBoxLayout* mainLayout = new TQVBoxLayout(this, 0, 0);
   m_dlg = new CacheDlgUI(this);
@@ -54,15 +54,15 @@ void KCacheConfigDialog::load()
   m_dlg->cbUseCache->setChecked(KProtocolManager::useCache());
   m_dlg->sbMaxCacheSize->setValue( KProtocolManager::maxCacheSize() );
 
-  KIO::CacheControl cc = KProtocolManager::cacheControl();
+  TDEIO::CacheControl cc = KProtocolManager::cacheControl();
 
-  if (cc==KIO::CC_Verify)
+  if (cc==TDEIO::CC_Verify)
       m_dlg->rbVerifyCache->setChecked( true );
-  else if (cc==KIO::CC_Refresh)
+  else if (cc==TDEIO::CC_Refresh)
       m_dlg->rbVerifyCache->setChecked( true );
-  else if (cc==KIO::CC_CacheOnly)
+  else if (cc==TDEIO::CC_CacheOnly)
       m_dlg->rbOfflineMode->setChecked( true );
-  else if (cc==KIO::CC_Cache)
+  else if (cc==TDEIO::CC_Cache)
       m_dlg->rbCacheIfPossible->setChecked( true );
 
   // Config changed notifications...
@@ -79,13 +79,13 @@ void KCacheConfigDialog::save()
   KSaveIOConfig::setMaxCacheSize( m_dlg->sbMaxCacheSize->value() );
 
   if ( !m_dlg->cbUseCache->isChecked() )
-      KSaveIOConfig::setCacheControl(KIO::CC_Refresh);
+      KSaveIOConfig::setCacheControl(TDEIO::CC_Refresh);
   else if ( m_dlg->rbVerifyCache->isChecked() )
-      KSaveIOConfig::setCacheControl(KIO::CC_Refresh);
+      KSaveIOConfig::setCacheControl(TDEIO::CC_Refresh);
   else if ( m_dlg->rbOfflineMode->isChecked() )
-      KSaveIOConfig::setCacheControl(KIO::CC_CacheOnly);
+      KSaveIOConfig::setCacheControl(TDEIO::CC_CacheOnly);
   else if ( m_dlg->rbCacheIfPossible->isChecked() )
-      KSaveIOConfig::setCacheControl(KIO::CC_Cache);
+      KSaveIOConfig::setCacheControl(TDEIO::CC_Cache);
 
   // Update running io-slaves...
   KSaveIOConfig::updateRunningIOSlaves (this);
diff --git a/kcontrol/kio/cache.h b/kcontrol/kio/cache.h
index 07ff0a6c8..f7d0dd695 100644
--- a/kcontrol/kio/cache.h
+++ b/kcontrol/kio/cache.h
@@ -26,7 +26,7 @@
 
 class CacheDlgUI;
 
-class KCacheConfigDialog : public KCModule
+class KCacheConfigDialog : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kcontrol/kio/kcookiesmain.cpp b/kcontrol/kio/kcookiesmain.cpp
index 06629ee22..a17c70603 100644
--- a/kcontrol/kio/kcookiesmain.cpp
+++ b/kcontrol/kio/kcookiesmain.cpp
@@ -17,7 +17,7 @@
 #include "kcookiesmanagement.h"
 
 KCookiesMain::KCookiesMain(TQWidget *parent)
-  : KCModule(parent, "kcmkio")
+  : TDECModule(parent, "kcmkio")
 {
     management = 0;
     bool managerOK = true;
@@ -70,7 +70,7 @@ void KCookiesMain::save()
 
 void KCookiesMain::defaults()
 {
-  KCModule* module = static_cast<KCModule*>(tab->currentPage());
+  TDECModule* module = static_cast<TDECModule*>(tab->currentPage());
   
   if ( module == policies )
     policies->defaults();
diff --git a/kcontrol/kio/kcookiesmain.h b/kcontrol/kio/kcookiesmain.h
index 285c9e87a..e11cf1a52 100644
--- a/kcontrol/kio/kcookiesmain.h
+++ b/kcontrol/kio/kcookiesmain.h
@@ -13,7 +13,7 @@ class DCOPClient;
 class KCookiesPolicies;
 class KCookiesManagement;
 
-class KCookiesMain : public KCModule
+class KCookiesMain : public TDECModule
 {
     Q_OBJECT
 public:
diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp
index e825fd2a4..c5a98fcc2 100644
--- a/kcontrol/kio/kcookiesmanagement.cpp
+++ b/kcontrol/kio/kcookiesmanagement.cpp
@@ -100,7 +100,7 @@ TQString CookieListViewItem::text(int f) const
 }
 
 KCookiesManagement::KCookiesManagement(TQWidget *parent)
-                   : KCModule(parent, "kcmkio")
+                   : TDECModule(parent, "kcmkio")
 {
   // Toplevel layout
   TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint(),
diff --git a/kcontrol/kio/kcookiesmanagement.h b/kcontrol/kio/kcookiesmanagement.h
index 3e7588282..3b8696e2c 100644
--- a/kcontrol/kio/kcookiesmanagement.h
+++ b/kcontrol/kio/kcookiesmanagement.h
@@ -59,7 +59,7 @@ private:
     bool mCookiesLoaded;
 };
 
-class KCookiesManagement : public KCModule
+class KCookiesManagement : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp
index 0c3641355..30f1859c4 100644
--- a/kcontrol/kio/kcookiespolicies.cpp
+++ b/kcontrol/kio/kcookiespolicies.cpp
@@ -47,7 +47,7 @@
 #include "kcookiespoliciesdlg_ui.h"
 
 KCookiesPolicies::KCookiesPolicies(TQWidget *parent)
-                 :KCModule(parent, "kcmkio")
+                 :TDECModule(parent, "kcmkio")
 {
     TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, 0);
 
@@ -283,7 +283,7 @@ void KCookiesPolicies::load()
   d_itemsSelected = 0;
   d_configChanged = false;
 
-  KConfig cfg ("kcookiejarrc", true);
+  TDEConfig cfg ("kcookiejarrc", true);
   cfg.setGroup ("Cookie Policy");
 
   bool enableCookies = cfg.readBoolEntry("Cookies", true);
@@ -365,7 +365,7 @@ void KCookiesPolicies::save()
   if (!d_configChanged)
     return;
 
-  KConfig cfg ( "kcookiejarrc" );
+  TDEConfig cfg ( "kcookiejarrc" );
   cfg.setGroup( "Cookie Policy" );
 
   bool state = dlg->cbEnableCookies->isChecked();
diff --git a/kcontrol/kio/kcookiespolicies.h b/kcontrol/kio/kcookiespolicies.h
index d59903a63..04a45672a 100644
--- a/kcontrol/kio/kcookiespolicies.h
+++ b/kcontrol/kio/kcookiespolicies.h
@@ -36,7 +36,7 @@ class TQListViewItem;
 class DCOPClient;
 class KCookiesPolicyDlgUI;
 
-class KCookiesPolicies : public KCModule
+class KCookiesPolicies : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/kio/kproxydlg.cpp b/kcontrol/kio/kproxydlg.cpp
index bbe7a76bd..f3cb65bff 100644
--- a/kcontrol/kio/kproxydlg.cpp
+++ b/kcontrol/kio/kproxydlg.cpp
@@ -41,7 +41,7 @@
 #include "kproxydlg_ui.h"
 
 KProxyOptions::KProxyOptions (TQWidget* parent )
-              :KCModule (parent, "kcmkio")
+              :TDECModule (parent, "kcmkio")
 {
   TQVBoxLayout *layout = new TQVBoxLayout(this);
   
@@ -85,9 +85,9 @@ TQString KProxyOptions::quickHelp() const
 {
   TQWidget *w = mTab->currentPage();
   
-  if (w && w->inherits("KCModule"))
+  if (w && w->inherits("TDECModule"))
   {
-     KCModule *m = static_cast<KCModule *>(w);
+     TDECModule *m = static_cast<TDECModule *>(w);
      return m->quickHelp();
   }
   
@@ -96,7 +96,7 @@ TQString KProxyOptions::quickHelp() const
 
 
 KProxyDialog::KProxyDialog( TQWidget* parent)
-             :KCModule( parent, "kcmkio" )
+             :TDECModule( parent, "kcmkio" )
 {
   TQVBoxLayout* mainLayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                               KDialog::spacingHint() );
diff --git a/kcontrol/kio/kproxydlg.h b/kcontrol/kio/kproxydlg.h
index f7de6913c..ecb99a77a 100644
--- a/kcontrol/kio/kproxydlg.h
+++ b/kcontrol/kio/kproxydlg.h
@@ -31,7 +31,7 @@ class TQTabWidget;
 class KProxyData;
 class KProxyDialogUI;
 
-class KProxyOptions : public KCModule
+class KProxyOptions : public TDECModule
 {
   Q_OBJECT
 
@@ -45,12 +45,12 @@ public:
   virtual TQString quickHelp() const;
 
 private:
-  KCModule* mProxy;
-  KCModule* mSocks;
+  TDECModule* mProxy;
+  TDECModule* mSocks;
   TQTabWidget* mTab;
 };
 
-class KProxyDialog : public KCModule
+class KProxyDialog : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/kio/ksaveioconfig.cpp b/kcontrol/kio/ksaveioconfig.cpp
index a52f92d3a..63e444b3b 100644
--- a/kcontrol/kio/ksaveioconfig.cpp
+++ b/kcontrol/kio/ksaveioconfig.cpp
@@ -32,8 +32,8 @@ public:
   KSaveIOConfigPrivate ();
   ~KSaveIOConfigPrivate ();
 
-  KConfig* config;
-  KConfig* http_config;
+  TDEConfig* config;
+  TDEConfig* http_config;
 };
 
 static KSaveIOConfigPrivate *ksiocpref = 0;
@@ -51,24 +51,24 @@ KSaveIOConfigPrivate::~KSaveIOConfigPrivate ()
 
 KSaveIOConfigPrivate* KSaveIOConfig::d = 0;
 
-KConfig* KSaveIOConfig::config()
+TDEConfig* KSaveIOConfig::config()
 {
   if (!d)
      d = new KSaveIOConfigPrivate;
 
   if (!d->config)
-     d->config = new KConfig("kioslaverc", false, false);
+     d->config = new TDEConfig("kioslaverc", false, false);
 
   return d->config;
 }
 
-KConfig* KSaveIOConfig::http_config()
+TDEConfig* KSaveIOConfig::http_config()
 {
   if (!d)
      d = new KSaveIOConfigPrivate;
 
   if (!d->http_config)
-     d->http_config = new KConfig("kio_httprc", false, false);
+     d->http_config = new TDEConfig("kio_httprc", false, false);
 
   return d->http_config;
 }
@@ -81,7 +81,7 @@ void KSaveIOConfig::reparseConfiguration ()
 
 void KSaveIOConfig::setReadTimeout( int _timeout )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
   cfg->writeEntry("ReadTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
   cfg->sync();
@@ -89,7 +89,7 @@ void KSaveIOConfig::setReadTimeout( int _timeout )
 
 void KSaveIOConfig::setConnectTimeout( int _timeout )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
   cfg->writeEntry("ConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
   cfg->sync();
@@ -97,7 +97,7 @@ void KSaveIOConfig::setConnectTimeout( int _timeout )
 
 void KSaveIOConfig::setProxyConnectTimeout( int _timeout )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
   cfg->writeEntry("ProxyConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
   cfg->sync();
@@ -105,7 +105,7 @@ void KSaveIOConfig::setProxyConnectTimeout( int _timeout )
 
 void KSaveIOConfig::setResponseTimeout( int _timeout )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
   cfg->writeEntry("ResponseTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
   cfg->sync();
@@ -114,7 +114,7 @@ void KSaveIOConfig::setResponseTimeout( int _timeout )
 
 void KSaveIOConfig::setMarkPartial( bool _mode )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
   cfg->writeEntry( "MarkPartial", _mode );
   cfg->sync();
@@ -122,7 +122,7 @@ void KSaveIOConfig::setMarkPartial( bool _mode )
 
 void KSaveIOConfig::setMinimumKeepSize( int _size )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
   cfg->writeEntry( "MinimumKeepSize", _size );
   cfg->sync();
@@ -130,7 +130,7 @@ void KSaveIOConfig::setMinimumKeepSize( int _size )
 
 void KSaveIOConfig::setAutoResume( bool _mode )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
   cfg->writeEntry( "AutoResume", _mode );
   cfg->sync();
@@ -138,36 +138,36 @@ void KSaveIOConfig::setAutoResume( bool _mode )
 
 void KSaveIOConfig::setUseCache( bool _mode )
 {
-  KConfig* cfg = http_config ();
+  TDEConfig* cfg = http_config ();
   cfg->writeEntry( "UseCache", _mode );
   cfg->sync();
 }
 
 void KSaveIOConfig::setMaxCacheSize( int cache_size )
 {
-  KConfig* cfg = http_config ();
+  TDEConfig* cfg = http_config ();
   cfg->writeEntry( "MaxCacheSize", cache_size );
   cfg->sync();
 }
 
-void KSaveIOConfig::setCacheControl(KIO::CacheControl policy)
+void KSaveIOConfig::setCacheControl(TDEIO::CacheControl policy)
 {
-  KConfig* cfg = http_config ();
-  TQString tmp = KIO::getCacheControlString(policy);
+  TDEConfig* cfg = http_config ();
+  TQString tmp = TDEIO::getCacheControlString(policy);
   cfg->writeEntry("cache", tmp);
   cfg->sync();
 }
 
 void KSaveIOConfig::setMaxCacheAge( int cache_age )
 {
-  KConfig* cfg = http_config ();
+  TDEConfig* cfg = http_config ();
   cfg->writeEntry( "MaxCacheAge", cache_age );
   cfg->sync();
 }
 
 void KSaveIOConfig::setUseReverseProxy( bool mode )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( "Proxy Settings" );
   cfg->writeEntry("ReversedException", mode);
   cfg->sync();
@@ -175,7 +175,7 @@ void KSaveIOConfig::setUseReverseProxy( bool mode )
 
 void KSaveIOConfig::setProxyType(KProtocolManager::ProxyType type)
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( "Proxy Settings" );
   cfg->writeEntry( "ProxyType", static_cast<int>(type) );
   cfg->sync();
@@ -183,7 +183,7 @@ void KSaveIOConfig::setProxyType(KProtocolManager::ProxyType type)
 
 void KSaveIOConfig::setProxyAuthMode(KProtocolManager::ProxyAuthMode mode)
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( "Proxy Settings" );
   cfg->writeEntry( "AuthMode", static_cast<int>(mode) );
   cfg->sync();
@@ -191,7 +191,7 @@ void KSaveIOConfig::setProxyAuthMode(KProtocolManager::ProxyAuthMode mode)
 
 void KSaveIOConfig::setNoProxyFor( const TQString& _noproxy )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( "Proxy Settings" );
   cfg->writeEntry( "NoProxyFor", _noproxy );
   cfg->sync();
@@ -200,7 +200,7 @@ void KSaveIOConfig::setNoProxyFor( const TQString& _noproxy )
 void KSaveIOConfig::setProxyFor( const TQString& protocol,
                                  const TQString& _proxy )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( "Proxy Settings" );
   cfg->writeEntry( protocol.lower() + "Proxy", _proxy );
   cfg->sync();
@@ -208,7 +208,7 @@ void KSaveIOConfig::setProxyFor( const TQString& protocol,
 
 void KSaveIOConfig::setProxyConfigScript( const TQString& _url )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( "Proxy Settings" );
   cfg->writeEntry( "Proxy Config Script", _url );
   cfg->sync();
@@ -216,7 +216,7 @@ void KSaveIOConfig::setProxyConfigScript( const TQString& _url )
 
 void KSaveIOConfig::setPersistentProxyConnection( bool enable )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
   cfg->writeEntry( "PersistentProxyConnection", enable );
   cfg->sync();
@@ -224,7 +224,7 @@ void KSaveIOConfig::setPersistentProxyConnection( bool enable )
 
 void KSaveIOConfig::setPersistentConnections( bool enable )
 {
-  KConfig* cfg = config ();
+  TDEConfig* cfg = config ();
   cfg->setGroup( TQString() );
   cfg->writeEntry( "PersistentConnections", enable );
   cfg->sync();
@@ -234,7 +234,7 @@ void KSaveIOConfig::updateRunningIOSlaves (TQWidget *parent)
 {
   // Inform all running io-slaves about the changes...
   // if we cannot update, ioslaves inform the end user...
-  if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString()))
+  if (!DCOPRef("*", "TDEIO::Scheduler").send("reparseSlaveConfiguration", TQString()))
   {
     TQString caption = i18n("Update Failed");
     TQString message = i18n("You have to restart the running applications "
diff --git a/kcontrol/kio/ksaveioconfig.h b/kcontrol/kio/ksaveioconfig.h
index c5efc5525..27df8c51d 100644
--- a/kcontrol/kio/ksaveioconfig.h
+++ b/kcontrol/kio/ksaveioconfig.h
@@ -50,7 +50,7 @@ public:
 
   static void setMaxCacheSize( int );
 
-  static void setCacheControl( KIO::CacheControl );
+  static void setCacheControl( TDEIO::CacheControl );
 
 
   /** Proxy Settings */
@@ -86,8 +86,8 @@ public:
   static void updateProxyScout( TQWidget * parent = 0L );
 
 protected:
-  static KConfig* config ();
-  static KConfig* http_config ();
+  static TDEConfig* config ();
+  static TDEConfig* http_config ();
   KSaveIOConfig ();
 
 private:
diff --git a/kcontrol/kio/main.cpp b/kcontrol/kio/main.cpp
index 96821defa..06d02d4f1 100644
--- a/kcontrol/kio/main.cpp
+++ b/kcontrol/kio/main.cpp
@@ -40,37 +40,37 @@
 extern "C"
 {
 
-  KDE_EXPORT KCModule *create_cookie(TQWidget *parent, const char /**name*/)
+  KDE_EXPORT TDECModule *create_cookie(TQWidget *parent, const char /**name*/)
   {
     return new KCookiesMain(parent);
   }
 
-  KDE_EXPORT KCModule *create_smb(TQWidget *parent, const char /**name*/)
+  KDE_EXPORT TDECModule *create_smb(TQWidget *parent, const char /**name*/)
   {
     return new SMBRoOptions(parent);
   }
 
-  KDE_EXPORT KCModule *create_useragent(TQWidget *parent, const char /**name*/)
+  KDE_EXPORT TDECModule *create_useragent(TQWidget *parent, const char /**name*/)
   {
     return new UserAgentDlg(parent);
   }
 
-  KDE_EXPORT KCModule *create_proxy(TQWidget *parent, const char /**name*/)
+  KDE_EXPORT TDECModule *create_proxy(TQWidget *parent, const char /**name*/)
   {
     return new KProxyOptions(parent);
   }
 
-  KDE_EXPORT KCModule *create_cache(TQWidget *parent, const char /**name*/)
+  KDE_EXPORT TDECModule *create_cache(TQWidget *parent, const char /**name*/)
   {
     return new KCacheConfigDialog( parent );
   }
 
-  KDE_EXPORT KCModule *create_netpref(TQWidget *parent, const char /**name*/)
+  KDE_EXPORT TDECModule *create_netpref(TQWidget *parent, const char /**name*/)
   {
     return new KIOPreferences(parent);
   }
 
-  KDE_EXPORT KCModule *create_lanbrowser(TQWidget *parent, const char *)
+  KDE_EXPORT TDECModule *create_lanbrowser(TQWidget *parent, const char *)
   {
     return new LanBrowser(parent);
   }
@@ -78,7 +78,7 @@ extern "C"
 }
 
 LanBrowser::LanBrowser(TQWidget *parent)
-:KCModule(parent,"kcmkio")
+:TDECModule(parent,"kcmkio")
 ,layout(this)
 ,tabs(this)
 {
@@ -105,21 +105,21 @@ LanBrowser::LanBrowser(TQWidget *parent)
    tabs.addTab(smbPage, i18n("&Windows Shares"));
    connect(smbPage,TQT_SIGNAL(changed(bool)), TQT_SLOT( changed() ));
 
-   lisaPage = KCModuleLoader::loadModule("kcmlisa", KCModuleLoader::None, &tabs);
+   lisaPage = TDECModuleLoader::loadModule("kcmlisa", TDECModuleLoader::None, &tabs);
    if (lisaPage)
    {
      tabs.addTab(lisaPage,i18n("&LISa Daemon"));
      connect(lisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
    }
 
-//   resLisaPage = KCModuleLoader::loadModule("kcmreslisa", &tabs);
+//   resLisaPage = TDECModuleLoader::loadModule("kcmreslisa", &tabs);
 //   if (resLisaPage)
 //   {
 //     tabs.addTab(resLisaPage,i18n("R&esLISa Daemon"));
 //     connect(resLisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
 //   }
 
-   kioLanPage = KCModuleLoader::loadModule("kcmkiolan",  KCModuleLoader::None, &tabs);
+   kioLanPage = TDECModuleLoader::loadModule("kcmkiolan",  TDECModuleLoader::None, &tabs);
    if (kioLanPage)
    {
      tabs.addTab(kioLanPage,i18n("lan:/ Iosla&ve"));
diff --git a/kcontrol/kio/main.h b/kcontrol/kio/main.h
index 5c6d35ef9..1122af019 100644
--- a/kcontrol/kio/main.h
+++ b/kcontrol/kio/main.h
@@ -26,7 +26,7 @@
 
 class TQTabWidget;
 
-class LanBrowser:public KCModule
+class LanBrowser:public TDECModule
 {
    Q_OBJECT
    public:
@@ -37,10 +37,10 @@ class LanBrowser:public KCModule
    private:
       TQVBoxLayout layout;
       TQTabWidget tabs;
-      KCModule *smbPage;
-      KCModule *lisaPage;
-//      KCModule *resLisaPage;
-      KCModule *kioLanPage;
+      TDECModule *smbPage;
+      TDECModule *lisaPage;
+//      TDECModule *resLisaPage;
+      TDECModule *kioLanPage;
 };
 #endif
 
diff --git a/kcontrol/kio/netpref.cpp b/kcontrol/kio/netpref.cpp
index 73cdb2123..b5788c973 100644
--- a/kcontrol/kio/netpref.cpp
+++ b/kcontrol/kio/netpref.cpp
@@ -15,7 +15,7 @@
 #define MAX_TIMEOUT_VALUE  3600
 
 KIOPreferences::KIOPreferences( TQWidget* parent )
-               :KCModule( parent, "kcmkio" )
+               :TDECModule( parent, "kcmkio" )
 {
     TQVBoxLayout* mainLayout = new TQVBoxLayout( this, 0,
                                                KDialog::spacingHint() );
@@ -90,7 +90,7 @@ void KIOPreferences::load()
   sb_serverConnect->setValue( proto.connectTimeout() );
   sb_proxyConnect->setValue( proto.proxyConnectTimeout() );
 
-  KConfig config( "kio_ftprc", true, false );
+  TDEConfig config( "kio_ftprc", true, false );
   cb_ftpEnablePasv->setChecked( !config.readBoolEntry( "DisablePassiveMode", false ) );
   cb_ftpMarkPartial->setChecked( config.readBoolEntry( "MarkPartial", true ) );
   emit changed( false );
@@ -103,7 +103,7 @@ void KIOPreferences::save()
   KSaveIOConfig::setConnectTimeout( sb_serverConnect->value() );
   KSaveIOConfig::setProxyConnectTimeout( sb_proxyConnect->value() );
 
-  KConfig config( "kio_ftprc", false, false );
+  TDEConfig config( "kio_ftprc", false, false );
   config.writeEntry( "DisablePassiveMode", !cb_ftpEnablePasv->isChecked() );
   config.writeEntry( "MarkPartial", cb_ftpMarkPartial->isChecked() );
   config.sync();
diff --git a/kcontrol/kio/netpref.h b/kcontrol/kio/netpref.h
index 4a48b30cb..ebe9ee3b6 100644
--- a/kcontrol/kio/netpref.h
+++ b/kcontrol/kio/netpref.h
@@ -12,7 +12,7 @@ class TQGridLayout;
 
 class KIntNumInput;
 
-class KIOPreferences : public KCModule
+class KIOPreferences : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp
index 1b0a4fea8..8ad181df6 100644
--- a/kcontrol/kio/smbrodlg.cpp
+++ b/kcontrol/kio/smbrodlg.cpp
@@ -36,7 +36,7 @@
 
 
 SMBRoOptions::SMBRoOptions(TQWidget *parent)
-  : KCModule(parent, "kcmkio")
+  : TDECModule(parent, "kcmkio")
 {
    TQGridLayout *layout = new TQGridLayout(this,2,-1,KDialog::marginHint(),
          KDialog::spacingHint());
@@ -91,7 +91,7 @@ SMBRoOptions::~SMBRoOptions()
 
 void SMBRoOptions::load()
 {
-   KConfig *cfg = new KConfig("kioslaverc");
+   TDEConfig *cfg = new TDEConfig("kioslaverc");
 
    TQString tmp;
    cfg->setGroup( "Browser Settings/SMBro" );
@@ -124,7 +124,7 @@ void SMBRoOptions::load()
 
 void SMBRoOptions::save()
 {
-   KConfig *cfg = new KConfig("kioslaverc");
+   TDEConfig *cfg = new TDEConfig("kioslaverc");
 
    cfg->setGroup( "Browser Settings/SMBro" );
    cfg->writeEntry( "User", m_userLe->text());
@@ -163,7 +163,7 @@ void SMBRoOptions::defaults()
 
 void SMBRoOptions::changed()
 {
-   emit KCModule::changed(true);
+   emit TDECModule::changed(true);
 }
 
 TQString SMBRoOptions::quickHelp() const
diff --git a/kcontrol/kio/smbrodlg.h b/kcontrol/kio/smbrodlg.h
index b1696e1e2..2174cfc18 100644
--- a/kcontrol/kio/smbrodlg.h
+++ b/kcontrol/kio/smbrodlg.h
@@ -29,7 +29,7 @@
 
 class KComboBox;
 
-class SMBRoOptions : public KCModule
+class SMBRoOptions : public TDECModule
 {
    Q_OBJECT
    public:
diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp
index 80453b75b..ef77a93c3 100644
--- a/kcontrol/kio/socks.cpp
+++ b/kcontrol/kio/socks.cpp
@@ -35,7 +35,7 @@
 #include <kaboutdata.h>
 
 KSocksConfig::KSocksConfig(TQWidget *parent)
-  : KCModule(parent, "kcmkio")
+  : TDECModule(parent, "kcmkio")
 {
 
   TDEAboutData *about =
@@ -194,7 +194,7 @@ void KSocksConfig::libSelection()
 
 void KSocksConfig::load()
 {
-  KConfigGroup config(kapp->config(), "Socks");
+  TDEConfigGroup config(kapp->config(), "Socks");
   base->_c_enableSocks->setChecked(config.readBoolEntry("SOCKS_enable", false));
   int id = config.readNumEntry("SOCKS_method", 1);
   base->bg->setButton(id);
@@ -228,7 +228,7 @@ void KSocksConfig::load()
 
 void KSocksConfig::save()
 {
-  KConfigGroup config(kapp->config(), "Socks");
+  TDEConfigGroup config(kapp->config(), "Socks");
   config.writeEntry("SOCKS_enable",base-> _c_enableSocks->isChecked(), true, true);
   config.writeEntry("SOCKS_method", base->bg->id(base->bg->selected()), true, true);
   config.writePathEntry("SOCKS_lib", base->_c_customPath->url(), true, true);
diff --git a/kcontrol/kio/socks.h b/kcontrol/kio/socks.h
index a18c85758..165d1d329 100644
--- a/kcontrol/kio/socks.h
+++ b/kcontrol/kio/socks.h
@@ -33,7 +33,7 @@
 
 class TQVButtonGroup;
 
-class KSocksConfig : public KCModule
+class KSocksConfig : public TDECModule
 {
   Q_OBJECT
 public:
diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp
index c34d5cadc..29181f0a9 100644
--- a/kcontrol/kio/useragentdlg.cpp
+++ b/kcontrol/kio/useragentdlg.cpp
@@ -47,7 +47,7 @@
 #include "useragentdlg_ui.h"
 
 UserAgentDlg::UserAgentDlg( TQWidget * parent )
-             :KCModule( parent, "kcmkio" )
+             :TDECModule( parent, "kcmkio" )
 {
   TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
@@ -87,7 +87,7 @@ void UserAgentDlg::load()
   d_itemsSelected = 0;
   dlg->lvDomainPolicyList->clear();
 
-  m_config = new KConfig("kio_httprc", false, false);
+  m_config = new TDEConfig("kio_httprc", false, false);
   m_provider = new FakeUASProvider();
 
   TQStringList list = m_config->groupList();
diff --git a/kcontrol/kio/useragentdlg.h b/kcontrol/kio/useragentdlg.h
index f5b20ac0d..39885956d 100644
--- a/kcontrol/kio/useragentdlg.h
+++ b/kcontrol/kio/useragentdlg.h
@@ -27,11 +27,11 @@
 
 #include <kcmodule.h>
 
-class KConfig;
+class TDEConfig;
 class FakeUASProvider;
 class UserAgentDlgUI;
 
-class UserAgentDlg : public KCModule
+class UserAgentDlg : public TDECModule
 {
   Q_OBJECT
 
@@ -76,7 +76,7 @@ private:
   //
   int d_itemsSelected;
 
-  KConfig *m_config;
+  TDEConfig *m_config;
   UserAgentDlgUI* dlg;
 };
 
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index 63438cbf2..bc9c63cc5 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -48,7 +48,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_knotify, NotifyFactory("kcmnotify") )
 using namespace KNotify;
 
 KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & )
-    : KCModule(NotifyFactory::instance(), parent, name),
+    : TDECModule(NotifyFactory::instance(), parent, name),
       m_playerSettings( 0L )
 {
     setButtons( Help | Default | Apply );
@@ -98,7 +98,7 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList &
 
 KCMKNotify::~KCMKNotify()
 {
-    KConfig config( "knotifyrc", false, false );
+    TDEConfig config( "knotifyrc", false, false );
     config.setGroup( "Misc" );
     ApplicationList allApps = m_notifyWidget->allApps();
     ApplicationListIterator appIt( allApps );
@@ -173,7 +173,7 @@ void KCMKNotify::load( bool useDefaults )
     allApps.sort();
     m_notifyWidget->setEnabled( !allApps.isEmpty() );
 
-    KConfig config( "knotifyrc", true, false );
+    TDEConfig config( "knotifyrc", true, false );
 	 config.setReadDefaults( useDefaults );
     config.setGroup( "Misc" );
     TQString select = config.readEntry( "LastConfiguredApp" );
@@ -239,7 +239,7 @@ PlayerSettingsDialog::PlayerSettingsDialog( TQWidget *parent, bool modal )
 
 void PlayerSettingsDialog::load( bool useDefaults )
 {
-    KConfig config( "knotifyrc", true, false );
+    TDEConfig config( "knotifyrc", true, false );
 	 config.setReadDefaults( useDefaults );
     config.setGroup( "Misc" );
     bool useExternal = config.readBoolEntry( "Use external player", false );
@@ -264,7 +264,7 @@ void PlayerSettingsDialog::load( bool useDefaults )
 void PlayerSettingsDialog::save()
 {
     // see tdelibs/arts/knotify/knotify.cpp
-    KConfig config( "knotifyrc", false, false );
+    TDEConfig config( "knotifyrc", false, false );
     config.setGroup( "Misc" );
 
     config.writePathEntry( "External player", m_ui->reqExternal->url() );
diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h
index 5af670bbe..a37393f97 100644
--- a/kcontrol/knotify/knotify.h
+++ b/kcontrol/knotify/knotify.h
@@ -44,7 +44,7 @@ namespace KNotify
     class KNotifyWidget;
 }
 
-class KCMKNotify : public KCModule
+class KCMKNotify : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index af6c12cc4..12bf6159c 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -38,8 +38,8 @@
 
 #include "behaviour.h"
 
-KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *parent, const char * )
-    : KCModule(parent, "kcmkonq"), g_pConfig(config), groupname(group)
+KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget *parent, const char * )
+    : TDECModule(parent, "kcmkonq"), g_pConfig(config), groupname(group)
 {
     TQLabel * label;
 
@@ -203,7 +203,7 @@ void KBehaviourOptions::load( bool useDefaults )
 
     cbRenameDirectlyIcon->setChecked( g_pConfig->readBoolEntry("RenameIconDirectly",  DEFAULT_RENAMEICONDIRECTLY ) );
     
-    KConfig globalconfig("kdeglobals", true, false);
+    TDEConfig globalconfig("kdeglobals", true, false);
     globalconfig.setGroup( "KDE" );
     cbShowDeleteCommand->setChecked( globalconfig.readBoolEntry("ShowDeleteCommand", false) );
 
@@ -212,7 +212,7 @@ void KBehaviourOptions::load( bool useDefaults )
 
 //    sbToolTip->setValue( g_pConfig->readNumEntry( "FileTipItems", 6 ) );
 
-    KConfig config("uiserverrc");
+    TDEConfig config("uiserverrc");
     config.setGroup( "UIServer" );
 
     cbListProgress->setChecked( config.readBoolEntry( "ShowList", false ) );
@@ -242,7 +242,7 @@ void KBehaviourOptions::save()
 
     g_pConfig->writeEntry( "RenameIconDirectly", cbRenameDirectlyIcon->isChecked());
     
-    KConfig globalconfig("kdeglobals", false, false);
+    TDEConfig globalconfig("kdeglobals", false, false);
     globalconfig.setGroup( "KDE" );
     globalconfig.writeEntry( "ShowDeleteCommand", cbShowDeleteCommand->isChecked());
     globalconfig.sync();
@@ -253,7 +253,7 @@ void KBehaviourOptions::save()
     g_pConfig->sync();
 
     // UIServer setting
-    KConfig config("uiserverrc");
+    TDEConfig config("uiserverrc");
     config.setGroup( "UIServer" );
     config.writeEntry( "ShowList", cbListProgress->isChecked() );
     config.sync();
diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h
index dd486cf8d..e9bded291 100644
--- a/kcontrol/konq/behaviour.h
+++ b/kcontrol/konq/behaviour.h
@@ -27,17 +27,17 @@ class TQRadioButton;
 class TQSpinBox;
 class TQVButtonGroup;
 
-class KConfig;
+class TDEConfig;
 class KURLRequester;
 
 //-----------------------------------------------------------------------------
 
 
-class KBehaviourOptions : public KCModule
+class KBehaviourOptions : public TDECModule
 {
   Q_OBJECT
 public:
-  KBehaviourOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
+  KBehaviourOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
     ~KBehaviourOptions();
   virtual void load();
   virtual void load( bool useDefaults );
@@ -50,7 +50,7 @@ protected slots:
   void slotShowTips(bool);
 private:
 
-  KConfig *g_pConfig;
+  TDEConfig *g_pConfig;
   TQString groupname;
 
   TQCheckBox *cbNewWin;
diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp
index cb1b5c47e..e25b6143d 100644
--- a/kcontrol/konq/browser.cpp
+++ b/kcontrol/konq/browser.cpp
@@ -30,8 +30,8 @@
 #include "previews.h"
 #include "browser.h"
 
-KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *parent, const char *name)
-    : KCModule( parent, "kcmkonq" ) 
+KBrowserOptions::KBrowserOptions(TDEConfig *config, TQString group, TQWidget *parent, const char *name)
+    : TDECModule( parent, "kcmkonq" ) 
 {
   TQVBoxLayout *layout = new TQVBoxLayout(this);
   TQTabWidget *tab = new TQTabWidget(this);
@@ -46,7 +46,7 @@ KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *pare
   previews = new KPreviewOptions(tab, name);
   previews->layout()->setMargin( KDialog::marginHint() );
 
-  kuick = KCModuleLoader::loadModule("kcmkuick", tab);
+  kuick = TDECModuleLoader::loadModule("kcmkuick", tab);
 
   tab->addTab(appearance, i18n("&Appearance"));
   tab->addTab(behavior, i18n("&Behavior"));
@@ -98,9 +98,9 @@ void KBrowserOptions::save()
 TQString KBrowserOptions::quickHelp() const
 {
   TQWidget *w = m_tab->currentPage();
-  if (w->inherits("KCModule"))
+  if (w->inherits("TDECModule"))
   {
-     KCModule *m = static_cast<KCModule *>(w);
+     TDECModule *m = static_cast<TDECModule *>(w);
      return m->quickHelp();
   }
   return TQString::null;
diff --git a/kcontrol/konq/browser.h b/kcontrol/konq/browser.h
index 7fc34725c..5e4aadebf 100644
--- a/kcontrol/konq/browser.h
+++ b/kcontrol/konq/browser.h
@@ -22,16 +22,16 @@
 
 #include <kcmodule.h>
 
-class KConfig;
+class TDEConfig;
 class TQTabWidget;
 
 //-----------------------------------------------------------------------------
 
-class KBrowserOptions : public KCModule
+class KBrowserOptions : public TDECModule
 {
   Q_OBJECT
 public:
-  KBrowserOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
+  KBrowserOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
 
   virtual void load();
   virtual void save();
@@ -40,10 +40,10 @@ public:
 
 private:
    
-  KCModule *appearance;
-  KCModule *behavior;
-  KCModule *previews;
-  KCModule *kuick;
+  TDECModule *appearance;
+  TDECModule *behavior;
+  TDECModule *previews;
+  TDECModule *kuick;
   TQTabWidget *m_tab;
 };
 
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index dcd0d7eeb..3b4bcb32a 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -40,7 +40,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/)
   {
     return new KDesktopConfig(parent, "kcmkonq");
   }
@@ -52,7 +52,7 @@ extern "C"
 // asking why I did not implement a more intelligent/smaller GUI.
 
 KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
-  : KCModule(parent, "kcmkonq")
+  : TDECModule(parent, "kcmkonq")
 {
 
   setQuickHelp( i18n("<h1>Multiple Desktops</h1>In this module, you can configure how many virtual desktops you want and how these should be labeled."));
@@ -141,7 +141,7 @@ void KDesktopConfig::load( bool useDefaults )
   else
      groupname.sprintf("Desktops-screen-%d", konq_screen_number);
 
-  KConfig * twinconfig = new KConfig("twinrc");
+  TDEConfig * twinconfig = new TDEConfig("twinrc");
 
   twinconfig->setReadDefaults( useDefaults );
 
@@ -172,7 +172,7 @@ void KDesktopConfig::load( bool useDefaults )
   else
       configfile.sprintf("kdesktop-screen-%drc", konq_screen_number);
 
-  KConfig *config = new KConfig(configfile, false, false);
+  TDEConfig *config = new TDEConfig(configfile, false, false);
 
   config->setReadDefaults( useDefaults );
 
@@ -216,7 +216,7 @@ void KDesktopConfig::save()
   else
       appname.sprintf("kdesktop-screen-%d", konq_screen_number);
 
-  KConfig *config = new KConfig(appname + "rc");
+  TDEConfig *config = new TDEConfig(appname + "rc");
   config->setGroup("Mouse Buttons");
   config->writeEntry("WheelSwitchesWorkspace", _wheelOption->isChecked());
   delete config;
diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h
index 938049628..c7c10de0a 100644
--- a/kcontrol/konq/desktop.h
+++ b/kcontrol/konq/desktop.h
@@ -30,7 +30,7 @@ class KIntNumInput;
 // if you change this, update also the number of keyboard shortcuts in twin/twinbindings.cpp
 static const int maxDesktops = 20;
 
-class KDesktopConfig : public KCModule
+class KDesktopConfig : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 757385cd0..3ae4cf41b 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -46,8 +46,8 @@
 const int customMenu1ID = 5;
 const int customMenu2ID = 6;
 
-DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, const char * )
-    : KCModule( parent, "kcmkonq" )
+DesktopBehaviorModule::DesktopBehaviorModule(TDEConfig *config, TQWidget *parent, const char * )
+    : TDECModule( parent, "kcmkonq" )
 {
     TQVBoxLayout* layout = new TQVBoxLayout(this);
     m_behavior = new DesktopBehavior(config, this);
@@ -57,7 +57,7 @@ DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent,
 
 void DesktopBehaviorModule::changed()
 {
-    emit KCModule::changed( true );
+    emit TDECModule::changed( true );
 }
 
 class DesktopBehaviorPreviewItem : public TQCheckListItem
@@ -112,7 +112,7 @@ private:
 static const int choiceCount=7;
 static const char * s_choices[7] = { "", "WindowListMenu", "DesktopMenu", "AppMenu", "BookmarksMenu", "CustomMenu1", "CustomMenu2" };
 
-DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * )
+DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char * )
     : DesktopBehaviorBase( parent, "kcmkonq" ), g_pConfig(config)
 {
   TQString strMouseButton1, strMouseButton3, strButtonTxt1, strButtonTxt3;
@@ -315,7 +315,7 @@ void DesktopBehavior::load( bool useDefaults )
     g_pConfig->setGroup( "FMSettings" );
     toolTipBox->setChecked(g_pConfig->readBoolEntry( "ShowFileTips", true ) );
     g_pConfig->setGroup( "Menubar" );
-    KConfig config( "kdeglobals" );
+    TDEConfig config( "kdeglobals" );
     config.setGroup("KDE");
     bool globalMenuBar = config.readBoolEntry("macStyle", false);
     bool desktopMenuBar = g_pConfig->readBoolEntry("ShowMenubar", false);
@@ -373,7 +373,7 @@ void DesktopBehavior::save()
     g_pConfig->writeEntry( "ShowFileTips", toolTipBox->isChecked() );
     g_pConfig->setGroup( "Menubar" );
     g_pConfig->writeEntry("ShowMenubar", desktopMenuGroup->selectedId() == 1);
-    KConfig config( "kdeglobals" );
+    TDEConfig config( "kdeglobals" );
     config.setGroup("KDE");
     bool globalMenuBar = desktopMenuGroup->selectedId() == 2;
     if ( globalMenuBar != config.readBoolEntry("macStyle", false) )
@@ -460,7 +460,7 @@ void DesktopBehavior::editButtonPressed()
       return;
 
    KCustomMenuEditor editor(this);
-   KConfig cfg(cfgFile, false, false);
+   TDEConfig cfg(cfgFile, false, false);
 
    editor.load(&cfg);
    if (editor.exec())
diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h
index ba9904d37..1dcb3bee1 100644
--- a/kcontrol/konq/desktopbehavior_impl.h
+++ b/kcontrol/konq/desktopbehavior_impl.h
@@ -30,7 +30,7 @@ class DesktopBehavior : public DesktopBehaviorBase
 {
         Q_OBJECT
 public:
-        DesktopBehavior(KConfig *config, TQWidget *parent = 0L, const char *name = 0L );
+        DesktopBehavior(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L );
         virtual void load();
         virtual void load( bool useDefaults );
         virtual void save();
@@ -49,7 +49,7 @@ private slots:
 	void mediaListViewChanged(TQListViewItem * item);
 
 private:
-        KConfig *g_pConfig;
+        TDEConfig *g_pConfig;
 
 	void fillMediaListView();
 	void saveMediaListView();
@@ -62,15 +62,15 @@ private:
         bool m_bHasMedia;
 };
 
-class DesktopBehaviorModule : public KCModule
+class DesktopBehaviorModule : public TDECModule
 {
         Q_OBJECT
 
 public:
-        DesktopBehaviorModule(KConfig *config, TQWidget *parent = 0L, const char *name = 0L );
-        virtual void load() { m_behavior->load(); emit KCModule::changed( false ); }
-        virtual void save() { m_behavior->save(); emit KCModule::changed( false ); }
-        virtual void defaults() { m_behavior->defaults(); emit KCModule::changed( true ); }
+        DesktopBehaviorModule(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L );
+        virtual void load() { m_behavior->load(); emit TDECModule::changed( false ); }
+        virtual void save() { m_behavior->save(); emit TDECModule::changed( false ); }
+        virtual void defaults() { m_behavior->defaults(); emit TDECModule::changed( true ); }
 
 private slots:
         void changed();
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index a01cdc06d..c1f610a46 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -40,8 +40,8 @@
 
 //-----------------------------------------------------------------------------
 
-KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, TQWidget *parent, const char* /*name*/)
-    : KCModule( parent, "kcmkonq" ), g_pConfig(config), groupname(group), m_bDesktop(desktop)
+KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop, TQWidget *parent, const char* /*name*/)
+    : TDECModule( parent, "kcmkonq" ), g_pConfig(config), groupname(group), m_bDesktop(desktop)
 {
     TQLabel *label;
     TQString wtstr;
@@ -283,7 +283,7 @@ void KonqFontOptions::load( bool useDefaults )
     }
     cbUnderline->setChecked( g_pConfig->readBoolEntry("UnderlineLinks", DEFAULT_UNDERLINELINKS ) );
 
-    KConfig cfg("kdeglobals");
+    TDEConfig cfg("kdeglobals");
     cfg.setGroup("DesktopIcons");
 
     updateGUI();
@@ -324,7 +324,7 @@ void KonqFontOptions::save()
     g_pConfig->writeEntry( "UnderlineLinks", cbUnderline->isChecked() );
     g_pConfig->sync();
 
-    KConfig cfg("kdeglobals");
+    TDEConfig cfg("kdeglobals");
     cfg.setGroup("DesktopIcons");
 
     // Send signal to konqueror
diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h
index 49c34b923..4e1575652 100644
--- a/kcontrol/konq/fontopts.h
+++ b/kcontrol/konq/fontopts.h
@@ -43,17 +43,17 @@ class TQCheckBox;
 class TQRadioButton;
 
 class KColorButton;
-class KConfig;
+class TDEConfig;
 class KFontCombo;
 
 
 //-----------------------------------------------------------------------------
 
-class KonqFontOptions : public KCModule
+class KonqFontOptions : public TDECModule
 {
   Q_OBJECT
 public:
-  KonqFontOptions(KConfig *config, TQString group, bool desktop, TQWidget *parent=0, const char *name=0);
+  KonqFontOptions(TDEConfig *config, TQString group, bool desktop, TQWidget *parent=0, const char *name=0);
   TQString quickHelp() const;
 
   virtual void load();
@@ -79,7 +79,7 @@ private:
 
 private:
 
-  KConfig *g_pConfig;
+  TDEConfig *g_pConfig;
   TQString groupname;
   bool m_bDesktop;
 
diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp
index e0a0d0780..e57a84859 100644
--- a/kcontrol/konq/main.cpp
+++ b/kcontrol/konq/main.cpp
@@ -48,48 +48,48 @@ static TQCString configname()
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_browser(TQWidget *parent, const char *name)
+  KDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name)
   {
-    KConfig *config = new KConfig("konquerorrc", false, true);
+    TDEConfig *config = new TDEConfig("konquerorrc", false, true);
     return new KBrowserOptions(config, "FMSettings", parent, name);
   }
 
-  KDE_EXPORT KCModule *create_behavior(TQWidget *parent, const char *name)
+  KDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name)
   {
-    KConfig *config = new KConfig("konquerorrc", false, true);
+    TDEConfig *config = new TDEConfig("konquerorrc", false, true);
     return new KBehaviourOptions(config, "FMSettings", parent, name);
   }
 
-  KDE_EXPORT KCModule *create_appearance(TQWidget *parent, const char *name)
+  KDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name)
   {
-    KConfig *config = new KConfig("konquerorrc", false, true);
+    TDEConfig *config = new TDEConfig("konquerorrc", false, true);
     return new KonqFontOptions(config, "FMSettings", false, parent, name);
   }
 
-  KDE_EXPORT KCModule *create_previews(TQWidget *parent, const char *name)
+  KDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name)
   {
     return new KPreviewOptions(parent, name);
   }
 
-  KDE_EXPORT KCModule *create_dbehavior(TQWidget *parent, const char* /*name*/)
+  KDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/)
   {
-    KConfig *config = new KConfig(configname(), false, false);
+    TDEConfig *config = new TDEConfig(configname(), false, false);
     return new DesktopBehaviorModule(config, parent);
   }
 
-  KDE_EXPORT KCModule *create_dappearance(TQWidget *parent, const char* /*name*/)
+  KDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/)
   {
-    KConfig *config = new KConfig(configname(), false, false);
+    TDEConfig *config = new TDEConfig(configname(), false, false);
     return new KonqFontOptions(config, "FMSettings", true, parent);
   }
 
-  KDE_EXPORT KCModule *create_dpath(TQWidget *parent, const char* /*name*/)
+  KDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/)
   {
-    //KConfig *config = new KConfig(configname(), false, false);
+    //TDEConfig *config = new TDEConfig(configname(), false, false);
     return new DesktopPathConfig(parent);
   }
 
-  KDE_EXPORT KCModule *create_ddesktop(TQWidget *parent, const char* /*name*/)
+  KDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/)
   {
     return new KDesktopConfig(parent, "VirtualDesktops");
   }
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index cfa367448..0a6521a67 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -58,7 +58,7 @@ class PreviewCheckListItem : public TQCheckListItem
 };
 
 KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
-    : KCModule( parent, "kcmkonq" )
+    : TDECModule( parent, "kcmkonq" )
 {
     TQVBoxLayout *lay = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
@@ -159,7 +159,7 @@ void KPreviewOptions::load(bool useDefaults)
 {
     // *** load and apply to GUI ***
     TDEGlobal::config()->setReadDefaults(useDefaults);
-    KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
+    TDEConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
     TQPtrListIterator<TQCheckListItem> it( m_items );
 
     for ( ; it.current() ; ++it ) {
@@ -191,7 +191,7 @@ void KPreviewOptions::defaults()
 
 void KPreviewOptions::save()
 {
-    KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
+    TDEConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
     TQPtrListIterator<TQCheckListItem> it( m_items );
     for ( ; it.current() ; ++it ) {
         TQString protocol( it.current()->text() );
@@ -213,7 +213,7 @@ void KPreviewOptions::save()
 
 void KPreviewOptions::changed()
 {
-    emit KCModule::changed(true);
+    emit TDECModule::changed(true);
 }
 
 #include "previews.moc"
diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h
index 8cf3ceade..10c5e32a7 100644
--- a/kcontrol/konq/previews.h
+++ b/kcontrol/konq/previews.h
@@ -35,12 +35,12 @@ Configuration of the maximum image size
 
 #include <kcmodule.h>
 
-class KConfig;
+class TDEConfig;
 class TQCheckBox;
 class TQCheckListItem;
 class KDoubleNumInput;
 
-class KPreviewOptions : public KCModule
+class KPreviewOptions : public TDECModule
 {
     Q_OBJECT
 public:
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index ea3c5baa4..a3234dba4 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -44,7 +44,7 @@
 //-----------------------------------------------------------------------------
 
 DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
-    : KCModule( parent, "kcmkonq" )
+    : TDECModule( parent, "kcmkonq" )
 {
   TQLabel * tmpLabel;
 
@@ -127,13 +127,13 @@ void DesktopPathConfig::load()
 
 void DesktopPathConfig::load( bool useDefaults )
 {
-    KConfig config("kdeglobals", true, false);
+    TDEConfig config("kdeglobals", true, false);
     // Desktop Paths
 	config.setReadDefaults( useDefaults );
     config.setGroup("Paths");
     urAutostart->setURL( config.readPathEntry( "Autostart" , TDEGlobalSettings::autostartPath() ));
 
-    KConfig xdguserconfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
+    TDEConfig xdguserconfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
      
     urDesktop->setURL( xdguserconfig.readPathEntry( "XDG_DESKTOP_DIR" , TQDir::homeDirPath() + "/Desktop" ).remove(  "\"" ));
     urDocument->setURL( xdguserconfig.readPathEntry( "XDG_DOCUMENTS_DIR", TQDir::homeDirPath()).remove(  "\"" ));
@@ -148,9 +148,9 @@ void DesktopPathConfig::defaults()
 
 void DesktopPathConfig::save()
 {
-    KConfig *config = TDEGlobal::config();
-    KConfig *xdgconfig = new KConfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
-    KConfigGroupSaver cgs( config, "Paths" );
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfig *xdgconfig = new TDEConfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" );
+    TDEConfigGroupSaver cgs( config, "Paths" );
 
     bool pathChanged = false;
     bool autostartMoved = false;
@@ -232,7 +232,7 @@ void DesktopPathConfig::save()
         {
             if (!KStandardDirs::makeDir(path))
             {
-                KMessageBox::sorry(this, KIO::buildErrorString(KIO::ERR_COULD_NOT_MKDIR, path));
+                KMessageBox::sorry(this, TDEIO::buildErrorString(TDEIO::ERR_COULD_NOT_MKDIR, path));
                 urDocument->setURL(documentURL.path());
                 pathOk = false;
             }
@@ -283,20 +283,20 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
         {
             m_copyToDest = dest;
             m_copyFromSrc = src;
-            KIO::ListJob* job = KIO::listDir( src );
-            connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
-                     this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) );
+            TDEIO::ListJob* job = TDEIO::listDir( src );
+            connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
+                     this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) );
             tqApp->enter_loop();
 
             if (m_ok)
             {
-                KIO::del( src );
+                TDEIO::del( src );
             }
         }
         else
         {
-            KIO::Job * job = KIO::move( src, dest );
-            connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+            TDEIO::Job * job = TDEIO::move( src, dest );
+            connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
             // wait for job
             tqApp->enter_loop();
         }
@@ -305,7 +305,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
     return m_ok;
 }
 
-void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& list)
+void DesktopPathConfig::slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryList& list)
 {
     if (job->error())
     {
@@ -313,8 +313,8 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li
         return;
     }
 
-    KIO::UDSEntryListConstIterator it = list.begin();
-    KIO::UDSEntryListConstIterator end = list.end();
+    TDEIO::UDSEntryListConstIterator it = list.begin();
+    TDEIO::UDSEntryListConstIterator end = list.end();
     for (; it != end; ++it)
     {
         KFileItem file(*it, m_copyFromSrc, true, true);
@@ -323,18 +323,18 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li
             continue;
         }
 
-        KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest );
-        connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+        TDEIO::Job * moveJob = TDEIO::move( file.url(), m_copyToDest );
+        connect( moveJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
         tqApp->enter_loop();
     }
     tqApp->exit_loop();
 }
 
-void DesktopPathConfig::slotResult( KIO::Job * job )
+void DesktopPathConfig::slotResult( TDEIO::Job * job )
 {
     if (job->error())
     {
-        if ( job->error() != KIO::ERR_DOES_NOT_EXIST )
+        if ( job->error() != TDEIO::ERR_DOES_NOT_EXIST )
             m_ok = false;
         // If the source doesn't exist, no wonder we couldn't move the dir.
         // In that case, trust the user and set the new setting in any case.
diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h
index 7af18f1ae..d4429c1dd 100644
--- a/kcontrol/konq/rootopts.h
+++ b/kcontrol/konq/rootopts.h
@@ -23,17 +23,17 @@ class TQCheckBox;
 class TQComboBox;
 class TQPushButton;
 
-class KConfig;
+class TDEConfig;
 class KListView;
 class KURLRequester;
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 //-----------------------------------------------------------------------------
 // The "Path" Tab contains :
 // The paths for Desktop, Autostart and Documents
 
-class DesktopPathConfig : public KCModule
+class DesktopPathConfig : public TDECModule
 {
         Q_OBJECT
 public:
@@ -44,7 +44,7 @@ public:
         virtual void defaults();
 
 private slots:
-    void slotEntries( KIO::Job * job, const KIO::UDSEntryList& list);
+    void slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryList& list);
 
 private:
         // Desktop Paths
@@ -58,7 +58,7 @@ private:
         KURL m_copyFromSrc;
 
 private slots:
-        void slotResult( KIO::Job * job );
+        void slotResult( TDEIO::Job * job );
 };
 
 #endif // __ROOT_OPTIONS_H
diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp
index c2c411b3e..0464f39bd 100644
--- a/kcontrol/konqhtml/advancedTabDialog.cpp
+++ b/kcontrol/konqhtml/advancedTabDialog.cpp
@@ -34,7 +34,7 @@
 #include "advancedTabOptions.h"
 #include "main.h"
 
-advancedTabDialog::advancedTabDialog(TQWidget* parent, KConfig* config, const char* name)
+advancedTabDialog::advancedTabDialog(TQWidget* parent, TDEConfig* config, const char* name)
     : KDialogBase(KDialogBase::Plain,
                   i18n("Advanced Options"),
                   KDialogBase::Ok |
diff --git a/kcontrol/konqhtml/advancedTabDialog.h b/kcontrol/konqhtml/advancedTabDialog.h
index 3e340b5b8..8951b01e1 100644
--- a/kcontrol/konqhtml/advancedTabDialog.h
+++ b/kcontrol/konqhtml/advancedTabDialog.h
@@ -29,7 +29,7 @@ class advancedTabDialog : public KDialogBase
     Q_OBJECT
 
     public:
-        advancedTabDialog(TQWidget* parent, KConfig *config, const char* name);
+        advancedTabDialog(TQWidget* parent, TDEConfig *config, const char* name);
         ~advancedTabDialog();
 
     protected slots:
@@ -38,7 +38,7 @@ class advancedTabDialog : public KDialogBase
         void changed();
 
     private:
-        KConfig* m_pConfig;
+        TDEConfig* m_pConfig;
         advancedTabOptions* m_advancedWidget;
 };
 
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index fa22ab533..78619d818 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -25,8 +25,8 @@
 
 #include "appearance.moc"
 
-KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget *parent, const char *)
-    : KCModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group),
+KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidget *parent, const char *)
+    : TDECModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group),
       fSize( 10 ), fMinSize( HTML_DEFAULT_MIN_FONT_SIZE )
 
 {
@@ -320,7 +320,7 @@ void KAppearanceOptions::load()
 
 void KAppearanceOptions::load( bool useDefaults )
 {
-    KConfig khtmlrc("khtmlrc", true, false);
+    TDEConfig khtmlrc("khtmlrc", true, false);
 	 m_pConfig->setReadDefaults( useDefaults );
 
 	 khtmlrc.setReadDefaults( useDefaults );
diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h
index ea85322db..6bca1908f 100644
--- a/kcontrol/konqhtml/appearance.h
+++ b/kcontrol/konqhtml/appearance.h
@@ -19,11 +19,11 @@
 class TQSpinBox;
 class KFontCombo;
 
-class KAppearanceOptions : public KCModule
+class KAppearanceOptions : public TDECModule
 {
   Q_OBJECT
 public:
-  KAppearanceOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
+  KAppearanceOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
   ~KAppearanceOptions();
 
   virtual void load();
@@ -48,7 +48,7 @@ private:
 
 private:
 
-  KConfig *m_pConfig;
+  TDEConfig *m_pConfig;
   TQString m_groupname;
   TQStringList m_families;
 
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index 29dccb14b..b61abd99b 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -32,7 +32,7 @@
 #include "policies.h"
 #include "policydlg.h"
 
-DomainListView::DomainListView(KConfig *config,const TQString &title,
+DomainListView::DomainListView(TDEConfig *config,const TQString &title,
 		TQWidget *parent,const char *name) :
 	TQGroupBox(title, parent, name), config(config) {
   setColumnLayout(0, Qt::Vertical);
diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h
index a8238bbb4..f62b2e46a 100644
--- a/kcontrol/konqhtml/domainlistview.h
+++ b/kcontrol/konqhtml/domainlistview.h
@@ -29,7 +29,7 @@ class TQListViewItem;
 class TQPushButton;
 class TQStringList;
 
-class KConfig;
+class TDEConfig;
 class KListView;
 
 class Policies;
@@ -67,7 +67,7 @@ public:
    * @param parent parent widget
    * @param name internal name for debugging
    */
-  DomainListView(KConfig *config,const TQString &title,TQWidget *parent,
+  DomainListView(TDEConfig *config,const TQString &title,TQWidget *parent,
   		const char *name = 0);
 
   virtual ~DomainListView();
@@ -191,7 +191,7 @@ private slots:
 
 protected:
 
-    KConfig *config;
+    TDEConfig *config;
 
   KListView *domainSpecificLV;
 
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index 731bae2ec..1bb71d4db 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -38,9 +38,9 @@
 #include "filteropts.h"
 #include "filteropts.moc"
 
-KCMFilter::KCMFilter(KConfig *config, TQString group,
+KCMFilter::KCMFilter(TDEConfig *config, TQString group,
                      TQWidget *parent, const char * )
-    : KCModule( parent, "kcmkonqhtml" ),
+    : TDECModule( parent, "kcmkonqhtml" ),
       mConfig( config ),
       mGroupname( group ),
       mSelCount(0)
diff --git a/kcontrol/konqhtml/filteropts.h b/kcontrol/konqhtml/filteropts.h
index 1678e5333..fae52b53f 100644
--- a/kcontrol/konqhtml/filteropts.h
+++ b/kcontrol/konqhtml/filteropts.h
@@ -26,13 +26,13 @@ class TQLineEdit;
 class TQListBoxItem;
 class TQCheckBox;
 
-class KConfig;
+class TDEConfig;
 
-class KCMFilter : public KCModule
+class KCMFilter : public TDECModule
 {
     Q_OBJECT
 public:
-    KCMFilter( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
+    KCMFilter( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
     ~KCMFilter();
     
     void load();
@@ -66,7 +66,7 @@ private:
     TQPushButton *mImportButton;
     TQPushButton *mExportButton;
 
-    KConfig *mConfig;
+    TDEConfig *mConfig;
     TQString mGroupname;
     int mSelCount;
 };
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index 9e199cbe4..153692082 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -32,8 +32,8 @@ enum AnimationsType { AnimationsAlways=0, AnimationsNever=1, AnimationsLoopOnce=
 enum SmoothScrollingType { SmoothScrollingAlways=0, SmoothScrollingNever=1, SmoothScrollingWhenEfficient=2 };
 //-----------------------------------------------------------------------------
 
-KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *parent, const char *)
-    : KCModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group)
+KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *parent, const char *)
+    : TDECModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group)
 {
     int row = 0;
     TQGridLayout *lay = new TQGridLayout(this, 10, 2, 0, KDialog::spacingHint());
@@ -230,7 +230,7 @@ void KMiscHTMLOptions::load()
 
 void KMiscHTMLOptions::load( bool useDefaults )
 {
-    KConfig khtmlrc("khtmlrc", true, false);
+    TDEConfig khtmlrc("khtmlrc", true, false);
     khtmlrc.setReadDefaults( useDefaults );
 	 m_pConfig->setReadDefaults( useDefaults );
 
@@ -290,13 +290,13 @@ void KMiscHTMLOptions::load( bool useDefaults )
     m_pShowMMBInTabs->setChecked( m_pConfig->readBoolEntry( "MMBOpensTab", false ) );
     m_pDynamicTabbarHide->setChecked( ! (m_pConfig->readBoolEntry( "AlwaysTabbedMode", false )) );
 
-    KConfig config("kbookmarkrc", true, false);
+    TDEConfig config("kbookmarkrc", true, false);
     config.setReadDefaults( useDefaults );
 	 config.setGroup("Bookmarks");
     m_pAdvancedAddBookmarkCheckBox->setChecked( config.readBoolEntry("AdvancedAddBookmarkDialog", false) );
     m_pOnlyMarkedBookmarksCheckBox->setChecked( config.readBoolEntry("FilteredToolbar", false) );
 
-    KConfig kdeglobals("kdeglobals", true, false);
+    TDEConfig kdeglobals("kdeglobals", true, false);
     kdeglobals.setReadDefaults( useDefaults );
 	 kdeglobals.setGroup("KDE");
     bool smoothScrolling = kdeglobals.readBoolEntry("SmoothScrolling", DEFAULT_SMOOTHSCROLL);
@@ -363,13 +363,13 @@ void KMiscHTMLOptions::save()
     m_pConfig->writeEntry( "AlwaysTabbedMode", !(m_pDynamicTabbarHide->isChecked()) );
     m_pConfig->sync();
 
-    KConfig config("kbookmarkrc", false, false);
+    TDEConfig config("kbookmarkrc", false, false);
     config.setGroup("Bookmarks");
     config.writeEntry("AdvancedAddBookmarkDialog", m_pAdvancedAddBookmarkCheckBox->isChecked());
     config.writeEntry("FilteredToolbar", m_pOnlyMarkedBookmarksCheckBox->isChecked());
     config.sync();
 
-    KConfig kdeglobals("kdeglobals", false, false);
+    TDEConfig kdeglobals("kdeglobals", false, false);
     kdeglobals.setGroup("KDE");
     switch(m_pSmoothScrollingCombo->currentItem())
     {
diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h
index 42024f71b..151607419 100644
--- a/kcontrol/konqhtml/htmlopts.h
+++ b/kcontrol/konqhtml/htmlopts.h
@@ -30,12 +30,12 @@
 class TQRadioButton;
 class KIntNumInput;
 
-class KMiscHTMLOptions : public KCModule
+class KMiscHTMLOptions : public TDECModule
 {
     Q_OBJECT
 
 public:
-    KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L );
+    KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L );
 	~KMiscHTMLOptions();
     virtual void load();
     virtual void load( bool useDefaults );
@@ -47,7 +47,7 @@ private slots:
     void launchAdvancedTabDialog();
 
 private:
-    KConfig* m_pConfig;
+    TDEConfig* m_pConfig;
     TQString  m_groupname;
 
     TQComboBox* m_pUnderlineCombo;
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index af168ed1f..68b20fd2f 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -31,7 +31,7 @@
 
 // == class JavaPolicies =====
 
-JavaPolicies::JavaPolicies(KConfig* config, const TQString &group, bool global,
+JavaPolicies::JavaPolicies(TDEConfig* config, const TQString &group, bool global,
   		const TQString &domain) :
 	Policies(config,group,global,domain,"java.","EnableJava") {
 }
@@ -45,9 +45,9 @@ JavaPolicies::~JavaPolicies() {
 
 // == class KJavaOptions =====
 
-KJavaOptions::KJavaOptions( KConfig* config, TQString group,
+KJavaOptions::KJavaOptions( TDEConfig* config, TQString group,
                             TQWidget *parent, const char *name )
-    : KCModule( parent, name ),
+    : TDECModule( parent, name ),
       _removeJavaScriptDomainAdvice(false),
       m_pConfig( config ),
       m_groupname( group ),
@@ -278,7 +278,7 @@ void KJavaOptions::toggleJavaControls()
 
 // == class JavaDomainListView =====
 
-JavaDomainListView::JavaDomainListView(KConfig *config,const TQString &group,
+JavaDomainListView::JavaDomainListView(TDEConfig *config,const TQString &group,
 	KJavaOptions *options,TQWidget *parent,const char *name)
 	: DomainListView(config,i18n( "Doma&in-Specific" ), parent, name),
 	group(group), options(options) {
diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h
index de8f7c7eb..b93a77e86 100644
--- a/kcontrol/konqhtml/javaopts.h
+++ b/kcontrol/konqhtml/javaopts.h
@@ -21,7 +21,7 @@
 #include "policies.h"
 
 class KColorButton;
-class KConfig;
+class TDEConfig;
 class KListView;
 class KURLRequester;
 class KIntNumInput;
@@ -48,7 +48,7 @@ public:
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    */
-  JavaPolicies(KConfig* config, const TQString &group, bool global,
+  JavaPolicies(TDEConfig* config, const TQString &group, bool global,
   		const TQString &domain = TQString::null);
 
   /** empty constructur to make TQMap happy
@@ -65,7 +65,7 @@ public:
 class JavaDomainListView : public DomainListView {
   Q_OBJECT
 public:
-  JavaDomainListView(KConfig *config,const TQString &group,KJavaOptions *opt,
+  JavaDomainListView(TDEConfig *config,const TQString &group,KJavaOptions *opt,
   		TQWidget *parent,const char *name = 0);
   virtual ~JavaDomainListView();
 
@@ -84,12 +84,12 @@ private:
   KJavaOptions *options;
 };
 
-class KJavaOptions : public KCModule
+class KJavaOptions : public TDECModule
 {
     Q_OBJECT
 
 public:
-    KJavaOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
+    KJavaOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
 
     virtual void load();
     virtual void load( bool useDefaults );
@@ -104,7 +104,7 @@ private slots:
 
 private:
 
-    KConfig* m_pConfig;
+    TDEConfig* m_pConfig;
     TQString  m_groupname;
     JavaPolicies java_global_policies;
 
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index e50224f53..e36743783 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -34,9 +34,9 @@
 
 // == class KJavaScriptOptions =====
 
-KJavaScriptOptions::KJavaScriptOptions( KConfig* config, TQString group, TQWidget *parent,
+KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWidget *parent,
 										const char *name ) :
-  KCModule( parent, name ),
+  TDECModule( parent, name ),
   _removeJavaScriptDomainAdvice(false),
    m_pConfig( config ), m_groupname( group ),
   js_global_policies(config,group,true,TQString::null),
@@ -165,7 +165,7 @@ void KJavaScriptOptions::slotChangeJSEnabled() {
 
 // == class JSDomainListView =====
 
-JSDomainListView::JSDomainListView(KConfig *config,const TQString &group,
+JSDomainListView::JSDomainListView(TDEConfig *config,const TQString &group,
 	KJavaScriptOptions *options, TQWidget *parent,const char *name)
 	: DomainListView(config,i18n( "Do&main-Specific" ), parent, name),
 	group(group), options(options) {
diff --git a/kcontrol/konqhtml/jsopts.h b/kcontrol/konqhtml/jsopts.h
index 5c9aa74e3..f5735294d 100644
--- a/kcontrol/konqhtml/jsopts.h
+++ b/kcontrol/konqhtml/jsopts.h
@@ -16,7 +16,7 @@
 #include "jspolicies.h"
 
 class KColorButton;
-class KConfig;
+class TDEConfig;
 class KURLRequester;
 class TQCheckBox;
 class TQComboBox;
@@ -35,7 +35,7 @@ class KJavaScriptOptions;
 class JSDomainListView : public DomainListView {
   Q_OBJECT
 public:
-  JSDomainListView(KConfig *config,const TQString &group,KJavaScriptOptions *opt,
+  JSDomainListView(TDEConfig *config,const TQString &group,KJavaScriptOptions *opt,
   		TQWidget *parent,const char *name = 0);
   virtual ~JSDomainListView();
 
@@ -54,11 +54,11 @@ private:
   KJavaScriptOptions *options;
 };
 
-class KJavaScriptOptions : public KCModule
+class KJavaScriptOptions : public TDECModule
 {
   Q_OBJECT
 public:
-  KJavaScriptOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
+  KJavaScriptOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
 
   virtual void load();
   virtual void load( bool useDefaults );
@@ -72,7 +72,7 @@ private slots:
 
 private:
 
-  KConfig *m_pConfig;
+  TDEConfig *m_pConfig;
   TQString m_groupname;
   JSPolicies js_global_policies;
   TQCheckBox *enableJavaScriptGloballyCB;
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index 5196af8dd..c035c1857 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -33,7 +33,7 @@
 
 // == class JSPolicies ==
 
-JSPolicies::JSPolicies(KConfig* config,const TQString &group,
+JSPolicies::JSPolicies(TDEConfig* config,const TQString &group,
 		bool global,const TQString &domain) :
 	Policies(config,group,global,domain,"javascript.","EnableJavaScript") {
 }
diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h
index 45352fbb9..7f3e400fa 100644
--- a/kcontrol/konqhtml/jspolicies.h
+++ b/kcontrol/konqhtml/jspolicies.h
@@ -29,7 +29,7 @@
 
 #include "policies.h"
 
-class KConfig;
+class TDEConfig;
 class TQRadioButton;
 class TQButtonGroup;
 
@@ -63,7 +63,7 @@ public:
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    */
-  JSPolicies(KConfig* config, const TQString &group, bool global,
+  JSPolicies(TDEConfig* config, const TQString &group, bool global,
   		const TQString &domain = TQString::null);
 		
   /**
diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp
index 93fb20d70..6e79a59ec 100644
--- a/kcontrol/konqhtml/khttpoptdlg.cpp
+++ b/kcontrol/konqhtml/khttpoptdlg.cpp
@@ -8,8 +8,8 @@
 #include "khttpoptdlg.h"
 
 
-KHTTPOptions::KHTTPOptions(KConfig *config, TQString group, TQWidget *parent, const char *name)
-  : KCModule( parent, name ), m_pConfig(config), m_groupname(group)
+KHTTPOptions::KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent, const char *name)
+  : TDECModule( parent, name ), m_pConfig(config), m_groupname(group)
 {
   TQVBoxLayout *lay = new TQVBoxLayout(this, 10, 5);
 
diff --git a/kcontrol/konqhtml/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h
index f758be15c..0a3507085 100644
--- a/kcontrol/konqhtml/khttpoptdlg.h
+++ b/kcontrol/konqhtml/khttpoptdlg.h
@@ -15,11 +15,11 @@
 *  Dialog for configuring HTTP Options like charset and language negotiation
 *  and assuming that file got from HTTP is HTML if no Content-Type is given
 */
-class KHTTPOptions : public KCModule
+class KHTTPOptions : public TDECModule
 {
 Q_OBJECT
   public:
-    KHTTPOptions(KConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L);
+    KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L);
 
     virtual void load();
     virtual void load( bool useDefaults );
@@ -28,7 +28,7 @@ Q_OBJECT
 
   private:
 
-    KConfig *m_pConfig;
+    TDEConfig *m_pConfig;
     TQString m_groupname;
 
     // Acceptable languages "LANG" - locale selected languages
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index f1f28efca..35a958b46 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -43,40 +43,40 @@
 
 extern "C"
 {
-	KDE_EXPORT KCModule *create_khtml_behavior(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_khtml_behavior(TQWidget *parent, const char *name)
 	{
-		KConfig *c = new KConfig( "konquerorrc", false, false );
+		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KMiscHTMLOptions(c, "HTML Settings", parent, name);
 	}
 
-	KDE_EXPORT KCModule *create_khtml_fonts(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_khtml_fonts(TQWidget *parent, const char *name)
 	{
-		KConfig *c = new KConfig( "konquerorrc", false, false );
+		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KAppearanceOptions(c, "HTML Settings", parent, name);
 	}
 
-	KDE_EXPORT KCModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/)
+	KDE_EXPORT TDECModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/)
 	{
-		KConfig *c = new KConfig( "konquerorrc", false, false );
+		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KJSParts(c, parent, "kcmkonqhtml");
 	}
 
-	KDE_EXPORT KCModule *create_khtml_plugins(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_khtml_plugins(TQWidget *parent, const char *name)
 	{
-		KConfig *c = new KConfig( "konquerorrc", false, false );
+		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KPluginOptions(c, "Java/JavaScript Settings", parent, name);
 	}
 
-        KDE_EXPORT KCModule *create_khtml_filter(TQWidget *parent, const char *name )
+        KDE_EXPORT TDECModule *create_khtml_filter(TQWidget *parent, const char *name )
         {
-	    KConfig *c = new KConfig( "khtmlrc", false, false );
+	    TDEConfig *c = new TDEConfig( "khtmlrc", false, false );
             return new KCMFilter(c, "Filter Settings", parent, name);
         }
 }
 
 
-KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name)
-	: KCModule(parent, name), mConfig(config)
+KJSParts::KJSParts(TDEConfig *config, TQWidget *parent, const char *name)
+	: TDECModule(parent, name), mConfig(config)
 {
   TDEAboutData *about =
   new TDEAboutData(I18N_NOOP("kcmkonqhtml"), I18N_NOOP("Konqueror Browsing Control Module"),
diff --git a/kcontrol/konqhtml/main.h b/kcontrol/konqhtml/main.h
index eeb9da311..182ac2756 100644
--- a/kcontrol/konqhtml/main.h
+++ b/kcontrol/konqhtml/main.h
@@ -33,13 +33,13 @@ class KJavaScriptOptions;
 
 class TQTabWidget;
 
-class KJSParts : public KCModule
+class KJSParts : public TDECModule
 {
   Q_OBJECT
 
 public:
 
-  KJSParts(KConfig *config,TQWidget *parent, const char *name);
+  KJSParts(TDEConfig *config,TQWidget *parent, const char *name);
   virtual ~KJSParts();
 
   void load();
@@ -54,7 +54,7 @@ private:
   KJavaScriptOptions *javascript;
   KJavaOptions       *java;
 
-  KConfig *mConfig;
+  TDEConfig *mConfig;
 };
 
 #endif
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index c78a63eec..c8f9f760d 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -33,7 +33,7 @@
 
 // == class PluginPolicies =====
 
-PluginPolicies::PluginPolicies(KConfig* config, const TQString &group, bool global,
+PluginPolicies::PluginPolicies(TDEConfig* config, const TQString &group, bool global,
   		const TQString &domain) :
 	Policies(config,group,global,domain,"plugins.","EnablePlugins") {
 }
@@ -43,9 +43,9 @@ PluginPolicies::~PluginPolicies() {
 
 // == class KPluginOptions =====
 
-KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *parent,
+KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *parent,
                             const char *)
-    : KCModule( parent, "kcmkonqhtml" ),
+    : TDECModule( parent, "kcmkonqhtml" ),
       m_pConfig( config ),
       m_groupname( group ),
       m_nspluginscan (0),
@@ -190,7 +190,7 @@ void KPluginOptions::load( bool useDefaults )
 
 /****************************************************************************/
 
-  KConfig *config = new KConfig("kcmnspluginrc", true);
+  TDEConfig *config = new TDEConfig("kcmnspluginrc", true);
 
   config->setReadDefaults( useDefaults );
 
@@ -236,7 +236,7 @@ void KPluginOptions::save()
 
 /*****************************************************************************/
 
-    KConfig *config= new KConfig("kcmnspluginrc", false);
+    TDEConfig *config= new TDEConfig("kcmnspluginrc", false);
 
     dirSave( config );
     pluginSave( config );
@@ -364,7 +364,7 @@ void KPluginOptions::dirInit()
 }
 
 
-void KPluginOptions::dirLoad( KConfig *config, bool useDefault )
+void KPluginOptions::dirLoad( TDEConfig *config, bool useDefault )
 {
     TQStringList paths;
 
@@ -406,7 +406,7 @@ void KPluginOptions::dirLoad( KConfig *config, bool useDefault )
 }
 
 
-void KPluginOptions::dirSave( KConfig *config )
+void KPluginOptions::dirSave( TDEConfig *config )
 {
     // create stringlist
     TQStringList paths;
@@ -506,7 +506,7 @@ void KPluginOptions::pluginInit()
 }
 
 
-void KPluginOptions::pluginLoad( KConfig* /*config*/ )
+void KPluginOptions::pluginLoad( TDEConfig* /*config*/ )
 {
     kdDebug() << "-> KPluginOptions::fillPluginList" << endl;
     m_widget->pluginList->clear();
@@ -583,7 +583,7 @@ void KPluginOptions::pluginLoad( KConfig* /*config*/ )
 }
 
 
-void KPluginOptions::pluginSave( KConfig* /*config*/ )
+void KPluginOptions::pluginSave( TDEConfig* /*config*/ )
 {
 
 }
@@ -623,7 +623,7 @@ void PluginDomainDialog::slotClose() {
 
 // == class PluginDomainListView =====
 
-PluginDomainListView::PluginDomainListView(KConfig *config,const TQString &group,
+PluginDomainListView::PluginDomainListView(TDEConfig *config,const TQString &group,
 	KPluginOptions *options,TQWidget *parent,const char *name)
 	: DomainListView(config,i18n( "Doma&in-Specific" ), parent, name),
 	group(group), options(options) {
diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h
index 8b61f8f16..37aeceeda 100644
--- a/kcontrol/konqhtml/pluginopts.h
+++ b/kcontrol/konqhtml/pluginopts.h
@@ -16,7 +16,7 @@
 #include "domainlistview.h"
 #include "policies.h"
 
-class KConfig;
+class TDEConfig;
 class TQCheckBox;
 
 #include <kcmodule.h>
@@ -44,7 +44,7 @@ public:
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    */
-  PluginPolicies(KConfig* config, const TQString &group, bool global,
+  PluginPolicies(TDEConfig* config, const TQString &group, bool global,
   		const TQString &domain = TQString::null);
 
   virtual ~PluginPolicies();
@@ -55,7 +55,7 @@ public:
 class PluginDomainListView : public DomainListView {
   Q_OBJECT
 public:
-  PluginDomainListView(KConfig *config,const TQString &group,KPluginOptions *opt,
+  PluginDomainListView(TDEConfig *config,const TQString &group,KPluginOptions *opt,
   		TQWidget *parent,const char *name = 0);
   virtual ~PluginDomainListView();
 
@@ -90,12 +90,12 @@ private:
   TQBoxLayout *thisLayout;
 };
 
-class KPluginOptions : public KCModule
+class KPluginOptions : public TDECModule
 {
     Q_OBJECT
 
 public:
-    KPluginOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
+    KPluginOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
 	~KPluginOptions();
 
     virtual void load();
@@ -111,7 +111,7 @@ private slots:
 
 private:
 
-    KConfig* m_pConfig;
+    TDEConfig* m_pConfig;
     TQString  m_groupname;
 
     TQCheckBox *enablePluginsGloballyCB, *enableHTTPOnly, *enableUserDemand;
@@ -140,8 +140,8 @@ private:
 /******************************************************************************/
  protected:
   void dirInit();
-  void dirLoad( KConfig *config, bool useDefault = false );
-  void dirSave( KConfig *config );
+  void dirLoad( TDEConfig *config, bool useDefault = false );
+  void dirSave( TDEConfig *config );
 
  protected slots:
   void dirNew();
@@ -154,8 +154,8 @@ private:
 /******************************************************************************/
  protected:
   void pluginInit();
-  void pluginLoad( KConfig *config );
-  void pluginSave( KConfig *config );
+  void pluginLoad( TDEConfig *config );
+  void pluginSave( TDEConfig *config );
 
   friend class PluginDomainListView;
 };
diff --git a/kcontrol/konqhtml/policies.cpp b/kcontrol/konqhtml/policies.cpp
index 524bd4d15..0c1cd3bc5 100644
--- a/kcontrol/konqhtml/policies.cpp
+++ b/kcontrol/konqhtml/policies.cpp
@@ -26,7 +26,7 @@
 
 // == class Policies ==
 
-Policies::Policies(KConfig* config,const TQString &group,
+Policies::Policies(TDEConfig* config,const TQString &group,
 		bool global,const TQString &domain, const TQString &prefix,
 		const TQString &feature_key) :
 	is_global(global), config(config), groupname(group),
diff --git a/kcontrol/konqhtml/policies.h b/kcontrol/konqhtml/policies.h
index a9814396a..df2a97750 100644
--- a/kcontrol/konqhtml/policies.h
+++ b/kcontrol/konqhtml/policies.h
@@ -24,7 +24,7 @@
 
 #include <tqstring.h>
 
-class KConfig;
+class TDEConfig;
 
 // special value for inheriting a global policy
 #define INHERIT_POLICY		32767
@@ -54,7 +54,7 @@ public:
    * @param feature_key key of the "feature enabled" policy. The final
    *	key the policy is stored under will be prefix + featureKey.
    */
-  Policies(KConfig* config, const TQString &group, bool global,
+  Policies(TDEConfig* config, const TQString &group, bool global,
   		const TQString &domain, const TQString &prefix,
 		const TQString &feature_key);
 
@@ -123,7 +123,7 @@ protected:
   unsigned int feature_enabled;
 
   bool is_global;
-  KConfig *config;
+  TDEConfig *config;
   TQString groupname;
   TQString domain;
   TQString prefix;
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 8eb8747ce..3d4e00bdd 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -37,7 +37,7 @@ typedef KGenericFactory<KCMKonsole, TQWidget> ModuleFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_konsole, ModuleFactory("kcmkonsole") )
 
 KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&)
-:KCModule(ModuleFactory::instance(), parent, name)
+:TDECModule(ModuleFactory::instance(), parent, name)
 {
     
     setQuickHelp( i18n("<h1>Konsole</h1> With this module you can configure Konsole, the KDE terminal"
@@ -87,7 +87,7 @@ void KCMKonsole::load()
 
 void KCMKonsole::load(bool useDefaults)
 {
-    KConfig config("konsolerc", true);
+    TDEConfig config("konsolerc", true);
     config.setDesktopGroup();
     config.setReadDefaults(useDefaults);
 
@@ -126,7 +126,7 @@ void KCMKonsole::save()
        dialog->SessionEditor1->querySave();
     }
 
-    KConfig config("konsolerc");
+    TDEConfig config("konsolerc");
     config.setDesktopGroup();
 
     config.writeEntry("TerminalSizeHint", dialog->terminalSizeHintCB->isChecked());
diff --git a/kcontrol/konsole/kcmkonsole.h b/kcontrol/konsole/kcmkonsole.h
index 255a63e66..71b0fb7a7 100644
--- a/kcontrol/konsole/kcmkonsole.h
+++ b/kcontrol/konsole/kcmkonsole.h
@@ -26,7 +26,7 @@ class TQFont;
 class TQStringList;
 
 class KCMKonsole
-	: public KCModule
+	: public TDECModule
 {
 	Q_OBJECT
 
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 1f8dfcc7d..72d9c1fe0 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -99,7 +99,7 @@ static void applyGtkStyles(bool active, int version)
 
 // -----------------------------------------------------------------------------
 
-static void applyQtColors( KConfig& kglobals, TQSettings& settings, TQPalette& newPal )
+static void applyQtColors( TDEConfig& kglobals, TQSettings& settings, TQPalette& newPal )
 {
   TQStringList actcg, inactcg, discg;
 
@@ -162,7 +162,7 @@ static void applyQtColors( KConfig& kglobals, TQSettings& settings, TQPalette& n
 
 // -----------------------------------------------------------------------------
 
-static void applyQtSettings( KConfig& kglobals, TQSettings& settings )
+static void applyQtSettings( TDEConfig& kglobals, TQSettings& settings )
 {
   /* export kde's plugin library path to qtrc */
 
@@ -428,7 +428,7 @@ void runRdb( uint flags )
   bool exportQtSettings  = flags & KRdbExportQtSettings;
   bool exportXftSettings = flags & KRdbExportXftSettings;
 
-  KConfig kglobals("kdeglobals", true, false);
+  TDEConfig kglobals("kdeglobals", true, false);
   kglobals.setGroup("KDE");
 
   KTempFile tmpFile;
@@ -497,7 +497,7 @@ void runRdb( uint flags )
     copyFile(tmp, homeDir + "/.Xdefaults", true);
 
   // Export the Xcursor theme & size settings
-  KConfig mousecfg( "kcminputrc" );
+  TDEConfig mousecfg( "kcminputrc" );
   mousecfg.setGroup( "Mouse" );
   TQString theme = mousecfg.readEntry("cursorTheme", TQString());
   TQString size  = mousecfg.readEntry("cursorSize", TQString());
@@ -545,7 +545,7 @@ void runRdb( uint flags )
         contents += "Xft.rgba: " + subPixel + '\n';
     }
 
-    KConfig cfgfonts("kcmfonts", true);
+    TDEConfig cfgfonts("kcmfonts", true);
     cfgfonts.setGroup("General");
     if( cfgfonts.readNumEntry( "forceFontDPI", 0 ) != 0 )
       contents += "Xft.dpi: " + cfgfonts.readEntry( "forceFontDPI" ) + '\n';
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index aebf467a0..faf6feb9c 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -89,7 +89,7 @@ bool KTheme::load( const KURL & url )
     kdDebug() << "Loading theme from URL: " << url << endl;
 
     TQString tmpFile;
-    if ( !KIO::NetAccess::download( url, tmpFile, 0L ) )
+    if ( !TDEIO::NetAccess::download( url, tmpFile, 0L ) )
         return false;
 
     kdDebug() << "Theme is in temp file: " << tmpFile << endl;
@@ -111,7 +111,7 @@ bool KTheme::load( const KURL & url )
     file.close();
 
     // remove the temp file
-    KIO::NetAccess::removeTempFile( tmpFile );
+    TDEIO::NetAccess::removeTempFile( tmpFile );
 
     return true;
 }
@@ -125,13 +125,13 @@ TQString KTheme::createYourself( bool pack )
     // 1. General stuff set by methods setBlah()
 
     // 2. Background theme
-    KConfig * globalConf = TDEGlobal::config();
+    TDEConfig * globalConf = TDEGlobal::config();
 
-    KConfig twinConf( "twinrc", true );
+    TDEConfig twinConf( "twinrc", true );
     twinConf.setGroup( "Desktops" );
     uint numDesktops = twinConf.readUnsignedNumEntry( "Number", 4 );
 
-    KConfig desktopConf( "kdesktoprc", true );
+    TDEConfig desktopConf( "kdesktoprc", true );
     desktopConf.setGroup( "Background Common" );
     bool common = desktopConf.readBoolEntry( "CommonDesktop", true );
 
@@ -197,7 +197,7 @@ TQString KTheme::createYourself( bool pack )
 
     // 4. Sounds
     // 4.1 Global sounds
-    KConfig * soundConf = new KConfig( "knotify.eventsrc", true );
+    TDEConfig * soundConf = new TDEConfig( "knotify.eventsrc", true );
     TQStringList stdEvents;
     stdEvents << "cannotopenfile" << "catastrophe" << "exitkde" << "fatalerror"
               << "notification" << "printerror" << "starttde" << "warning"
@@ -205,7 +205,7 @@ TQString KTheme::createYourself( bool pack )
               << "messageboxQuestion";
 
     // 4.2 KWin sounds
-    KConfig * twinSoundConf = new KConfig( "twin.eventsrc", true );
+    TDEConfig * twinSoundConf = new TDEConfig( "twin.eventsrc", true );
     TQStringList twinEvents;
     twinEvents << "activate" << "close" << "delete" <<
         "desktop1" << "desktop2" << "desktop3" << "desktop4" <<
@@ -247,7 +247,7 @@ TQString KTheme::createYourself( bool pack )
     m_root.appendChild( colorsElem );
 
     // 6. Cursors
-    KConfig* mouseConf = new KConfig( "kcminputrc", true );
+    TDEConfig* mouseConf = new TDEConfig( "kcminputrc", true );
     mouseConf->setGroup( "Mouse" );
     TQDomElement cursorsElem = m_dom.createElement( "cursors" );
     cursorsElem.setAttribute( "name", mouseConf->readEntry( "cursorTheme" ) );
@@ -273,7 +273,7 @@ TQString KTheme::createYourself( bool pack )
     m_root.appendChild( wmElem );
 
     // 8. Konqueror
-    KConfig konqConf( "konquerorrc", true );
+    TDEConfig konqConf( "konquerorrc", true );
     konqConf.setGroup( "Settings" );
     TQDomElement konqElem = m_dom.createElement( "konqueror" );
     TQDomElement konqWallElem = m_dom.createElement( "wallpaper" );
@@ -286,7 +286,7 @@ TQString KTheme::createYourself( bool pack )
     m_root.appendChild( konqElem );
 
     // 9. Kicker (aka TDE Panel)
-    KConfig kickerConf( "kickerrc", true );
+    TDEConfig kickerConf( "kickerrc", true );
     kickerConf.setGroup( "General" );
 
     TQDomElement panelElem = m_dom.createElement( "panel" );
@@ -396,7 +396,7 @@ void KTheme::apply()
     // 2. Background theme
 
     TQDomNodeList desktopList = m_dom.elementsByTagName( "desktop" );
-    KConfig desktopConf( "kdesktoprc" );
+    TDEConfig desktopConf( "kdesktoprc" );
     desktopConf.setGroup( "Background Common" );
 
     for ( uint i = 0; i <= desktopList.count(); i++ )
@@ -448,7 +448,7 @@ void KTheme::apply()
     TQDomElement iconElem = m_dom.elementsByTagName( "icons" ).item( 0 ).toElement();
     if ( !iconElem.isNull() )
     {
-        KConfig * iconConf = TDEGlobal::config();
+        TDEConfig * iconConf = TDEGlobal::config();
         iconConf->setGroup( "Icons" );
         iconConf->writeEntry( "Theme", iconElem.attribute( "name", "crystalsvg" ), true, true );
 
@@ -492,8 +492,8 @@ void KTheme::apply()
     TQDomElement soundsElem = m_dom.elementsByTagName( "sounds" ).item( 0 ).toElement();
     if ( !soundsElem.isNull() )
     {
-        KConfig soundConf( "knotify.eventsrc" );
-        KConfig twinSoundConf( "twin.eventsrc" );
+        TDEConfig soundConf( "knotify.eventsrc" );
+        TDEConfig twinSoundConf( "twin.eventsrc" );
         TQDomNodeList eventList = soundsElem.elementsByTagName( "event" );
         for ( uint i = 0; i < eventList.count(); i++ )
         {
@@ -526,7 +526,7 @@ void KTheme::apply()
     if ( !colorsElem.isNull() )
     {
         TQDomNodeList colorList = colorsElem.childNodes();
-        KConfig * colorConf = TDEGlobal::config();
+        TDEConfig * colorConf = TDEGlobal::config();
 
         TQString sCurrentScheme = locateLocal("data", "kdisplay/color-schemes/thememgr.kcsrc");
         KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme );
@@ -562,7 +562,7 @@ void KTheme::apply()
 
     if ( !cursorsElem.isNull() )
     {
-        KConfig mouseConf( "kcminputrc" );
+        TDEConfig mouseConf( "kcminputrc" );
         mouseConf.setGroup( "Mouse" );
         mouseConf.writeEntry( "cursorTheme", cursorsElem.attribute( "name" ));
         // FIXME is there a way to notify KDE of cursor changes?
@@ -573,7 +573,7 @@ void KTheme::apply()
 
     if ( !wmElem.isNull() )
     {
-        KConfig twinConf( "twinrc" );
+        TDEConfig twinConf( "twinrc" );
         twinConf.setGroup( "Style" );
         TQString type = wmElem.attribute( "type" );
         if ( type == "builtin" )
@@ -601,7 +601,7 @@ void KTheme::apply()
 
     if ( !konqElem.isNull() )
     {
-        KConfig konqConf( "konquerorrc" );
+        TDEConfig konqConf( "konquerorrc" );
         konqConf.setGroup( "Settings" );
         konqConf.writeEntry( "BgImage", unprocessFilePath( "konqueror", getProperty( konqElem, "wallpaper", "url" ) ) );
         konqConf.writeEntry( "BgColor", TQColor( getProperty( konqElem, "bgcolor", "rgb" ) ) );
@@ -615,7 +615,7 @@ void KTheme::apply()
 
     if ( !panelElem.isNull() )
     {
-        KConfig kickerConf( "kickerrc" );
+        TDEConfig kickerConf( "kickerrc" );
         kickerConf.setGroup( "General" );
         TQString kickerBgUrl = getProperty( panelElem, "background", "url" );
         if ( !kickerBgUrl.isEmpty() )
@@ -643,7 +643,7 @@ void KTheme::apply()
 
     if ( !widgetsElem.isNull() )
     {
-        KConfig * widgetConf = TDEGlobal::config();
+        TDEConfig * widgetConf = TDEGlobal::config();
         widgetConf->setGroup( "General" );
         widgetConf->writeEntry( "widgetStyle", widgetsElem.attribute( "name" ), true, true );
         widgetConf->sync();
@@ -654,8 +654,8 @@ void KTheme::apply()
     TQDomElement fontsElem = m_dom.elementsByTagName( "fonts" ).item( 0 ).toElement();
     if ( !fontsElem.isNull() )
     {
-        KConfig * fontsConf = TDEGlobal::config();
-        KConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" );
+        TDEConfig * fontsConf = TDEGlobal::config();
+        TDEConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" );
         kde1xConf->setGroup( "General" );
 
         TQDomNodeList fontList = fontsElem.childNodes();
@@ -688,7 +688,7 @@ void KTheme::apply()
 bool KTheme::remove( const TQString & name )
 {
     kdDebug() << "Going to remove theme: " << name << endl;
-    return KIO::NetAccess::del( TDEGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L );
+    return TDEIO::NetAccess::del( TDEGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L );
 }
 
 void KTheme::setProperty( const TQString & name, const TQString & value, TQDomElement parent )
@@ -726,7 +726,7 @@ TQString KTheme::getProperty( TQDomElement parent, const TQString & tag,
 }
 
 void KTheme::createIconElems( const TQString & group, const TQString & object,
-                              TQDomElement parent, KConfig * cfg )
+                              TQDomElement parent, TDEConfig * cfg )
 {
     cfg->setGroup( group );
     TQStringList elemNames;
@@ -759,7 +759,7 @@ void KTheme::createIconElems( const TQString & group, const TQString & object,
 }
 
 void KTheme::createColorElem( const TQString & name, const TQString & object,
-                              TQDomElement parent, KConfig * cfg )
+                              TQDomElement parent, TDEConfig * cfg )
 {
     TQColor color = cfg->readColorEntry( name );
     if ( color.isValid() )
@@ -772,7 +772,7 @@ void KTheme::createColorElem( const TQString & name, const TQString & object,
 }
 
 void KTheme::createSoundList( const TQStringList & events, const TQString & object,
-                              TQDomElement parent, KConfig * cfg )
+                              TQDomElement parent, TDEConfig * cfg )
 {
     for ( TQStringList::ConstIterator it = events.begin(); it != events.end(); ++it )
     {
@@ -876,7 +876,7 @@ void KTheme::addPreview()
 bool KTheme::copyFile( const TQString & from, const TQString & to )
 {
     // we overwrite b/c of restoring the "original" theme
-    return KIO::NetAccess::file_copy( from, to, -1, true /*overwrite*/ );
+    return TDEIO::NetAccess::file_copy( from, to, -1, true /*overwrite*/ );
 }
 
 TQString KTheme::findResource( const TQString & section, const TQString & path )
diff --git a/kcontrol/kthememanager/ktheme.h b/kcontrol/kthememanager/ktheme.h
index fd659d3c7..4efad8527 100644
--- a/kcontrol/kthememanager/ktheme.h
+++ b/kcontrol/kthememanager/ktheme.h
@@ -28,7 +28,7 @@
 #include <kurl.h>
 
 class KStandardDirs;
-class KConfig;
+class TDEConfig;
 
 /// defines the syntax version used by the XML
 #define SYNTAX_VERSION 1
@@ -153,30 +153,30 @@ private:
 
     /**
      * Creates a list of "icon" elements based on:
-     * @param group The group in the KConfig object @p cfg
+     * @param group The group in the TDEConfig object @p cfg
      * @param object Specifier (similiar, but not identical to @p group)
      * @param parent Parent element to append to
-     * @param cfg The KConfig object to work with
+     * @param cfg The TDEConfig object to work with
      */
     void createIconElems( const TQString & group, const TQString & object,
-                          TQDomElement parent, KConfig * cfg );
+                          TQDomElement parent, TDEConfig * cfg );
 
     /**
      * Creates a color DOM element @p name, with a specifier @p object,
      * appends it to @p parent; used when creating themes
-     * @param cfg The KConfig object to work with
+     * @param cfg The TDEConfig object to work with
      */
     void createColorElem( const TQString & name, const TQString & object,
-                          TQDomElement parent, KConfig * cfg );
+                          TQDomElement parent, TDEConfig * cfg );
     /**
      * Creates a list of "event" elements based on:
      * @param events The list of events to work on
      * @param object Specifier (currently "global" or "twin")
      * @param parent Parent element to append to
-     * @param cfg The KConfig object to work with
+     * @param cfg The TDEConfig object to work with
      */
     void createSoundList( const TQStringList & events, const TQString & object,
-                          TQDomElement parent, KConfig * cfg );
+                          TQDomElement parent, TDEConfig * cfg );
 
     /**
      * Tries to find out absolute path to a resource and copy it to the theme's temp dir;
@@ -195,7 +195,7 @@ private:
     TQString unprocessFilePath( const TQString & section, TQString path );
 
     /**
-     * Wrapper around KIO::NetAccess::file_copy
+     * Wrapper around TDEIO::NetAccess::file_copy
      */
     bool copyFile( const TQString & from, const TQString & to );
 
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 5489aedbf..f4b7835bb 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -43,7 +43,7 @@
 #include "config.h"
 
 kthememanager::kthememanager( TQWidget *parent, const char *name )
-    : KCModule( parent, name ), m_theme( 0 ), m_origTheme( 0 )
+    : TDECModule( parent, name ), m_theme( 0 ), m_origTheme( 0 )
 {
 
     TDEAboutData *about = new TDEAboutData("kthememanager", I18N_NOOP("TDE Theme Manager"),
@@ -56,7 +56,7 @@ kthememanager::kthememanager( TQWidget *parent, const char *name )
     setQuickHelp( i18n("This control module handles installing, removing and "
                 "creating visual TDE themes."));
 
-    setButtons( KCModule::Default|KCModule::Apply|KCModule::Help );
+    setButtons( TDECModule::Default|TDECModule::Apply|TDECModule::Help );
 
     setAcceptDrops( true );
     init();
@@ -130,7 +130,7 @@ void kthememanager::load(bool useDefaults)
     listThemes();
 
     // Load the current theme name
-    KConfig conf("kcmthememanagerrc", false, false);
+    TDEConfig conf("kcmthememanagerrc", false, false);
 
 	 conf.setReadDefaults( useDefaults );
 
@@ -164,7 +164,7 @@ void kthememanager::save()
         m_theme->apply();
 
         // Save the current theme name
-        KConfig conf("kcmthememanagerrc", false, false);
+        TDEConfig conf("kcmthememanagerrc", false, false);
         conf.setGroup( "General" );
         conf.writeEntry( "CurrentTheme", themeName );
         conf.sync();
@@ -415,7 +415,7 @@ void kthememanager::updatePreview( const TQString & pixFile )
 
 extern "C"
 {
-    KDE_EXPORT KCModule *create_kthememanager(TQWidget *parent, const char *)
+    KDE_EXPORT TDECModule *create_kthememanager(TQWidget *parent, const char *)
     {
         TDEGlobal::locale()->insertCatalogue( "kthememanager" );
         return new kthememanager( parent, "kthememanager" );
diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h
index 0d7059729..3ca337300 100644
--- a/kcontrol/kthememanager/kthememanager.h
+++ b/kcontrol/kthememanager/kthememanager.h
@@ -59,7 +59,7 @@ private:
  * @brief The Theme Manager config module.
  * @author Lukas Tinkl <[email protected]>
  */
-class kthememanager: public KCModule
+class kthememanager: public TDECModule
 {
     Q_OBJECT
 public:
diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index 2040dd868..b1d209a24 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_launch, LaunchFactory("kcmlaunch") )
 
 
 LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringList &)
-  : KCModule(LaunchFactory::instance(), parent, name)
+  : TDECModule(LaunchFactory::instance(), parent, name)
 {
     TQVBoxLayout* Form1Layout = new TQVBoxLayout( this, 0, 
         KDialog::spacingHint() );
@@ -155,7 +155,7 @@ LaunchConfig::load()
 void
 LaunchConfig::load(bool useDefaults)
 {
-  KConfig c("klaunchrc", false, false);
+  TDEConfig c("klaunchrc", false, false);
 
   c.setReadDefaults( useDefaults );
 
@@ -194,7 +194,7 @@ LaunchConfig::load(bool useDefaults)
   void
 LaunchConfig::save()
 {
-  KConfig c("klaunchrc", false, false);
+  TDEConfig c("klaunchrc", false, false);
 
   c.setGroup("FeedbackStyle");
   c.writeEntry("BusyCursor",    cb_busyCursor->currentItem() != 0);
@@ -228,7 +228,7 @@ LaunchConfig::defaults()
   void
 LaunchConfig::checkChanged()
 {
-  KConfig c("klaunchrc", false, false);
+  TDEConfig c("klaunchrc", false, false);
 
   c.setGroup("FeedbackStyle");
 
diff --git a/kcontrol/launch/kcmlaunch.h b/kcontrol/launch/kcmlaunch.h
index c831182a6..13c980bf7 100644
--- a/kcontrol/launch/kcmlaunch.h
+++ b/kcontrol/launch/kcmlaunch.h
@@ -26,7 +26,7 @@ class TQGroupBox;
 
 class KIntNumInput;
 
-class LaunchConfig : public KCModule
+class LaunchConfig : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index 40bbf1ab7..c2f50eab7 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -413,7 +413,7 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name,
 
 void KLocaleConfig::save()
 {
-  KConfigBase *config = TDEGlobal::config();
+  TDEConfigBase *config = TDEGlobal::config();
 
   config->setGroup("Locale");
 
diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp
index dc4cb2c2e..795524813 100644
--- a/kcontrol/locale/localemon.cpp
+++ b/kcontrol/locale/localemon.cpp
@@ -127,8 +127,8 @@ KLocaleConfigMoney::~KLocaleConfigMoney()
 
 void KLocaleConfigMoney::save()
 {
-  KConfig *config = TDEGlobal::config();
-  KConfigGroupSaver saver(config, "Locale");
+  TDEConfig *config = TDEGlobal::config();
+  TDEConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig ent(locate("locale",
                            TQString::fromLatin1("l10n/%1/entry.desktop")
diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp
index a940a7ef3..4d291f969 100644
--- a/kcontrol/locale/localenum.cpp
+++ b/kcontrol/locale/localenum.cpp
@@ -85,8 +85,8 @@ void KLocaleConfigNumber::save()
   KLocale *lsave = TDEGlobal::_locale;
   TDEGlobal::_locale = m_locale;
 
-  KConfig *config = TDEGlobal::config();
-  KConfigGroupSaver saver(config, "Locale");
+  TDEConfig *config = TDEGlobal::config();
+  TDEConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig ent(locate("locale",
 			   TQString::fromLatin1("l10n/%1/entry.desktop")
diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index cf92ea1fb..2231864ef 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -76,8 +76,8 @@ KLocaleConfigOther::~KLocaleConfigOther()
 
 void KLocaleConfigOther::save()
 {
-  KConfig *config = TDEGlobal::config();
-  KConfigGroupSaver saver(config, "Locale");
+  TDEConfig *config = TDEGlobal::config();
+  TDEConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig ent(locate("locale",
                            TQString::fromLatin1("l10n/%1/entry.desktop")
diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index df51ae8a4..c41bcba4d 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -249,8 +249,8 @@ void KLocaleConfigTime::save()
   KLocale *lsave = TDEGlobal::_locale;
   TDEGlobal::_locale = m_locale;
 
-  KConfig *config = TDEGlobal::config();
-  KConfigGroupSaver saver(config, "Locale");
+  TDEConfig *config = TDEGlobal::config();
+  TDEConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig ent(locate("locale",
 			   TQString::fromLatin1("l10n/%1/entry.desktop")
diff --git a/kcontrol/locale/main.cpp b/kcontrol/locale/main.cpp
index 74febe07e..63ca9da4b 100644
--- a/kcontrol/locale/main.cpp
+++ b/kcontrol/locale/main.cpp
@@ -30,7 +30,7 @@ extern "C" {
 
 /*
 extern "C" {
-  KCModule *create_locale(TQWidget *parent, const char* name) {
+  TDECModule *create_locale(TQWidget *parent, const char* name) {
     KLocale::setMainCatalogue("kcmlocale");
     return new KLocaleApplication(parent, "kcmlocale");
   }
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index 5df0f5eb7..01e189fd4 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -47,7 +47,7 @@
 
 KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, 
                                        const TQStringList &args)
-  : KCModule( KLocaleFactory::instance(), parent, args)
+  : TDECModule( KLocaleFactory::instance(), parent, args)
 {
   TDEAboutData* aboutData = new TDEAboutData("kcmlocale",
         I18N_NOOP("KCMLocale"),
@@ -59,8 +59,8 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/,
         0, 0, "[email protected]");
   setAboutData( aboutData );
 
-  m_nullConfig = new KConfig(TQString::null, false, false);
-  m_globalConfig = new KConfig(TQString::null, false, true);
+  m_nullConfig = new TDEConfig(TQString::null, false, false);
+  m_globalConfig = new TDEConfig(TQString::null, false, true);
 
   m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig);
   TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint());
@@ -184,8 +184,8 @@ void KLocaleApplication::save()
   // restore the old global locale
   TDEGlobal::_locale = lsave;
 
-  KConfig *config = TDEGlobal::config();
-  KConfigGroupSaver saver(config, "Locale");
+  TDEConfig *config = TDEGlobal::config();
+  TDEConfigGroupSaver saver(config, "Locale");
 
   // ##### this doesn't make sense
   bool langChanged = config->readEntry("Language")
diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h
index 64cc89c2a..a999d64d0 100644
--- a/kcontrol/locale/toplevel.h
+++ b/kcontrol/locale/toplevel.h
@@ -31,7 +31,7 @@
 class TQTabWidget;
 class TQGroupBox;
 
-class KConfig;
+class TDEConfig;
 class KLocale;
 class KLocaleConfig;
 class KLocaleConfigMoney;
@@ -40,7 +40,7 @@ class KLocaleConfigTime;
 class KLocaleConfigOther;
 class KLocaleSample;
 
-class KLocaleApplication : public KCModule
+class KLocaleApplication : public TDECModule
 {
   Q_OBJECT
 
@@ -78,8 +78,8 @@ private:
   TQGroupBox           *m_gbox;
   KLocaleSample       *m_sample;
 
-  KConfig * m_globalConfig;
-  KConfig * m_nullConfig;
+  TDEConfig * m_globalConfig;
+  TDEConfig * m_nullConfig;
 };
 
 typedef KGenericFactory<KLocaleApplication, TQWidget > KLocaleFactory;
diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp
index 6d2acf1e9..d51bad54d 100644
--- a/kcontrol/nics/nic.cpp
+++ b/kcontrol/nics/nic.cpp
@@ -85,7 +85,7 @@ typedef TQPtrList<MyNIC> NICList;
 NICList* findNICs();
 
 KCMNic::KCMNic(TQWidget *parent, const char * name, const TQStringList &)
-   :KCModule(KCMNicFactory::instance(), parent,name)
+   :TDECModule(KCMNicFactory::instance(), parent,name)
 {
    TQVBoxLayout *box=new TQVBoxLayout(this, 0, KDialog::spacingHint());
    m_list=new TQListView(this);
diff --git a/kcontrol/nics/nic.h b/kcontrol/nics/nic.h
index 9bc41ddbb..0c1939d46 100644
--- a/kcontrol/nics/nic.h
+++ b/kcontrol/nics/nic.h
@@ -27,7 +27,7 @@ class TQStringList;
 class TQPushButton;
 class TQListView;
 
-class KCMNic:public KCModule
+class KCMNic:public TDECModule
 {
    Q_OBJECT
    public:
diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp
index 11ea51438..3795cc39a 100644
--- a/kcontrol/performance/kcmperformance.cpp
+++ b/kcontrol/performance/kcmperformance.cpp
@@ -28,12 +28,12 @@
 
 extern "C"
 {
-    KDE_EXPORT KCModule* create_performance( TQWidget* parent_P, const char* name_P )
+    KDE_EXPORT TDECModule* create_performance( TQWidget* parent_P, const char* name_P )
     {
     return new KCMPerformance::Config( parent_P, name_P );
     }
 
-    KDE_EXPORT KCModule* create_konqueror( TQWidget* parent_P, const char* name_P )
+    KDE_EXPORT TDECModule* create_konqueror( TQWidget* parent_P, const char* name_P )
     {
     return new KCMPerformance::KonquerorConfig( parent_P, name_P );
     }
@@ -43,7 +43,7 @@ namespace KCMPerformance
 {
 
 Config::Config( TQWidget* parent_P, const char* )
-    : KCModule( parent_P, "kcmperformance" )
+    : TDECModule( parent_P, "kcmperformance" )
     {
     setQuickHelp( i18n( "<h1>TDE Performance</h1>"
         " You can configure settings that improve TDE performance here." ));
@@ -86,7 +86,7 @@ void Config::defaults()
     }
 
 KonquerorConfig::KonquerorConfig( TQWidget* parent_P, const char* )
-    : KCModule( parent_P, "kcmperformance" )
+    : TDECModule( parent_P, "kcmperformance" )
     {
     setQuickHelp( i18n( "<h1>Konqueror Performance</h1>"
         " You can configure several settings that improve Konqueror performance here."
diff --git a/kcontrol/performance/kcmperformance.h b/kcontrol/performance/kcmperformance.h
index bb924b880..2ae868093 100644
--- a/kcontrol/performance/kcmperformance.h
+++ b/kcontrol/performance/kcmperformance.h
@@ -28,7 +28,7 @@ class Konqueror;
 class SystemWidget;
 
 class Config
-    : public KCModule
+    : public TDECModule
     {
     Q_OBJECT
     public:
@@ -43,7 +43,7 @@ class Config
     };
 
 class KonquerorConfig
-    : public KCModule
+    : public TDECModule
     {
     Q_OBJECT
     public:
diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp
index b9edc46f0..3c8bb6db3 100644
--- a/kcontrol/performance/konqueror.cpp
+++ b/kcontrol/performance/konqueror.cpp
@@ -96,7 +96,7 @@ void Konqueror::preload_count_changed( int count )
 
 void Konqueror::load( bool useDefaults )
     {
-    KConfig cfg( "konquerorrc", true );
+    TDEConfig cfg( "konquerorrc", true );
 	 cfg.setReadDefaults( useDefaults );
     cfg.setGroup( "Reusing" );
     allowed_parts = cfg.readEntry( "SafeParts", "SAFE" );
@@ -113,7 +113,7 @@ void Konqueror::load( bool useDefaults )
 
 void Konqueror::save()
     {
-    KConfig cfg( "konquerorrc" );
+    TDEConfig cfg( "konquerorrc" );
     cfg.setGroup( "Reusing" );
     if( rb_always_reuse->isChecked())
         allowed_parts = "ALL";
diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp
index 001e00abf..500178002 100644
--- a/kcontrol/performance/system.cpp
+++ b/kcontrol/performance/system.cpp
@@ -57,7 +57,7 @@ SystemWidget::SystemWidget( TQWidget* parent_P )
 
 void SystemWidget::load(bool useDefaults )
     {
-    KConfig cfg( "kdedrc", true );
+    TDEConfig cfg( "kdedrc", true );
 	 cfg.setReadDefaults( useDefaults );
     cfg.setGroup( "General" );
     cb_disable_kbuildsycoca->setChecked( cfg.readBoolEntry( "DelayedCheck", false ));
@@ -65,7 +65,7 @@ void SystemWidget::load(bool useDefaults )
 
 void SystemWidget::save()
     {
-    KConfig cfg( "kdedrc" );
+    TDEConfig cfg( "kdedrc" );
     cfg.setGroup( "General" );
     cfg.writeEntry( "DelayedCheck", cb_disable_kbuildsycoca->isChecked());
     }
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index e8da79f48..3367bbaa1 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -87,10 +87,10 @@ bool KPrivacyManager::clearSavedClipboardContents()
 {
   if(!isApplicationRegistered("klipper"))
   {
-    KConfig *c = new KConfig("klipperrc", false, false);
+    TDEConfig *c = new TDEConfig("klipperrc", false, false);
 
     {
-      KConfigGroupSaver saver(c, "General");
+      TDEConfigGroupSaver saver(c, "General");
       c->deleteEntry("ClipboardData");
       c->sync();
     }
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index 55b4246cb..6b54baac6 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -38,12 +38,12 @@
 #include "privacy.h"
 
 Privacy::Privacy(TQWidget *parent, const char *name)
-    : KCModule(parent, name)
+    : TDECModule(parent, name)
 {
   setQuickHelp( i18n("The privacy module allows a user to erase traces which TDE leaves on "
               "the system, such as command histories or browser caches."));
 
-  setButtons( KCModule::Default|KCModule::Apply|KCModule::Help );
+  setButtons( TDECModule::Default|TDECModule::Apply|TDECModule::Help );
 
   TDEAboutData *about =
     new TDEAboutData(I18N_NOOP("kcm_privacy"), I18N_NOOP("TDE Privacy Control Module"),
@@ -157,13 +157,13 @@ void Privacy::load()
 
 void Privacy::load(bool useDefaults)
 {
-  KConfig *c = new KConfig("kprivacyrc", false, false);
+  TDEConfig *c = new TDEConfig("kprivacyrc", false, false);
 
   c->setReadDefaults( useDefaults );
 
   // get general privacy settings
   {
-    KConfigGroupSaver saver(c, "Cleaning");
+    TDEConfigGroupSaver saver(c, "Cleaning");
 
     clearThumbnails->setOn(c->readBoolEntry("ClearThumbnails", true));
     clearRunCommandHistory->setOn(c->readBoolEntry("ClearRunCommandHistory", true));
@@ -178,7 +178,7 @@ void Privacy::load(bool useDefaults)
   }
 
   {
-    KConfigGroupSaver saver(c, "P3P");
+    TDEConfigGroupSaver saver(c, "P3P");
 
     // TODO: add P3P settings here
   }
@@ -196,9 +196,9 @@ void Privacy::defaults()
 
 void Privacy::save()
 {
-  KConfig *c = new KConfig("kprivacyrc", false, false);
+  TDEConfig *c = new TDEConfig("kprivacyrc", false, false);
   {
-    KConfigGroupSaver saver(c, "Cleaning");
+    TDEConfigGroupSaver saver(c, "Cleaning");
 
     c->writeEntry("ClearThumbnails", clearThumbnails->isOn());
     c->writeEntry("ClearRunCommandHistory", clearRunCommandHistory->isOn());
@@ -213,7 +213,7 @@ void Privacy::save()
   }
 
   {
-    KConfigGroupSaver saver(c, "P3P");
+    TDEConfigGroupSaver saver(c, "P3P");
 
     // TODO: add settings for P3P
   }
@@ -309,7 +309,7 @@ void Privacy::cleanup()
 extern "C"
 {
 
-  KDE_EXPORT KCModule *create_privacy(TQWidget *parent, const char * /*name*/)
+  KDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/)
   {
     TDEGlobal::locale()->insertCatalogue("privacy");
     return new Privacy(parent, "Privacy");
diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h
index 69b061f4c..1df7c4acc 100644
--- a/kcontrol/privacy/privacy.h
+++ b/kcontrol/privacy/privacy.h
@@ -28,7 +28,7 @@
 #include "kprivacymanager.h"
 #include "kprivacysettings.h"
 
-class Privacy: public KCModule
+class Privacy: public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp
index 03a063f4d..474bc0416 100644
--- a/kcontrol/randr/krandrmodule.cpp
+++ b/kcontrol/randr/krandrmodule.cpp
@@ -64,7 +64,7 @@ extern "C"
 
 void KRandRModule::performApplyOnStartup()
 {
-	KConfig config("kcmrandrrc", true);
+	TDEConfig config("kcmrandrrc", true);
 	if (RandRDisplay::applyOnStartup(config))
 	{
 		// Load settings and apply appropriate config
@@ -75,7 +75,7 @@ void KRandRModule::performApplyOnStartup()
 }
 
 KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringList&)
-    : KCModule(parent, name)
+    : TDECModule(parent, name)
 	, m_changed(false)
 {
 	if (!isValid()) {
@@ -146,7 +146,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
 
 	slotScreenChanged(TQApplication::desktop()->primaryScreen());
 
-	setButtons(KCModule::Apply);
+	setButtons(TDECModule::Apply);
 }
 
 void KRandRModule::addRotationButton(int thisRotation, bool checkbox)
@@ -272,7 +272,7 @@ void KRandRModule::load( bool useDefaults )
 	// It will be correct already if they wanted to retain their settings over TDE restarts,
 	// and if it isn't correct they have changed a) their X configuration, b) the screen
 	// with another program, or c) their hardware.
-	KConfig config("kcmrandrrc", true);
+	TDEConfig config("kcmrandrrc", true);
 
    config.setReadDefaults( useDefaults );
 
@@ -294,7 +294,7 @@ void KRandRModule::save()
 
 	m_oldApply = m_applyOnStartup->isChecked();
 	m_oldSyncTrayApp = m_syncTrayApp->isChecked();
-	KConfig config("kcmrandrrc");
+	TDEConfig config("kcmrandrrc");
 	saveDisplay(config, m_oldApply, m_oldSyncTrayApp);
 
 	setChanged();
diff --git a/kcontrol/randr/krandrmodule.h b/kcontrol/randr/krandrmodule.h
index 40a94566a..53d428fe1 100644
--- a/kcontrol/randr/krandrmodule.h
+++ b/kcontrol/randr/krandrmodule.h
@@ -25,7 +25,7 @@ class TQButtonGroup;
 class KComboBox;
 class TQCheckBox;
 
-class KRandRModule : public KCModule, public KRandrSimpleAPI
+class KRandRModule : public TDECModule, public KRandrSimpleAPI
 {
 	Q_OBJECT
 
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index 85a5e3f60..f30e3102a 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -476,7 +476,7 @@ void KRandRSystemTray::slotResolutionChanged(int parameter)
 	currentScreen()->proposeRefreshRate(-1);
 
 	if (currentScreen()->applyProposedAndConfirm()) {
-		KConfig config("kcmrandrrc");
+		TDEConfig config("kcmrandrrc");
 		if (syncTrayApp(config))
 			currentScreen()->save(config);
 	}
@@ -497,7 +497,7 @@ void KRandRSystemTray::slotOrientationChanged(int parameter)
 	currentScreen()->proposeRotation(propose);
 
 	if (currentScreen()->applyProposedAndConfirm()) {
-		KConfig config("kcmrandrrc");
+		TDEConfig config("kcmrandrrc");
 		if (syncTrayApp(config))
 			currentScreen()->save(config);
 	}
@@ -511,7 +511,7 @@ void KRandRSystemTray::slotRefreshRateChanged(int parameter)
 	currentScreen()->proposeRefreshRate(parameter);
 
 	if (currentScreen()->applyProposedAndConfirm()) {
-		KConfig config("kcmrandrrc");
+		TDEConfig config("kcmrandrrc");
 		if (syncTrayApp(config))
 			currentScreen()->save(config);
 	}
diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp
index fd31f7800..caa785605 100644
--- a/kcontrol/samba/kcmsambaimports.cpp
+++ b/kcontrol/samba/kcmsambaimports.cpp
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 
-ImportsView::ImportsView(TQWidget * parent, KConfig *config, const char * name )
+ImportsView::ImportsView(TQWidget * parent, TDEConfig *config, const char * name )
    : TQWidget (parent, name)
    ,configFile(config)
    ,list(this)
diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h
index 51b83bd3c..bad8ab2fd 100644
--- a/kcontrol/samba/kcmsambaimports.h
+++ b/kcontrol/samba/kcmsambaimports.h
@@ -32,12 +32,12 @@ class ImportsView: public TQWidget
 {
    Q_OBJECT
    public:
-      ImportsView(TQWidget *parent, KConfig *config=0, const char * name=0);
+      ImportsView(TQWidget *parent, TDEConfig *config=0, const char * name=0);
       virtual ~ImportsView() {};
       void saveSettings() {};
       void loadSettings() {};
 private:
-   KConfig *configFile;
+   TDEConfig *configFile;
    TQListView list;
    TQTimer timer;
 private slots:
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index 59f44cc56..b6bceb31f 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -34,7 +34,7 @@
 
 #define LOG_SCREEN_XY_OFFSET 10
 
-LogView::LogView(TQWidget *parent,KConfig *config, const char *name)
+LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
 : TQWidget (parent, name)
 ,configFile(config)
 ,filesCount(0)
diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h
index ff2799ccc..05f6c3040 100644
--- a/kcontrol/samba/kcmsambalog.h
+++ b/kcontrol/samba/kcmsambalog.h
@@ -40,12 +40,12 @@ class LogView: public TQWidget
 {
    Q_OBJECT
    public:
-      LogView(TQWidget *parent=0, KConfig *config=0, const char *name=0);
+      LogView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0);
       virtual ~LogView() {};
       void saveSettings();
       void loadSettings();
    private:
-      KConfig *configFile;
+      TDEConfig *configFile;
       int filesCount, connectionsCount;
       KURLRequester logFileName;
       TQLabel label;
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index 1e3fa2175..b4b32611c 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -37,7 +37,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 
-StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *name)
+StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *name)
    :TQWidget (parent, name)
    ,configFile(config)
    ,dataList(0)
diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h
index 64c6026ad..4b6ad6211 100644
--- a/kcontrol/samba/kcmsambastatistics.h
+++ b/kcontrol/samba/kcmsambastatistics.h
@@ -33,7 +33,7 @@ class TQCheckBox;
 class TQLineEdit;
 class TQPushButton;
 
-class KConfig;
+class TDEConfig;
 
 class SmallLogItem
 {
@@ -79,14 +79,14 @@ class StatisticsView: public TQWidget
 {
   Q_OBJECT
 public:
-  StatisticsView(TQWidget *parent=0, KConfig *config=0, const char *name=0);
+  StatisticsView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0);
   virtual ~StatisticsView() {};
   void saveSettings() {};
   void loadSettings() {};
   public slots:
 	void setListInfo(TQListView *list, int nrOfFiles, int nrOfConnections);
 private:
-  KConfig *configFile;
+  TDEConfig *configFile;
   TQListView *dataList;
   TQListView* viewStatistics;
   TQLabel* connectionsL, *filesL;
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index effd67312..cd5457de1 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -34,7 +34,7 @@
 #define Before(ttf,in) in.left(in.find(ttf))
 #define After(ttf,in)  (in.contains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString(""))
 
-NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name )
+NetMon::NetMon( TQWidget * parent, TDEConfig *config, const char * name )
    : TQWidget(parent, name)
    ,configFile(config)
    ,showmountProc(0)
diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h
index e256de067..2d6c10fba 100644
--- a/kcontrol/samba/ksmbstatus.h
+++ b/kcontrol/samba/ksmbstatus.h
@@ -36,11 +36,11 @@ class NetMon : public TQWidget
 {
 Q_OBJECT
 public:
-   NetMon(TQWidget *parent, KConfig * config=0, const char * name=0);
+   NetMon(TQWidget *parent, TDEConfig * config=0, const char * name=0);
    void saveSettings() {};
    void loadSettings() {};
 private:
-   KConfig *configFile;
+   TDEConfig *configFile;
    TDEProcess *showmountProc;
    TQListView *list;
    TQLabel *version;
diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp
index 5c2856c32..2db372feb 100644
--- a/kcontrol/samba/main.cpp
+++ b/kcontrol/samba/main.cpp
@@ -29,7 +29,7 @@
 #include "kcmsambastatistics.h"
 #include "ksmbstatus.h"
 
-class SambaContainer:public KCModule
+class SambaContainer:public TDECModule
 {
    public:
       SambaContainer(TQWidget *parent=0, const char * name=0, const TQStringList &list = TQStringList() );
@@ -38,7 +38,7 @@ class SambaContainer:public KCModule
       virtual void save();
 
    private:
-      KConfig config;
+      TDEConfig config;
       TQTabWidget tabs;
       NetMon status;
       ImportsView imports;
@@ -50,7 +50,7 @@ typedef KGenericFactory<SambaContainer, TQWidget > SambaFactory;
 K_EXPORT_COMPONENT_FACTORY (kcm_samba, SambaFactory("kcmsamba") )
 
 SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStringList&)
-:KCModule(SambaFactory::instance(), parent,name)
+:TDECModule(SambaFactory::instance(), parent,name)
 ,config("kcmsambarc",false,true)
 ,tabs(this)
 ,status(&tabs,&config)
diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp
index 4a48eedfe..507255eea 100644
--- a/kcontrol/screensaver/advanceddialog.cpp
+++ b/kcontrol/screensaver/advanceddialog.cpp
@@ -43,7 +43,7 @@ KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(TQWidget *parent, const c
 
 void KScreenSaverAdvancedDialog::readSettings()
 {
-	KConfig *config = new KConfig("kdesktoprc");
+	TDEConfig *config = new TDEConfig("kdesktoprc");
 	config->setGroup("ScreenSaver");
 	
 	mPriority = config->readNumEntry("Priority", 19);
@@ -100,7 +100,7 @@ void KScreenSaverAdvancedDialog::slotOk()
 {
 	if (mChanged)
 	{
-		KConfig *config = new KConfig("kdesktoprc");
+		TDEConfig *config = new TDEConfig("kdesktoprc");
 		config->setGroup( "ScreenSaver" );
 	
 		config->writeEntry("Priority", mPriority);
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index c9f1e8f2b..4efb38e90 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -71,7 +71,7 @@ static TQString findExe(const TQString &exe) {
 }
 
 KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringList&)
-    : KCModule(KSSFactory::instance(), parent, name)
+    : TDECModule(KSSFactory::instance(), parent, name)
 {
     mSetupProc = 0;
     mPreviewProc = 0;
@@ -96,7 +96,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
        " the \"Require password\" feature of the screen saver; if you do not, you can still"
        " explicitly lock the session using the desktop's \"Lock Session\" action."));
 
-    setButtons( KCModule::Help | KCModule::Default | KCModule::Apply );
+    setButtons( TDECModule::Help | TDECModule::Default | TDECModule::Apply );
 
     // Add KDE specific screensaver path
     TQString relPath="System/ScreenSavers/";
@@ -384,7 +384,7 @@ void KScreenSaver::load( bool useDefaults )
 //
 void KScreenSaver::readSettings( bool useDefaults )
 {
-    KConfig *config = new KConfig( "kdesktoprc");
+    TDEConfig *config = new TDEConfig( "kdesktoprc");
 
 	 config->setReadDefaults( useDefaults );
 
@@ -437,7 +437,7 @@ void KScreenSaver::save()
     if ( !mChanged )
         return;
 
-    KConfig *config = new KConfig( "kdesktoprc");
+    TDEConfig *config = new TDEConfig( "kdesktoprc");
     config->setGroup( "ScreenSaver" );
 
     config->writeEntry("Enabled", mEnabled);
diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
index afaa3450b..72a00c410 100644
--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@@ -31,7 +31,7 @@ class KIntNumInput;
 class TDEProcess;
 
 //===========================================================================
-class KScreenSaver : public KCModule
+class KScreenSaver : public TDECModule
 {
     Q_OBJECT
 public:
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index fcc70a66d..acc66880e 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -44,11 +44,11 @@
 #include "smartcard.h"
 
 KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
-  : KCModule(parent, name),DCOPObject(name)
+  : TDECModule(parent, name),DCOPObject(name)
 {
 
   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-  config = new KConfig("ksmartcardrc", false, false);
+  config = new TDEConfig("ksmartcardrc", false, false);
 
   DCOPClient *dc = TDEApplication::kApplication()->dcopClient();
 
@@ -372,14 +372,14 @@ TQString KSmartcardConfig::quickHelp() const
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_smartcard(TQWidget *parent, const char *)
+  KDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *)
   {
     return new KSmartcardConfig(parent, "kcmsmartcard");
   }
 
   KDE_EXPORT void init_smartcard()
   {
-    KConfig *config = new KConfig("ksmartcardrc", false, false);
+    TDEConfig *config = new TDEConfig("ksmartcardrc", false, false);
     bool start = config->readBoolEntry("Enable Support", false);
     delete config;
 
diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h
index 31fcea349..8a7367341 100644
--- a/kcontrol/smartcard/smartcard.h
+++ b/kcontrol/smartcard/smartcard.h
@@ -32,12 +32,12 @@
 #include "smartcardbase.h"
 #include "nosmartcardbase.h"
 
-class KConfig;
+class TDEConfig;
 class KCardDB;
 class KPopupMenu;
 class KListViewItem;
 
-class KSmartcardConfig : public KCModule, public DCOPObject
+class KSmartcardConfig : public TDECModule, public DCOPObject
 {
   K_DCOP
     Q_OBJECT
@@ -74,7 +74,7 @@ public:
 
 private:
 
-  KConfig *config;
+  TDEConfig *config;
   bool _ok;
   KCardDB * _cardDB;
   KPopupMenu * _popUpKardChooser;
diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp
index 1a312034d..11c09baf7 100644
--- a/kcontrol/smserver/kcmsmserver.cpp
+++ b/kcontrol/smserver/kcmsmserver.cpp
@@ -37,7 +37,7 @@ typedef KGenericFactory<SMServerConfig, TQWidget > SMSFactory;
 K_EXPORT_COMPONENT_FACTORY (kcm_smserver, SMSFactory("kcmsmserver") )
 
 SMServerConfig::SMServerConfig( TQWidget *parent, const char* name, const TQStringList & )
-  : KCModule (SMSFactory::instance(), parent, name)
+  : TDECModule (SMSFactory::instance(), parent, name)
 {
     setQuickHelp( i18n("<h1>Session Manager</h1>"
     " You can configure the session manager here."
@@ -63,7 +63,7 @@ void SMServerConfig::load()
 
 void SMServerConfig::load(bool useDefaults )
 {
-  KConfig *c = new KConfig("ksmserverrc", false, false);
+  TDEConfig *c = new TDEConfig("ksmserverrc", false, false);
   c->setReadDefaults( useDefaults );
   c->setGroup("General");
   dialog->confirmLogoutCheck->setChecked(c->readBoolEntry("confirmLogout", true));
@@ -102,7 +102,7 @@ void SMServerConfig::load(bool useDefaults )
 
 void SMServerConfig::save()
 {
-  KConfig *c = new KConfig("ksmserverrc", false, false);
+  TDEConfig *c = new TDEConfig("ksmserverrc", false, false);
   c->setGroup("General");
   c->writeEntry( "confirmLogout", dialog->confirmLogoutCheck->isChecked());
   c->writeEntry( "offerShutdown", dialog->offerShutdownCheck->isChecked());
diff --git a/kcontrol/smserver/kcmsmserver.h b/kcontrol/smserver/kcmsmserver.h
index c1ea4a362..c66caaa93 100644
--- a/kcontrol/smserver/kcmsmserver.h
+++ b/kcontrol/smserver/kcmsmserver.h
@@ -26,7 +26,7 @@
 class SMServerConfigImpl;
 
 
-class SMServerConfig : public KCModule
+class SMServerConfig : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp
index 18bbbb5ed..68aa0cac8 100644
--- a/kcontrol/spellchecking/spellchecking.cpp
+++ b/kcontrol/spellchecking/spellchecking.cpp
@@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_spellchecking, SpellFactory("kcmspellchecking")
 
 
 KSpellCheckingConfig::KSpellCheckingConfig(TQWidget *parent, const char *name, const TQStringList &):
-    KCModule(SpellFactory::instance(), parent, name)
+    TDECModule(SpellFactory::instance(), parent, name)
 {
   TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
   TQGroupBox *box = new TQVGroupBox( i18n("Spell Checking Settings"), this );
diff --git a/kcontrol/spellchecking/spellchecking.h b/kcontrol/spellchecking/spellchecking.h
index 130bf5e51..19aadbc76 100644
--- a/kcontrol/spellchecking/spellchecking.h
+++ b/kcontrol/spellchecking/spellchecking.h
@@ -23,7 +23,7 @@
 
 class KSpellConfig;
 
-class KSpellCheckingConfig  : public KCModule
+class KSpellCheckingConfig  : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 3a2025589..f540d7e75 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -73,7 +73,7 @@
 // Danimo: Why do we use the old interface?!
 extern "C"
 {
-    KDE_EXPORT KCModule *create_style(TQWidget *parent, const char*)
+    KDE_EXPORT TDECModule *create_style(TQWidget *parent, const char*)
     {
         TDEGlobal::locale()->insertCatalogue("kcmstyle");
         return new KCMStyle(parent, "kcmstyle");
@@ -82,7 +82,7 @@ extern "C"
     KDE_EXPORT void init_style()
     {
         uint flags = KRdbExportQtSettings | KRdbExportQtColors | KRdbExportXftSettings;
-        KConfig config("kcmdisplayrc", true /*readonly*/, false /*don't read kdeglobals etc.*/);
+        TDEConfig config("kcmdisplayrc", true /*readonly*/, false /*don't read kdeglobals etc.*/);
         config.setGroup("X11");
 
         // This key is written by the "colors" module.
@@ -116,7 +116,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kcmstyle, GeneralFactory )
 
 
 KCMStyle::KCMStyle( TQWidget* parent, const char* name )
-	: KCModule( parent, name ), appliedStyle(NULL)
+	: TDECModule( parent, name ), appliedStyle(NULL)
 {
     setQuickHelp( i18n("<h1>Style</h1>"
 			"This module allows you to modify the visual appearance "
@@ -489,7 +489,7 @@ void KCMStyle::load()
 
 void KCMStyle::load(bool useDefaults)
 {
-	KConfig config( "kdeglobals", true, false );
+	TDEConfig config( "kdeglobals", true, false );
 
 	config.setReadDefaults( useDefaults );
 
@@ -562,7 +562,7 @@ void KCMStyle::save()
 
 
 	// Save effects.
-	KConfig config( "kdeglobals" );
+	TDEConfig config( "kdeglobals" );
 	config.setGroup("KDE");
 
 	config.writeEntry( "EffectsEnabled", cbEnableEffects->isChecked());
@@ -634,7 +634,7 @@ void KCMStyle::save()
 	if (m_bStyleDirty | m_bEffectsDirty)	// Export only if necessary
 	{
 		uint flags = KRdbExportQtSettings;
-		KConfig kconfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
+		TDEConfig kconfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
 		kconfig.setGroup("X11");
 		bool exportKDEColors = kconfig.readBoolEntry("exportKDEColors", true);
 		if (exportKDEColors)
@@ -717,7 +717,7 @@ void KCMStyle::setStyleDirty()
 // All the Style Switching / Preview stuff
 // ----------------------------------------------------------------
 
-void KCMStyle::loadStyle( KConfig& config )
+void KCMStyle::loadStyle( TDEConfig& config )
 {
 	cbStyle->clear();
 
@@ -894,7 +894,7 @@ void KCMStyle::setStyleRecursive(TQWidget* w, TQStyle* s)
 // All the Effects stuff
 // ----------------------------------------------------------------
 
-void KCMStyle::loadEffects( KConfig& config )
+void KCMStyle::loadEffects( TDEConfig& config )
 {
 	// Load effects.
 	config.setGroup("KDE");
@@ -1011,9 +1011,9 @@ void KCMStyle::menuEffectChanged( bool enabled )
 // All the Miscellaneous stuff
 // ----------------------------------------------------------------
 
-void KCMStyle::loadMisc( KConfig& config )
+void KCMStyle::loadMisc( TDEConfig& config )
 {
-	// TDE's Part via KConfig
+	// TDE's Part via TDEConfig
 	config.setGroup("Toolbar style");
 	cbHoverButtons->setChecked(config.readBoolEntry("Highlighting", true));
 	cbTransparentToolbars->setChecked(config.readBoolEntry("TransparentMoving", true));
diff --git a/kcontrol/style/kcmstyle.h b/kcontrol/style/kcmstyle.h
index ac3d56cb3..44fb68c0e 100644
--- a/kcontrol/style/kcmstyle.h
+++ b/kcontrol/style/kcmstyle.h
@@ -59,7 +59,7 @@ struct StyleEntry {
 	bool hidden;
 };
 
-class KCMStyle : public KCModule
+class KCMStyle : public TDECModule
 {
 	Q_OBJECT
 
@@ -77,9 +77,9 @@ protected:
 	void switchStyle(const TQString& styleName, bool force = false);
 	void setStyleRecursive(TQWidget* w, TQStyle* s);
 
-	void loadStyle( KConfig& config );
-	void loadEffects( KConfig& config );
-	void loadMisc( KConfig& config );
+	void loadStyle( TDEConfig& config );
+	void loadEffects( TDEConfig& config );
+	void loadMisc( TDEConfig& config );
 	void addWhatsThis();
 
 protected slots:
diff --git a/kcontrol/style/main.cpp b/kcontrol/style/main.cpp
index 252cee0fd..334229f4e 100644
--- a/kcontrol/style/main.cpp
+++ b/kcontrol/style/main.cpp
@@ -5,7 +5,7 @@
 #include "kcmstyle.h"
 
 extern "C" {
-    KCModule *create_style(TQWidget *parent, const char *) {
+    TDECModule *create_style(TQWidget *parent, const char *) {
       return new KCMStyle(parent, "kcmstyle");
     }
 }
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 053330367..2429b59bc 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -151,7 +151,7 @@ TQStringList TaskbarConfig::i18nShowTaskStatesList()
 }
 
 TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringList& args)
-  : KCModule(TaskBarFactory::instance(), parent, name),
+  : TDECModule(TaskBarFactory::instance(), parent, name),
     m_settingsObject(NULL)
 {
     TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
@@ -175,8 +175,8 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     TQFile configFile(locateLocal("config", m_configFileName));
     if (!configFile.exists())
     {
-        KConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
-        KConfig localConfig(m_configFileName);
+        TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
+        TDEConfig localConfig(m_configFileName);
         globalConfig.copyTo(m_configFileName, &localConfig);
         localConfig.sync();
     }
@@ -243,7 +243,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
                                        I18N_NOOP("(c) 2000 - 2001 Matthias Elter"));
 
     about->addAuthor("Matthias Elter", 0, "[email protected]");
-    about->addCredit("Stefan Nikolaus", I18N_NOOP("KConfigXT conversion"),
+    about->addCredit("Stefan Nikolaus", I18N_NOOP("TDEConfigXT conversion"),
                      "[email protected]");
     setAboutData(about);
 
@@ -261,8 +261,8 @@ TaskbarConfig::~TaskbarConfig()
 
 void TaskbarConfig::slotReloadConfigurationFromGlobals()
 {
-    KConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
-    KConfig localConfig(m_configFileName);
+    TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
+    TDEConfig localConfig(m_configFileName);
     globalConfig.copyTo(m_configFileName, &localConfig);
     localConfig.sync();
     m_settingsObject->readConfig();
@@ -338,7 +338,7 @@ void TaskbarConfig::appearanceChanged(int selected)
 
 void TaskbarConfig::load()
 {
-    KCModule::load();
+    TDECModule::load();
     slotUpdateComboBox();
     updateAppearanceCombo();
     m_widget->showAllScreens->setChecked(!m_settingsObject->showCurrentScreenOnly());
@@ -354,7 +354,7 @@ void TaskbarConfig::save()
         m_settingsObject->writeConfig();
     }
 
-    KCModule::save();
+    TDECModule::save();
 
     TQByteArray data;
     kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data);
@@ -362,7 +362,7 @@ void TaskbarConfig::save()
 
 void TaskbarConfig::defaults()
 {
-    KCModule::defaults();
+    TDECModule::defaults();
     slotUpdateComboBox();
     updateAppearanceCombo();
 }
diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h
index 9aaec9664..8b313c0e6 100644
--- a/kcontrol/taskbar/kcmtaskbar.h
+++ b/kcontrol/taskbar/kcmtaskbar.h
@@ -50,7 +50,7 @@ class TaskbarAppearance
         TaskBarSettings* m_settingsObject;
 };
 
-class TaskbarConfig : public KCModule
+class TaskbarConfig : public TDECModule
 {
     Q_OBJECT
 
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp
index 8348a617b..13a0af19a 100644
--- a/kcontrol/tdm/main.cpp
+++ b/kcontrol/tdm/main.cpp
@@ -79,7 +79,7 @@ KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg)
 KSimpleConfig *config;
 
 TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(TDMFactory::instance(), parent, name)
+  : TDECModule(TDMFactory::instance(), parent, name)
   , minshowuid(0)
   , maxshowuid(0)
   , updateOK(false)
diff --git a/kcontrol/tdm/main.h b/kcontrol/tdm/main.h
index d613f9c4e..dbfb936dc 100644
--- a/kcontrol/tdm/main.h
+++ b/kcontrol/tdm/main.h
@@ -36,7 +36,7 @@ class TDMUsersWidget;
 class TDMConvenienceWidget;
 class KBackground;
 
-class TDModule : public KCModule
+class TDModule : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index bcd7517aa..e549b38a1 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -431,7 +431,7 @@ void TDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
 	if(!url->isLocalFile()) {
 	    pixurl.setPath(TDEGlobal::dirs()->resourceDirs("data").last() +
 		     "tdm/pics/" + url->fileName());
-	    KIO::NetAccess::copy(*url, pixurl, parentWidget());
+	    TDEIO::NetAccess::copy(*url, pixurl, parentWidget());
 	    istmp = true;
 	} else {
 	    pixurl = *url;
@@ -440,7 +440,7 @@ void TDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
 
 	// By now url should be "file:/..."
 	if (!setLogo(pixurl.path())) {
-	    KIO::NetAccess::del(pixurl, parentWidget());
+	    TDEIO::NetAccess::del(pixurl, parentWidget());
 	    TQString msg = i18n("There was an error loading the image:\n"
 			       "%1\n"
 			       "It will not be saved.")
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index 3be482a17..d2fbcf002 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -346,9 +346,9 @@ void TDMUsersWidget::userButtonDropEvent(TQDropEvent *e)
     KURL *url = decodeImgDrop(e, this);
     if (url) {
 	TQString pixpath;
-	KIO::NetAccess::download(*url, pixpath, parentWidget());
+	TDEIO::NetAccess::download(*url, pixpath, parentWidget());
 	changeUserPix( pixpath );
-	KIO::NetAccess::removeTempFile(pixpath);
+	TDEIO::NetAccess::removeTempFile(pixpath);
 	delete url;
     }
 }
diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index 8739783de..5c4a8983d 100644
--- a/kcontrol/usbview/kcmusb.cpp
+++ b/kcontrol/usbview/kcmusb.cpp
@@ -27,7 +27,7 @@ typedef KGenericFactory<USBViewer, TQWidget > USBFactory;
 K_EXPORT_COMPONENT_FACTORY (kcm_usb, USBFactory("kcmusb") )
 
 USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &)
-  : KCModule(USBFactory::instance(), parent, name)
+  : TDECModule(USBFactory::instance(), parent, name)
 {
   setButtons(Help);
 
diff --git a/kcontrol/usbview/kcmusb.h b/kcontrol/usbview/kcmusb.h
index 33d7f31c1..3b81a3f80 100644
--- a/kcontrol/usbview/kcmusb.h
+++ b/kcontrol/usbview/kcmusb.h
@@ -21,7 +21,7 @@ class TQListViewItem;
 class TQTextView;
 
 
-class USBViewer : public KCModule
+class USBViewer : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp
index c1443b221..09214adbd 100644
--- a/kcontrol/view1394/view1394.cpp
+++ b/kcontrol/view1394/view1394.cpp
@@ -58,7 +58,7 @@ int my_reset_handler(raw1394handle_t handle, unsigned int )
 
 
 View1394::View1394(TQWidget *parent, const char *name)
-:KCModule(parent,name)
+:TDECModule(parent,name)
 ,m_insideRescanBus(false)
 {
    setQuickHelp( i18n("On the right hand side you can see some information about "
@@ -75,7 +75,7 @@ View1394::View1394(TQWidget *parent, const char *name)
                "<b>Acc</b>: the cycle clock accuracy of the node, valid from 0 to 100<br>"
                "<b>Speed</b>: the speed of the node<br>"));
 
-   setButtons( KCModule::Help );
+   setButtons( TDECModule::Help );
 
    m_ouiDb=new OuiDb();
    TQVBoxLayout *box=new TQVBoxLayout(this, 0, KDialog::spacingHint());
@@ -323,7 +323,7 @@ TQString OuiDb::vendor(octlet_t guid)
 extern "C"
 {
 
-   KDE_EXPORT KCModule *create_view1394(TQWidget *parent, const char *name)
+   KDE_EXPORT TDECModule *create_view1394(TQWidget *parent, const char *name)
    {
       TDEGlobal::locale()->insertCatalogue("kcmview1394");
       return new View1394(parent, name);
diff --git a/kcontrol/view1394/view1394.h b/kcontrol/view1394/view1394.h
index 6d7a3b2c9..c88722b82 100644
--- a/kcontrol/view1394/view1394.h
+++ b/kcontrol/view1394/view1394.h
@@ -43,7 +43,7 @@ class OuiDb
       TQMap<TQString, TQString> m_vendorIds;
 };
 
-class View1394: public KCModule
+class View1394: public TDECModule
 {
    Q_OBJECT
    public:
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index 607cd8754..9d1819223 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -41,7 +41,7 @@
 
 
 KCMXinerama::KCMXinerama(TQWidget *parent, const char *name)
-  : KCModule(parent, name) {
+  : TDECModule(parent, name) {
 	_indicators.setAutoDelete(true);
 
 	TDEAboutData *about =
@@ -56,8 +56,8 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name)
 	setQuickHelp( i18n("<h1>Multiple Monitors</h1> This module allows you to configure TDE support"
      " for multiple monitors."));
 
-	config = new KConfig("kdeglobals", false, false);
-	ksplashrc = new KConfig("ksplashrc", false, false);
+	config = new TDEConfig("kdeglobals", false, false);
+	ksplashrc = new TDEConfig("ksplashrc", false, false);
 
 	connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearIndicator()));
 
@@ -239,7 +239,7 @@ void KCMXinerama::clearIndicator() {
 }
 
 extern "C" {
-        KDE_EXPORT KCModule *create_xinerama(TQWidget *parent, const char *name) {
+        KDE_EXPORT TDECModule *create_xinerama(TQWidget *parent, const char *name) {
    	    TDEGlobal::locale()->insertCatalogue("kcmxinerama");
 	    return new KCMXinerama(parent, name);
         }
diff --git a/kcontrol/xinerama/kcmxinerama.h b/kcontrol/xinerama/kcmxinerama.h
index 130fae78e..707bba28c 100644
--- a/kcontrol/xinerama/kcmxinerama.h
+++ b/kcontrol/xinerama/kcmxinerama.h
@@ -27,10 +27,10 @@
 
 #include "xineramawidget.h"
 
-class KConfig;
+class TDEConfig;
 class TQWidget;
 
-class KCMXinerama : public KCModule {
+class KCMXinerama : public TDECModule {
 	Q_OBJECT
 public:
 	KCMXinerama(TQWidget *parent = 0L, const char *name = 0L);
@@ -49,7 +49,7 @@ public slots:
 
 private:
 	TQWidget* indicator(int dpy);
-	KConfig *config, *ksplashrc;
+	TDEConfig *config, *ksplashrc;
 	XineramaWidget *xw;
 	TQTimer _timer;
 	TQPtrList<TQWidget> _indicators;