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

4 files changed, 9 insertions, 9 deletions

diff --git a/kresources/caldav/preferences.cpp b/kresources/caldav/preferences.cpp
index 87d9c972f..10da60e0e 100644
--- a/kresources/caldav/preferences.cpp
+++ b/kresources/caldav/preferences.cpp
@@ -99,8 +99,8 @@ void CalDavPrefs::removeWallet(bool noWallet) {
 }
 
 void CalDavPrefs::addPrefix(const TQString& prefix) {
-    KConfigSkeletonItem::List itemList = items();
-    KConfigSkeletonItem::List::Iterator it;
+    TDEConfigSkeletonItem::List itemList = items();
+    TDEConfigSkeletonItem::List::Iterator it;
 
     for ( it = itemList.begin(); it != itemList.end(); ++it ) {
         (*it)->setGroup( prefix + ':' + (*it)->group() );
diff --git a/kresources/caldav/preferences.h b/kresources/caldav/preferences.h
index d21be84c3..fe585406e 100644
--- a/kresources/caldav/preferences.h
+++ b/kresources/caldav/preferences.h
@@ -100,7 +100,7 @@ public:
 protected:
 
     /**
-     * Add an unique prefix to KConfigGroup, so that different instances of the resource
+     * Add an unique prefix to TDEConfigGroup, so that different instances of the resource
      * can use the same config file.
      * @param prefix Unique prefix of the resource instance.
      */
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index 0ec3ceb6f..b9285e611 100644
--- a/kresources/caldav/resource.cpp
+++ b/kresources/caldav/resource.cpp
@@ -68,7 +68,7 @@ const int ResourceCalDav::DEFAULT_SAVE_POLICY       = ResourceCached::SaveDelaye
 | CONSTRUCTOR / DESTRUCTOR
  ========================================================================*/
 
-ResourceCalDav::ResourceCalDav( const KConfig *config ) :
+ResourceCalDav::ResourceCalDav( const TDEConfig *config ) :
     ResourceCached(config)
     , readLockout(false)
     , mAllWritesComplete(false)
@@ -213,13 +213,13 @@ KABC::Lock* ResourceCalDav::lock() {
     return &mLock;
 }
 
-void ResourceCalDav::readConfig( const KConfig *config ) {
+void ResourceCalDav::readConfig( const TDEConfig *config ) {
     log("readConfig");
     mPrefs->readConfig();
     ResourceCached::readConfig(config);
 }
 
-void ResourceCalDav::writeConfig( KConfig *config ) {
+void ResourceCalDav::writeConfig( TDEConfig *config ) {
     log("writeConfig()");
     ResourceCalendar::writeConfig(config);
     mPrefs->writeConfig();
diff --git a/kresources/caldav/resource.h b/kresources/caldav/resource.h
index 67eaa6c0d..ea04ef483 100644
--- a/kresources/caldav/resource.h
+++ b/kresources/caldav/resource.h
@@ -48,11 +48,11 @@ class KDE_EXPORT ResourceCalDav : public ResourceCached
 
 public:
 
-    explicit ResourceCalDav( const KConfig *config );
+    explicit ResourceCalDav( const TDEConfig *config );
     virtual ~ResourceCalDav();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     /**
      * @return This resource preferences.