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

4 files changed, 9 insertions, 9 deletions

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() ) {