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

1 files changed, 9 insertions, 9 deletions

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;