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

3 files changed, 7 insertions, 7 deletions

diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp
index 16bec28a7..c5efa60aa 100644
--- a/kaddressbook/interfaces/configurewidget.cpp
+++ b/kaddressbook/interfaces/configurewidget.cpp
@@ -37,12 +37,12 @@ ConfigureWidget::~ConfigureWidget()
 {
 }
 
-void ConfigureWidget::restoreSettings( KConfig* )
+void ConfigureWidget::restoreSettings( TDEConfig* )
 {
   // should be reimplemented in the views, extensions etc.
 }
 
-void ConfigureWidget::saveSettings( KConfig* )
+void ConfigureWidget::saveSettings( TDEConfig* )
 {
   // should be reimplemented in the views, extensions etc.
 }
diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h
index 10eb3de88..d1d23c8c7 100644
--- a/kaddressbook/interfaces/configurewidget.h
+++ b/kaddressbook/interfaces/configurewidget.h
@@ -47,7 +47,7 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
       values from the config file.
       Important: Don't change the group of cfg!
      */
-    virtual void restoreSettings( KConfig *cfg );
+    virtual void restoreSettings( TDEConfig *cfg );
 
     /**
       This method is called after the user clicked the 'Ok' button.
@@ -55,7 +55,7 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
       the GUI to the config file.
       Important: Don't change the group of cfg!
      */
-    virtual void saveSettings( KConfig *cfg );
+    virtual void saveSettings( TDEConfig *cfg );
 
 
     /**
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 996044f47..c291f208c 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -45,7 +45,7 @@ class Resource;
 class TQWidget;
 
 class KActionCollection;
-class KConfig;
+class TDEConfig;
 class KURL;
 
 namespace KAB {
@@ -66,9 +66,9 @@ class KDE_EXPORT Core : public TQObject
     virtual KABC::AddressBook *addressBook() const = 0;
 
     /**
-      Returns a pointer to the KConfig object of the application.
+      Returns a pointer to the TDEConfig object of the application.
      */
-    virtual KConfig *config() const = 0;
+    virtual TDEConfig *config() const = 0;
 
     /**
       Returns a pointer to the global KActionCollection object. So