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

13 files changed, 34 insertions, 34 deletions

diff --git a/kresources/README.design b/kresources/README.design
index b2163c8b7..f883c7d13 100644
--- a/kresources/README.design
+++ b/kresources/README.design
@@ -41,7 +41,7 @@ Both Exchange-based calendar resources are objects of the same
 type, but with different settings. These resources are persistent,
 and they are managed by the ResourceManager for the calendar
 resource family. The list of resources, and the settings for
-each resource, are stored by the resource manager using KConfig,
+each resource, are stored by the resource manager using TDEConfig,
 in $HOME/.trinity/share/config/<family>.
 
 The resource manager is a singleton object for every resource family. 
diff --git a/kresources/configdialog.cpp b/kresources/configdialog.cpp
index bbebc47a3..0d306d29c 100644
--- a/kresources/configdialog.cpp
+++ b/kresources/configdialog.cpp
@@ -36,7 +36,7 @@
 using namespace KRES;
 
 ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
-    /*const TQString& type,*/ Resource* resource, /*KConfig *config, */const char *name )
+    /*const TQString& type,*/ Resource* resource, /*TDEConfig *config, */const char *name )
   : KDialogBase( parent, name, true, i18n( "Resource Configuration" ),
     Ok|Cancel, Ok, false )/*, mConfig( config )*/, mResource( resource )
 {
diff --git a/kresources/configpage.cpp b/kresources/configpage.cpp
index a3db58de6..ba3b89a47 100644
--- a/kresources/configpage.cpp
+++ b/kresources/configpage.cpp
@@ -145,7 +145,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
 
   mLastItem = 0;
 
-  mConfig = new KConfig( "kcmkresourcesrc" );
+  mConfig = new TDEConfig( "kcmkresourcesrc" );
   mConfig->setGroup( "General" );
 
   load();
@@ -223,7 +223,7 @@ void ConfigPage::loadManager( const TQString& family )
 
       ResourcePageInfo *info = new ResourcePageInfo;
       info->mManager = mCurrentManager;
-      info->mConfig = new KConfig( KRES::ManagerImpl::defaultConfigFile( family ) );
+      info->mConfig = new TDEConfig( KRES::ManagerImpl::defaultConfigFile( family ) );
       info->mManager->readConfig( info->mConfig );
 
       mInfoMap.append( KSharedPtr<ResourcePageInfo>(info) );
diff --git a/kresources/configpage.h b/kresources/configpage.h
index ec1fb3799..d00372ac6 100644
--- a/kresources/configpage.h
+++ b/kresources/configpage.h
@@ -43,7 +43,7 @@ class KRESOURCES_EXPORT ResourcePageInfo : public KShared
     ResourcePageInfo();
     ~ResourcePageInfo();
     Manager<Resource> *mManager;
-    KConfig *mConfig;
+    TDEConfig *mConfig;
 };
 
 class Resource;
@@ -89,8 +89,8 @@ class KRESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<Res
     void saveResourceSettings();
 
     Manager<Resource>* mCurrentManager;
-    KConfig* mCurrentConfig;
-    KConfig* mConfig;
+    TDEConfig* mCurrentConfig;
+    TDEConfig* mConfig;
     TQString mFamily;
     TQStringList mFamilyMap;
     TQValueList<KSharedPtr<ResourcePageInfo> > mInfoMap;
diff --git a/kresources/factory.cpp b/kresources/factory.cpp
index fa3ee6eaf..e76d318a7 100644
--- a/kresources/factory.cpp
+++ b/kresources/factory.cpp
@@ -125,7 +125,7 @@ TQString Factory::typeDescription( const TQString &type ) const
   return ptr->comment();
 }
 
-Resource *Factory::resource( const TQString& type, const KConfig *config )
+Resource *Factory::resource( const TQString& type, const TDEConfig *config )
 {
   kdDebug(5650) << "Factory::resource( " << type << ", config )" << endl;
 
diff --git a/kresources/factory.h b/kresources/factory.h
index 925ff2e82..694b470a4 100644
--- a/kresources/factory.h
+++ b/kresources/factory.h
@@ -49,7 +49,7 @@ namespace KRES {
  *
  * // to allow a transparent configuration of resources, we have
  * // to use a kconfig object.
- * KConfig config( "tst" );
+ * TDEConfig config( "tst" );
  * config.writePathEntry( "FileName", "/home/foobar/test.vcf" );// resource dependend
  * config.writeEntry( "FileFormat", "vcard" );                  // resource dependend
  *
@@ -87,7 +87,7 @@ class KRESOURCES_EXPORT Factory
      * @param config The config object where the resource get it settings from,
      *               or 0 if a resource with default values should be created.
      */
-    Resource *resource( const TQString& type, const KConfig *config );
+    Resource *resource( const TQString& type, const TDEConfig *config );
 
     /**
      * Returns a list of all available resource types.
diff --git a/kresources/kcmkresources.cpp b/kresources/kcmkresources.cpp
index ec6a7be48..1baf11f41 100644
--- a/kresources/kcmkresources.cpp
+++ b/kresources/kcmkresources.cpp
@@ -33,7 +33,7 @@ typedef KGenericFactory<KCMKResources, TQWidget> ResourcesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kresources, ResourcesFactory( "kcmkresources" ) )
 
 KCMKResources::KCMKResources( TQWidget *parent, const char *name, const TQStringList& )
-  : KCModule( ResourcesFactory::instance(), parent, name )
+  : TDECModule( ResourcesFactory::instance(), parent, name )
 {
   TQVBoxLayout *layout = new TQVBoxLayout( this );
   mConfigPage = new KRES::ConfigPage( this );
diff --git a/kresources/kcmkresources.h b/kresources/kcmkresources.h
index 97a3183e0..38279d29a 100644
--- a/kresources/kcmkresources.h
+++ b/kresources/kcmkresources.h
@@ -24,7 +24,7 @@
 
 #include <kcmodule.h>
 
-class KRESOURCES_EXPORT KCMKResources : public KCModule
+class KRESOURCES_EXPORT KCMKResources : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kresources/manager.h b/kresources/manager.h
index ab1562716..0363d959e 100644
--- a/kresources/manager.h
+++ b/kresources/manager.h
@@ -227,7 +227,7 @@ class Manager : private ManagerNotifier
       Recreate Resource objects from configuration file. If cfg is 0, read
       standard configuration file determined by family name.
     */
-    void readConfig( KConfig *cfg = 0 )
+    void readConfig( TDEConfig *cfg = 0 )
     {
       mImpl->readConfig( cfg );
     }
@@ -236,7 +236,7 @@ class Manager : private ManagerNotifier
       Write configuration of Resource objects to configuration file. If cfg is
       0, write to standard configuration file determined by family name.
     */
-    void writeConfig( KConfig *cfg = 0 )
+    void writeConfig( TDEConfig *cfg = 0 )
     {
       mImpl->writeConfig( cfg );
     }
diff --git a/kresources/managerimpl.cpp b/kresources/managerimpl.cpp
index 8fa2e03c0..1f7b08444 100644
--- a/kresources/managerimpl.cpp
+++ b/kresources/managerimpl.cpp
@@ -88,13 +88,13 @@ void ManagerImpl::createStandardConfig()
 {
   if ( !mStdConfig ) {
     TQString file = defaultConfigFile( mFamily );
-    mStdConfig = new KConfig( file );
+    mStdConfig = new TDEConfig( file );
   }
   
   mConfig = mStdConfig;
 }
 
-void ManagerImpl::readConfig( KConfig *cfg )
+void ManagerImpl::readConfig( TDEConfig *cfg )
 {
   kdDebug(5650) << "ManagerImpl::readConfig()" << endl;
 
@@ -123,7 +123,7 @@ void ManagerImpl::readConfig( KConfig *cfg )
   mConfigRead = true;
 }
 
-void ManagerImpl::writeConfig( KConfig *cfg )
+void ManagerImpl::writeConfig( TDEConfig *cfg )
 {
   kdDebug(5650) << "ManagerImpl::writeConfig()" << endl;
 
diff --git a/kresources/managerimpl.h b/kresources/managerimpl.h
index e86ea3d9d..4fdd4d96c 100644
--- a/kresources/managerimpl.h
+++ b/kresources/managerimpl.h
@@ -30,7 +30,7 @@
 #include "manageriface.h"
 #include <kresources/resource.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KRES {
 
@@ -49,8 +49,8 @@ class KRESOURCES_EXPORT ManagerImpl : virtual public ManagerIface
     ManagerImpl( ManagerNotifier *, const TQString &family );
     ~ManagerImpl();
 
-    void readConfig( KConfig * );
-    void writeConfig( KConfig * );
+    void readConfig( TDEConfig * );
+    void writeConfig( TDEConfig * );
 
     void add( Resource *resource );
     void remove( Resource *resource );
@@ -90,8 +90,8 @@ class KRESOURCES_EXPORT ManagerImpl : virtual public ManagerIface
 
     ManagerNotifier *mNotifier;
     TQString mFamily;
-    KConfig *mConfig;
-    KConfig *mStdConfig;
+    TDEConfig *mConfig;
+    TDEConfig *mStdConfig;
     Resource *mStandard;
     Factory *mFactory;
     Resource::List mResources;
diff --git a/kresources/resource.cpp b/kresources/resource.cpp
index 83d24cbf5..e652f61f5 100644
--- a/kresources/resource.cpp
+++ b/kresources/resource.cpp
@@ -44,7 +44,7 @@ class Resource::ResourcePrivate
     bool mIsOpen;
 };
 
-Resource::Resource( const KConfig* config )
+Resource::Resource( const TDEConfig* config )
   : TQObject( 0, "" ), d( new ResourcePrivate )
 {
   d->mOpenCount = 0;
@@ -71,7 +71,7 @@ Resource::~Resource()
   d = 0;
 }
 
-void Resource::writeConfig( KConfig* config )
+void Resource::writeConfig( TDEConfig* config )
 {
   kdDebug(5650) << "Resource::writeConfig()" << endl;
 
diff --git a/kresources/resource.h b/kresources/resource.h
index f5587ed09..9fd50db69 100644
--- a/kresources/resource.h
+++ b/kresources/resource.h
@@ -28,7 +28,7 @@
 
 #include <klibloader.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KRES {
 
@@ -72,9 +72,9 @@ class ConfigWidget;
 class ResourceExample : public KRES::Resource
 {
   public:
-    ResourceExample( const KConfig * );
+    ResourceExample( const TDEConfig * );
     ~ResourceExample();
-    void writeConfig( KConfig *config );
+    void writeConfig( TDEConfig *config );
 
   private:
     TQString mLocation;
@@ -88,7 +88,7 @@ class ResourceExample : public KRES::Resource
 
 #include "resourceexample.h"
 
-ResourceExample::ResourceExample( const KConfig *config )
+ResourceExample::ResourceExample( const TDEConfig *config )
     : Resource( config )
 {
   if ( config ) {
@@ -100,7 +100,7 @@ ResourceExample::ResourceExample( const KConfig *config )
   }
 }
 
-void ResourceExample::writeConfig( KConfig *config )
+void ResourceExample::writeConfig( TDEConfig *config )
 {
   KRES::Resource::writeConfig( config );
   config->writePathEntry( "Location", mLocation );
@@ -113,7 +113,7 @@ extern "C"
     return new ResourceExampleConfig( parent, "Configure Example Resource" );
   }
 
-  KRES::Resource *resource( const KConfig *config ) {
+  KRES::Resource *resource( const TDEConfig *config ) {
     return new ResourceExample( config );
   }
 }
@@ -266,7 +266,7 @@ class KRESOURCES_EXPORT Resource : public TQObject
      * @param config Configuration to read persistence information from.
      *               If config is 0, create object using default settings.
      */
-    Resource( const KConfig *config );
+    Resource( const TDEConfig *config );
 
     /**
      * Destructor.
@@ -279,7 +279,7 @@ class KRESOURCES_EXPORT Resource : public TQObject
      * or Terrible Things(TM) will happen.
      * @param config Configuration to write persistence information to.
      */
-    virtual void writeConfig( KConfig *config );
+    virtual void writeConfig( TDEConfig *config );
 
     /**
      * Open this resource, if it not already open. Increase the open
@@ -384,7 +384,7 @@ class KRESOURCES_EXPORT Resource : public TQObject
 class KRESOURCES_EXPORT PluginFactoryBase : public KLibFactory
 {
   public:
-    virtual Resource *resource( const KConfig *config ) = 0;
+    virtual Resource *resource( const TDEConfig *config ) = 0;
 
     virtual ConfigWidget *configWidget( TQWidget *parent ) = 0;
 
@@ -404,7 +404,7 @@ template<class TR,class TC>
 class PluginFactory : public PluginFactoryBase
 {
   public:
-    Resource *resource( const KConfig *config )
+    Resource *resource( const TDEConfig *config )
     {
       return new TR( config );
     }