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

31 files changed, 74 insertions, 74 deletions

diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 6e0abdfb8..863e75c6d 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -34,7 +34,7 @@ class DCOPClient;
 class DCOPObject;
 class TDEAboutData;
 class KAction;
-class KConfig;
+class TDEConfig;
 class TQWidget;
 namespace KParts { class ReadOnlyPart; }
 
@@ -250,12 +250,12 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
     /**
      * Session management: read properties
      */
-    virtual void readProperties( KConfig * ) {}
+    virtual void readProperties( TDEConfig * ) {}
 
     /**
      * Session management: save properties
      */
-    virtual void saveProperties( KConfig * ) {}
+    virtual void saveProperties( TDEConfig * ) {}
 
     Core *core() const;
 
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index dae73e4b3..f59423099 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -115,7 +115,7 @@ TQStringList Plugin::configModules() const
     return modules;
 }
 
-void Plugin::readProperties( KConfig *config )
+void Plugin::readProperties( TDEConfig *config )
 {
     if ( part() ) {
         Akregator::Part *myPart = static_cast<Akregator::Part*>( part() );    
@@ -123,7 +123,7 @@ void Plugin::readProperties( KConfig *config )
     }
 }
 
-void Plugin::saveProperties( KConfig *config )
+void Plugin::saveProperties( TDEConfig *config )
 {
     if ( part() ) {
         Akregator::Part *myPart = static_cast<Akregator::Part*>( part() );    
diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h
index bbc0063bc..657cbc4d7 100644
--- a/kontact/plugins/akregator/akregator_plugin.h
+++ b/kontact/plugins/akregator/akregator_plugin.h
@@ -65,8 +65,8 @@ class Plugin : public Kontact::Plugin
     virtual TQStringList configModules() const;
     virtual TQStringList invisibleToolbarActions() const;
     virtual bool isRunningStandalone();
-    virtual void readProperties( KConfig *config );
-    virtual void saveProperties( KConfig *config );
+    virtual void readProperties( TDEConfig *config );
+    virtual void saveProperties( TDEConfig *config );
 
   private slots:
     void showPart();
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index c9d467774..72141a6f1 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -41,14 +41,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmailsummary( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmailsummary( TQWidget *parent, const char * )
   {
     return new KCMKMailSummary( parent, "kcmkmailsummary" );
   }
 }
 
 KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   initGUI();
 
@@ -125,7 +125,7 @@ void KCMKMailSummary::initFolders()
 
 void KCMKMailSummary::loadFolders()
 {
-  KConfig config( "kcmkmailsummaryrc" );
+  TDEConfig config( "kcmkmailsummaryrc" );
   config.setGroup( "General" );
 
   TQStringList folders;
@@ -150,7 +150,7 @@ void KCMKMailSummary::loadFolders()
 
 void KCMKMailSummary::storeFolders()
 {
-  KConfig config( "kcmkmailsummaryrc" );
+  TDEConfig config( "kcmkmailsummaryrc" );
   config.setGroup( "General" );
 
   TQStringList folders;
diff --git a/kontact/plugins/kmail/kcmkmailsummary.desktop b/kontact/plugins/kmail/kcmkmailsummary.desktop
index c5af05991..2a614c6ab 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.desktop
+++ b/kontact/plugins/kmail/kcmkmailsummary.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kontact_mail
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmailsummary
diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h
index ae8792802..4e810ea37 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.h
+++ b/kontact/plugins/kmail/kcmkmailsummary.h
@@ -33,7 +33,7 @@ class KListView;
 class TQCheckBox;
 class TQCheckListItem;
 
-class KCMKMailSummary : public KCModule
+class KCMKMailSummary : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index e878ce1c2..0c4e765cf 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -104,7 +104,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
   mLabels.clear();
   mLabels.setAutoDelete( false );
 
-  KConfig config( "kcmkmailsummaryrc" );
+  TDEConfig config( "kcmkmailsummaryrc" );
   config.setGroup( "General" );
 
   TQStringList activeFolders;
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 48b6d3c8c..203055d5a 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -41,14 +41,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_korgsummary( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_korgsummary( TQWidget *parent, const char * )
   {
     return new KCMKOrgSummary( parent, "kcmkorgsummary" );
   }
 }
 
 KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   initGUI();
 
@@ -135,7 +135,7 @@ void KCMKOrgSummary::initGUI()
 
 void KCMKOrgSummary::load()
 {
-  KConfig config( "kcmkorgsummaryrc" );
+  TDEConfig config( "kcmkorgsummaryrc" );
 
   config.setGroup( "Calendar" );
   int days = config.readNumEntry( "DaysToShow", 1 );
@@ -166,7 +166,7 @@ void KCMKOrgSummary::load()
 
 void KCMKOrgSummary::save()
 {
-  KConfig config( "kcmkorgsummaryrc" );
+  TDEConfig config( "kcmkorgsummaryrc" );
 
   config.setGroup( "Calendar" );
 
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.desktop b/kontact/plugins/korganizer/kcmkorgsummary.desktop
index bb89934bc..4485a5143 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.desktop
+++ b/kontact/plugins/korganizer/kcmkorgsummary.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kontact_date
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korgsummary
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h
index 216557857..216e89d13 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.h
+++ b/kontact/plugins/korganizer/kcmkorgsummary.h
@@ -29,7 +29,7 @@
 class TQSpinxBox;
 class TQButtonGroup;
 
-class KCMKOrgSummary : public KCModule
+class KCMKOrgSummary : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index bbd9be2b8..d12081d6c 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -85,7 +85,7 @@ void SummaryWidget::updateView()
 
   KIconLoader loader( "tdepim" );
 
-  KConfig config( "kcmkorgsummaryrc" );
+  TDEConfig config( "kcmkorgsummaryrc" );
 
   config.setGroup( "Calendar" );
   int days = config.readNumEntry( "DaysToShow", 1 );
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index b0cbf7d93..26ce828eb 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -85,7 +85,7 @@ void TodoSummaryWidget::updateView()
   mLabels.clear();
   mLabels.setAutoDelete( false );
 
-  KConfig config( "kcmkorgsummaryrc" );
+  TDEConfig config( "kcmkorgsummaryrc" );
   config.setGroup( "Todo" );
   bool showAllTodos = config.readBoolEntry( "ShowAllTodos", false );
 
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 0a059da3b..6e0efd0fc 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -49,7 +49,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kontactknt( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kontactknt( TQWidget *parent, const char * )
   {
     return new KCMKontactKNT( parent, "kcmkontactknt" );
   }
@@ -129,7 +129,7 @@ class NewsItem : public TQListViewItem
 };
 
 KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   initGUI();
 
@@ -175,7 +175,7 @@ void KCMKontactKNT::loadNews()
 
 void KCMKontactKNT::loadCustomNews()
 {
-  KConfig config( "kcmkontactkntrc" );
+  TDEConfig config( "kcmkontactkntrc" );
   TQMap<TQString, TQString> customFeeds = config.entryMap( "CustomFeeds" );
   config.setGroup( "CustomFeeds" );
 
@@ -196,7 +196,7 @@ void KCMKontactKNT::loadCustomNews()
 
 void KCMKontactKNT::storeCustomNews()
 {
-  KConfig config( "kcmkontactkntrc" );
+  TDEConfig config( "kcmkontactkntrc" );
   config.deleteGroup( "CustomFeeds" );
   config.setGroup( "CustomFeeds" );
 
@@ -409,7 +409,7 @@ void KCMKontactKNT::load()
   loadCustomNews();
   scanNews();
 
-  KConfig config( "kcmkontactkntrc" );
+  TDEConfig config( "kcmkontactkntrc" );
   config.setGroup( "General" );
 
   mUpdateInterval->setValue( config.readNumEntry( "UpdateInterval", 600 ) );
@@ -422,7 +422,7 @@ void KCMKontactKNT::save()
 {
   storeCustomNews();
 
-  KConfig config( "kcmkontactkntrc" );
+  TDEConfig config( "kcmkontactkntrc" );
   config.setGroup( "General" );
 
   config.writeEntry( "UpdateInterval", mUpdateInterval->value() );
diff --git a/kontact/plugins/newsticker/kcmkontactknt.desktop b/kontact/plugins/newsticker/kcmkontactknt.desktop
index b395d1313..5b4418c96 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.desktop
+++ b/kontact/plugins/newsticker/kcmkontactknt.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=knode
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kontactknt
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index 0f9c15481..2eedb0a73 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -35,7 +35,7 @@ class KPushButton;
 
 class NewsItem;
 
-class KCMKontactKNT : public KCModule
+class KCMKontactKNT : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index 8e6719fce..52bb8b6e4 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -105,7 +105,7 @@ void SummaryWidget::configChanged()
 
 void SummaryWidget::readConfig()
 {
-  KConfig config( "kcmkontactkntrc" );
+  TDEConfig config( "kcmkontactkntrc" );
   config.setGroup( "General" );
 
   mUpdateInterval = config.readNumEntry( "UpdateInterval", 600 );
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index 4ce846d06..193958b89 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -43,14 +43,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_sdsummary( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_sdsummary( TQWidget *parent, const char * )
   {
     return new KCMSDSummary( parent, "kcmsdsummary" );
   }
 }
 
 KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   initGUI();
 
@@ -140,7 +140,7 @@ void KCMSDSummary::initGUI()
 
 void KCMSDSummary::load()
 {
-  KConfig config( "kcmsdsummaryrc" );
+  TDEConfig config( "kcmsdsummaryrc" );
 
   config.setGroup( "Days" );
   int days = config.readNumEntry( "DaysToShow", 7 );
@@ -181,7 +181,7 @@ void KCMSDSummary::load()
 
 void KCMSDSummary::save()
 {
-  KConfig config( "kcmsdsummaryrc" );
+  TDEConfig config( "kcmsdsummaryrc" );
 
   config.setGroup( "Days" );
 
diff --git a/kontact/plugins/specialdates/kcmsdsummary.desktop b/kontact/plugins/specialdates/kcmsdsummary.desktop
index dbed97243..c5b4f7dfa 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.desktop
+++ b/kontact/plugins/specialdates/kcmsdsummary.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=cookie
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=sdsummary
diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h
index 9a4e56e51..b0dbbae9d 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.h
+++ b/kontact/plugins/specialdates/kcmsdsummary.h
@@ -33,7 +33,7 @@ class TQSpinBox;
 
 class TDEAboutData;
 
-class KCMSDSummary : public KCModule
+class KCMSDSummary : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index a36989304..4ab89a323 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -106,7 +106,7 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
 
   KCal::CalendarResourceManager *manager = mCalendar->resourceManager();
   if ( manager->isEmpty() ) {
-    KConfig config( "korganizerrc" );
+    TDEConfig config( "korganizerrc" );
     config.setGroup( "General" );
     TQString fileName = config.readPathEntry( "Active Calendar" );
 
@@ -139,7 +139,7 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
 
 void SDSummaryWidget::configUpdated()
 {
-  KConfig config( "kcmsdsummaryrc" );
+  TDEConfig config( "kcmsdsummaryrc" );
 
   config.setGroup( "Days" );
   mDaysAhead = config.readNumEntry( "DaysToShow", 7 );
@@ -166,7 +166,7 @@ void SDSummaryWidget::configUpdated()
 
 bool SDSummaryWidget::initHolidays()
 {
-  KConfig hconfig( "korganizerrc" );
+  TDEConfig hconfig( "korganizerrc" );
   hconfig.setGroup( "Time & Date" );
   TQString location = hconfig.readEntry( "Holidays" );
   if ( !location.isEmpty() ) {
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index f3eae0121..d880f153b 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -43,7 +43,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kontactsummary( TQWidget *parent, const char * ) {
+  KDE_EXPORT TDECModule *create_kontactsummary( TQWidget *parent, const char * ) {
     return new KCMKontactSummary( parent, "kcmkontactsummary" );
   }
 }
@@ -91,7 +91,7 @@ PluginView::~PluginView()
 }
 
 KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+  : TDECModule( parent, name )
 {
   TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
@@ -124,7 +124,7 @@ void KCMKontactSummary::load()
 
   TQStringList activeSummaries;
 
-  KConfig config( "kontact_summaryrc" );
+  TDEConfig config( "kontact_summaryrc" );
   if ( !config.hasKey( "ActiveSummaries" ) ) {
     activeSummaries << "kontact_kaddressbookplugin";
     activeSummaries << "kontact_specialdatesplugin";
@@ -142,8 +142,8 @@ void KCMKontactSummary::load()
 
   mPluginList = KPluginInfo::fromServices( offers, &config, "Plugins" );
   KPluginInfo::List::Iterator it;
-  KConfig *conf = new KConfig("kontactrc");
-  KConfigGroup *cg = new KConfigGroup( conf, "Plugins" );
+  TDEConfig *conf = new TDEConfig("kontactrc");
+  TDEConfigGroup *cg = new TDEConfigGroup( conf, "Plugins" );
   for ( it = mPluginList.begin(); it != mPluginList.end(); ++it ) {
       (*it)->load( cg );
 
@@ -174,7 +174,7 @@ void KCMKontactSummary::save()
     ++it;
   }
 
-  KConfig config( "kontact_summaryrc" );
+  TDEConfig config( "kontact_summaryrc" );
   config.writeEntry( "ActiveSummaries", activeSummaries );
 }
 
diff --git a/kontact/plugins/summary/kcmkontactsummary.desktop b/kontact/plugins/summary/kcmkontactsummary.desktop
index bb5e95d0b..34787c32d 100644
--- a/kontact/plugins/summary/kcmkontactsummary.desktop
+++ b/kontact/plugins/summary/kcmkontactsummary.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kontact_summary
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kontactsummary
diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h
index fa1620452..6129f46a0 100644
--- a/kontact/plugins/summary/kcmkontactsummary.h
+++ b/kontact/plugins/summary/kcmkontactsummary.h
@@ -40,7 +40,7 @@ class PluginView : public KListView
     ~PluginView();
 };
 
-class KCMKontactSummary : public KCModule
+class KCMKontactSummary : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index ba85836b2..b1da7d0fc 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -149,7 +149,7 @@ void SummaryViewPart::updateWidgets()
 
   TQStringList activeSummaries;
 
-  KConfig config( "kontact_summaryrc" );
+  TDEConfig config( "kontact_summaryrc" );
   if ( !config.hasKey( "ActiveSummaries" ) ) {
     activeSummaries << "kontact_kmailplugin";
     activeSummaries << "kontact_specialdatesplugin";
@@ -392,7 +392,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
 
 void SummaryViewPart::loadLayout()
 {
-  KConfig config( "kontact_summaryrc" );
+  TDEConfig config( "kontact_summaryrc" );
 
   if ( !config.hasKey( "LeftColumnSummaries" ) ) {
     mLeftColumnSummaries << "kontact_korganizerplugin";
@@ -412,7 +412,7 @@ void SummaryViewPart::loadLayout()
 
 void SummaryViewPart::saveLayout()
 {
-  KConfig config( "kontact_summaryrc" );
+  TDEConfig config( "kontact_summaryrc" );
 
   config.writeEntry( "LeftColumnSummaries", mLeftColumnSummaries );
   config.writeEntry( "RightColumnSummaries", mRightColumnSummaries );
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 9e46eef2d..96101ec00 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -42,7 +42,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kontactconfig( TQWidget *parent, const char * ) {
+  KDE_EXPORT TDECModule *create_kontactconfig( TQWidget *parent, const char * ) {
     return new KcmKontact( parent, "kcmkontact" );
   }
 }
@@ -100,7 +100,7 @@ const TDEAboutData* KcmKontact::aboutData() const
 }
 
 
-PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent )
+PluginSelection::PluginSelection( TDEConfigSkeleton::ItemString *item, TQWidget *parent )
 {
   mItem = item;
   mPluginCombo = new TQComboBox( parent );
diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h
index c15ecf048..6e0c402af 100644
--- a/kontact/src/kcmkontact.h
+++ b/kontact/src/kcmkontact.h
@@ -53,7 +53,7 @@ class PluginSelection : public KPrefsWid
   
 
   public:
-    PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent );
+    PluginSelection( TDEConfigSkeleton::ItemString *item, TQWidget *parent );
     ~PluginSelection();
 
     void readConfig();
@@ -65,7 +65,7 @@ class PluginSelection : public KPrefsWid
   private:
     TQComboBox *mPluginCombo;
     TQValueList<KService::Ptr> mPluginList;
-    KConfigSkeleton::ItemString *mItem;
+    TDEConfigSkeleton::ItemString *mItem;
 };
 
 #endif
diff --git a/kontact/src/kontactconfig.desktop b/kontact/src/kontactconfig.desktop
index 6ea38e238..0c094d502 100644
--- a/kontact/src/kontactconfig.desktop
+++ b/kontact/src/kontactconfig.desktop
@@ -2,7 +2,7 @@
 Exec=kcmshell kontactconfig
 Icon=kontact
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kontact
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 5ac040f73..8a6a7f354 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -338,7 +338,7 @@ void MainWindow::setupActions()
                                          KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewClicked() ),
                                          actionCollection(), "action_new" );
 
-  KConfig* const cfg = Prefs::self()->config();
+  TDEConfig* const cfg = Prefs::self()->config();
   cfg->setGroup( "Kontact Groupware Settings" );
   mSyncActionsEnabled = cfg->readBoolEntry( "GroupwareMailFoldersEnabled", true );
 
@@ -371,7 +371,7 @@ void MainWindow::slotConfigureProfiles()
 }
 
 namespace {
-    void copyConfigEntry( KConfig* source, KConfig* dest, const TQString& group, const TQString& key, const TQString& defaultValue=TQString() )
+    void copyConfigEntry( TDEConfig* source, TDEConfig* dest, const TQString& group, const TQString& key, const TQString& defaultValue=TQString() )
     {
         source->setGroup( group );
         dest->setGroup( group );
@@ -385,12 +385,12 @@ void MainWindow::slotSaveToProfile( const TQString& id )
   if ( path.isNull() )
     return;
 
-  KConfig* const cfg = Prefs::self()->config();
+  TDEConfig* const cfg = Prefs::self()->config();
   Prefs::self()->writeConfig();
   saveMainWindowSettings( cfg );
   saveSettings();
 
-  KConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
+  TDEConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
   ::copyConfigEntry( cfg, &profile, "MainWindow Toolbar navigatorToolBar", "Hidden", "true" );
   ::copyConfigEntry( cfg, &profile, "View", "SidePaneSplitter" );
   ::copyConfigEntry( cfg, &profile, "Icons", "Theme" );
@@ -409,12 +409,12 @@ void MainWindow::slotLoadProfile( const TQString& id )
   if ( path.isNull() )
     return;
 
-  KConfig* const cfg = Prefs::self()->config();
+  TDEConfig* const cfg = Prefs::self()->config();
   Prefs::self()->writeConfig();
   saveMainWindowSettings( cfg );
   saveSettings();
 
-  const KConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
+  const TDEConfig profile( path+"/kontactrc", /*read-only=*/false, /*useglobals=*/false );
   const TQStringList groups = profile.groupList();
   for ( TQStringList::ConstIterator it = groups.begin(), end = groups.end(); it != end; ++it )
   {
@@ -1091,7 +1091,7 @@ void MainWindow::slotOpenUrl( const KURL &url )
   }
 }
 
-void MainWindow::readProperties( KConfig *config )
+void MainWindow::readProperties( TDEConfig *config )
 {
   Core::readProperties( config );
 
@@ -1109,7 +1109,7 @@ void MainWindow::readProperties( KConfig *config )
   }
 }
 
-void MainWindow::saveProperties( KConfig *config )
+void MainWindow::saveProperties( TDEConfig *config )
 {
   Core::saveProperties( config );
 
diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index 90e9045bd..42b55420b 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -43,7 +43,7 @@ class TQVBox;
 class TQFrame;
 
 class KAction;
-class KConfig;
+class TDEConfig;
 class KPluginInfo;
 class KRSqueezedTextLabel;
 class KHTMLPart;
@@ -129,8 +129,8 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont
     void setupActions();
     void showTip( bool );
     virtual bool queryClose();
-    virtual void readProperties( KConfig *config );
-    virtual void saveProperties( KConfig *config );
+    virtual void readProperties( TDEConfig *config );
+    virtual void saveProperties( TDEConfig *config );
     void paintAboutScreen( const TQString& msg );
     static TQString introductionString();
     KToolBar* findToolBar(const char* name);
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index c64cbf978..295f4615d 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -151,7 +151,7 @@ void Kontact::ProfileManager::writeConfig() const
 
 Kontact::Profile Kontact::ProfileManager::readFromConfiguration( const TQString& configFile, bool isLocal )
 {
-    KConfig profileCfg( configFile, true /*read-only*/, false /*no KDE global*/ );
+    TDEConfig profileCfg( configFile, true /*read-only*/, false /*no KDE global*/ );
     const TQString configDir = configFile.left( configFile.findRev( TQDir::separator(), -1 ) );
     profileCfg.setGroup( "Kontact Profile" );
     const TQString id = profileCfg.readEntry( "Identifier" );
@@ -168,7 +168,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil
 {
     const TQString profileDir = profile.saveLocation();
     const TQString cfgPath = profileDir + "/profile.cfg";
-    KConfig profileCfg( cfgPath, false /*read-only*/, false /*no KDE global*/ );
+    TDEConfig profileCfg( cfgPath, false /*read-only*/, false /*no KDE global*/ );
     profileCfg.setGroup( "Kontact Profile" );
     profileCfg.writeEntry( "Identifier", profile.id() );
     profileCfg.writeEntry( "Name", profile.name() );
@@ -235,7 +235,7 @@ void Kontact::Profile::copyConfigFiles( const TQString& source_, const TQString&
 {
     const KURL source = KURL::fromPathOrURL( source_+"/*rc" );
     const KURL dest = KURL::fromPathOrURL( dest_ );
-    KIO::CopyJob* job = KIO::copy( source, dest, /*showProgressInfo=*/false );
+    TDEIO::CopyJob* job = TDEIO::copy( source, dest, /*showProgressInfo=*/false );
     // TODO better check for the copy result
 }
 
@@ -283,7 +283,7 @@ void Kontact::ProfileManager::removeProfile( const TQString& id )
     Kontact::Profile profile = profileById( id );
     if ( profile.isLocal() ) {
         KURL location = KURL::fromPathOrURL( profile.saveLocation() );
-        KIO::DeleteJob* job = KIO::del( location, /*shred*/ false, /*showProgressInfo=*/false );
+        TDEIO::DeleteJob* job = TDEIO::del( location, /*shred*/ false, /*showProgressInfo=*/false );
         // TODO check result
     }
     m_profiles.remove( id );
@@ -302,7 +302,7 @@ Kontact::ProfileManager::ExportError Kontact::ProfileManager::exportProfileToDir
     const KURL source = KURL::fromPathOrURL( profile.saveLocation() );
     const KURL target = KURL::fromPathOrURL( path + TQDir::separator() + profile.name() );
 
-    KIO::CopyJob* job = KIO::copy( source, target, /*showProgressInfo=*/false );
+    TDEIO::CopyJob* job = TDEIO::copy( source, target, /*showProgressInfo=*/false );
     // TODO check result
 
     return SuccessfulExport;
@@ -319,7 +319,7 @@ Kontact::ProfileManager::ImportError Kontact::ProfileManager::importProfileFromD
     const KURL source = KURL::fromPathOrURL( path );
     const KURL target = KURL::fromPathOrURL( profile.saveLocation() );
 
-    KIO::CopyJob* job = KIO::copy( source, target, /*showProgressInfo=*/false );
+    TDEIO::CopyJob* job = TDEIO::copy( source, target, /*showProgressInfo=*/false );
     // TODO better check for the copy result
 
     addProfile( profile );
diff --git a/kontact/src/profilemanager.h b/kontact/src/profilemanager.h
index 12ed57471..b72511f5c 100644
--- a/kontact/src/profilemanager.h
+++ b/kontact/src/profilemanager.h
@@ -31,7 +31,7 @@
 
 template <class T> class TQValueList;
 
-namespace KIO {
+namespace TDEIO {
     class Job;
 }