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

22 files changed, 93 insertions, 93 deletions

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;
 };