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

5 files changed, 8 insertions, 8 deletions

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