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

1 files changed, 6 insertions, 6 deletions

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