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

4 files changed, 7 insertions, 7 deletions

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;