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

4 files changed, 15 insertions, 15 deletions

diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp
index 932f6f108..1872ecea0 100644
--- a/kaddressbook/common/filter.cpp
+++ b/kaddressbook/common/filter.cpp
@@ -121,7 +121,7 @@ const TQStringList &Filter::categories() const
   return mCategoryList;
 }
 
-void Filter::save( KConfig *config )
+void Filter::save( TDEConfig *config )
 {
   config->writeEntry( "Name", mName );
   config->writeEntry( "Enabled", mEnabled );
@@ -129,7 +129,7 @@ void Filter::save( KConfig *config )
   config->writeEntry( "MatchRule", (int)mMatchRule );
 }
 
-void Filter::restore( KConfig *config )
+void Filter::restore( TDEConfig *config )
 {
   mName = config->readEntry( "Name", "<internal error>" );
   mEnabled = config->readBoolEntry( "Enabled", true );
@@ -139,10 +139,10 @@ void Filter::restore( KConfig *config )
   mIsEmpty = false;
 }
 
-void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &list )
+void Filter::save( TDEConfig *config, const TQString &baseGroup, Filter::List &list )
 {
   {
-    KConfigGroupSaver s( config, baseGroup );
+    TDEConfigGroupSaver s( config, baseGroup );
 
     // remove the old filters
     uint count = config->readNumEntry( "Count" );
@@ -155,31 +155,31 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis
   Filter::List::Iterator iter;
   for ( iter = list.begin(); iter != list.end(); ++iter ) {
     if ( !(*iter).mInternal ) {
-      KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
+      TDEConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
                                                      .arg( index ) );
       (*iter).save( config );
       index++;
     }
   }
 
-  KConfigGroupSaver s( config, baseGroup );
+  TDEConfigGroupSaver s( config, baseGroup );
   config->writeEntry( "Count", index );
 }
 
-Filter::List Filter::restore( KConfig *config, const TQString &baseGroup )
+Filter::List Filter::restore( TDEConfig *config, const TQString &baseGroup )
 {
   Filter::List list;
   int count = 0;
   Filter f;
 
   {
-    KConfigGroupSaver s( config, baseGroup );
+    TDEConfigGroupSaver s( config, baseGroup );
     count = config->readNumEntry( "Count", 0 );
   }
 
   for ( int i = 0; i < count; i++ ) {
     {
-      KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
+      TDEConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
       f.restore( config );
     }
 
diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h
index cb13ce536..e8518b8e8 100644
--- a/kaddressbook/common/filter.h
+++ b/kaddressbook/common/filter.h
@@ -102,12 +102,12 @@ class Filter
     /**
       Saves the filter to the config file. The group should already be set.
      */
-    void save( KConfig *config );
+    void save( TDEConfig *config );
 
     /**
       Loads the filter from the config file. The group should already be set.
      */
-    void restore( KConfig *config );
+    void restore( TDEConfig *config );
 
     /**
       Saves a list of filters to the config file.
@@ -118,7 +118,7 @@ class Filter
                        will be append for each filter saved.
       @param list The list of filters to be saved.
      */
-    static void save( KConfig *config, const TQString &baseGroup, Filter::List &list );
+    static void save( TDEConfig *config, const TQString &baseGroup, Filter::List &list );
 
     /**
       Restores a list of filters from a config file.
@@ -128,7 +128,7 @@ class Filter
 
       @return The list of filters.
      */
-    static Filter::List restore( KConfig *config, const TQString &baseGroup );
+    static Filter::List restore( TDEConfig *config, const TQString &baseGroup );
 
     /**
       Sets the filter rule. If the rule is Filter::Matching (default),
diff --git a/kaddressbook/common/kabprefs.cpp b/kaddressbook/common/kabprefs.cpp
index 18180b801..8a45fc14d 100644
--- a/kaddressbook/common/kabprefs.cpp
+++ b/kaddressbook/common/kabprefs.cpp
@@ -33,7 +33,7 @@ static KStaticDeleter<KABPrefs> staticDeleter;
 KABPrefs::KABPrefs()
   : KABPrefsBase()
 {
-  KConfigSkeleton::setCurrentGroup( "General" );
+  TDEConfigSkeleton::setCurrentGroup( "General" );
 
   TQStringList defaultMap;
   defaultMap << "http://maps.google.com/maps?f=q&hl=%1&q=%n,%l,%s";
diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h
index c0c92bdcc..4ac486f78 100644
--- a/kaddressbook/common/kabprefs.h
+++ b/kaddressbook/common/kabprefs.h
@@ -28,7 +28,7 @@
 #include <tdepimmacros.h>
 #include "kabprefs_base.h"
 
-class KConfig;
+class TDEConfig;
 
 class KDE_EXPORT KABPrefs : public KABPrefsBase
 {