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

56 files changed, 152 insertions, 152 deletions

diff --git a/kaddressbook/addresseeconfig.cpp b/kaddressbook/addresseeconfig.cpp
index 98495c41e..81f5ceef5 100644
--- a/kaddressbook/addresseeconfig.cpp
+++ b/kaddressbook/addresseeconfig.cpp
@@ -48,7 +48,7 @@ Addressee AddresseeConfig::addressee()
 
 void AddresseeConfig::setAutomaticNameParsing( bool value )
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.setGroup( mAddressee.uid() );
   config.writeEntry( "AutomaticNameParsing", value );
   config.sync();
@@ -56,7 +56,7 @@ void AddresseeConfig::setAutomaticNameParsing( bool value )
 
 bool AddresseeConfig::automaticNameParsing()
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.setGroup( mAddressee.uid() );
   return config.readBoolEntry( "AutomaticNameParsing",
                                KABPrefs::instance()->automaticNameParsing() );
@@ -64,7 +64,7 @@ bool AddresseeConfig::automaticNameParsing()
 
 void AddresseeConfig::setNoDefaultAddrTypes( const TQValueList<int> &types )
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.setGroup( mAddressee.uid() );
   config.writeEntry( "NoDefaultAddrTypes", types );
   config.sync();
@@ -72,14 +72,14 @@ void AddresseeConfig::setNoDefaultAddrTypes( const TQValueList<int> &types )
 
 TQValueList<int> AddresseeConfig::noDefaultAddrTypes() const
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.setGroup( mAddressee.uid() );
   return config.readIntListEntry( "NoDefaultAddrTypes" );
 }
 
 void AddresseeConfig::setCustomFields( const TQStringList &fields )
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.setGroup( mAddressee.uid() );
   config.writeEntry( "LocalCustomFields", fields );
   config.sync();
@@ -87,13 +87,13 @@ void AddresseeConfig::setCustomFields( const TQStringList &fields )
 
 TQStringList AddresseeConfig::customFields() const
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.setGroup( mAddressee.uid() );
   return config.readListEntry( "LocalCustomFields" );
 }
 
 void AddresseeConfig::remove()
 {
-  KConfig config( "kaddressbook_addrconfig" );
+  TDEConfig config( "kaddressbook_addrconfig" );
   config.deleteGroup( mAddressee.uid() );
 }
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index cbb60bd26..d203e4ddc 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -60,7 +60,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
 
   enableButton( KDialogBase::Apply, false );
 
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "AddresseeEditor" );
   TQSize defaultSize( 750, 570 );
   resize( config.readSizeEntry( "Size", &defaultSize ) );
@@ -70,7 +70,7 @@ AddresseeEditorDialog::~AddresseeEditorDialog()
 {
   kdDebug(5720) << "~AddresseeEditorDialog()" << endl;
 
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "AddresseeEditor" );
   config.writeEntry( "Size", size() );
 
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index b875c99af..e4cd5a3af 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -519,7 +519,7 @@ void AddresseeEditorWidget::load()
   mNameEdit->blockSignals( false );
 
   if ( mAddressee.formattedName().isEmpty() ) {
-    KConfig config( "kaddressbookrc" );
+    TDEConfig config( "kaddressbookrc" );
     config.setGroup( "General" );
     mFormattedNameType = config.readNumEntry( "FormattedNameType", 1 );
     mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp
index 932f6f108..1872ecea0 100644
--- a/kaddressbook/common/filter.cpp
+++ b/kaddressbook/common/filter.cpp
@@ -121,7 +121,7 @@ const TQStringList &Filter::categories() const
   return mCategoryList;
 }
 
-void Filter::save( KConfig *config )
+void Filter::save( TDEConfig *config )
 {
   config->writeEntry( "Name", mName );
   config->writeEntry( "Enabled", mEnabled );
@@ -129,7 +129,7 @@ void Filter::save( KConfig *config )
   config->writeEntry( "MatchRule", (int)mMatchRule );
 }
 
-void Filter::restore( KConfig *config )
+void Filter::restore( TDEConfig *config )
 {
   mName = config->readEntry( "Name", "<internal error>" );
   mEnabled = config->readBoolEntry( "Enabled", true );
@@ -139,10 +139,10 @@ void Filter::restore( KConfig *config )
   mIsEmpty = false;
 }
 
-void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &list )
+void Filter::save( TDEConfig *config, const TQString &baseGroup, Filter::List &list )
 {
   {
-    KConfigGroupSaver s( config, baseGroup );
+    TDEConfigGroupSaver s( config, baseGroup );
 
     // remove the old filters
     uint count = config->readNumEntry( "Count" );
@@ -155,31 +155,31 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis
   Filter::List::Iterator iter;
   for ( iter = list.begin(); iter != list.end(); ++iter ) {
     if ( !(*iter).mInternal ) {
-      KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
+      TDEConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
                                                      .arg( index ) );
       (*iter).save( config );
       index++;
     }
   }
 
-  KConfigGroupSaver s( config, baseGroup );
+  TDEConfigGroupSaver s( config, baseGroup );
   config->writeEntry( "Count", index );
 }
 
-Filter::List Filter::restore( KConfig *config, const TQString &baseGroup )
+Filter::List Filter::restore( TDEConfig *config, const TQString &baseGroup )
 {
   Filter::List list;
   int count = 0;
   Filter f;
 
   {
-    KConfigGroupSaver s( config, baseGroup );
+    TDEConfigGroupSaver s( config, baseGroup );
     count = config->readNumEntry( "Count", 0 );
   }
 
   for ( int i = 0; i < count; i++ ) {
     {
-      KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
+      TDEConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
       f.restore( config );
     }
 
diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h
index cb13ce536..e8518b8e8 100644
--- a/kaddressbook/common/filter.h
+++ b/kaddressbook/common/filter.h
@@ -102,12 +102,12 @@ class Filter
     /**
       Saves the filter to the config file. The group should already be set.
      */
-    void save( KConfig *config );
+    void save( TDEConfig *config );
 
     /**
       Loads the filter from the config file. The group should already be set.
      */
-    void restore( KConfig *config );
+    void restore( TDEConfig *config );
 
     /**
       Saves a list of filters to the config file.
@@ -118,7 +118,7 @@ class Filter
                        will be append for each filter saved.
       @param list The list of filters to be saved.
      */
-    static void save( KConfig *config, const TQString &baseGroup, Filter::List &list );
+    static void save( TDEConfig *config, const TQString &baseGroup, Filter::List &list );
 
     /**
       Restores a list of filters from a config file.
@@ -128,7 +128,7 @@ class Filter
 
       @return The list of filters.
      */
-    static Filter::List restore( KConfig *config, const TQString &baseGroup );
+    static Filter::List restore( TDEConfig *config, const TQString &baseGroup );
 
     /**
       Sets the filter rule. If the rule is Filter::Matching (default),
diff --git a/kaddressbook/common/kabprefs.cpp b/kaddressbook/common/kabprefs.cpp
index 18180b801..8a45fc14d 100644
--- a/kaddressbook/common/kabprefs.cpp
+++ b/kaddressbook/common/kabprefs.cpp
@@ -33,7 +33,7 @@ static KStaticDeleter<KABPrefs> staticDeleter;
 KABPrefs::KABPrefs()
   : KABPrefsBase()
 {
-  KConfigSkeleton::setCurrentGroup( "General" );
+  TDEConfigSkeleton::setCurrentGroup( "General" );
 
   TQStringList defaultMap;
   defaultMap << "http://maps.google.com/maps?f=q&hl=%1&q=%n,%l,%s";
diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h
index c0c92bdcc..4ac486f78 100644
--- a/kaddressbook/common/kabprefs.h
+++ b/kaddressbook/common/kabprefs.h
@@ -28,7 +28,7 @@
 #include <tdepimmacros.h>
 #include "kabprefs_base.h"
 
-class KConfig;
+class TDEConfig;
 
 class KDE_EXPORT KABPrefs : public KABPrefsBase
 {
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index bb2064883..1d64fde3f 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -67,11 +67,11 @@ KABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok )
     image.load( url.path() );
     picture.setData( image );
     (*ok) = true;
-  } else if ( KIO::NetAccess::download( url, tempFile, mParent ) ) {
+  } else if ( TDEIO::NetAccess::download( url, tempFile, mParent ) ) {
     image.load( tempFile );
     picture.setData( image );
     (*ok) = true;
-    KIO::NetAccess::removeTempFile( tempFile );
+    TDEIO::NetAccess::removeTempFile( tempFile );
   }
 
   if ( !(*ok) ) {
diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp
index 16bec28a7..c5efa60aa 100644
--- a/kaddressbook/interfaces/configurewidget.cpp
+++ b/kaddressbook/interfaces/configurewidget.cpp
@@ -37,12 +37,12 @@ ConfigureWidget::~ConfigureWidget()
 {
 }
 
-void ConfigureWidget::restoreSettings( KConfig* )
+void ConfigureWidget::restoreSettings( TDEConfig* )
 {
   // should be reimplemented in the views, extensions etc.
 }
 
-void ConfigureWidget::saveSettings( KConfig* )
+void ConfigureWidget::saveSettings( TDEConfig* )
 {
   // should be reimplemented in the views, extensions etc.
 }
diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h
index 10eb3de88..d1d23c8c7 100644
--- a/kaddressbook/interfaces/configurewidget.h
+++ b/kaddressbook/interfaces/configurewidget.h
@@ -47,7 +47,7 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
       values from the config file.
       Important: Don't change the group of cfg!
      */
-    virtual void restoreSettings( KConfig *cfg );
+    virtual void restoreSettings( TDEConfig *cfg );
 
     /**
       This method is called after the user clicked the 'Ok' button.
@@ -55,7 +55,7 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
       the GUI to the config file.
       Important: Don't change the group of cfg!
      */
-    virtual void saveSettings( KConfig *cfg );
+    virtual void saveSettings( TDEConfig *cfg );
 
 
     /**
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 996044f47..c291f208c 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -45,7 +45,7 @@ class Resource;
 class TQWidget;
 
 class KActionCollection;
-class KConfig;
+class TDEConfig;
 class KURL;
 
 namespace KAB {
@@ -66,9 +66,9 @@ class KDE_EXPORT Core : public TQObject
     virtual KABC::AddressBook *addressBook() const = 0;
 
     /**
-      Returns a pointer to the KConfig object of the application.
+      Returns a pointer to the TDEConfig object of the application.
      */
-    virtual KConfig *config() const = 0;
+    virtual TDEConfig *config() const = 0;
 
     /**
       Returns a pointer to the global KActionCollection object. So
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 8d4dd2fda..0b517bf00 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -250,7 +250,7 @@ KABC::AddressBook *KABCore::addressBook() const
   return mAddressBook;
 }
 
-KConfig *KABCore::config() const
+TDEConfig *KABCore::config() const
 {
   return KABPrefs::instance()->config();
 }
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index d3ce562b4..c8d368722 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -49,7 +49,7 @@ class CategorySelectDialog;
 class TDEAboutData;
 class KAction;
 class KActionCollection;
-class KConfig;
+class TDEConfig;
 class KPushButton;
 class KStatusBar;
 class KToggleAction;
@@ -106,9 +106,9 @@ class KDE_EXPORT KABCore : public KAB::Core
     KABC::AddressBook *addressBook() const;
 
     /**
-      Returns a pointer to the KConfig object of the application.
+      Returns a pointer to the TDEConfig object of the application.
      */
-    KConfig *config() const;
+    TDEConfig *config() const;
 
     /**
       Returns a pointer to the global KActionCollection object. So
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index 081ab2a5e..9c2d476e2 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -135,11 +135,11 @@ void KAddressBookMain::syncAllResources()
   mCore->load();
 }
 
-void KAddressBookMain::saveProperties( KConfig* )
+void KAddressBookMain::saveProperties( TDEConfig* )
 {
 }
 
-void KAddressBookMain::readProperties( KConfig* )
+void KAddressBookMain::readProperties( TDEConfig* )
 {
 }
 
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h
index 2444b28e5..3e8ffb832 100644
--- a/kaddressbook/kaddressbookmain.h
+++ b/kaddressbook/kaddressbookmain.h
@@ -75,14 +75,14 @@ class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
       This function is called when it is time for the app to save its
       properties for session management purposes.
      */
-    void saveProperties( KConfig* );
+    void saveProperties( TDEConfig* );
 
     /**
-      This function is called when this app is restored.  The KConfig
+      This function is called when this app is restored.  The TDEConfig
       object points to the session management config file that was saved
       with @ref saveProperties
      */
-    void readProperties( KConfig* );
+    void readProperties( TDEConfig* );
 
     virtual bool queryClose();
 
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 028663e3e..15ea63bac 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -53,7 +53,7 @@ KAddressBookView::~KAddressBookView()
                 << name() << endl;
 }
 
-void KAddressBookView::readConfig( KConfig *config )
+void KAddressBookView::readConfig( TDEConfig *config )
 {
   mFieldList = KABC::Field::restoreFields( config, "KABCFields" );
 
@@ -64,7 +64,7 @@ void KAddressBookView::readConfig( KConfig *config )
   mDefaultFilterName = config->readEntry( "DefaultFilterName" );
 }
 
-void KAddressBookView::writeConfig( KConfig* )
+void KAddressBookView::writeConfig( TDEConfig* )
 {
   // Most of writing the config is handled by the ConfigureViewDialog
 }
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 86153200d..1f26ca71e 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -36,7 +36,7 @@
 #include "filter.h"
 #include "viewconfigurewidget.h"
 
-class KConfig;
+class TDEConfig;
 class KXMLGUIClient;
 
 class TQDropEvent;
@@ -80,10 +80,10 @@ class KDE_EXPORT KAddressBookView : public TQWidget
       If overloaded in the subclass, do not forget to call super class's
       method.
 
-      @param config The KConfig object to read from. The group will already
+      @param config The TDEConfig object to read from. The group will already
       be set, so do not change the group.
      */
-    virtual void readConfig( KConfig *config );
+    virtual void readConfig( TDEConfig *config );
 
     /**
       Called whenever this view should write the config. The view should not
@@ -94,9 +94,9 @@ class KDE_EXPORT KAddressBookView : public TQWidget
       If overloaded in the subclass, do not forget to call the super class's
       method.
      */
-    // The KConfig object is unused so we do not document it
+    // The TDEConfig object is unused so we do not document it
     // else doxygen will complain.
-    virtual void writeConfig( KConfig * );
+    virtual void writeConfig( TDEConfig * );
 
     /**
       Returns a TQString with all the selected email addresses concatenated
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 );
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 42920b3b6..b3fd9af25 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -118,7 +118,7 @@ void KeyWidget::addKey()
     return;
 
   TQString tmpFile;
-  if ( KIO::NetAccess::download( url, tmpFile, this ) ) {
+  if ( TDEIO::NetAccess::download( url, tmpFile, this ) ) {
     TQFile file( tmpFile );
     if ( !file.open( IO_ReadOnly ) ) {
       TQString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
@@ -140,7 +140,7 @@ void KeyWidget::addKey()
 
     emit changed();
 
-    KIO::NetAccess::removeTempFile( tmpFile );
+    TDEIO::NetAccess::removeTempFile( tmpFile );
   }
 
   updateKeyCombo();
@@ -175,7 +175,7 @@ void KeyWidget::exportKey()
   (*s) << key.textData();
   tempFile.close();
 
-  KIO::NetAccess::upload( tempFile.name(), url, kapp->mainWidget() );
+  TDEIO::NetAccess::upload( tempFile.name(), url, kapp->mainWidget() );
 }
 
 void KeyWidget::updateKeyCombo()
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index cf7b1d5f8..6537bebe9 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -249,14 +249,14 @@ void LDAPSearchDialog::restoreSettings()
   mLdapClientList.setAutoDelete( true );
   mLdapClientList.clear();
 
-  KConfig kabConfig( "kaddressbookrc" );
+  TDEConfig kabConfig( "kaddressbookrc" );
   kabConfig.setGroup( "LDAPSearch" );
   mSearchType->setCurrentItem( kabConfig.readNumEntry( "SearchType", 0 ) );
 
   // then read the config file and register all selected
   // server in the list
-  KConfig* config = KPIM::LdapSearch::config();
-  KConfigGroupSaver saver( config, "LDAP" );
+  TDEConfig* config = KPIM::LdapSearch::config();
+  TDEConfigGroupSaver saver( config, "LDAP" );
   mNumHosts = config->readUnsignedNumEntry( "NumSelectedHosts" );
   if ( !mNumHosts ) {
     KMessageBox::error( this, i18n( "You must select a LDAP server before searching.\nYou can do this from the menu Settings/Configure KAddressBook." ) );
@@ -316,7 +316,7 @@ void LDAPSearchDialog::restoreSettings()
 
 void LDAPSearchDialog::saveSettings()
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "LDAPSearch" );
   config.writeEntry( "SearchType", mSearchType->currentItem() );
   config.sync();
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 718ce8e2b..8f70f0f82 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -124,7 +124,7 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
   mFormattedNameEdit->setText( addr.formattedName() );
 
   // Prefix and suffix combos
-  KConfig config( "kabcrc" );
+  TDEConfig config( "kabcrc" );
   config.setGroup( "General" );
 
   TQStringList sTitle;
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 377669732..a80626519 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -69,7 +69,7 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na
     mPainter( 0 ),
     mPrintProgress( 0 )
 {
-  KConfig *config;
+  TDEConfig *config;
   TQFont font;
   bool kdeFonts;
   TQFont standard = TDEGlobalSettings::generalFont();
@@ -145,7 +145,7 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro
   TQFont comment = TQFont("Helvetica", 10, TQFont::Normal);
 
   // store the configuration settings:
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( ConfigSectionName );
   useKDEFonts = mPageAppearance->cbStandardFonts->isChecked();
   config->writeEntry( UseKDEFonts, useKDEFonts );
diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp
index ec412aa35..f4558258e 100644
--- a/kaddressbook/soundwidget.cpp
+++ b/kaddressbook/soundwidget.cpp
@@ -147,7 +147,7 @@ void SoundWidget::loadSound()
 
   if ( url.isLocalFile() )
     fileName = url.path();
-  else if ( !KIO::NetAccess::download( url, fileName, this ) )
+  else if ( !TDEIO::NetAccess::download( url, fileName, this ) )
     return;
 
   TQFile file( fileName );
@@ -159,7 +159,7 @@ void SoundWidget::loadSound()
   file.close();
 
   if ( !url.isLocalFile() )
-    KIO::NetAccess::removeTempFile( fileName );
+    TDEIO::NetAccess::removeTempFile( fileName );
 }
 
 void SoundWidget::updateGUI()
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index bbe0f3f19..e3c9a81cf 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -61,7 +61,7 @@ ViewConfigureFieldsPage::ViewConfigureFieldsPage( KABC::AddressBook *ab,
   initGUI();
 }
 
-void ViewConfigureFieldsPage::restoreSettings( KConfig *config )
+void ViewConfigureFieldsPage::restoreSettings( TDEConfig *config )
 {
   KABC::Field::List fields = KABC::Field::restoreFields( config, "KABCFields" );
 
@@ -75,7 +75,7 @@ void ViewConfigureFieldsPage::restoreSettings( KConfig *config )
   slotShowFields( mCategoryCombo->currentItem() );
 }
 
-void ViewConfigureFieldsPage::saveSettings( KConfig *config )
+void ViewConfigureFieldsPage::saveSettings( TDEConfig *config )
 {
   KABC::Field::List fields;
 
diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h
index 0ac75709d..91bf6da72 100644
--- a/kaddressbook/viewconfigurefieldspage.h
+++ b/kaddressbook/viewconfigurefieldspage.h
@@ -44,8 +44,8 @@ class ViewConfigureFieldsPage : public TQWidget
     ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *parent = 0,
                              const char *name = 0 );
 
-    void restoreSettings( KConfig* );
-    void saveSettings( KConfig* );
+    void restoreSettings( TDEConfig* );
+    void saveSettings( TDEConfig* );
 
   public slots:
     void slotSelect();
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp
index 39bab7c81..9602f2d31 100644
--- a/kaddressbook/viewconfigurefilterpage.cpp
+++ b/kaddressbook/viewconfigurefilterpage.cpp
@@ -79,7 +79,7 @@ ViewConfigureFilterPage::~ViewConfigureFilterPage()
   delete mFilterGroup;
 }
 
-void ViewConfigureFilterPage::restoreSettings( KConfig *config )
+void ViewConfigureFilterPage::restoreSettings( TDEConfig *config )
 {
   mFilterCombo->clear();
 
@@ -97,7 +97,7 @@ void ViewConfigureFilterPage::restoreSettings( KConfig *config )
     mFilterCombo->setCurrentText( config->readEntry( "DefaultFilterName" ) );
 }
 
-void ViewConfigureFilterPage::saveSettings( KConfig *config )
+void ViewConfigureFilterPage::saveSettings( TDEConfig *config )
 {
   config->writeEntry( "DefaultFilterName", mFilterCombo->currentText() );
   config->writeEntry( "DefaultFilterType", mFilterGroup->id( mFilterGroup->selected() ) );
diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h
index 7367d59d6..a29bf8808 100644
--- a/kaddressbook/viewconfigurefilterpage.h
+++ b/kaddressbook/viewconfigurefilterpage.h
@@ -29,7 +29,7 @@
 class TQButtonGroup;
 
 class KComboBox;
-class KConfig;
+class TDEConfig;
 
 class ViewConfigureFilterPage : public TQWidget
 {
@@ -40,8 +40,8 @@ class ViewConfigureFilterPage : public TQWidget
     ViewConfigureFilterPage( TQWidget *parent, const char *name = 0 );
     ~ViewConfigureFilterPage();
 
-    void restoreSettings( KConfig* );
-    void saveSettings( KConfig* );
+    void restoreSettings( TDEConfig* );
+    void saveSettings( TDEConfig* );
 
   protected slots:
     void buttonClicked( int id );
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index 8278b2f1d..415430d92 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -66,13 +66,13 @@ ViewConfigureWidget::~ViewConfigureWidget()
 {
 }
 
-void ViewConfigureWidget::restoreSettings( KConfig *config )
+void ViewConfigureWidget::restoreSettings( TDEConfig *config )
 {
   mFieldsPage->restoreSettings( config );
   mFilterPage->restoreSettings( config );
 }
 
-void ViewConfigureWidget::saveSettings( KConfig *config )
+void ViewConfigureWidget::saveSettings( TDEConfig *config )
 {
   mFieldsPage->saveSettings( config );
   mFilterPage->saveSettings( config );
@@ -98,12 +98,12 @@ ViewConfigureDialog::~ViewConfigureDialog()
 {
 }
 
-void ViewConfigureDialog::restoreSettings( KConfig *config )
+void ViewConfigureDialog::restoreSettings( TDEConfig *config )
 {
   mConfigWidget->restoreSettings( config );
 }
 
-void ViewConfigureDialog::saveSettings( KConfig *config )
+void ViewConfigureDialog::saveSettings( TDEConfig *config )
 {
   mConfigWidget->saveSettings( config );
 }
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index e65e095d4..c13f0fab9 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -61,7 +61,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
 
       Do not change the group of the config object in this method.
      */
-    virtual void restoreSettings( KConfig *config );
+    virtual void restoreSettings( TDEConfig *config );
 
     /**
       Writes the configuration from the GUI to the config object. If this
@@ -69,7 +69,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
 
       Do not change the group of the config object in this method.
      */
-    virtual void saveSettings( KConfig *config );
+    virtual void saveSettings( TDEConfig *config );
 
 
     /**
@@ -95,8 +95,8 @@ class ViewConfigureDialog : public KDialogBase
                          TQWidget *parent, const char *name = 0 );
     ~ViewConfigureDialog();
 
-    void restoreSettings( KConfig* );
-    void saveSettings( KConfig* );
+    void restoreSettings( TDEConfig* );
+    void saveSettings( TDEConfig* );
 
   protected slots:
     void slotHelp();
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 3938c14a9..2616bf330 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -83,7 +83,7 @@ void ViewManager::restoreSettings()
   // been modified by global settings
   TQDictIterator<KAddressBookView> it( mViewDict );
   for ( it.toFirst(); it.current(); ++it ) {
-    KConfigGroupSaver saver( mCore->config(), it.currentKey() );
+    TDEConfigGroupSaver saver( mCore->config(), it.currentKey() );
     it.current()->readConfig( mCore->config() );
   }
 
@@ -96,7 +96,7 @@ void ViewManager::saveSettings()
 {
   TQDictIterator<KAddressBookView> it( mViewDict );
   for ( it.toFirst(); it.current(); ++it ) {
-    KConfigGroupSaver saver( mCore->config(), it.currentKey() );
+    TDEConfigGroupSaver saver( mCore->config(), it.currentKey() );
     (*it)->writeConfig( mCore->config() );
   }
 
@@ -199,8 +199,8 @@ void ViewManager::setActiveView( const TQString &name )
 
   // Check if we found the view. If we didn't, then we need to create it
   if ( view == 0 ) {
-    KConfig *config = mCore->config();
-    KConfigGroupSaver saver( config, name );
+    TDEConfig *config = mCore->config();
+    TDEConfigGroupSaver saver( config, name );
     TQString type = config->readEntry( "Type", "Table" );
 
     kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl;
@@ -278,7 +278,7 @@ void ViewManager::editView()
   if ( wdg ) {
     ViewConfigureDialog dlg( wdg, mActiveView->caption(), this );
 
-    KConfigGroupSaver saver( mCore->config(), mActiveView->caption() );
+    TDEConfigGroupSaver saver( mCore->config(), mActiveView->caption() );
     dlg.restoreSettings( mCore->config() );
 
     if ( dlg.exec() ) {
@@ -314,7 +314,7 @@ void ViewManager::deleteView()
     mViewNameList.remove( mActiveView->caption() );
 
     // remove the view from the config file
-    KConfig *config = mCore->config();
+    TDEConfig *config = mCore->config();
     config->deleteGroup( mActiveView->caption() );
 
     mViewDict.remove( mActiveView->caption() );
@@ -356,9 +356,9 @@ void ViewManager::addView()
     mViewNameList.append( newName );
 
     // write the view to the config file,
-    KConfig *config = mCore->config();
+    TDEConfig *config = mCore->config();
     config->deleteGroup( newName );
-    KConfigGroupSaver saver( config, newName );
+    TDEConfigGroupSaver saver( config, newName );
     config->writeEntry( "Type", type );
 
     // try to set the active view
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 0ffc5e5df..347bd4233 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -60,14 +60,14 @@ ConfigureCardViewWidget::~ConfigureCardViewWidget()
 {
 }
 
-void ConfigureCardViewWidget::restoreSettings( KConfig *config )
+void ConfigureCardViewWidget::restoreSettings( TDEConfig *config )
 {
   ViewConfigureWidget::restoreSettings( config );
 
   mAdvancedPage->restoreSettings( config );
 }
 
-void ConfigureCardViewWidget::saveSettings( KConfig *config )
+void ConfigureCardViewWidget::saveSettings( TDEConfig *config )
 {
   ViewConfigureWidget::saveSettings( config );
 
@@ -86,7 +86,7 @@ CardViewLookNFeelPage::~CardViewLookNFeelPage()
 {
 }
 
-void CardViewLookNFeelPage::restoreSettings( KConfig *config )
+void CardViewLookNFeelPage::restoreSettings( TDEConfig *config )
 {
   // colors
   cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) );
@@ -132,7 +132,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
   cbShowEmptyFields->setChecked( config->readBoolEntry( "ShowEmptyFields", false ) );
 }
 
-void CardViewLookNFeelPage::saveSettings( KConfig *config )
+void CardViewLookNFeelPage::saveSettings( TDEConfig *config )
 {
   // colors
   config->writeEntry( "EnableCustomColors", cbEnableCustomColors->isChecked() );
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index 9c079d887..892532c5e 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -34,7 +34,7 @@ class TQString;
 class TQWidget;
 class TQCheckBox;
 class TQLabel;
-class KConfig;
+class TDEConfig;
 
 namespace KABC { class AddressBook; }
 
@@ -51,8 +51,8 @@ class ConfigureCardViewWidget : public ViewConfigureWidget
     ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
     virtual ~ConfigureCardViewWidget();
 
-    virtual void restoreSettings( KConfig* );
-    virtual void saveSettings( KConfig* );
+    virtual void restoreSettings( TDEConfig* );
+    virtual void saveSettings( TDEConfig* );
 
   private:
     class CardViewLookNFeelPage *mAdvancedPage;
@@ -86,8 +86,8 @@ class CardViewLookNFeelPage : public TQVBox {
     CardViewLookNFeelPage( TQWidget *parent=0, const char *name=0 );
     ~CardViewLookNFeelPage();
 
-    void restoreSettings( KConfig* );
-    void saveSettings( KConfig* );
+    void restoreSettings( TDEConfig* );
+    void saveSettings( TDEConfig* );
 
   private slots:
     void setTextFont();
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index a8359884b..987feb17d 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -56,14 +56,14 @@ ConfigureTableViewWidget::~ConfigureTableViewWidget()
 {
 }
 
-void ConfigureTableViewWidget::restoreSettings( KConfig *config )
+void ConfigureTableViewWidget::restoreSettings( TDEConfig *config )
 {
   ViewConfigureWidget::restoreSettings( config );
 
   mPage->restoreSettings( config );
 }
 
-void ConfigureTableViewWidget::saveSettings( KConfig *config )
+void ConfigureTableViewWidget::saveSettings( TDEConfig *config )
 {
   ViewConfigureWidget::saveSettings( config );
 
@@ -81,7 +81,7 @@ LookAndFeelPage::LookAndFeelPage(TQWidget *parent, const char *name)
   enableBackgroundToggled(mBackgroundBox->isChecked());
 }
 
-void LookAndFeelPage::restoreSettings( KConfig *config )
+void LookAndFeelPage::restoreSettings( TDEConfig *config )
 {
   mAlternateButton->setChecked(config->readBoolEntry("ABackground", true));
   mLineButton->setChecked(config->readBoolEntry("SingleLine", false));
@@ -97,7 +97,7 @@ void LookAndFeelPage::restoreSettings( KConfig *config )
 #endif
 }
 
-void LookAndFeelPage::saveSettings( KConfig *config )
+void LookAndFeelPage::saveSettings( TDEConfig *config )
 {
   config->writeEntry("ABackground", mAlternateButton->isChecked());
   config->writeEntry("SingleLine", mLineButton->isChecked());
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index d4a79a6f1..94fd2a687 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -31,7 +31,7 @@ class TQWidget;
 class TQRadioButton;
 class TQCheckBox;
 class KURLRequester;
-class KConfig;
+class TDEConfig;
 
 namespace KABC { class AddressBook; }
 
@@ -48,8 +48,8 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
     ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
     virtual ~ConfigureTableViewWidget();
 
-    virtual void restoreSettings( KConfig* );
-    virtual void saveSettings( KConfig* );
+    virtual void restoreSettings( TDEConfig* );
+    virtual void saveSettings( TDEConfig* );
 
   private:
     void initGUI();
@@ -69,8 +69,8 @@ class LookAndFeelPage : public TQWidget
     LookAndFeelPage( TQWidget *parent, const char *name = 0 );
     ~LookAndFeelPage() {}
 
-    void restoreSettings( KConfig* );
-    void saveSettings( KConfig* );
+    void restoreSettings( TDEConfig* );
+    void saveSettings( TDEConfig* );
 
   protected slots:
     void enableBackgroundToggled( bool );
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 4656f62b1..30e1ca672 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -178,7 +178,7 @@ KABC::Field *KAddressBookCardView::sortField() const
   return KABC::Field::allFields()[ 0 ];
 }
 
-void KAddressBookCardView::readConfig( KConfig *config )
+void KAddressBookCardView::readConfig( TDEConfig *config )
 {
   KAddressBookView::readConfig( config );
 
@@ -238,7 +238,7 @@ void KAddressBookCardView::readConfig( KConfig *config )
              this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) );
 }
 
-void KAddressBookCardView::writeConfig( KConfig *config )
+void KAddressBookCardView::writeConfig( TDEConfig *config )
 {
   config->writeEntry( "ItemWidth", mCardView->itemWidth() );
   KAddressBookView::writeConfig( config );
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index f14b12fc8..90b738d53 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -32,7 +32,7 @@
 
 class TQDragEntryEvent;
 class TQDropEvent;
-class KConfig;
+class TDEConfig;
 class AddresseeCardView;
 
 /**
@@ -54,8 +54,8 @@ class KAddressBookCardView : public KAddressBookView
     virtual TQString type() const { return "Card"; }
     virtual KABC::Field *sortField() const;
 
-    virtual void readConfig( KConfig *config );
-    virtual void writeConfig( KConfig *config );
+    virtual void readConfig( TDEConfig *config );
+    virtual void writeConfig( TDEConfig *config );
 
     void scrollUp();
     void scrollDown();
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 42e315c50..adf3de0e2 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -167,7 +167,7 @@ KABC::Field *KAddressBookIconView::sortField() const
   return KABC::Field::allFields()[ 2 ];
 }
 
-void KAddressBookIconView::readConfig( KConfig *config )
+void KAddressBookIconView::readConfig( TDEConfig *config )
 {
   KAddressBookView::readConfig( config );
 
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index 8cbc98a9d..56984cfc5 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -29,7 +29,7 @@
 #include "kaddressbookview.h"
 
 class TQIconViewItem;
-class KConfig;
+class TDEConfig;
 class AddresseeIconView;
 class AddresseeIconViewItem;
 
@@ -52,7 +52,7 @@ class KAddressBookIconView : public KAddressBookView
     virtual TQStringList selectedUids();
     virtual TQString type() const { return "Icon"; }
     virtual KABC::Field *sortField() const;
-    virtual void readConfig( KConfig *config );
+    virtual void readConfig( TDEConfig *config );
 
     void scrollUp();
     void scrollDown();
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index de1ae2ec3..9432dafa2 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -173,14 +173,14 @@ KABC::Field *KAddressBookTableView::sortField() const
   return ( mListView->sortColumn() == -1 ? fields()[ 0 ] : fields()[ mListView->sortColumn() ] );
 }
 
-void KAddressBookTableView::writeConfig( KConfig *config )
+void KAddressBookTableView::writeConfig( TDEConfig *config )
 {
   KAddressBookView::writeConfig( config );
 
   mListView->saveLayout( config, config->group() );
 }
 
-void KAddressBookTableView::readConfig( KConfig *config )
+void KAddressBookTableView::readConfig( TDEConfig *config )
 {
   KAddressBookView::readConfig( config );
 
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index 3b2e0df13..4ebdfd938 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -41,7 +41,7 @@
 class TQListViewItem;
 class TQListBox;
 class TQVBoxLayout;
-class KConfig;
+class TDEConfig;
 class KIMProxy;
 
 class ContactListViewItem;
@@ -75,8 +75,8 @@ friend class ContactListView;
     virtual void setFirstSelected( bool selected = true );
     virtual KABC::Field *sortField() const;
 
-    virtual void readConfig( KConfig *config );
-    virtual void writeConfig( KConfig *config );
+    virtual void readConfig( TDEConfig *config );
+    virtual void writeConfig( TDEConfig *config );
     virtual TQString type() const { return "Table"; }
 
     void scrollUp();
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 9c270a2e3..f3d47bfc3 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -66,7 +66,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
-    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+    return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
   } else {
     TQFile file( url.path() );
     if ( !file.open( IO_WriteOnly ) ) {
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 728823019..40c209dce 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -866,7 +866,7 @@ void CSVImportDialog::saveTemplate()
   if ( name.isEmpty() )
     return;
 
-  KConfig config( fileName );
+  TDEConfig config( fileName );
   config.setGroup( "General" );
   config.writeEntry( "DatePattern", mDatePatternEdit->text() );
   config.writeEntry( "Columns", mTable->numCols() );
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 30718a9f0..f0c13e610 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -114,7 +114,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
-    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+    return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
   } else {
     TQString filename = url.path();
     TQFile file( filename );
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index ad85389fe..34a6809fa 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -146,7 +146,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
           else
             testUrl = baseUrl.url() + "/" + (*it).givenName() + "_" + (*it).familyName();
 
-          if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) {
+          if ( TDEIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) {
             counter++;
             url = testUrl + TQString::number( counter ) + ".vcf";
           } else
@@ -220,7 +220,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
     bool anyFailures = false;
     KURL::List::Iterator it;
     for ( it = urls.begin(); it != urls.end(); ++it ) {
-      if ( KIO::NetAccess::download( *it, fileName, parentWidget() ) ) {
+      if ( TDEIO::NetAccess::download( *it, fileName, parentWidget() ) ) {
 
         TQFile file( fileName );
 
@@ -247,7 +247,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
             addrList += parseVCard( vCardText );
           }
 #endif
-          KIO::NetAccess::removeTempFile( fileName );
+          TDEIO::NetAccess::removeTempFile( fileName );
         } else {
           TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" );
           text = text.arg( (*it).url() );
@@ -258,7 +258,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
         }
       } else {
         TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" );
-        text = text.arg( KIO::NetAccess::lastErrorString() );
+        text = text.arg( TDEIO::NetAccess::lastErrorString() );
         KMessageBox::error( parentWidget(), text, caption );
         anyFailures = true;
       }
@@ -302,7 +302,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data )
   tmpFile.file()->writeBlock( data.data(), data.size() );
   tmpFile.close();
 
-  return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+  return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
 }
 #else
 KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
@@ -327,7 +327,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data )
   stream << data;
   tmpFile.close();
 
-  return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+  return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
 }
 #endif
 
@@ -561,7 +561,7 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
   mEncryptionKeys = new TQCheckBox( i18n( "Encryption keys" ), page );
   layout->addWidget( mEncryptionKeys );
 
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "XXPortVCard" );
 
   mPrivateBox->setChecked( config.readBoolEntry( "ExportPrivateFields", true ) );
@@ -572,7 +572,7 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
 
 VCardExportSelectionDialog::~VCardExportSelectionDialog()
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "XXPortVCard" );
 
   config.writeEntry( "ExportPrivateFields", mPrivateBox->isChecked() );