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

23 files changed, 48 insertions, 48 deletions

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