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

4 files changed, 26 insertions, 26 deletions

diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index c0ce5a6e8..761236f55 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -121,7 +121,7 @@ TQString Signature::textFromFile( bool * ok ) const
 {
   assert( mType == FromFile );
 
-  // ### FIXME: Use KIO::NetAccess to download non-local files!
+  // ### FIXME: Use TDEIO::NetAccess to download non-local files!
   if ( !KURL(mUrl).isLocalFile() && !(TQFileInfo(mUrl).isRelative()
                                       && TQFileInfo(mUrl).exists()) ) {
     kdDebug( 5006 ) << "Signature::textFromFile: non-local URLs are unsupported" << endl;
@@ -172,7 +172,7 @@ static const char sigTextKey[] = "Inline Signature";
 static const char sigFileKey[] = "Signature File";
 static const char sigCommandKey[] = "Signature Command";
 
-void Signature::readConfig( const KConfigBase * config )
+void Signature::readConfig( const TDEConfigBase * config )
 {
   TQString sigType = config->readEntry( sigTypeKey );
   if ( sigType == sigTypeInlineValue ) {
@@ -189,7 +189,7 @@ void Signature::readConfig( const KConfigBase * config )
   mText = config->readEntry( sigTextKey );
 }
 
-void Signature::writeConfig( KConfigBase * config ) const
+void Signature::writeConfig( TDEConfigBase * config ) const
 {
   switch ( mType ) {
   case Inlined:
@@ -316,7 +316,7 @@ Identity::~Identity()
 }
 
 
-void Identity::readConfig( const KConfigBase * config )
+void Identity::readConfig( const TDEConfigBase * config )
 {
   mUoid = config->readUnsignedNumEntry("uoid",0);
 
@@ -353,7 +353,7 @@ void Identity::readConfig( const KConfigBase * config )
 }
 
 
-void Identity::writeConfig( KConfigBase * config ) const
+void Identity::writeConfig( TDEConfigBase * config ) const
 {
   config->writeEntry("uoid", mUoid);
 
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index 7139b753a..4d6eeed09 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -20,7 +20,7 @@ namespace KPIM {
   class Identity;
   class Signature;
 }
-class KConfigBase;
+class TDEConfigBase;
 class IdentityList;
 class TQDataStream;
 
@@ -72,8 +72,8 @@ public:
   void setType( Type type ) { mType = type; }
 
 protected:
-  void writeConfig( KConfigBase * config ) const;
-  void readConfig( const KConfigBase * config );
+  void writeConfig( TDEConfigBase * config ) const;
+  void readConfig( const TDEConfigBase * config );
 
 private:
   TQString textFromFile( bool * ok ) const;
@@ -136,12 +136,12 @@ public:
 
 protected:
   /** Read configuration from config. Group must be preset (or use
-      KConfigGroup). Called from IdentityManager. */
-  void readConfig( const KConfigBase * );
+      TDEConfigGroup). Called from IdentityManager. */
+  void readConfig( const TDEConfigBase * );
 
   /** Write configuration to config. Group must be preset (or use
-      KConfigGroup). Called from IdentityManager. */
-  void writeConfig( KConfigBase * ) const;
+      TDEConfigGroup). Called from IdentityManager. */
+  void writeConfig( TDEConfigBase * ) const;
 
 public:
   /** Tests if there are enough values set to allow mailing */
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index 2935fe0a2..f6bc5def4 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -70,13 +70,13 @@ IdentityManager::IdentityManager( bool readonly, TQObject * parent, const char *
   : ConfigManager( parent, name ), DCOPObject( newDCOPObjectName() )
 {
   mReadOnly = readonly;
-  mConfig = new KConfig( "emailidentities", readonly );
+  mConfig = new TDEConfig( "emailidentities", readonly );
   readConfig(mConfig);
   if ( mIdentities.isEmpty() ) {
     kdDebug(5006) << "emailidentities is empty -> convert from kmailrc" << endl;
     // No emailidentities file, or an empty one due to broken conversion (kconf_update bug in tdelibs <= 3.2.2)
     // => convert it, i.e. read settings from kmailrc
-    KConfig kmailConf( "kmailrc", true );
+    TDEConfig kmailConf( "kmailrc", true );
     readConfig( &kmailConf );
   }
   // we need at least a default identity:
@@ -201,11 +201,11 @@ void IdentityManager::writeConfig() const {
   int i = 0;
   for ( ConstIterator it = mIdentities.begin() ;
 	it != mIdentities.end() ; ++it, ++i ) {
-    KConfigGroup cg( mConfig, TQString::fromLatin1("Identity #%1").arg(i) );
+    TDEConfigGroup cg( mConfig, TQString::fromLatin1("Identity #%1").arg(i) );
     (*it).writeConfig( &cg );
     if ( (*it).isDefault() ) {
       // remember which one is default:
-      KConfigGroup general( mConfig, "General" );
+      TDEConfigGroup general( mConfig, "General" );
       general.writeEntry( configKeyDefaultIdentity, (*it).uoid() );
 
       // Also write the default identity to emailsettings
@@ -220,19 +220,19 @@ void IdentityManager::writeConfig() const {
 
 }
 
-void IdentityManager::readConfig(KConfigBase* config) {
+void IdentityManager::readConfig(TDEConfigBase* config) {
   mIdentities.clear();
 
   TQStringList identities = groupList(config);
   if ( identities.isEmpty() ) return; // nothing to be done...
 
-  KConfigGroup general( config, "General" );
+  TDEConfigGroup general( config, "General" );
   uint defaultIdentity = general.readUnsignedNumEntry( configKeyDefaultIdentity );
   bool haveDefault = false;
 
   for ( TQStringList::Iterator group = identities.begin() ;
 	group != identities.end() ; ++group ) {
-    KConfigGroup configGroup( config, *group );
+    TDEConfigGroup configGroup( config, *group );
     mIdentities << Identity();
     mIdentities.last().readConfig( &configGroup );
     if ( !haveDefault && mIdentities.last().uoid() == defaultIdentity ) {
@@ -249,7 +249,7 @@ void IdentityManager::readConfig(KConfigBase* config) {
   mShadowIdentities = mIdentities;
 }
 
-TQStringList IdentityManager::groupList(KConfigBase* config) const {
+TQStringList IdentityManager::groupList(TDEConfigBase* config) const {
   return config->groupList().grep( TQRegExp("^Identity #\\d+$") );
 }
 
@@ -442,7 +442,7 @@ void IdentityManager::createDefaultIdentity() {
       if ( emailAddress.isEmpty() ) {
         emailAddress = user.loginName();
         if ( !emailAddress.isEmpty() ) {
-          KConfigGroup general( mConfig, "General" );
+          TDEConfigGroup general( mConfig, "General" );
           TQString defaultdomain = general.readEntry( "Default domain" );
           if( !defaultdomain.isEmpty() ) {
             emailAddress += '@' + defaultdomain;
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index 2f0d5bde9..b0aee59d4 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -37,8 +37,8 @@
 #include <dcopobject.h>
 #include <tdepimmacros.h>
 
-class KConfigBase;
-class KConfig;
+class TDEConfigBase;
+class TDEConfig;
 class KMKernel;
 class TQStringList;
 class KMIdentity;
@@ -226,15 +226,15 @@ k_dcop:
 
 private:
   void writeConfig() const;
-  void readConfig(KConfigBase* config);
-  TQStringList groupList(KConfigBase* config) const;
+  void readConfig(TDEConfigBase* config);
+  TQStringList groupList(TDEConfigBase* config) const;
   void createDefaultIdentity();
 
   // returns a new Unique Object Identifier
   int newUoid();
 
 private:
-  KConfig* mConfig;
+  TDEConfig* mConfig;
   bool mReadOnly;
 };