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

4 files changed, 11 insertions, 11 deletions

diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index f3eae012..d880f153 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 bb5e95d0..34787c32 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 fa162045..6129f46a 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 ba85836b..b1da7d0f 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 );