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

13 files changed, 23 insertions, 23 deletions

diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 80af92274..6bbc45bec 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -169,28 +169,28 @@ AddresseeWidget::~AddresseeWidget()
 
 void AddresseeWidget::restoreSettings()
 {
-  KConfig config( "kabcrc" );
+  TDEConfig config( "kabcrc" );
   config.setGroup( "General" );
 
   mPrefix->setNameParts( config.readListEntry( "Prefixes" ) );
   mInclusion->setNameParts( config.readListEntry( "Inclusions" ) );
   mSuffix->setNameParts( config.readListEntry( "Suffixes" ) );
 
-  KConfig cfg( "kaddressbookrc" );
+  TDEConfig cfg( "kaddressbookrc" );
   cfg.setGroup( "General" );
   mFormattedNameCombo->setCurrentItem( cfg.readNumEntry( "FormattedNameType", 1 ) );
 }
 
 void AddresseeWidget::saveSettings()
 {
-  KConfig config( "kabcrc" );
+  TDEConfig config( "kabcrc" );
   config.setGroup( "General" );
 
   config.writeEntry( "Prefixes", mPrefix->nameParts() );
   config.writeEntry( "Inclusions", mInclusion->nameParts() );
   config.writeEntry( "Suffixes", mSuffix->nameParts() );
 
-  KConfig cfg( "kaddressbookrc" );
+  TDEConfig cfg( "kaddressbookrc" );
   cfg.setGroup( "General" );
   cfg.writeEntry( "FormattedNameType", mFormattedNameCombo->currentItem() );
 
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index 97c8d0b2d..5bdec2f86 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -29,7 +29,7 @@
 #include "extensionconfigdialog.h"
 #include "extensionwidget.h"
 
-ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
+ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, TDEConfig *config,
                                               TQWidget *parent, const char *name )
   : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, parent,
                  name, true, true ), mWidget( 0 ), mConfig( config )
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h
index 93a3c8501..0aa97f74f 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.h
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h
@@ -38,7 +38,7 @@ class ExtensionConfigDialog : public KDialogBase
   
 
   public:
-    ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
+    ExtensionConfigDialog( KAB::ExtensionFactory *factory, TDEConfig *config,
                            TQWidget *parent, const char *name = 0 );
     ~ExtensionConfigDialog();
 
@@ -47,7 +47,7 @@ class ExtensionConfigDialog : public KDialogBase
 
   private:
     KAB::ConfigureWidget *mWidget;
-    KConfig *mConfig;
+    TDEConfig *mConfig;
 };
 
 #endif
diff --git a/kaddressbook/kcmconfigs/kabconfig.desktop b/kaddressbook/kcmconfigs/kabconfig.desktop
index fdf752b07..fa84b328e 100644
--- a/kaddressbook/kcmconfigs/kabconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kaddressbook
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=kaddressbook/preferences.html
 
 X-TDE-ModuleType=Library
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index e4c6e23da..18cb1a908 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -174,7 +174,7 @@ void KABConfigWidget::restoreSettings()
   mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) );
   mLocationMapURL->lineEdit()->setCursorPosition( 0 );
 
-  KConfig config( "kabcrc", false, false );
+  TDEConfig config( "kabcrc", false, false );
   config.setGroup( "General" );
   mTradeAsFamilyName->setChecked( config.readBoolEntry( "TradeAsFamilyName", true ) );
   mLimitContactDisplay->setChecked( config.readBoolEntry( "LimitContactDisplay", true ) );
@@ -197,7 +197,7 @@ void KABConfigWidget::saveSettings()
 
   KABPrefs::instance()->writeConfig();
 
-  KConfig config( "kabcrc", false, false );
+  TDEConfig config( "kabcrc", false, false );
   config.setGroup( "General" );
   config.writeEntry( "TradeAsFamilyName", mTradeAsFamilyName->isChecked() );
   config.writeEntry( "LimitContactDisplay", mLimitContactDisplay->isChecked() );
diff --git a/kaddressbook/kcmconfigs/kabcustomfields.desktop b/kaddressbook/kcmconfigs/kabcustomfields.desktop
index 2806171c9..c9cd4742c 100644
--- a/kaddressbook/kcmconfigs/kabcustomfields.desktop
+++ b/kaddressbook/kcmconfigs/kabcustomfields.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=dlgedit
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=kaddressbook/preferences.html
 
 X-TDE-ModuleType=Library
diff --git a/kaddressbook/kcmconfigs/kabldapconfig.desktop b/kaddressbook/kcmconfigs/kabldapconfig.desktop
index 321f9c81d..33eb263e4 100644
--- a/kaddressbook/kcmconfigs/kabldapconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabldapconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=find
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 DocPath=kaddressbook/preferences.html#preferences-ldap-lookup
 
 X-TDE-ModuleType=Library
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 296f79553..8f3bb5e58 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -35,13 +35,13 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kabconfig( TQWidget *parent, const char * ) {
+  KDE_EXPORT TDECModule *create_kabconfig( TQWidget *parent, const char * ) {
     return new KCMKabConfig( parent, "kcmkabconfig" );
   }
 }
 
 KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   TQVBoxLayout *layout = new TQVBoxLayout( this );
   mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index ceadd6c94..c920d4099 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -28,7 +28,7 @@
 
 class KABConfigWidget;
 
-class KCMKabConfig : public KCModule
+class KCMKabConfig : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
index 0a76b6d2c..dcbcd2c58 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
@@ -33,7 +33,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *parent, const char * ) {
+  KDE_EXPORT TDECModule *create_kabcustomfields( TQWidget *parent, const char * ) {
     return new KCMKabCustomFields( parent, "kcmkabcustomfields" );
   }
 }
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index 66fcde2f5..ba512b63a 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -36,13 +36,13 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *parent, const char * ) {
+  KDE_EXPORT TDECModule *create_kabldapconfig( TQWidget *parent, const char * ) {
     return new KCMKabLdapConfig( parent, "kcmkabldapconfig" );
   }
 }
 
 KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   TQVBoxLayout *layout = new TQVBoxLayout( this );
   mConfigWidget = new LDAPOptionsWidget( this );
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
index 0325c88e2..8539c515c 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
@@ -30,7 +30,7 @@
 
 class LDAPOptionsWidget;
 
-class KCMKabLdapConfig : public KCModule
+class KCMKabLdapConfig : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 92eda9910..0f33eca6a 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -197,8 +197,8 @@ void LDAPOptionsWidget::slotMoveDown()
 void LDAPOptionsWidget::restoreSettings()
 {
   mHostListView->clear();
-  KConfig *config = KPIM::LdapSearch::config();
-  KConfigGroupSaver saver( config, "LDAP" );
+  TDEConfig *config = KPIM::LdapSearch::config();
+  TDEConfigGroupSaver saver( config, "LDAP" );
 
   TQString host;
 
@@ -222,10 +222,10 @@ void LDAPOptionsWidget::restoreSettings()
 
 void LDAPOptionsWidget::saveSettings()
 {
-  KConfig *config = KPIM::LdapSearch::config();
+  TDEConfig *config = KPIM::LdapSearch::config();
   config->deleteGroup( "LDAP" );
 
-  KConfigGroupSaver saver( config, "LDAP" );
+  TDEConfigGroupSaver saver( config, "LDAP" );
 
   uint selected = 0; uint unselected = 0;
   TQListViewItemIterator it( mHostListView );