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

143 files changed, 1232 insertions, 1232 deletions

diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index d970bbe8a..927acc7ed 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -171,7 +171,7 @@ of which you have to reimplement at least the first two:
 
 - void installProfile()
   This is called when the user selected a profile and hit apply. A
-  profile is just another KConfig object. Therefore, this method
+  profile is just another TDEConfig object. Therefore, this method
   should be the same as setup(), except that you should only alter
   widgets for configs that really exist in the profile.
 
diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index c655583c9..6e80f20de 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -156,7 +156,7 @@ namespace KMail {
   };
 
   static const about_data credits[] = {
-    { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons replacement
+    { "Sam Abed", 0, 0, 0 }, // TDEConfigXT porting, smileys->emoticons replacement
     { "Joern Ahrens", 0, 0, 0 }, // implement wish 77182 (Add some separators to "Mark Message as" popup menu)
     { "Tom Albers", 0, 0, 0 }, // small fixes, bugzilla maintenance
     { "Albert Cervera Areny", 0, 0, 0 }, // implemented wish 88309 (optional compression of attachments)
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 0610622f7..a2bb384ff 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -49,10 +49,10 @@ AccountManager::~AccountManager()
 //-----------------------------------------------------------------------------
 void AccountManager::writeConfig( bool withSync )
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   TQString groupName;
 
-  KConfigGroupSaver saver(config, "General");
+  TDEConfigGroupSaver saver(config, "General");
   config->writeEntry("accounts", mAcctList.count());
 
   // first delete all account groups in the config file:
@@ -66,7 +66,7 @@ void AccountManager::writeConfig( bool withSync )
   int i = 1;
   for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it, ++i ) {
     groupName.sprintf("Account %d", i);
-    KConfigGroupSaver saver(config, groupName);
+    TDEConfigGroupSaver saver(config, groupName);
     (*it)->writeConfig(*config);
   }
   if (withSync) config->sync();
@@ -76,7 +76,7 @@ void AccountManager::writeConfig( bool withSync )
 //-----------------------------------------------------------------------------
 void AccountManager::readConfig(void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   KMAccount* acct;
   TQString acctType, acctName;
   TQCString groupName;
@@ -87,13 +87,13 @@ void AccountManager::readConfig(void)
       delete *it;
   mAcctList.clear();
 
-  KConfigGroup general(config, "General");
+  TDEConfigGroup general(config, "General");
   num = general.readNumEntry("accounts", 0);
 
   for (i=1; i<=num; i++)
   {
     groupName.sprintf("Account %d", i);
-    KConfigGroupSaver saver(config, groupName);
+    TDEConfigGroupSaver saver(config, groupName);
     acctType = config->readEntry("Type");
     // Provide backwards compatibility
     if (acctType == "advanced pop" || acctType == "experimental pop")
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 5ae16164b..89861527b 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -120,7 +120,7 @@ AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *parent )
 
 void AccountWizard::start( KMKernel *kernel, TQWidget *parent )
 {
-  KConfigGroup wizardConfig( KMKernel::config(), "AccountWizard" );
+  TDEConfigGroup wizardConfig( KMKernel::config(), "AccountWizard" );
 
   if ( wizardConfig.readBoolEntry( "ShowOnStartup", true ) ) {
     AccountWizard wizard( kernel, parent );
@@ -367,7 +367,7 @@ void AccountWizard::accept()
 void AccountWizard::createTransport()
 {
   // create outgoing account
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   uint numTransports = general.readNumEntry( "transports", 0 );
 
@@ -403,7 +403,7 @@ void AccountWizard::transportCreated()
 {
   mTransportInfoList.append( mTransportInfo );
 
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
   general.writeEntry( "transports", mTransportInfoList.count() );
 
   for ( uint i = 0 ; i < mTransportInfoList.count() ; i++ )
@@ -411,12 +411,12 @@ void AccountWizard::transportCreated()
 
     // No default transport? => set the first transport as the default
   if ( GlobalSettings::self()->defaultTransport().isEmpty() ) {
-    KConfigGroup general( KMKernel::config(), "General" );
+    TDEConfigGroup general( KMKernel::config(), "General" );
 
     if ( mTransportInfoList.count() > 0 ) {
       KMTransportInfo info;
       info.readConfig( 1 );
-      KConfigGroup composer( KMKernel::config(), "Composer" );
+      TDEConfigGroup composer( KMKernel::config(), "Composer" );
       GlobalSettings::self()->setDefaultTransport( info.name );
       GlobalSettings::self()->setCurrentTransport( info.name );
     }
diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp
index 1ad1a69be..2aa55b0c1 100644
--- a/kmail/acljobs.cpp
+++ b/kmail/acljobs.cpp
@@ -120,7 +120,7 @@ TQString ACLJobs::permissionsToString( unsigned int permissions )
 }
 #endif
 
-KIO::SimpleJob* ACLJobs::setACL( KIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions )
+TDEIO::SimpleJob* ACLJobs::setACL( TDEIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions )
 {
   TQString perm = TQString::fromLatin1( permissionsToIMAPRights( permissions ) );
 
@@ -128,53 +128,53 @@ KIO::SimpleJob* ACLJobs::setACL( KIO::Slave* slave, const KURL& url, const TQStr
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'A' << (int)'S' << url << user << perm;
 
-  KIO::SimpleJob* job = KIO::special( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::SimpleJob* job = TDEIO::special( url, packedArgs, false );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-ACLJobs::DeleteACLJob* ACLJobs::deleteACL( KIO::Slave* slave, const KURL& url, const TQString& user )
+ACLJobs::DeleteACLJob* ACLJobs::deleteACL( TDEIO::Slave* slave, const KURL& url, const TQString& user )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'A' << (int)'D' << url << user;
 
   ACLJobs::DeleteACLJob* job = new ACLJobs::DeleteACLJob( url, user, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-ACLJobs::GetACLJob* ACLJobs::getACL( KIO::Slave* slave, const KURL& url )
+ACLJobs::GetACLJob* ACLJobs::getACL( TDEIO::Slave* slave, const KURL& url )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'A' << (int)'G' << url;
 
   ACLJobs::GetACLJob* job = new ACLJobs::GetACLJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
-ACLJobs::GetUserRightsJob* ACLJobs::getUserRights( KIO::Slave* slave, const KURL& url )
+ACLJobs::GetUserRightsJob* ACLJobs::getUserRights( TDEIO::Slave* slave, const KURL& url )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'A' << (int)'M' << url;
 
   ACLJobs::GetUserRightsJob* job = new ACLJobs::GetUserRightsJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
 ACLJobs::GetACLJob::GetACLJob( const KURL& url, const TQByteArray &packedArgs,
                                  bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
-  connect( this, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
-           TQT_SLOT(slotInfoMessage(KIO::Job*,const TQString&)) );
+  connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+           TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
 }
 
-void ACLJobs::GetACLJob::slotInfoMessage( KIO::Job*, const TQString& str )
+void ACLJobs::GetACLJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
 {
   // Parse the result
   TQStringList lst = TQStringList::split( "\"", str, true );
@@ -189,13 +189,13 @@ void ACLJobs::GetACLJob::slotInfoMessage( KIO::Job*, const TQString& str )
 
 ACLJobs::GetUserRightsJob::GetUserRightsJob( const KURL& url, const TQByteArray &packedArgs,
                                                bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
-  connect( this, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
-           TQT_SLOT(slotInfoMessage(KIO::Job*,const TQString&)) );
+  connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+           TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
 }
 
-void ACLJobs::GetUserRightsJob::slotInfoMessage( KIO::Job*, const TQString& str )
+void ACLJobs::GetUserRightsJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
 {
   // Parse the result
   m_permissions = IMAPRightsToPermission( str, url(), TQString() );
@@ -204,15 +204,15 @@ void ACLJobs::GetUserRightsJob::slotInfoMessage( KIO::Job*, const TQString& str
 ACLJobs::DeleteACLJob::DeleteACLJob( const KURL& url, const TQString& userId,
                                      const TQByteArray &packedArgs,
                                      bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
     mUserId( userId )
 {
 }
 
 ////
 
-ACLJobs::MultiSetACLJob::MultiSetACLJob( KIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo )
-  : KIO::Job( showProgressInfo ),
+ACLJobs::MultiSetACLJob::MultiSetACLJob( TDEIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo )
+  : TDEIO::Job( showProgressInfo ),
     mSlave( slave ),
     mUrl( url ), mACLList( acl ), mACLListIterator( mACLList.begin() )
 {
@@ -228,7 +228,7 @@ void ACLJobs::MultiSetACLJob::slotStart()
   if ( mACLListIterator != mACLList.end() )
   {
     const ACLListEntry& entry = *mACLListIterator;
-    KIO::Job* job = 0;
+    TDEIO::Job* job = 0;
     if ( entry.permissions > -1 )
       job = setACL( mSlave, mUrl, entry.userId, entry.permissions );
     else
@@ -240,10 +240,10 @@ void ACLJobs::MultiSetACLJob::slotStart()
   }
 }
 
-void ACLJobs::MultiSetACLJob::slotResult( KIO::Job *job )
+void ACLJobs::MultiSetACLJob::slotResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    KIO::Job::slotResult( job ); // will set the error and emit result(this)
+    TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
     return;
   }
   subjobs.remove(job);
@@ -255,7 +255,7 @@ void ACLJobs::MultiSetACLJob::slotResult( KIO::Job *job )
   slotStart();
 }
 
-ACLJobs::MultiSetACLJob* ACLJobs::multiSetACL( KIO::Slave* slave, const KURL& url, const ACLList& acl )
+ACLJobs::MultiSetACLJob* ACLJobs::multiSetACL( TDEIO::Slave* slave, const KURL& url, const ACLList& acl )
 {
   return new MultiSetACLJob( slave, url, acl, false /*showProgressInfo*/ );
 }
diff --git a/kmail/acljobs.h b/kmail/acljobs.h
index 6404a2287..b4bfd0dfb 100644
--- a/kmail/acljobs.h
+++ b/kmail/acljobs.h
@@ -86,26 +86,26 @@ namespace ACLJobs {
     All = List | Read | WriteFlags | Insert | Post | Create | Delete | Administer | WriteSeenFlag
   };
   /// Set the permissions for a given user on a given url
-  KIO::SimpleJob* setACL( KIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions );
+  TDEIO::SimpleJob* setACL( TDEIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions );
 
   class DeleteACLJob;
   /// Delete the permissions for a given user on a given url
-  DeleteACLJob* deleteACL( KIO::Slave* slave, const KURL& url, const TQString& user );
+  DeleteACLJob* deleteACL( TDEIO::Slave* slave, const KURL& url, const TQString& user );
 
   class GetACLJob;
   /// List all ACLs for a given url
-  GetACLJob* getACL( KIO::Slave* slave, const KURL& url );
+  GetACLJob* getACL( TDEIO::Slave* slave, const KURL& url );
 
   class GetUserRightsJob;
   /// Get the users' rights for a given url
-  GetUserRightsJob* getUserRights( KIO::Slave* slave, const KURL& url );
+  GetUserRightsJob* getUserRights( TDEIO::Slave* slave, const KURL& url );
 
   class MultiSetACLJob;
   /// Set and delete a list of permissions for different users on a given url
-  MultiSetACLJob* multiSetACL( KIO::Slave* slave, const KURL& url, const ACLList& acl );
+  MultiSetACLJob* multiSetACL( TDEIO::Slave* slave, const KURL& url, const ACLList& acl );
 
   /// List all ACLs for a given url
-  class GetACLJob : public KIO::SimpleJob
+  class GetACLJob : public TDEIO::SimpleJob
   {
     Q_OBJECT
   
@@ -116,13 +116,13 @@ namespace ACLJobs {
     const ACLList& entries() const { return m_entries; }
 
   protected slots:
-    void slotInfoMessage( KIO::Job*, const TQString& );
+    void slotInfoMessage( TDEIO::Job*, const TQString& );
   private:
     ACLList m_entries;
   };
 
   /// Get the users' rights for a given url
-  class GetUserRightsJob : public KIO::SimpleJob
+  class GetUserRightsJob : public TDEIO::SimpleJob
   {
     Q_OBJECT
   
@@ -132,14 +132,14 @@ namespace ACLJobs {
     unsigned int permissions() const { return m_permissions; }
 
   protected slots:
-    void slotInfoMessage( KIO::Job*, const TQString& );
+    void slotInfoMessage( TDEIO::Job*, const TQString& );
   private:
     unsigned int m_permissions;
   };
 
   /// Delete the permissions for a given user on a given url
   /// This class only exists to store the userid in the job
-  class DeleteACLJob : public KIO::SimpleJob
+  class DeleteACLJob : public TDEIO::SimpleJob
   {
     Q_OBJECT
   
@@ -155,12 +155,12 @@ namespace ACLJobs {
   };
 
   /// Set and delete a list of permissions for different users on a given url
-  class MultiSetACLJob : public KIO::Job {
+  class MultiSetACLJob : public TDEIO::Job {
     Q_OBJECT
   
 
   public:
-    MultiSetACLJob( KIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo );
+    MultiSetACLJob( TDEIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo );
 
   signals:
     // Emitted when a given user's permissions were successfully changed.
@@ -169,10 +169,10 @@ namespace ACLJobs {
 
   protected slots:
     virtual void slotStart();
-    virtual void slotResult( KIO::Job *job );
+    virtual void slotResult( TDEIO::Job *job );
 
   private:
-    KIO::Slave* mSlave;
+    TDEIO::Slave* mSlave;
     const KURL mUrl;
     const ACLList mACLList;
     ACLList::const_iterator mACLListIterator;
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 215e54511..6f8e43b0d 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -544,7 +544,7 @@ void ActionScheduler::processMessage()
 
   bool mdnEnabled = true;
   {
-    KConfigGroup mdnConfig( kmkernel->config(), "MDN" );
+    TDEConfigGroup mdnConfig( kmkernel->config(), "MDN" );
     int mode = mdnConfig.readNumEntry( "default-policy", 0 );
     if (!mode || mode < 0 || mode > 3)
       mdnEnabled = false;
@@ -820,8 +820,8 @@ bool ActionScheduler::isEnabled()
 	return sEnabled;
 
     sEnabledChecked = true;
-    KConfig* config = KMKernel::config();
-    KConfigGroupSaver saver(config, "General");
+    TDEConfig* config = KMKernel::config();
+    TDEConfigGroupSaver saver(config, "General");
     sEnabled = config->readBoolEntry("action-scheduler", false);
     return sEnabled;
 }
diff --git a/kmail/annotationjobs.cpp b/kmail/annotationjobs.cpp
index 6fb6645e9..6aa4d932d 100644
--- a/kmail/annotationjobs.cpp
+++ b/kmail/annotationjobs.cpp
@@ -34,21 +34,21 @@
 
 using namespace KMail;
 
-KIO::SimpleJob* AnnotationJobs::setAnnotation(
-    KIO::Slave* slave, const KURL& url, const TQString& entry,
+TDEIO::SimpleJob* AnnotationJobs::setAnnotation(
+    TDEIO::Slave* slave, const KURL& url, const TQString& entry,
     const TQMap<TQString,TQString>& attributes )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'M' << (int)'S' << url << entry << attributes;
 
-  KIO::SimpleJob* job = KIO::special( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::SimpleJob* job = TDEIO::special( url, packedArgs, false );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
 AnnotationJobs::GetAnnotationJob* AnnotationJobs::getAnnotation(
-    KIO::Slave* slave, const KURL& url, const TQString& entry,
+    TDEIO::Slave* slave, const KURL& url, const TQString& entry,
     const TQStringList& attributes )
 {
   TQByteArray packedArgs;
@@ -56,21 +56,21 @@ AnnotationJobs::GetAnnotationJob* AnnotationJobs::getAnnotation(
   stream << (int)'M' << (int)'G' << url << entry << attributes;
 
   GetAnnotationJob* job = new GetAnnotationJob( url, entry, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
 AnnotationJobs::GetAnnotationJob::GetAnnotationJob( const KURL& url, const TQString& entry,
                                                     const TQByteArray &packedArgs,
                                                     bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ),
     mEntry( entry )
 {
-  connect( this, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
-           TQT_SLOT(slotInfoMessage(KIO::Job*,const TQString&)) );
+  connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+           TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
 }
 
-void AnnotationJobs::GetAnnotationJob::slotInfoMessage( KIO::Job*, const TQString& str )
+void AnnotationJobs::GetAnnotationJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
 {
   // Parse the result
   TQStringList lst = TQStringList::split( "\r", str );
@@ -83,8 +83,8 @@ void AnnotationJobs::GetAnnotationJob::slotInfoMessage( KIO::Job*, const TQStrin
 }
 
 AnnotationJobs::MultiGetAnnotationJob::MultiGetAnnotationJob(
-  KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo )
-  : KIO::Job( showProgressInfo ),
+  TDEIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo )
+  : TDEIO::Job( showProgressInfo ),
     mSlave( slave ),
     mUrl( url ), mEntryList( entries ), mEntryListIterator( mEntryList.begin() )
 {
@@ -97,17 +97,17 @@ void AnnotationJobs::MultiGetAnnotationJob::slotStart()
   if ( mEntryListIterator != mEntryList.end() ) {
     TQStringList attributes;
     attributes << "value";
-    KIO::Job* job = getAnnotation( mSlave, mUrl, *mEntryListIterator, attributes );
+    TDEIO::Job* job = getAnnotation( mSlave, mUrl, *mEntryListIterator, attributes );
     addSubjob( job );
   } else { // done!
     emitResult();
   }
 }
 
-void AnnotationJobs::MultiGetAnnotationJob::slotResult( KIO::Job *job )
+void AnnotationJobs::MultiGetAnnotationJob::slotResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    KIO::Job::slotResult( job ); // will set the error and emit result(this)
+    TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
     return;
   }
   subjobs.remove( job );
@@ -130,7 +130,7 @@ void AnnotationJobs::MultiGetAnnotationJob::slotResult( KIO::Job *job )
   slotStart();
 }
 
-AnnotationJobs::MultiGetAnnotationJob* AnnotationJobs::multiGetAnnotation( KIO::Slave* slave, const KURL& url, const TQStringList& entries )
+AnnotationJobs::MultiGetAnnotationJob* AnnotationJobs::multiGetAnnotation( TDEIO::Slave* slave, const KURL& url, const TQStringList& entries )
 {
   return new MultiGetAnnotationJob( slave, url, entries, false /*showProgressInfo*/ );
 }
@@ -138,8 +138,8 @@ AnnotationJobs::MultiGetAnnotationJob* AnnotationJobs::multiGetAnnotation( KIO::
 ////
 
 AnnotationJobs::MultiSetAnnotationJob::MultiSetAnnotationJob(
-  KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo )
-  : KIO::Job( showProgressInfo ),
+  TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo )
+  : TDEIO::Job( showProgressInfo ),
     mSlave( slave ),
     mUrl( url ), mAnnotationList( annotations ), mAnnotationListIterator( mAnnotationList.begin() )
 {
@@ -156,17 +156,17 @@ void AnnotationJobs::MultiSetAnnotationJob::slotStart()
     TQMap<TQString, TQString> attributes;
     attributes.insert( attr.name, attr.value );
     kdDebug() << k_funcinfo << " setting annotation " << attr.entry << " " << attr.name << " " << attr.value << endl;
-    KIO::Job* job = setAnnotation( mSlave, mUrl, attr.entry, attributes );
+    TDEIO::Job* job = setAnnotation( mSlave, mUrl, attr.entry, attributes );
     addSubjob( job );
   } else { // done!
     emitResult();
   }
 }
 
-void AnnotationJobs::MultiSetAnnotationJob::slotResult( KIO::Job *job )
+void AnnotationJobs::MultiSetAnnotationJob::slotResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    KIO::Job::slotResult( job ); // will set the error and emit result(this)
+    TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
     return;
   }
   subjobs.remove( job );
@@ -179,17 +179,17 @@ void AnnotationJobs::MultiSetAnnotationJob::slotResult( KIO::Job *job )
 }
 
 AnnotationJobs::MultiSetAnnotationJob* AnnotationJobs::multiSetAnnotation(
-  KIO::Slave* slave, const KURL& url, const AnnotationList& annotations )
+  TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations )
 {
   return new MultiSetAnnotationJob( slave, url, annotations, false /*showProgressInfo*/ );
 }
 
 
-AnnotationJobs::MultiUrlGetAnnotationJob::MultiUrlGetAnnotationJob( KIO::Slave* slave,
+AnnotationJobs::MultiUrlGetAnnotationJob::MultiUrlGetAnnotationJob( TDEIO::Slave* slave,
                                                                     const KURL& baseUrl,
                                                                     const TQStringList& paths,
                                                                     const TQString& annotation )
-  : KIO::Job( false ),
+  : TDEIO::Job( false ),
     mSlave( slave ),
     mUrl( baseUrl ),
     mPathList( paths ),
@@ -207,17 +207,17 @@ void AnnotationJobs::MultiUrlGetAnnotationJob::slotStart()
     attributes << "value";
     KURL url(mUrl);
     url.setPath( *mPathListIterator );
-    KIO::Job* job = getAnnotation( mSlave, url, mAnnotation, attributes );
+    TDEIO::Job* job = getAnnotation( mSlave, url, mAnnotation, attributes );
     addSubjob( job );
   } else { // done!
     emitResult();
   }
 }
 
-void AnnotationJobs::MultiUrlGetAnnotationJob::slotResult( KIO::Job *job )
+void AnnotationJobs::MultiUrlGetAnnotationJob::slotResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    KIO::Job::slotResult( job ); // will set the error and emit result(this)
+    TDEIO::Job::slotResult( job ); // will set the error and emit result(this)
     return;
   }
   subjobs.remove( job );
@@ -241,7 +241,7 @@ TQMap<TQString, TQString> AnnotationJobs::MultiUrlGetAnnotationJob::annotations(
   return mAnnotations;
 }
 
-AnnotationJobs::MultiUrlGetAnnotationJob* AnnotationJobs::multiUrlGetAnnotation( KIO::Slave* slave,
+AnnotationJobs::MultiUrlGetAnnotationJob* AnnotationJobs::multiUrlGetAnnotation( TDEIO::Slave* slave,
                                                                                  const KURL& baseUrl,
                                                                                  const TQStringList& paths,
                                                                                  const TQString& annotation )
diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index 3972a80b0..8b50a025a 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -65,14 +65,14 @@ namespace AnnotationJobs {
  * @param entry the name of the annotation entry
  * @param attributes attribute name+value pairs
  */
-KIO::SimpleJob* setAnnotation( KIO::Slave* slave, const KURL& url, const TQString& entry,
+TDEIO::SimpleJob* setAnnotation( TDEIO::Slave* slave, const KURL& url, const TQString& entry,
                                const TQMap<TQString,TQString>& attributes );
 
 class MultiSetAnnotationJob;
 /**
  * Set multiple annotation entries
  */
-MultiSetAnnotationJob* multiSetAnnotation( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations );
+MultiSetAnnotationJob* multiSetAnnotation( TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations );
 
 class GetAnnotationJob;
 /**
@@ -82,7 +82,7 @@ class GetAnnotationJob;
  * @param entry the name of the annotation entry
  * @param attributes attribute names
  */
-GetAnnotationJob* getAnnotation( KIO::Slave* slave, const KURL& url, const TQString& entry,
+GetAnnotationJob* getAnnotation( TDEIO::Slave* slave, const KURL& url, const TQString& entry,
                                  const TQStringList& attributes );
 
 class MultiGetAnnotationJob;
@@ -90,7 +90,7 @@ class MultiGetAnnotationJob;
  * Get multiple annotation entries
  * Currently we assume we want to get the "value" for each, to simplify the data structure.
  */
-MultiGetAnnotationJob* multiGetAnnotation( KIO::Slave* slave, const KURL& url, const TQStringList& entries );
+MultiGetAnnotationJob* multiGetAnnotation( TDEIO::Slave* slave, const KURL& url, const TQStringList& entries );
 
 class MultiUrlGetAnnotationJob;
 /**
@@ -98,14 +98,14 @@ class MultiUrlGetAnnotationJob;
  * @param paths The paths to get the annotation for 
  * @param annotation The annotation to get
  */
-MultiUrlGetAnnotationJob* multiUrlGetAnnotation( KIO::Slave* slave,
+MultiUrlGetAnnotationJob* multiUrlGetAnnotation( TDEIO::Slave* slave,
                                               const KURL& baseUrl,
                                               const TQStringList& paths,
                                               const TQString& annotation );
 
 
 /// for getAnnotation()
-class GetAnnotationJob : public KIO::SimpleJob
+class GetAnnotationJob : public TDEIO::SimpleJob
 {
   Q_OBJECT
   
@@ -116,20 +116,20 @@ public:
   const AnnotationList& annotations() const { return mAnnotations; }
 
 protected slots:
-  void slotInfoMessage( KIO::Job*, const TQString& );
+  void slotInfoMessage( TDEIO::Job*, const TQString& );
 private:
   AnnotationList mAnnotations;
   TQString mEntry;
 };
 
 /// for multiGetAnnotation
-class MultiGetAnnotationJob : public KIO::Job
+class MultiGetAnnotationJob : public TDEIO::Job
 {
   Q_OBJECT
   
 
 public:
-  MultiGetAnnotationJob( KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
+  MultiGetAnnotationJob( TDEIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
 
 signals:
   // Emitted when a given annotation was found - or not found
@@ -137,33 +137,33 @@ signals:
 
 protected slots:
   virtual void slotStart();
-  virtual void slotResult( KIO::Job *job );
+  virtual void slotResult( TDEIO::Job *job );
 
 private:
-  KIO::Slave* mSlave;
+  TDEIO::Slave* mSlave;
   const KURL mUrl;
   const TQStringList mEntryList;
   TQStringList::const_iterator mEntryListIterator;
 };
 
 /// for multiUrlGetAnnotation
-class MultiUrlGetAnnotationJob : public KIO::Job
+class MultiUrlGetAnnotationJob : public TDEIO::Job
 {
   Q_OBJECT
   
 
 public:
-  MultiUrlGetAnnotationJob( KIO::Slave* slave, const KURL& baseUrl,
+  MultiUrlGetAnnotationJob( TDEIO::Slave* slave, const KURL& baseUrl,
                             const TQStringList& paths, const TQString& annotation );
 
   TQMap<TQString, TQString> annotations() const;
 
 protected slots:
   virtual void slotStart();
-  virtual void slotResult( KIO::Job *job );
+  virtual void slotResult( TDEIO::Job *job );
 
 private:
-  KIO::Slave* mSlave;
+  TDEIO::Slave* mSlave;
   const KURL mUrl;
   const TQStringList mPathList;
   TQStringList::const_iterator mPathListIterator;
@@ -172,13 +172,13 @@ private:
 };
 
 /// for multiSetAnnotation
-class MultiSetAnnotationJob : public KIO::Job
+class MultiSetAnnotationJob : public TDEIO::Job
 {
   Q_OBJECT
   
 
 public:
-  MultiSetAnnotationJob( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo );
+  MultiSetAnnotationJob( TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo );
 
 signals:
   // Emitted when a given annotation was successfully changed
@@ -186,10 +186,10 @@ signals:
 
 protected slots:
   virtual void slotStart();
-  virtual void slotResult( KIO::Job *job );
+  virtual void slotResult( TDEIO::Job *job );
 
 private:
-  KIO::Slave* mSlave;
+  TDEIO::Slave* mSlave;
   const KURL mUrl;
   const AnnotationList mAnnotationList;
   AnnotationList::const_iterator mAnnotationListIterator;
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index 0cb047fd4..9a1c8347f 100644
--- a/kmail/antispamconfig.cpp
+++ b/kmail/antispamconfig.cpp
@@ -54,12 +54,12 @@ AntiSpamConfig * AntiSpamConfig::instance() {
 void AntiSpamConfig::readConfig()
 {
   mAgents.clear();
-  KConfig config( "kmail.antispamrc", true );
+  TDEConfig config( "kmail.antispamrc", true );
   config.setReadDefaults( true );
-  KConfigGroup general( &config, "General" );
+  TDEConfigGroup general( &config, "General" );
   unsigned int totalTools = general.readUnsignedNumEntry( "tools", 0 );
   for ( unsigned int i = 1; i <= totalTools; ++i ) {
-    KConfigGroup tool( &config, TQString("Spamtool #%1").arg( i ) );
+    TDEConfigGroup tool( &config, TQString("Spamtool #%1").arg( i ) );
     if ( tool.hasKey( "ScoreHeader" ) ) {
       TQString name      = tool.readEntry( "ScoreName" );
       TQCString header   = tool.readEntry( "ScoreHeader" ).latin1();
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 2f6750f2c..d83a19e1f 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -680,9 +680,9 @@ AntiSpamWizard::ConfigReader::ConfigReader( WizardMode mode,
     mMode( mode )
 {
   if ( mMode == AntiSpam )
-    mConfig = new KConfig( "kmail.antispamrc", true );
+    mConfig = new TDEConfig( "kmail.antispamrc", true );
   else
-    mConfig = new KConfig( "kmail.antivirusrc", true );
+    mConfig = new TDEConfig( "kmail.antivirusrc", true );
 }
 
 AntiSpamWizard::ConfigReader::~ConfigReader( )
@@ -698,11 +698,11 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
                       : TQString("Virustool #%1");
   // read the configuration from the global config file
   mConfig->setReadDefaults( true );
-  KConfigGroup general( mConfig, "General" );
+  TDEConfigGroup general( mConfig, "General" );
   int registeredTools = general.readNumEntry( "tools", 0 );
   for (int i = 1; i <= registeredTools; i++)
   {
-    KConfigGroup toolConfig( mConfig, groupName.arg( i ) );
+    TDEConfigGroup toolConfig( mConfig, groupName.arg( i ) );
     if( !toolConfig.readBoolEntry( "HeadersOnly", false ) )
       mToolList.append( readToolConfig( toolConfig ) );
   }
@@ -710,11 +710,11 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
   // read the configuration from the user config file
   // and merge newer config data
   mConfig->setReadDefaults( false );
-  KConfigGroup user_general( mConfig, "General" );
+  TDEConfigGroup user_general( mConfig, "General" );
   int user_registeredTools = user_general.readNumEntry( "tools", 0 );
   for (int i = 1; i <= user_registeredTools; i++)
   {
-    KConfigGroup toolConfig( mConfig, groupName.arg( i ) );
+    TDEConfigGroup toolConfig( mConfig, groupName.arg( i ) );
     if( !toolConfig.readBoolEntry( "HeadersOnly", false ) )
       mergeToolConfig( readToolConfig( toolConfig ) );
   }
@@ -730,7 +730,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
 
 
 AntiSpamWizard::SpamToolConfig
-    AntiSpamWizard::ConfigReader::readToolConfig( KConfigGroup & configGroup )
+    AntiSpamWizard::ConfigReader::readToolConfig( TDEConfigGroup & configGroup )
 {
   TQString id = configGroup.readEntry( "Ident" );
   int version = configGroup.readNumEntry( "Version" );
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index e66d2f358..ed9e4a3b4 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -225,10 +225,10 @@ namespace KMail {
 
         private:
           TQValueList<SpamToolConfig> & mToolList;
-          KConfig *mConfig;
+          TDEConfig *mConfig;
           WizardMode mMode;
 
-          SpamToolConfig readToolConfig( KConfigGroup & configGroup );
+          SpamToolConfig readToolConfig( TDEConfigGroup & configGroup );
           SpamToolConfig createDummyConfig();
 
           void mergeToolConfig( SpamToolConfig config );
diff --git a/kmail/attachmentstrategy.cpp b/kmail/attachmentstrategy.cpp
index 23bd05951..87157ed4f 100644
--- a/kmail/attachmentstrategy.cpp
+++ b/kmail/attachmentstrategy.cpp
@@ -211,7 +211,7 @@ static AttachmentStrategy::Display smartDisplay( const partNode *node )
     if ( lowerType == "hidden" )     return hidden();
     if ( lowerType == "headeronly" ) return headerOnly();
     // don't kdFatal here, b/c the strings are user-provided
-    // (KConfig), so fail gracefully to the default:
+    // (TDEConfig), so fail gracefully to the default:
     return smart();
   }
 
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index fd53997b3..132a8dba1 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -175,9 +175,9 @@ void BackupJob::finish()
                    .arg( mRootFolder->name() ).arg( mMailArchivePath.path() );
   text += "\n" + i18n( "1 message of size %1 was archived.",
                        "%n messages with the total size of %1 were archived.", mArchivedMessages )
-                   .arg( KIO::convertSize( mArchivedSize ) );
+                   .arg( TDEIO::convertSize( mArchivedSize ) );
   text += "\n" + i18n( "The archive file has a size of %1." )
-                   .arg( KIO::convertSize( archiveFileInfo.size() ) );
+                   .arg( TDEIO::convertSize( archiveFileInfo.size() ) );
   KMessageBox::information( mParentWidget, text, i18n( "Archiving finished." ) );
 
   if ( mDeleteFoldersAfterCompletion ) {
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index 5e5232d42..143c18c5b 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -167,8 +167,8 @@ void CachedImapJob::execute()
 
       ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
       jd.items << mFolder->label(); // for the err msg
-      KIO::SimpleJob *simpleJob = KIO::special( url.url(), packedArgs, false );
-      KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+      TDEIO::SimpleJob *simpleJob = TDEIO::special( url.url(), packedArgs, false );
+      TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
       mAccount->insertJob(simpleJob, jd);
 
       mAccount->setSentCustomLoginCommand( true );
@@ -195,19 +195,19 @@ void CachedImapJob::listMessages()
   KURL url = mAccount->getUrl();
   url.setPath( mFolder->imapPath() + ";UID=1:*;SECTION=FLAGS RFC822.SIZE");
 
-  KIO::SimpleJob *job = KIO::get(url, false, false);
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+  TDEIO::SimpleJob *job = TDEIO::get(url, false, false);
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.cancellable = true;
   mAccount->insertJob( job, jd );
-  connect( job, TQT_SIGNAL( result(KIO::Job *) ),
-           this, TQT_SLOT( slotListMessagesResult( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+           this, TQT_SLOT( slotListMessagesResult( TDEIO::Job* ) ) );
   // send the data directly for KMFolderCachedImap
-  connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-           mFolder, TQT_SLOT( slotGetMessagesData( KIO::Job* , const TQByteArray& ) ) );
+  connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           mFolder, TQT_SLOT( slotGetMessagesData( TDEIO::Job* , const TQByteArray& ) ) );
 }
 
-void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
+void CachedImapJob::slotDeleteNextMessages( TDEIO::Job* job )
 {
   if (job) {
     KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -236,12 +236,12 @@ void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
   url.setPath( mFolder->imapPath() +
                TQString::fromLatin1(";UID=%1").arg(uids) );
 
-  KIO::SimpleJob *simpleJob = KIO::file_delete( url, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
+  TDEIO::SimpleJob *simpleJob = TDEIO::file_delete( url, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   mAccount->insertJob( simpleJob, jd );
-  connect( simpleJob, TQT_SIGNAL( result(KIO::Job *) ),
-           this, TQT_SLOT( slotDeleteNextMessages(KIO::Job *) ) );
+  connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
+           this, TQT_SLOT( slotDeleteNextMessages(TDEIO::Job *) ) );
 }
 
 void CachedImapJob::expungeFolder()
@@ -250,15 +250,15 @@ void CachedImapJob::expungeFolder()
   // Special URL that means EXPUNGE
   url.setPath( mFolder->imapPath() + TQString::fromLatin1(";UID=*") );
 
-  KIO::SimpleJob *job = KIO::file_delete( url, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+  TDEIO::SimpleJob *job = TDEIO::file_delete( url, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   mAccount->insertJob( job, jd );
-  connect( job, TQT_SIGNAL( result(KIO::Job *) ),
-           this, TQT_SLOT( slotExpungeResult(KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+           this, TQT_SLOT( slotExpungeResult(TDEIO::Job *) ) );
 }
 
-void CachedImapJob::slotExpungeResult( KIO::Job * job )
+void CachedImapJob::slotExpungeResult( TDEIO::Job * job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -276,7 +276,7 @@ void CachedImapJob::slotExpungeResult( KIO::Job * job )
   delete this;
 }
 
-void CachedImapJob::slotGetNextMessage(KIO::Job * job)
+void CachedImapJob::slotGetNextMessage(TDEIO::Job * job)
 {
   if (job) {
     KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -346,18 +346,18 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.cancellable = true;
   mMsg->setTransferInProgress(true);
-  KIO::SimpleJob *simpleJob = KIO::get(url, false, false);
-  KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+  TDEIO::SimpleJob *simpleJob = TDEIO::get(url, false, false);
+  TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
   mAccount->insertJob(simpleJob, jd);
-  connect(simpleJob, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)),
-          this, TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t)));
-  connect(simpleJob, TQT_SIGNAL(result(KIO::Job *)),
-          this, TQT_SLOT(slotGetNextMessage(KIO::Job *)));
-  connect(simpleJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-          mFolder, TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)));
+  connect(simpleJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+          this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
+  connect(simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+          this, TQT_SLOT(slotGetNextMessage(TDEIO::Job *)));
+  connect(simpleJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+          mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
 }
 
-void CachedImapJob::slotProcessedSize(KIO::Job *, KIO::filesize_t processed)
+void CachedImapJob::slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t processed)
 {
   emit progress( mSentBytes + processed, mTotalBytes );
 }
@@ -417,23 +417,23 @@ void CachedImapJob::slotPutNextMessage()
   jd.msgList.append( mMsg );
 
   mMsg->setTransferInProgress(true);
-  KIO::SimpleJob *simpleJob = KIO::put(url, 0, false, false, false);
-  KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+  TDEIO::SimpleJob *simpleJob = TDEIO::put(url, 0, false, false, false);
+  TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
   mAccount->insertJob(simpleJob, jd);
-  connect( simpleJob, TQT_SIGNAL( result(KIO::Job *) ),
-           TQT_SLOT( slotPutMessageResult(KIO::Job *) ) );
-  connect( simpleJob, TQT_SIGNAL( dataReq(KIO::Job *, TQByteArray &) ),
-           TQT_SLOT( slotPutMessageDataReq(KIO::Job *, TQByteArray &) ) );
-  connect( simpleJob, TQT_SIGNAL( data(KIO::Job *, const TQByteArray &) ),
-           mFolder, TQT_SLOT( slotSimpleData(KIO::Job *, const TQByteArray &) ) );
-  connect( simpleJob, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)),
-             TQT_SLOT(slotPutMessageInfoData(KIO::Job *, const TQString &)) );
+  connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
+           TQT_SLOT( slotPutMessageResult(TDEIO::Job *) ) );
+  connect( simpleJob, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ),
+           TQT_SLOT( slotPutMessageDataReq(TDEIO::Job *, TQByteArray &) ) );
+  connect( simpleJob, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ),
+           mFolder, TQT_SLOT( slotSimpleData(TDEIO::Job *, const TQByteArray &) ) );
+  connect( simpleJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+             TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) );
 
 }
 
 //-----------------------------------------------------------------------------
-// TODO: port to KIO::StoredTransferJob once it's ok to require tdelibs-3.3
-void CachedImapJob::slotPutMessageDataReq(KIO::Job *job, TQByteArray &data)
+// TODO: port to TDEIO::StoredTransferJob once it's ok to require tdelibs-3.3
+void CachedImapJob::slotPutMessageDataReq(TDEIO::Job *job, TQByteArray &data)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -452,7 +452,7 @@ void CachedImapJob::slotPutMessageDataReq(KIO::Job *job, TQByteArray &data)
 }
 
 //----------------------------------------------------------------------------
-void CachedImapJob::slotPutMessageInfoData( KIO::Job *job, const TQString &data )
+void CachedImapJob::slotPutMessageInfoData( TDEIO::Job *job, const TQString &data )
 {
   KMFolderCachedImap *imapFolder = static_cast<KMFolderCachedImap*>( mDestFolder->storage() );
   if ( imapFolder ) {
@@ -472,7 +472,7 @@ void CachedImapJob::slotPutMessageInfoData( KIO::Job *job, const TQString &data
 
 
 //-----------------------------------------------------------------------------
-void CachedImapJob::slotPutMessageResult(KIO::Job *job)
+void CachedImapJob::slotPutMessageResult(TDEIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -524,7 +524,7 @@ void CachedImapJob::slotPutMessageResult(KIO::Job *job)
 }
 
 
-void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
+void CachedImapJob::slotAddNextSubfolder( TDEIO::Job * job )
 {
   if (job) {
     KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -587,11 +587,11 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
     ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
     jd.items << folder->label(); // for the err msg
     jd.current = folder->folder();
-    KIO::SimpleJob *simpleJob = KIO::mkdir(url);
-    KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+    TDEIO::SimpleJob *simpleJob = TDEIO::mkdir(url);
+    TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
     mAccount->insertJob(simpleJob, jd);
-    connect( simpleJob, TQT_SIGNAL(result(KIO::Job *)),
-             this, TQT_SLOT(slotAddNextSubfolder(KIO::Job *)) );
+    connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+             this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) );
   } else {
     TQByteArray packedArgs;
     TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -605,16 +605,16 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
     ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
     jd.items << folder->label(); // for the err msg
     jd.current = folder->folder();
-    KIO::SimpleJob *simpleJob = KIO::special( url.url(), packedArgs, false );
-    KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+    TDEIO::SimpleJob *simpleJob = TDEIO::special( url.url(), packedArgs, false );
+    TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
     mAccount->insertJob(simpleJob, jd);
-    connect( simpleJob, TQT_SIGNAL(result(KIO::Job *)),
-             this, TQT_SLOT(slotAddNextSubfolder(KIO::Job *)) );
+    connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+             this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) );
   }
 }
 
 
-void CachedImapJob::slotDeleteNextFolder( KIO::Job *job )
+void CachedImapJob::slotDeleteNextFolder( TDEIO::Job *job )
 {
   if (job) {
     KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
@@ -645,11 +645,11 @@ void CachedImapJob::slotDeleteNextFolder( KIO::Job *job )
   url.setPath(folderPath);
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.path = url.path();
-  KIO::SimpleJob *simpleJob = KIO::file_delete(url, false);
-  KIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
+  TDEIO::SimpleJob *simpleJob = TDEIO::file_delete(url, false);
+  TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob);
   mAccount->insertJob(simpleJob, jd);
-  connect( simpleJob, TQT_SIGNAL( result(KIO::Job *) ),
-           TQT_SLOT( slotDeleteNextFolder(KIO::Job *) ) );
+  connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ),
+           TQT_SLOT( slotDeleteNextFolder(TDEIO::Job *) ) );
 }
 
 void CachedImapJob::checkUidValidity()
@@ -660,16 +660,16 @@ void CachedImapJob::checkUidValidity()
   ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
   jd.cancellable = true;
 
-  KIO::SimpleJob *job = KIO::get( url, false, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+  TDEIO::SimpleJob *job = TDEIO::get( url, false, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
   mAccount->insertJob( job, jd );
-  connect( job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotCheckUidValidityResult(KIO::Job *)) );
-  connect( job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-           mFolder, TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)));
+  connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+           TQT_SLOT(slotCheckUidValidityResult(TDEIO::Job *)) );
+  connect( job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+           mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
 }
 
-void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
+void CachedImapJob::slotCheckUidValidityResult(TDEIO::Job * job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -749,11 +749,11 @@ void CachedImapJob::renameFolder( const TQString &newName )
   ImapAccountBase::jobData jd( newName, mFolder->folder() );
   jd.path = mNewImapPath;
 
-  KIO::SimpleJob *simpleJob = KIO::rename( urlSrc, urlDst, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
+  TDEIO::SimpleJob *simpleJob = TDEIO::rename( urlSrc, urlDst, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
   mAccount->insertJob( simpleJob, jd );
-  connect( simpleJob, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotRenameFolderResult(KIO::Job *)) );
+  connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)),
+           TQT_SLOT(slotRenameFolderResult(TDEIO::Job *)) );
 }
 
 static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath,
@@ -844,7 +844,7 @@ void CachedImapJob::slotSubscribtionChange2Done( const TQString&, bool )
   delete this;
 }
 
-void CachedImapJob::slotRenameFolderResult( KIO::Job *job )
+void CachedImapJob::slotRenameFolderResult( TDEIO::Job *job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -873,7 +873,7 @@ void CachedImapJob::slotRenameFolderResult( KIO::Job *job )
   }
 }
 
-void CachedImapJob::slotListMessagesResult( KIO::Job * job )
+void CachedImapJob::slotListMessagesResult( TDEIO::Job * job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index f37953d35..592ba3928 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -109,19 +109,19 @@ protected:
   void listMessages();
 
 protected slots:
-  virtual void slotGetNextMessage( KIO::Job *job = 0 );
-  virtual void slotAddNextSubfolder( KIO::Job *job = 0 );
+  virtual void slotGetNextMessage( TDEIO::Job *job = 0 );
+  virtual void slotAddNextSubfolder( TDEIO::Job *job = 0 );
   virtual void slotPutNextMessage();
-  virtual void slotPutMessageDataReq( KIO::Job *job, TQByteArray &data );
-  virtual void slotPutMessageResult( KIO::Job *job );
-  virtual void slotPutMessageInfoData(KIO::Job *, const TQString &data);
-  virtual void slotExpungeResult( KIO::Job *job );
-  virtual void slotDeleteNextFolder( KIO::Job *job = 0 );
-  virtual void slotCheckUidValidityResult( KIO::Job *job );
-  virtual void slotRenameFolderResult( KIO::Job *job );
-  virtual void slotListMessagesResult( KIO::Job * job );
-  void slotDeleteNextMessages( KIO::Job* job = 0 );
-  void slotProcessedSize( KIO::Job *, KIO::filesize_t processed );
+  virtual void slotPutMessageDataReq( TDEIO::Job *job, TQByteArray &data );
+  virtual void slotPutMessageResult( TDEIO::Job *job );
+  virtual void slotPutMessageInfoData(TDEIO::Job *, const TQString &data);
+  virtual void slotExpungeResult( TDEIO::Job *job );
+  virtual void slotDeleteNextFolder( TDEIO::Job *job = 0 );
+  virtual void slotCheckUidValidityResult( TDEIO::Job *job );
+  virtual void slotRenameFolderResult( TDEIO::Job *job );
+  virtual void slotListMessagesResult( TDEIO::Job * job );
+  void slotDeleteNextMessages( TDEIO::Job* job = 0 );
+  void slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t processed );
   void slotSubscribtionChange1Done( const TQString&, bool );
   void slotSubscribtionChange2Done( const TQString&, bool );
   void slotSubscribtionChange1Failed( const TQString &errorMessage );
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index 7a7a583f2..9b6da633a 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -139,7 +139,7 @@ bool Callback::mailICal( const TQString& to, const TQString &iCal,
 
   // Outlook will only understand the reply if the From: header is the
   // same as the To: header of the invitation message.
-  KConfigGroup options( KMKernel::config(), "Groupware" );
+  TDEConfigGroup options( KMKernel::config(), "Groupware" );
   if( !options.readBoolEntry( "LegacyMangleFromToHeaders", true ) ) {
     if( identity != KPIM::Identity::null() ) {
       msg->setFrom( identity.fullEmailAddr() );
diff --git a/kmail/composer.h b/kmail/composer.h
index 4bbad3165..3d86ec57a 100644
--- a/kmail/composer.h
+++ b/kmail/composer.h
@@ -19,7 +19,7 @@ class KMMessagePart;
 class TQListViewItem;
 class MailComposerIface;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 4bad5bc5d..7b24e228d 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -156,7 +156,7 @@ namespace {
     I18N_NOOP("<qt><p>This setting has been fixed by your administrator.</p>"
               "<p>If you think this is an error, please contact him.</p></qt>");
 
-  void checkLockDown( TQWidget * w, const KConfigBase & c, const char * key ) {
+  void checkLockDown( TQWidget * w, const TDEConfigBase & c, const char * key ) {
     if ( c.entryIsImmutable( key ) ) {
       w->setEnabled( false );
       TQToolTip::add( w, i18n( lockedDownWarning ) );
@@ -176,13 +176,13 @@ namespace {
     b->setText( i18n( e.desc ) );
   }
 
-  void loadWidget( TQCheckBox * b, const KConfigBase & c, const BoolConfigEntry & e ) {
+  void loadWidget( TQCheckBox * b, const TDEConfigBase & c, const BoolConfigEntry & e ) {
     Q_ASSERT( c.group() == e.group );
     checkLockDown( b, c, e.key );
     b->setChecked( c.readBoolEntry( e.key, e.defaultValue ) );
   }
 
-  void loadWidget( TQButtonGroup * g, const KConfigBase & c, const EnumConfigEntry & e ) {
+  void loadWidget( TQButtonGroup * g, const TDEConfigBase & c, const EnumConfigEntry & e ) {
     Q_ASSERT( c.group() == e.group );
     Q_ASSERT( g->count() == e.numItems );
     checkLockDown( g, c, e.key );
@@ -195,19 +195,19 @@ namespace {
     g->setButton( e.defaultItem );
   }
 
-  void saveCheckBox( TQCheckBox * b, KConfigBase & c, const BoolConfigEntry & e ) {
+  void saveCheckBox( TQCheckBox * b, TDEConfigBase & c, const BoolConfigEntry & e ) {
     Q_ASSERT( c.group() == e.group );
     c.writeEntry( e.key, b->isChecked() );
   }
 
-  void saveButtonGroup( TQButtonGroup * g, KConfigBase & c, const EnumConfigEntry & e ) {
+  void saveButtonGroup( TQButtonGroup * g, TDEConfigBase & c, const EnumConfigEntry & e ) {
     Q_ASSERT( c.group() == e.group );
     Q_ASSERT( g->count() == e.numItems );
     c.writeEntry( e.key, e.items[ g->id( g->selected() ) ].key );
   }
 
   template <typename T_Widget, typename T_Entry>
-  inline void loadProfile( T_Widget * g, const KConfigBase & c, const T_Entry & e ) {
+  inline void loadProfile( T_Widget * g, const TDEConfigBase & c, const T_Entry & e ) {
     if ( c.hasKey( e.key ) )
       loadWidget( g, c, e );
   }
@@ -233,7 +233,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
   // the KCMultiDialog starts with the size of the first kcm, not
   // the largest one. This way at least after the first showing of
   // the largest kcm the size is kept.
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
   int width = geometry.readNumEntry( "ConfigureDialogWidth" );
   int height = geometry.readNumEntry( "ConfigureDialogHeight" );
   if ( width != 0 && height != 0 ) {
@@ -243,7 +243,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
 }
 
 void ConfigureDialog::hideEvent( TQHideEvent *ev ) {
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
   geometry.writeEntry( "ConfigureDialogWidth", width() );
   geometry.writeEntry( "ConfigureDialogHeight",height() );
   KDialogBase::hideEvent( ev );
@@ -270,8 +270,8 @@ void ConfigureDialog::slotUser2() {
     return;
   }
   mProfileDialog = new ProfileDialog( this, "mProfileDialog" );
-  connect( mProfileDialog, TQT_SIGNAL(profileSelected(KConfig*)),
-                this, TQT_SIGNAL(installProfile(KConfig*)) );
+  connect( mProfileDialog, TQT_SIGNAL(profileSelected(TDEConfig*)),
+                this, TQT_SIGNAL(installProfile(TDEConfig*)) );
   mProfileDialog->show();
 }
 
@@ -359,7 +359,7 @@ void IdentityPage::save() {
   if( mOldNumberOfIdentities < 2 && mIdentityList->childCount() > 1 ) {
     // have more than one identity, so better show the combo in the
     // composer now:
-    KConfigGroup composer( KMKernel::config(), "Composer" );
+    TDEConfigGroup composer( KMKernel::config(), "Composer" );
     int showHeaders = composer.readNumEntry( "headers", HDR_STANDARD );
     showHeaders |= HDR_IDENTITY;
     composer.writeEntry( "headers", showHeaders );
@@ -367,7 +367,7 @@ void IdentityPage::save() {
   // and now the reverse
   if( mOldNumberOfIdentities > 1 && mIdentityList->childCount() < 2 ) {
     // have only one identity, so remove the combo in the composer:
-    KConfigGroup composer( KMKernel::config(), "Composer" );
+    TDEConfigGroup composer( KMKernel::config(), "Composer" );
     int showHeaders = composer.readNumEntry( "headers", HDR_STANDARD );
     showHeaders &= ~HDR_IDENTITY;
     composer.writeEntry( "headers", showHeaders );
@@ -970,8 +970,8 @@ void AccountsPage::SendingTab::doLoadFromGlobalSettings() {
 }
 
 void AccountsPage::SendingTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General");
-  KConfigGroup composer( KMKernel::config(), "Composer");
+  TDEConfigGroup general( KMKernel::config(), "General");
+  TDEConfigGroup composer( KMKernel::config(), "Composer");
 
   int numTransports = general.readNumEntry("transports", 0);
 
@@ -1032,8 +1032,8 @@ void AccountsPage::SendingTab::doLoadOther() {
 }
 
 void AccountsPage::SendingTab::save() {
-  KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   // Save transports:
   general.writeEntry( "transports", mTransportInfoList.count() );
@@ -1391,7 +1391,7 @@ void AccountsPage::ReceivingTab::doLoadFromGlobalSettings() {
 }
 
 void AccountsPage::ReceivingTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   mAccountList->clear();
   TQListViewItem *top = 0;
@@ -1453,7 +1453,7 @@ void AccountsPage::ReceivingTab::save() {
   kmkernel->cleanupImapFolders();
 
   // Save Mail notification settings
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
   general.writeEntry( "beep-on-mail", mBeepNewMailCheck->isChecked() );
   GlobalSettings::self()->setVerboseNewMailNotification( mVerboseNotificationCheck->isChecked() );
 
@@ -1644,7 +1644,7 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index )
 }
 
 void AppearancePage::FontsTab::doLoadOther() {
-  KConfigGroup fonts( KMKernel::config(), "Fonts" );
+  TDEConfigGroup fonts( KMKernel::config(), "Fonts" );
 
   mFont[0] = TDEGlobalSettings::generalFont();
   TQFont fixedFont = TDEGlobalSettings::fixedFont();
@@ -1657,8 +1657,8 @@ void AppearancePage::FontsTab::doLoadOther() {
   slotFontSelectorChanged( 0 );
 }
 
-void AppearancePage::FontsTab::installProfile( KConfig * profile ) {
-  KConfigGroup fonts( profile, "Fonts" );
+void AppearancePage::FontsTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup fonts( profile, "Fonts" );
 
   // read fonts that are defined in the profile:
   bool needChange = false;
@@ -1678,7 +1678,7 @@ void AppearancePage::FontsTab::installProfile( KConfig * profile ) {
 }
 
 void AppearancePage::FontsTab::save() {
-  KConfigGroup fonts( KMKernel::config(), "Fonts" );
+  TDEConfigGroup fonts( KMKernel::config(), "Fonts" );
 
   // read the current font (might have been modified)
   if ( mActiveFontIndex >= 0 )
@@ -1786,7 +1786,7 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char
 }
 
 void AppearancePage::ColorsTab::doLoadOther() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   mCustomColorCheck->setChecked( !reader.readBoolEntry( "defaultColors", true ) );
   mRecycleColorCheck->setChecked( reader.readBoolEntry( "RecycleQuoteColors", false ) );
@@ -1827,8 +1827,8 @@ void AppearancePage::ColorsTab::doLoadOther() {
            this, TQT_SLOT( slotEmitChanged( void ) ) );
 }
 
-void AppearancePage::ColorsTab::installProfile( KConfig * profile ) {
-  KConfigGroup reader( profile, "Reader" );
+void AppearancePage::ColorsTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup reader( profile, "Reader" );
 
   if ( reader.hasKey( "defaultColors" ) )
     mCustomColorCheck->setChecked( !reader.readBoolEntry( "defaultColors" ) );
@@ -1841,7 +1841,7 @@ void AppearancePage::ColorsTab::installProfile( KConfig * profile ) {
 }
 
 void AppearancePage::ColorsTab::save() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   bool customColors = mCustomColorCheck->isChecked();
   reader.writeEntry( "defaultColors", !customColors );
@@ -1940,8 +1940,8 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char
 }
 
 void AppearancePage::LayoutTab::doLoadOther() {
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
-  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   loadWidget( mFolderListGroup, geometry, folderListMode );
   loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation );
@@ -1950,9 +1950,9 @@ void AppearancePage::LayoutTab::doLoadOther() {
   mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() );
 }
 
-void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
-  const KConfigGroup reader( profile, "Reader" );
-  const KConfigGroup geometry( profile, "Geometry" );
+void AppearancePage::LayoutTab::installProfile( TDEConfig * profile ) {
+  const TDEConfigGroup reader( profile, "Reader" );
+  const TDEConfigGroup geometry( profile, "Geometry" );
 
   loadProfile( mFolderListGroup, geometry, folderListMode );
   loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation );
@@ -1961,8 +1961,8 @@ void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
 }
 
 void AppearancePage::LayoutTab::save() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   saveButtonGroup( mFolderListGroup, geometry, folderListMode );
   saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation );
@@ -2114,8 +2114,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 }
 
 void AppearancePage::HeadersTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   // "General Options":
   mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) );
@@ -2150,9 +2150,9 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma
   mDateDisplay->setButton( numDateDisplayConfig - 2 ); // default
 }
 
-void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
-  KConfigGroup general( profile, "General" );
-  KConfigGroup geometry( profile, "Geometry" );
+void AppearancePage::HeadersTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup general( profile, "General" );
+  TDEConfigGroup geometry( profile, "Geometry" );
 
   if ( geometry.hasKey( "nestedMessages" ) )
     mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) );
@@ -2176,8 +2176,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
 }
 
 void AppearancePage::HeadersTab::save() {
-  KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
 
   if ( geometry.readBoolEntry( "nestedMessages", false )
        != mNestedMessagesCheck->isChecked() ) {
@@ -2191,7 +2191,7 @@ void AppearancePage::HeadersTab::save() {
       TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") );
       kdDebug(5006) << "groups.count() == " << groups.count() << endl;
       for ( TQStringList::const_iterator it = groups.begin() ; it != groups.end() ; ++it ) {
-        KConfigGroup group( KMKernel::config(), *it );
+        TDEConfigGroup group( KMKernel::config(), *it );
         group.deleteEntry( "threadMessagesOverride" );
       }
     }
@@ -2433,14 +2433,14 @@ void AppearancePage::ReaderTab::doLoadFromGlobalSettings()
 
 void AppearancePage::ReaderTab::doLoadOther()
 {
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
   loadWidget( mShowColorbarCheck, reader, showColorbarMode );
   loadWidget( mShowSpamStatusCheck, reader, showSpamStatusMode );
 }
 
 
 void AppearancePage::ReaderTab::save() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
   saveCheckBox( mShowColorbarCheck, reader, showColorbarMode );
   saveCheckBox( mShowSpamStatusCheck, reader, showSpamStatusMode );
   GlobalSettings::self()->setCloseAfterReplyOrForward( mCloseAfterReplyOrForwardCheck->isChecked() );
@@ -2459,8 +2459,8 @@ void AppearancePage::ReaderTab::save() {
 }
 
 
-void AppearancePage::ReaderTab::installProfile( KConfig * /* profile */ ) {
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+void AppearancePage::ReaderTab::installProfile( TDEConfig * /* profile */ ) {
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
   loadProfile( mCloseAfterReplyOrForwardCheck, reader, closeAfterReplyOrForward );
   loadProfile( mShowColorbarCheck, reader, showColorbarMode );
   loadProfile( mShowSpamStatusCheck, reader, showSpamStatusMode );
@@ -2512,8 +2512,8 @@ void AppearancePage::SystemTrayTab::doLoadFromGlobalSettings() {
   mSystemTrayGroup->setEnabled( mSystemTrayCheck->isChecked() );
 }
 
-void AppearancePage::SystemTrayTab::installProfile( KConfig * profile ) {
-  KConfigGroup general( profile, "General" );
+void AppearancePage::SystemTrayTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup general( profile, "General" );
 
   if ( general.hasKey( "SystemTrayEnabled" ) ) {
     mSystemTrayCheck->setChecked( general.readBoolEntry( "SystemTrayEnabled" ) );
@@ -2832,9 +2832,9 @@ void ComposerPage::GeneralTab::doLoadFromGlobalSettings() {
   mEditorRequester->setURL( GlobalSettings::self()->externalEditor() );
 }
 
-void ComposerPage::GeneralTab::installProfile( KConfig * profile ) {
-  KConfigGroup composer( profile, "Composer" );
-  KConfigGroup general( profile, "General" );
+void ComposerPage::GeneralTab::installProfile( TDEConfig * profile ) {
+  TDEConfigGroup composer( profile, "Composer" );
+  TDEConfigGroup general( profile, "General" );
 
   if ( composer.hasKey( "signature" ) ) {
     bool state = composer.readBoolEntry("signature");
@@ -3320,7 +3320,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
 }
 
 void ComposerPage::CharsetTab::doLoadOther() {
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   TQStringList charsets = composer.readListEntry( "pref-charsets" );
   for ( TQStringList::Iterator it = charsets.begin() ;
@@ -3336,7 +3336,7 @@ void ComposerPage::CharsetTab::doLoadOther() {
 }
 
 void ComposerPage::CharsetTab::save() {
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   TQStringList charsetList = mCharsetListEditor->stringList();
   TQStringList::Iterator it = charsetList.begin();
@@ -3509,7 +3509,7 @@ void ComposerPage::HeadersTab::slotRemoveMimeHeader()
 }
 
 void ComposerPage::HeadersTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   TQString suffix = general.readEntry( "myMessageIdSuffix" );
   mMessageIdSuffixEdit->setText( suffix );
@@ -3525,7 +3525,7 @@ void ComposerPage::HeadersTab::doLoadOther() {
 
   int count = general.readNumEntry( "mime-header-count", 0 );
   for( int i = 0 ; i < count ; i++ ) {
-    KConfigGroup config( KMKernel::config(),
+    TDEConfigGroup config( KMKernel::config(),
                          TQCString("Mime #") + TQCString().setNum(i) );
     TQString name  = config.readEntry( "name" );
     TQString value = config.readEntry( "value" );
@@ -3543,7 +3543,7 @@ void ComposerPage::HeadersTab::doLoadOther() {
 }
 
 void ComposerPage::HeadersTab::save() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   general.writeEntry( "useCustomMessageIdSuffix",
                       mCreateOwnMessageIdCheck->isChecked() );
@@ -3554,7 +3554,7 @@ void ComposerPage::HeadersTab::save() {
   TQListViewItem * item = mTagList->firstChild();
   for ( ; item ; item = item->itemBelow() )
     if( !item->text(0).isEmpty() ) {
-      KConfigGroup config( KMKernel::config(), TQCString("Mime #")
+      TDEConfigGroup config( KMKernel::config(), TQCString("Mime #")
                              + TQCString().setNum( numValidEntries ) );
       config.writeEntry( "name",  item->text( 0 ) );
       config.writeEntry( "value", item->text( 1 ) );
@@ -3708,7 +3708,7 @@ SecurityPage::SecurityPage( TQWidget * parent, const char * name )
 }
 
 
-void SecurityPage::installProfile( KConfig * profile ) {
+void SecurityPage::installProfile( TDEConfig * profile ) {
   mGeneralTab->installProfile( profile );
   mComposerCryptoTab->installProfile( profile );
   mWarningTab->installProfile( profile );
@@ -3910,7 +3910,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 }
 
 void SecurityPage::GeneralTab::doLoadOther() {
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   mHtmlMailCheck->setChecked( reader.readBoolEntry( "htmlMail", false ) );
   mExternalReferences->setChecked( reader.readBoolEntry( "htmlLoadExternal", false ) );
@@ -3918,7 +3918,7 @@ void SecurityPage::GeneralTab::doLoadOther() {
 
   mAlwaysDecrypt->setChecked( GlobalSettings::self()->alwaysDecrypt() );
 
-  const KConfigGroup mdn( KMKernel::config(), "MDN" );
+  const TDEConfigGroup mdn( KMKernel::config(), "MDN" );
 
   int num = mdn.readNumEntry( "default-policy", 0 );
   if ( num < 0 || num >= mMDNGroup->count() ) num = 0;
@@ -3929,9 +3929,9 @@ void SecurityPage::GeneralTab::doLoadOther() {
   mNoMDNsWhenEncryptedCheck->setChecked(mdn.readBoolEntry( "not-send-when-encrypted", true ));
 }
 
-void SecurityPage::GeneralTab::installProfile( KConfig * profile ) {
-  const KConfigGroup reader( profile, "Reader" );
-  const KConfigGroup mdn( profile, "MDN" );
+void SecurityPage::GeneralTab::installProfile( TDEConfig * profile ) {
+  const TDEConfigGroup reader( profile, "Reader" );
+  const TDEConfigGroup mdn( profile, "MDN" );
 
   if ( reader.hasKey( "htmlMail" ) )
     mHtmlMailCheck->setChecked( reader.readBoolEntry( "htmlMail" ) );
@@ -3955,8 +3955,8 @@ void SecurityPage::GeneralTab::installProfile( KConfig * profile ) {
 }
 
 void SecurityPage::GeneralTab::save() {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
-  KConfigGroup mdn( KMKernel::config(), "MDN" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup mdn( KMKernel::config(), "MDN" );
 
   if (reader.readBoolEntry( "htmlMail", false ) != mHtmlMailCheck->isChecked())
   {
@@ -3976,7 +3976,7 @@ void SecurityPage::GeneralTab::save() {
       {
         if (*it)
         {
-          KConfigGroupSaver saver(KMKernel::config(),
+          TDEConfigGroupSaver saver(KMKernel::config(),
             "Folder-" + (*it)->idString());
           KMKernel::config()->writeEntry("htmlMailOverride", false);
         }
@@ -4014,7 +4014,7 @@ SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent,
 }
 
 void SecurityPage::ComposerCryptoTab::doLoadOther() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   // If you change default values, sync messagecomposer.cpp too
 
@@ -4031,8 +4031,8 @@ void SecurityPage::ComposerCryptoTab::doLoadOther() {
   mWidget->mStoreEncrypted->setChecked( composer.readBoolEntry( "crypto-store-encrypted", true ) );
 }
 
-void SecurityPage::ComposerCryptoTab::installProfile( KConfig * profile ) {
-  const KConfigGroup composer( profile, "Composer" );
+void SecurityPage::ComposerCryptoTab::installProfile( TDEConfig * profile ) {
+  const TDEConfigGroup composer( profile, "Composer" );
 
   if ( composer.hasKey( "pgp-auto-sign" ) )
     mWidget->mAutoSignature->setChecked( composer.readBoolEntry( "pgp-auto-sign" ) );
@@ -4053,7 +4053,7 @@ void SecurityPage::ComposerCryptoTab::installProfile( KConfig * profile ) {
 }
 
 void SecurityPage::ComposerCryptoTab::save() {
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   composer.writeEntry( "pgp-auto-sign", mWidget->mAutoSignature->isChecked() );
 
@@ -4097,7 +4097,7 @@ SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char *
 }
 
 void SecurityPage::WarningTab::doLoadOther() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   mWidget->warnUnencryptedCB->setChecked( composer.readBoolEntry( "crypto-warning-unencrypted", false ) );
   mWidget->mWarnUnsigned->setChecked( composer.readBoolEntry( "crypto-warning-unsigned", false ) );
@@ -4118,8 +4118,8 @@ void SecurityPage::WarningTab::doLoadOther() {
   mWidget->enableAllWarningsPB->setEnabled( true );
 }
 
-void SecurityPage::WarningTab::installProfile( KConfig * profile ) {
-  const KConfigGroup composer( profile, "Composer" );
+void SecurityPage::WarningTab::installProfile( TDEConfig * profile ) {
+  const TDEConfigGroup composer( profile, "Composer" );
 
   if ( composer.hasKey( "crypto-warning-unencrypted" ) )
     mWidget->warnUnencryptedCB->setChecked( composer.readBoolEntry( "crypto-warning-unencrypted" ) );
@@ -4147,7 +4147,7 @@ void SecurityPage::WarningTab::installProfile( KConfig * profile ) {
 }
 
 void SecurityPage::WarningTab::save() {
-  KConfigGroup composer( KMKernel::config(), "Composer" );
+  TDEConfigGroup composer( KMKernel::config(), "Composer" );
 
   composer.writeEntry( "crypto-warn-recv-not-in-cert", mWidget->warnReceiverNotInCertificateCB->isChecked() );
   composer.writeEntry( "crypto-warning-unencrypted", mWidget->warnUnencryptedCB->isChecked() );
@@ -4390,7 +4390,7 @@ void SecurityPage::SMimeTab::slotUpdateHTTPActions() {
   mWidget->customHTTPProxy->setEnabled( enableProxySettings );
 }
 
-void SecurityPage::SMimeTab::installProfile( KConfig * ) {
+void SecurityPage::SMimeTab::installProfile( TDEConfig * ) {
 }
 
 static void saveCheckBoxToKleoEntry( TQCheckBox* cb, Kleo::CryptoConfigEntry* entry ) {
@@ -4758,7 +4758,7 @@ void MiscPage::FolderTab::doLoadFromGlobalSettings() {
 }
 
 void MiscPage::FolderTab::doLoadOther() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   mEmptyTrashCheck->setChecked( general.readBoolEntry( "empty-trash-on-exit", true ) );
   mOnStartupOpenFolder->setFolder( general.readEntry( "startupFolder",
@@ -4775,7 +4775,7 @@ void MiscPage::FolderTab::doLoadOther() {
 }
 
 void MiscPage::FolderTab::save() {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   general.writeEntry( "empty-trash-on-exit", mEmptyTrashCheck->isChecked() );
   general.writeEntry( "confirm-before-empty", mEmptyFolderConfirmCheck->isChecked() );
@@ -5076,7 +5076,7 @@ void MiscPage::GroupwareTab::doLoadFromGlobalSettings() {
 }
 
 void MiscPage::GroupwareTab::save() {
-  KConfigGroup groupware( KMKernel::config(), "Groupware" );
+  TDEConfigGroup groupware( KMKernel::config(), "Groupware" );
 
   // Write the groupware config
   if ( mEnableGwCB ) {
diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h
index a3ffff0b7..265bc9570 100644
--- a/kmail/configuredialog.h
+++ b/kmail/configuredialog.h
@@ -25,7 +25,7 @@
 #include <tqguardedptr.h>
 #include <kcmultidialog.h>
 
-class KConfig;
+class TDEConfig;
 class ProfileDialog;
 namespace KMail {
     class ImapAccountBase;
@@ -48,7 +48,7 @@ signals:
       resp. Only keys that this profile is supposed to alter should be
       included in the file.
   */
-  void installProfile( KConfig *profile );
+  void installProfile( TDEConfig *profile );
   void configChanged();
 protected:
   void hideEvent( TQHideEvent *i );
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index daa326d2e..c430171ef 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -333,7 +333,7 @@ void ProfileDialog::setup() {
   TQListViewItem * listItem = 0;
   for ( TQStringList::const_iterator it = mProfileList.begin() ;
 	it != mProfileList.end() ; ++it ) {
-    KConfig profile( *it, true /* read-only */, false /* no KDE global */ );
+    TDEConfig profile( *it, true /* read-only */, false /* no KDE global */ );
     profile.setGroup("KMail Profile");
     TQString name = profile.readEntry( "Name" );
     if ( name.isEmpty() ) {
@@ -358,7 +358,7 @@ void ProfileDialog::slotOk() {
 
   assert( (unsigned int)index < mProfileList.count() );
 
-  KConfig profile( *mProfileList.at(index), true, false );
+  TDEConfig profile( *mProfileList.at(index), true, false );
   emit profileSelected( &profile );
   KDialogBase::slotOk();
 }
@@ -385,11 +385,11 @@ void ConfigModuleWithTabs::load() {
     if ( tab )
       tab->load();
   }
-  KCModule::load();
+  TDECModule::load();
 }
 
 void ConfigModuleWithTabs::save() {
-  KCModule::save();
+  TDECModule::save();
    for ( int i = 0 ; i < mTabWidget->count() ; ++i ) {
     ConfigModuleTab *tab = dynamic_cast<ConfigModuleTab*>( mTabWidget->page(i) );
     if ( tab )
@@ -401,10 +401,10 @@ void ConfigModuleWithTabs::defaults() {
   ConfigModuleTab *tab = dynamic_cast<ConfigModuleTab*>( mTabWidget->currentPage() );
   if ( tab )
     tab->defaults();
-  KCModule::defaults();
+  TDECModule::defaults();
 }
 
-void ConfigModuleWithTabs::installProfile(KConfig * /* profile */ ) {
+void ConfigModuleWithTabs::installProfile(TDEConfig * /* profile */ ) {
   for ( int i = 0 ; i < mTabWidget->count() ; ++i ) {
     ConfigModuleTab *tab = dynamic_cast<ConfigModuleTab*>( mTabWidget->page(i) );
     if ( tab )
@@ -421,7 +421,7 @@ void ConfigModuleTab::load()
 void ConfigModuleTab::defaults()
 {
   // reset settings which are available via GlobalSettings to their defaults
-  // (stolen from KConfigDialogManager::updateWidgetsDefault())
+  // (stolen from TDEConfigDialogManager::updateWidgetsDefault())
   const bool bUseDefaults = GlobalSettings::self()->useDefaults( true );
   doLoadFromGlobalSettings();
   GlobalSettings::self()->useDefaults( bUseDefaults );
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 0ed45d95e..7b05ddb3f 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -40,7 +40,7 @@ class ListView;
 class ConfigureDialog;
 class KIntSpinBox;
 class SimpleStringListEditor;
-class KConfig;
+class TDEConfig;
 class TQPoint;
 class ComposerCryptoConfiguration;
 class WarningConfiguration;
@@ -161,7 +161,7 @@ public:
   ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false );
 
 signals:
-  void profileSelected( KConfig * profile );
+  void profileSelected( TDEConfig * profile );
 
 private slots:
   void slotSelectionChanged();
@@ -176,12 +176,12 @@ private:
 };
 
 #include <kdialog.h>
-class ConfigModule : public KCModule {
+class ConfigModule : public TDECModule {
   Q_OBJECT
   
 public:
   ConfigModule( TQWidget * parent=0, const char * name=0 )
-     : KCModule ( parent, name )
+     : TDECModule ( parent, name )
      {}
   ~ConfigModule() {}
 
@@ -198,7 +198,7 @@ signals:
       from the profile only for those entries that
       really have keys defined in the profile.
    */
-   void installProfile( KConfig * profile );
+   void installProfile( TDEConfig * profile );
 
 };
 
@@ -230,7 +230,7 @@ private:
   // via GlobalSettings
   virtual void doLoadOther() {}
   // reimplement this for loading default values of settings which are
-  // not available via GlobalSettings (KConfigXT).
+  // not available via GlobalSettings (TDEConfigXT).
   virtual void doResetToDefaultsOther() {}
 };
 
@@ -250,7 +250,7 @@ public:
   virtual void load();
   virtual void save();
   virtual void defaults();
-  virtual void installProfile( KConfig * profile );
+  virtual void installProfile( TDEConfig * profile );
 
 protected:
   void addTab( ConfigModuleTab* tab, const TQString & title );
@@ -437,7 +437,7 @@ public:
   TQString helpAnchor() const;
   void save();
 
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private slots:
   void slotFontSelectorChanged( int );
@@ -465,7 +465,7 @@ public:
   TQString helpAnchor() const;
   void save();
 
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private:
   //virtual void doLoadFromGlobalSettings();
@@ -487,7 +487,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private:
   //virtual void doLoadFromGlobalSettings();
@@ -511,7 +511,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private: // methods
   //virtual void doLoadFromGlobalSettings();
@@ -538,7 +538,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private:
   virtual void doLoadFromGlobalSettings();
@@ -570,7 +570,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private:
   virtual void doLoadFromGlobalSettings();
@@ -619,7 +619,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 protected slots:
   void slotConfigureRecentAddresses();
   void slotConfigureCompletionOrder();
@@ -852,7 +852,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private:
   //virtual void doLoadFromGlobalSettings();
@@ -879,7 +879,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private:
   //virtual void doLoadFromGlobalSettings();
@@ -899,7 +899,7 @@ public:
   TQString helpAnchor() const;
 
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private slots:
   void slotReenableAllWarningsClicked();
@@ -925,7 +925,7 @@ public:
 
   // Can't use k_dcop here. dcopidl can't parse this file, dcopidlng has a namespace bug.
   void save();
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
 private slots:
   void slotUpdateHTTPActions();
@@ -969,7 +969,7 @@ public:
   TQString helpAnchor() const;
 
   // OpenPGP tab is special:
-  void installProfile( KConfig * profile );
+  void installProfile( TDEConfig * profile );
 
   typedef SecurityPageGeneralTab GeneralTab;
   typedef SecurityPageComposerCryptoTab ComposerCryptoTab;
diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp
index a83b1cd6c..21f475d63 100644
--- a/kmail/copyfolderjob.cpp
+++ b/kmail/copyfolderjob.cpp
@@ -171,8 +171,8 @@ void CopyFolderJob::slotCopyNextChild( bool success )
 bool CopyFolderJob::createTargetDir()
 {
   // get the default mailbox type
-  KConfig * const config = KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig * const config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
   int deftype = config->readNumEntry("default-mailbox-format", 1);
   if ( deftype < 0 || deftype > 1 ) deftype = 1;
 
diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp
index 3fe2fd78b..61bdbdd1b 100644
--- a/kmail/csshelper.cpp
+++ b/kmail/csshelper.cpp
@@ -44,11 +44,11 @@ namespace KMail {
   CSSHelper::CSSHelper( const TQPaintDeviceMetrics &pdm ) :
     KPIM::CSSHelper( pdm )
   {
-    KConfig * config = KMKernel::config();
+    TDEConfig * config = KMKernel::config();
 
-    KConfigGroup reader( config, "Reader" );
-    KConfigGroup fonts( config, "Fonts" );
-    KConfigGroup pixmaps( config, "Pixmaps" );
+    TDEConfigGroup reader( config, "Reader" );
+    TDEConfigGroup fonts( config, "Fonts" );
+    TDEConfigGroup pixmaps( config, "Pixmaps" );
 
     mRecycleQuoteColors = reader.readBoolEntry( "RecycleQuoteColors", false );
 
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index be5003b3d..2fcc323e2 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -205,7 +205,7 @@ void ExpireJob::done()
   if ( !str.isEmpty() )
     BroadcastStatus::instance()->setStatusMsg( str );
 
-  KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
+  TDEConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
   group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used
 
   if ( !moving ) {
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index e1c7d6b80..8b629f832 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -435,9 +435,9 @@ void FavoriteFolderView::contentsDragEnterEvent(TQDragEnterEvent * e)
 void FavoriteFolderView::readColorConfig()
 {
   FolderTreeBase::readColorConfig();
-  KConfig* conf = KMKernel::config();
+  TDEConfig* conf = KMKernel::config();
   // Custom/System color support
-  KConfigGroupSaver saver(conf, "Reader");
+  TDEConfigGroupSaver saver(conf, "Reader");
   TQColor c = TDEGlobalSettings::alternateBackgroundColor();
   if ( !conf->readBoolEntry("defaultColors", true) )
     mPaintInfo.colBack = conf->readColorEntry( "AltBackgroundColor",&c );
diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp
index d63278ad7..3f6208d6d 100644
--- a/kmail/filterimporterexporter.cpp
+++ b/kmail/filterimporterexporter.cpp
@@ -139,9 +139,9 @@ void FilterSelectionDialog::slotSelectAllButton()
 }
 
 /* static */
-TQValueList<KMFilter*> FilterImporterExporter::readFiltersFromConfig( KConfig* config, bool bPopFilter )
+TQValueList<KMFilter*> FilterImporterExporter::readFiltersFromConfig( TDEConfig* config, bool bPopFilter )
 {
-    KConfigGroupSaver saver(config, "General");
+    TDEConfigGroupSaver saver(config, "General");
     int numFilters = 0;
     if (bPopFilter)
       numFilters = config->readNumEntry("popfilters",0);
@@ -152,7 +152,7 @@ TQValueList<KMFilter*> FilterImporterExporter::readFiltersFromConfig( KConfig* c
     for ( int i=0 ; i < numFilters ; ++i ) {
       TQString grpName;
       grpName.sprintf("%s #%d", (bPopFilter ? "PopFilter" : "Filter") , i);
-      KConfigGroupSaver saver(config, grpName);
+      TDEConfigGroupSaver saver(config, grpName);
       KMFilter * filter = new KMFilter(config, bPopFilter);
       filter->purify();
       if ( filter->isEmpty() ) {
@@ -168,7 +168,7 @@ TQValueList<KMFilter*> FilterImporterExporter::readFiltersFromConfig( KConfig* c
 }
 
 /* static */
-void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>& filters, KConfig* config, bool bPopFilter )
+void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>& filters, TDEConfig* config, bool bPopFilter )
 {
     // first, delete all groups:
     TQStringList filterGroups =
@@ -186,12 +186,12 @@ void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>&
           grpName.sprintf("PopFilter #%d", i);
         else
           grpName.sprintf("Filter #%d", i);
-        KConfigGroupSaver saver(config, grpName);
+        TDEConfigGroupSaver saver(config, grpName);
         (*it)->writeConfig(config);
         ++i;
       }
     }
-    KConfigGroupSaver saver(config, "General");
+    TDEConfigGroupSaver saver(config, "General");
     if (bPopFilter)
       config->writeEntry("popfilters", i);
     else
@@ -222,7 +222,7 @@ TQValueList<KMFilter*> FilterImporterExporter::importFilters()
         }
     }
 
-    KConfig config( fileName );
+    TDEConfig config( fileName );
     TQValueList<KMFilter*> imported = readFiltersFromConfig( &config, mPopFilter );
     FilterSelectionDialog dlg( mParent );
     dlg.setFilters( imported );
@@ -237,7 +237,7 @@ void FilterImporterExporter::exportFilters(const TQValueList<KMFilter*> & filter
     if ( saveUrl.isEmpty() || !Util::checkOverwrite( saveUrl, mParent ) )
       return;
 
-    KConfig config( saveUrl.path() );
+    TDEConfig config( saveUrl.path() );
     FilterSelectionDialog dlg( mParent );
     dlg.setFilters( filters );
     dlg.exec();
diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h
index 1b46ac02b..051288f55 100644
--- a/kmail/filterimporterexporter.h
+++ b/kmail/filterimporterexporter.h
@@ -33,7 +33,7 @@
 #include <tqvaluelist.h>
 #include <kdialogbase.h>
 class KMFilter;
-class KConfig;
+class TDEConfig;
 class TQWidget;
 class KPushButton;
 
@@ -41,7 +41,7 @@ namespace KMail
 {
 
 /**
-    @short Utility class that provides persisting of filters to/from KConfig.
+    @short Utility class that provides persisting of filters to/from TDEConfig.
     @author Till Adam <till@kdab.net>
  */
 class FilterImporterExporter
@@ -59,8 +59,8 @@ public:
        * and which filters to import. */
       TQValueList<KMFilter*> importFilters();
 
-      static void writeFiltersToConfig( const TQValueList<KMFilter*>& filters, KConfig* config, bool bPopFilter );
-      static TQValueList<KMFilter*> readFiltersFromConfig( KConfig* config, bool bPopFilter );
+      static void writeFiltersToConfig( const TQValueList<KMFilter*>& filters, TDEConfig* config, bool bPopFilter );
+      static TQValueList<KMFilter*> readFiltersFromConfig( TDEConfig* config, bool bPopFilter );
 private:
       TQWidget* mParent;
       bool mPopFilter;
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index b6c3e2c1d..65f656001 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -414,7 +414,7 @@ void KMail::FolderDiaACLTab::load()
   // warning mImapAccount can be 0 if creating a subsubsubfolder with dimap...  (bug?)
   if ( mImapAccount && mImapAccount->login().find('@') == -1 )
     defaultFormat = "username"; // no @ found, so we assume it's just the username
-  KConfigGroup configGroup( kmkernel->config(), "IMAP" );
+  TDEConfigGroup configGroup( kmkernel->config(), "IMAP" );
   TQString str = configGroup.readEntry( "UserIdFormat", defaultFormat );
   mUserIdFormat = FullEmail;
   if ( str == "username" )
@@ -474,7 +474,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString
       mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
     else
       // Connection error (error message box already shown by the account)
-      mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) );
+      mLabel->setText( TDEIO::buildErrorString( errorCode, errorMsg ) );
     return;
   }
 
@@ -507,18 +507,18 @@ void KMail::FolderDiaACLTab::startListing()
 {
   // List ACLs of folder - or its parent, if creating a new folder
   mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath );
-  connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-           this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+  connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+           this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
 }
 
-void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList )
+void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList )
 {
   if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) {
-    disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-                this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+    disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+                this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
 
     if ( job && job->error() ) {
-      if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
+      if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
         mLabel->setText( i18n( "This IMAP server does not have support for access control lists (ACL)" ) );
       else
         mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).arg( job->errorString() ) );
@@ -752,18 +752,18 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
     return;
   mImapPath = folderImap->imapPath();
 
-  KIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList );
+  TDEIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList );
   ImapAccountBase::jobData jd;
   jd.total = 1; jd.done = 0; jd.parent = 0;
   mImapAccount->insertJob(job, jd);
 
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_SLOT(slotMultiSetACLResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *)));
   connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )),
           TQT_SLOT(slotACLChanged( const TQString&, int )) );
 }
 
-void KMail::FolderDiaACLTab::slotMultiSetACLResult(KIO::Job* job)
+void KMail::FolderDiaACLTab::slotMultiSetACLResult(TDEIO::Job* job)
 {
   ImapAccountBase::JobIterator it = mImapAccount->findJob( job );
   if ( it == mImapAccount->jobsEnd() ) return;
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index b5484d7c3..4f7f3ab4f 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -42,7 +42,7 @@ class TQWidgetStack;
 class TQHBox;
 class TQVButtonGroup;
 class KListView;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 namespace KMail {
 
@@ -101,8 +101,8 @@ public:
 private slots:
   // Network (KIO) slots
   void slotConnectionResult( int, const TQString& );
-  void slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& );
-  void slotMultiSetACLResult(KIO::Job *);
+  void slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& );
+  void slotMultiSetACLResult(TDEIO::Job *);
   void slotACLChanged( const TQString&, int );
   void slotReceivedUserRights( KMFolder* folder );
   void slotDirectoryListingFinished(KMFolderImap*);
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 133a2b1a5..3fdb308ff 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -139,27 +139,27 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri
       mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
     else
       // Connection error (error message box already shown by the account)
-      mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) );
+      mLabel->setText( TDEIO::buildErrorString( errorCode, errorMsg ) );
     return;
   }
-  connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ),
-          this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ) );
+  connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ),
+          this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ) );
   KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
   mImapAccount->getStorageQuotaInfo( folder, mImapPath );
 }
 
 void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder,
-                                                      KIO::Job* job,
+                                                      TDEIO::Job* job,
                                                       const KMail::QuotaInfo& info )
 {
   if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) {
     //KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() );
 
-    disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& )),
-                this, TQT_SLOT(slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& )) );
+    disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )),
+                this, TQT_SLOT(slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )) );
 
     if ( job && job->error() ) {
-      if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
+      if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
         mLabel->setText( i18n( "This account does not have support for quota information." ) );
       else
         mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).arg( job->errorString() ) );
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index 222b7efcd..dd36cf97a 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -70,7 +70,7 @@ private:
 private slots:
   // Network (KIO) slots
   void slotConnectionResult( int, const TQString& );
-  void slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& );
+  void slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& );
 
 
 private:
diff --git a/kmail/folderjob.cpp b/kmail/folderjob.cpp
index 655e18d7a..852082a9b 100644
--- a/kmail/folderjob.cpp
+++ b/kmail/folderjob.cpp
@@ -114,7 +114,7 @@ FolderJob::start()
 //----------------------------------------------------------------------------
 void FolderJob::kill()
 {
-  mErrorCode = KIO::ERR_USER_CANCELED;
+  mErrorCode = TDEIO::ERR_USER_CANCELED;
   delete this;
 }
 
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index bfc36b70a..00368e6d8 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -771,7 +771,7 @@ void FolderStorage::remove()
   needsCompact = false; //we are dead - no need to compact us
 
   // Erase settings, otherwise they might interfer when recreating the folder
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   config->deleteGroup( "Folder-" + folder()->idString() );
 
   emit closed(folder());
@@ -918,8 +918,8 @@ void FolderStorage::headerOfMsgChanged(const KMMsgBase* aMsg, int idx)
 void FolderStorage::readConfig()
 {
   //kdDebug(5006)<<"#### READING CONFIG  = "<< name() <<endl;
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + folder()->idString());
   if (mUnreadMsgs == -1)
     mUnreadMsgs = config->readNumEntry("UnreadMsgs", -1);
   if (mTotalMsgs == -1)
@@ -938,8 +938,8 @@ void FolderStorage::readConfig()
 //-----------------------------------------------------------------------------
 void FolderStorage::writeConfig()
 {
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + folder()->idString());
   config->writeEntry("UnreadMsgs",
       mGuessedUnreadMsgs == -1 ? mUnreadMsgs : mGuessedUnreadMsgs);
   config->writeEntry("TotalMsgs", mTotalMsgs);
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 2584f9258..b2f82ad92 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -105,9 +105,9 @@ bool FolderTreeBase::event(TQEvent * e)
 
 void FolderTreeBase::readColorConfig()
 {
-  KConfig* conf = KMKernel::config();
+  TDEConfig* conf = KMKernel::config();
   // Custom/System color support
-  KConfigGroupSaver saver(conf, "Reader");
+  TDEConfigGroupSaver saver(conf, "Reader");
   TQColor c1=TQColor(kapp->palette().active().text());
   TQColor c2=TQColor("blue");
   TQColor c4=TQColor(kapp->palette().active().base());
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index dfc3bbbaf..f7e3953e2 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -35,7 +35,7 @@ class FolderViewToolTip : public TQToolTip
           .arg( item->folder()->prettyURL().replace( " ", "&nbsp;" ) )
           .arg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) )
           .arg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) )
-          .arg( KIO::convertSize( item->folderSize() ) );
+          .arg( TDEIO::convertSize( item->folderSize() ) );
       
       if ( KMFolderCachedImap* imap = dynamic_cast<KMFolderCachedImap*>( item->folder()->storage() ) ) {
           QuotaInfo info = imap->quotaInfo();
diff --git a/kmail/globalsettings.h b/kmail/globalsettings.h
index f0b16f0c0..dd8cd5b50 100644
--- a/kmail/globalsettings.h
+++ b/kmail/globalsettings.h
@@ -37,7 +37,7 @@ public:
 
   static GlobalSettings *self();
 
-  /** Call this slot instead of directly @ref KConfig::sync() to
+  /** Call this slot instead of directly @ref TDEConfig::sync() to
       minimize the overall config writes. Calling this slot will
       schedule a sync of the application config file using a timer, so
       that many consecutive calls can be condensed into a single
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index c63a1ba1d..3dbb2b9f0 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -199,9 +199,9 @@ TQString HeaderItem::text( int col) const
   } else if(col == headers->paintInfo()->sizeCol
       && headers->paintInfo()->showSize) {
     if ( mMsgBase->parent()->folderType() == KMFolderTypeImap ) {
-      tmp = KIO::convertSize( mMsgBase->msgSizeServer() );
+      tmp = TDEIO::convertSize( mMsgBase->msgSizeServer() );
     } else {
-      tmp = KIO::convertSize( mMsgBase->msgSize() );
+      tmp = TDEIO::convertSize( mMsgBase->msgSize() );
     }
   }
   return tmp;
diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp
index 239525d30..4bd068112 100644
--- a/kmail/headerstrategy.cpp
+++ b/kmail/headerstrategy.cpp
@@ -205,7 +205,7 @@ namespace KMail {
   CustomHeaderStrategy::CustomHeaderStrategy()
     : HeaderStrategy()
   {
-    KConfigGroup customHeader( KMKernel::config(), "Custom Headers" );
+    TDEConfigGroup customHeader( KMKernel::config(), "Custom Headers" );
     if ( customHeader.hasKey( "headers to display" ) ) {
       mHeadersToDisplay = customHeader.readListEntry( "headers to display" );
       for ( TQStringList::iterator it = mHeadersToDisplay.begin() ; it != mHeadersToDisplay.end() ; ++ it )
@@ -269,7 +269,7 @@ namespace KMail {
     if ( lowerType == "brief" ) return brief();
     if ( lowerType == "custom" )  return custom();
     // don't kdFatal here, b/c the strings are user-provided
-    // (KConfig), so fail gracefully to the default:
+    // (TDEConfig), so fail gracefully to the default:
     return standard();
   }
 
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index c3a5b8b26..5c4108eed 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -423,7 +423,7 @@ namespace KMail {
     if ( !strategy )
       strategy = HeaderStrategy::rich();
 
-    KConfigGroup configReader( KMKernel::config(), "Reader" );
+    TDEConfigGroup configReader( KMKernel::config(), "Reader" );
 
     // ### from kmreaderwin begin
     // The direction of the header is determined according to the direction
@@ -1085,7 +1085,7 @@ namespace KMail {
     if ( lowerType == "enterprise" )  return enterprise();
     //if ( lowerType == "fancy" ) return fancy(); // not needed, see below
     // don't kdFatal here, b/c the strings are user-provided
-    // (KConfig), so fail gracefully to the default:
+    // (TDEConfig), so fail gracefully to the default:
     return fancy();
   }
 
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index d8c002515..d2c35b42b 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -101,7 +101,7 @@ TQString KMail::HtmlStatusBar::message() const {
 }
 
 namespace {
-  inline KConfig * config() {
+  inline TDEConfig * config() {
 #ifndef KMAIL_TESTING
     return KMKernel::config();
 #else
@@ -111,7 +111,7 @@ namespace {
 }
 
 TQColor KMail::HtmlStatusBar::fgColor() const {
-  KConfigGroup conf( config(), "Reader" );
+  TDEConfigGroup conf( config(), "Reader" );
   switch ( mode() ) {
   case Html:
     return conf.readColorEntry( "ColorbarForegroundHTML", &TQt::white );
@@ -124,7 +124,7 @@ TQColor KMail::HtmlStatusBar::fgColor() const {
 }
 
 TQColor KMail::HtmlStatusBar::bgColor() const {
-  KConfigGroup conf( config(), "Reader" );
+  TDEConfigGroup conf( config(), "Reader" );
 
   switch ( mode() ) {
   case Html:
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index b37a400df..f180d61da 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -434,7 +434,7 @@ namespace KMail {
     mXFaceConfigurator->layout()->setMargin( KDialog::marginHint() );
     tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") );
 
-    KConfigGroup geometry( KMKernel::config(), "Geometry" );
+    TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
     if ( geometry.hasKey( "Identity Dialog size" ) )
       resize( geometry.readSizeEntry( "Identity Dialog size" ) );
     mNameEdit->setFocus();
@@ -444,7 +444,7 @@ namespace KMail {
   }
 
   IdentityDialog::~IdentityDialog() {
-    KConfigGroup geometry( KMKernel::config(), "Geometry" );
+    TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
     geometry.writeEntry( "Identity Dialog size", size() );
   }
 
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 6380251e4..e97a260ed 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -55,16 +55,16 @@ using KPIM::ProgressManager;
 #include <kconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-using KIO::MetaData;
+using TDEIO::MetaData;
 #include <kio/passdlg.h>
-using KIO::PasswordDialog;
+using TDEIO::PasswordDialog;
 #include <kio/scheduler.h>
 #include <kio/slave.h>
 #include <mimelib/bodypart.h>
 #include <mimelib/body.h>
 #include <mimelib/headers.h>
 #include <mimelib/message.h>
-//using KIO::Scheduler; // use FQN below
+//using TDEIO::Scheduler; // use FQN below
 
 #include <tqregexp.h>
 #include <tqstylesheet.h>
@@ -105,10 +105,10 @@ namespace KMail {
   {
     mPort = imapDefaultPort;
     mBodyPartList.setAutoDelete(true);
-    KIO::Scheduler::connect(TQT_SIGNAL(slaveError(KIO::Slave *, int, const TQString &)),
-                            this, TQT_SLOT(slotSchedulerSlaveError(KIO::Slave *, int, const TQString &)));
-    KIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(KIO::Slave *)),
-                            this, TQT_SLOT(slotSchedulerSlaveConnected(KIO::Slave *)));
+    TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)),
+                            this, TQT_SLOT(slotSchedulerSlaveError(TDEIO::Slave *, int, const TQString &)));
+    TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave *)),
+                            this, TQT_SLOT(slotSchedulerSlaveConnected(TDEIO::Slave *)));
     connect(&mNoopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNoopTimeout()));
     connect(&mIdleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimeout()));
   }
@@ -189,7 +189,7 @@ namespace KMail {
   //
   //
 
-  void ImapAccountBase::readConfig( /*const*/ KConfig/*Base*/ & config ) {
+  void ImapAccountBase::readConfig( /*const*/ TDEConfig/*Base*/ & config ) {
     NetworkAccount::readConfig( config );
 
     setAutoExpunge( config.readBoolEntry( "auto-expunge", false ) );
@@ -229,7 +229,7 @@ namespace KMail {
     localBlacklistFromStringList( config.readListEntry( "locallyUnsubscribedFolders" ) );
   }
 
-  void ImapAccountBase::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
+  void ImapAccountBase::writeConfig( TDEConfig/*Base*/ & config ) /*const*/ {
     NetworkAccount::writeConfig( config );
 
     config.writeEntry( "auto-expunge", autoExpunge() );
@@ -288,7 +288,7 @@ namespace KMail {
       // "keep password" checkbox. Then, we set [Passwords]Keep to
       // storePasswd(), so that the checkbox in the dialog will be
       // init'ed correctly:
-      KConfigGroup passwords( TDEGlobal::config(), "Passwords" );
+      TDEConfigGroup passwords( TDEGlobal::config(), "Passwords" );
       passwords.writeEntry( "Keep", storePasswd() );
       TQString msg = i18n("You need to supply a username and a password to "
 			 "access this mailbox.");
@@ -301,7 +301,7 @@ namespace KMail {
       if (ret != TQDialog::Accepted ) {
         mPasswordDialogIsActive = false;
         mAskAgain = false;
-        emit connectionResult( KIO::ERR_USER_CANCELED, TQString() );
+        emit connectionResult( TDEIO::ERR_USER_CANCELED, TQString() );
         return Error;
       }
       mPasswordDialogIsActive = false;
@@ -315,7 +315,7 @@ namespace KMail {
     if ( mSlave && !mSlaveConnected ) return Connecting;
 
     mSlaveConnected = false;
-    mSlave = KIO::Scheduler::getConnectedSlave( getUrl(), slaveConfig() );
+    mSlave = TDEIO::Scheduler::getConnectedSlave( getUrl(), slaveConfig() );
     if ( !mSlave ) {
       KMessageBox::error(0, i18n("Could not start process for %1.")
 			 .arg( getUrl().protocol() ) );
@@ -329,7 +329,7 @@ namespace KMail {
     return Connecting;
   }
 
-  bool ImapAccountBase::handleJobError( KIO::Job *job, const TQString& context, bool abortSync )
+  bool ImapAccountBase::handleJobError( TDEIO::Job *job, const TQString& context, bool abortSync )
   {
     JobIterator it = findJob( job );
     if ( it != jobsEnd() && (*it).progressItem )
@@ -376,8 +376,8 @@ namespace KMail {
     // create the KIO-job
     if ( makeConnection() != Connected )
       return;// ## doesn't handle Connecting
-    KIO::SimpleJob *job = KIO::special(url, packedArgs, false);
-    KIO::Scheduler::assignJobToSlave(mSlave, job);
+    TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);
+    TDEIO::Scheduler::assignJobToSlave(mSlave, job);
     jobData jd( url.url(), NULL );
     // a bit of a hack to save one slot
     if (subscribe) jd.onlySubscribed = true;
@@ -385,18 +385,18 @@ namespace KMail {
     jd.quiet = quiet;
     insertJob(job, jd);
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-        TQT_SLOT(slotSubscriptionResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+        TQT_SLOT(slotSubscriptionResult(TDEIO::Job *)));
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSubscriptionResult( KIO::Job * job )
+  void ImapAccountBase::slotSubscriptionResult( TDEIO::Job * job )
   {
     // result of a subscription-job
     JobIterator it = findJob( job );
     if ( it == jobsEnd() ) return;
     bool onlySubscribed = (*it).onlySubscribed;
-    TQString path = static_cast<KIO::SimpleJob*>(job)->url().path();
+    TQString path = static_cast<TDEIO::SimpleJob*>(job)->url().path();
     if (job->error())
     {
       if ( !(*it).quiet )
@@ -437,11 +437,11 @@ namespace KMail {
     jd.cancellable = true;
     insertJob(job, jd);
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotGetUserRightsResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotGetUserRightsResult(TDEIO::Job *)));
   }
 
-  void ImapAccountBase::slotGetUserRightsResult( KIO::Job* _job )
+  void ImapAccountBase::slotGetUserRightsResult( TDEIO::Job* _job )
   {
     ACLJobs::GetUserRightsJob* job = static_cast<ACLJobs::GetUserRightsJob *>( _job );
     JobIterator it = findJob( job );
@@ -449,7 +449,7 @@ namespace KMail {
 
     KMFolder* folder = (*it).parent;
     if ( job->error() ) {
-      if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) // that's when the imap server doesn't support ACLs
+      if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) // that's when the imap server doesn't support ACLs
           mACLSupport = false;
       else
         kdWarning(5006) << "slotGetUserRightsResult: " << job->errorString() << endl;
@@ -481,11 +481,11 @@ namespace KMail {
     jd.cancellable = true;
     insertJob(job, jd);
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotGetACLResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotGetACLResult(TDEIO::Job *)));
   }
 
-  void ImapAccountBase::slotGetACLResult( KIO::Job* _job )
+  void ImapAccountBase::slotGetACLResult( TDEIO::Job* _job )
   {
     ACLJobs::GetACLJob* job = static_cast<ACLJobs::GetACLJob *>( _job );
     JobIterator it = findJob( job );
@@ -509,16 +509,16 @@ namespace KMail {
     jd.cancellable = true;
     insertJob(job, jd);
 
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            TQT_SLOT(slotGetStorageQuotaInfoResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            TQT_SLOT(slotGetStorageQuotaInfoResult(TDEIO::Job *)));
   }
 
-  void ImapAccountBase::slotGetStorageQuotaInfoResult( KIO::Job* _job )
+  void ImapAccountBase::slotGetStorageQuotaInfoResult( TDEIO::Job* _job )
   {
     QuotaJobs::GetStorageQuotaJob* job = static_cast<QuotaJobs::GetStorageQuotaJob *>( _job );
     JobIterator it = findJob( job );
     if ( it == jobsEnd() ) return;
-    if ( job->error() && job->error() == KIO::ERR_UNSUPPORTED_ACTION )
+    if ( job->error() && job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
       setHasNoQuotaSupport();
 
     KMFolder* folder = (*it).parent; // can be 0
@@ -534,10 +534,10 @@ namespace KMail {
 
       stream << ( int ) 'N';
 
-      KIO::SimpleJob *job = KIO::special( getUrl(), packedArgs, false );
-      KIO::Scheduler::assignJobToSlave(mSlave, job);
-      connect( job, TQT_SIGNAL(result( KIO::Job * ) ),
-          this, TQT_SLOT( slotSimpleResult( KIO::Job * ) ) );
+      TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false );
+      TDEIO::Scheduler::assignJobToSlave(mSlave, job);
+      connect( job, TQT_SIGNAL(result( TDEIO::Job * ) ),
+          this, TQT_SLOT( slotSimpleResult( TDEIO::Job * ) ) );
     } else {
       /* Stop the timer, we have disconnected. We have to make sure it is
          started again when a new slave appears. */
@@ -548,7 +548,7 @@ namespace KMail {
   void ImapAccountBase::slotIdleTimeout()
   {
     if ( mSlave ) {
-      KIO::Scheduler::disconnectSlave(mSlave);
+      TDEIO::Scheduler::disconnectSlave(mSlave);
       mSlave = 0;
       mSlaveConnected = false;
       /* As for the noop timer, we need to make sure this one is started
@@ -566,7 +566,7 @@ namespace KMail {
 
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSchedulerSlaveError(KIO::Slave *aSlave, int errorCode,
+  void ImapAccountBase::slotSchedulerSlaveError(TDEIO::Slave *aSlave, int errorCode,
       const TQString &errorMsg)
   {
     if (aSlave != mSlave) return;
@@ -580,7 +580,7 @@ namespace KMail {
       resetConnectionList( this );
       if ( mSlave )
       {
-        KIO::Scheduler::disconnectSlave( slave() );
+        TDEIO::Scheduler::disconnectSlave( slave() );
         mSlave = 0;
       }
     }
@@ -588,7 +588,7 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSchedulerSlaveConnected(KIO::Slave *aSlave)
+  void ImapAccountBase::slotSchedulerSlaveConnected(TDEIO::Slave *aSlave)
   {
     if (aSlave != mSlave) return;
     mSlaveConnected = true;
@@ -605,14 +605,14 @@ namespace KMail {
     TQByteArray packedArgs;
     TQDataStream stream( packedArgs, IO_WriteOnly);
     stream << (int) 'c';
-    KIO::SimpleJob *job = KIO::special( getUrl(), packedArgs, false );
-    KIO::Scheduler::assignJobToSlave( mSlave, job );
-    connect( job, TQT_SIGNAL(infoMessage(KIO::Job*, const TQString&)),
-	   TQT_SLOT(slotCapabilitiesResult(KIO::Job*, const TQString&)) );
+    TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false );
+    TDEIO::Scheduler::assignJobToSlave( mSlave, job );
+    connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*, const TQString&)),
+	   TQT_SLOT(slotCapabilitiesResult(TDEIO::Job*, const TQString&)) );
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotCapabilitiesResult( KIO::Job*, const TQString& result )
+  void ImapAccountBase::slotCapabilitiesResult( TDEIO::Job*, const TQString& result )
   {
     mCapabilities = TQStringList::split(' ', result.lower() );
     kdDebug(5006) << "capabilities:" << mCapabilities << endl;
@@ -649,15 +649,15 @@ namespace KMail {
         TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
         this,
         TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
-    KIO::SimpleJob *job = KIO::special( getUrl(), packedArgs, false );
-    KIO::Scheduler::assignJobToSlave( mSlave, job );
+    TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false );
+    TDEIO::Scheduler::assignJobToSlave( mSlave, job );
     insertJob( job, jd );
-    connect( job, TQT_SIGNAL( infoMessage(KIO::Job*, const TQString&) ),
-        TQT_SLOT( slotNamespaceResult(KIO::Job*, const TQString&) ) );
+    connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ),
+        TQT_SLOT( slotNamespaceResult(TDEIO::Job*, const TQString&) ) );
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotNamespaceResult( KIO::Job* job, const TQString& str )
+  void ImapAccountBase::slotNamespaceResult( TDEIO::Job* job, const TQString& str )
   {
     JobIterator it = findJob( job );
     if ( it == jobsEnd() ) return;
@@ -847,7 +847,7 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSimpleResult(KIO::Job * job)
+  void ImapAccountBase::slotSimpleResult(TDEIO::Job * job)
   {
     JobIterator it = findJob( job );
     bool quiet = false;
@@ -860,20 +860,20 @@ namespace KMail {
       if (!quiet)
         handleJobError(job, TQString() );
       else {
-        if ( job->error() == KIO::ERR_CONNECTION_BROKEN && slave() ) {
+        if ( job->error() == TDEIO::ERR_CONNECTION_BROKEN && slave() ) {
           // make sure ERR_CONNECTION_BROKEN is properly handled and the slave
           // disconnected even when quiet()
-          KIO::Scheduler::disconnectSlave( slave() );
+          TDEIO::Scheduler::disconnectSlave( slave() );
           mSlave = 0;
         }
-        if (job->error() == KIO::ERR_SLAVE_DIED)
+        if (job->error() == TDEIO::ERR_SLAVE_DIED)
           slaveDied();
       }
     }
   }
 
   //-----------------------------------------------------------------------------
-  bool ImapAccountBase::handlePutError( KIO::Job* job, jobData& jd, KMFolder* folder )
+  bool ImapAccountBase::handlePutError( TDEIO::Job* job, jobData& jd, KMFolder* folder )
   {
     Q_ASSERT( !jd.msgList.isEmpty() );
     KMMessage* msg = jd.msgList.first();
@@ -891,7 +891,7 @@ namespace KMail {
     return handleJobError( job, myError );
   }
 
-  TQString ImapAccountBase::prettifyQuotaError( const TQString& _error, KIO::Job * job )
+  TQString ImapAccountBase::prettifyQuotaError( const TQString& _error, TDEIO::Job * job )
   {
       TQString error = _error;
       if ( error.find( "quota", 0, false ) == -1 ) return error;
@@ -917,27 +917,27 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  bool ImapAccountBase::handleError( int errorCode, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync )
+  bool ImapAccountBase::handleError( int errorCode, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync )
   {
     // Copy job's data before a possible killAllJobs
     TQStringList errors;
-    if ( job && job->error() != KIO::ERR_SLAVE_DEFINED /*workaround for tdelibs-3.2*/)
+    if ( job && job->error() != TDEIO::ERR_SLAVE_DEFINED /*workaround for tdelibs-3.2*/)
       errors = job->detailedErrorStrings();
 
     bool jobsKilled = true;
     switch( errorCode ) {
-    case KIO::ERR_SLAVE_DIED: slaveDied(); killAllJobs( true ); break;
-    case KIO::ERR_COULD_NOT_AUTHENTICATE: // bad password
+    case TDEIO::ERR_SLAVE_DIED: slaveDied(); killAllJobs( true ); break;
+    case TDEIO::ERR_COULD_NOT_AUTHENTICATE: // bad password
       mAskAgain = true;
       // fallthrough intended
-    case KIO::ERR_CONNECTION_BROKEN:
-    case KIO::ERR_COULD_NOT_CONNECT:
-    case KIO::ERR_SERVER_TIMEOUT:
+    case TDEIO::ERR_CONNECTION_BROKEN:
+    case TDEIO::ERR_COULD_NOT_CONNECT:
+    case TDEIO::ERR_SERVER_TIMEOUT:
       // These mean that we'll have to reconnect on the next attempt, so disconnect and set mSlave to 0.
       killAllJobs( true );
       break;
-    case KIO::ERR_COULD_NOT_LOGIN:
-    case KIO::ERR_USER_CANCELED:
+    case TDEIO::ERR_COULD_NOT_LOGIN:
+    case TDEIO::ERR_USER_CANCELED:
       killAllJobs( false );
       break;
     default:
@@ -949,21 +949,21 @@ namespace KMail {
     }
 
     // check if we still display an error
-    if ( !mErrorDialogIsActive && errorCode != KIO::ERR_USER_CANCELED ) {
+    if ( !mErrorDialogIsActive && errorCode != TDEIO::ERR_USER_CANCELED ) {
       mErrorDialogIsActive = true;
-      TQString msg = context + '\n' + prettifyQuotaError( KIO::buildErrorString( errorCode, errorMsg ), job );
+      TQString msg = context + '\n' + prettifyQuotaError( TDEIO::buildErrorString( errorCode, errorMsg ), job );
       TQString caption = i18n("Error");
 
-      if ( jobsKilled || errorCode == KIO::ERR_COULD_NOT_LOGIN ) {
-        if ( errorCode == KIO::ERR_SERVER_TIMEOUT || errorCode == KIO::ERR_CONNECTION_BROKEN ) {
+      if ( jobsKilled || errorCode == TDEIO::ERR_COULD_NOT_LOGIN ) {
+        if ( errorCode == TDEIO::ERR_SERVER_TIMEOUT || errorCode == TDEIO::ERR_CONNECTION_BROKEN ) {
           msg = i18n("The connection to the server %1 was unexpectedly closed or timed out. It will be re-established automatically if possible.").
             arg( name() );
           KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), msg, caption, "kmailConnectionBrokenErrorDialog" );
           // Show it in the status bar, in case the user has ticked "don't show again"
-          if ( errorCode == KIO::ERR_CONNECTION_BROKEN )
+          if ( errorCode == TDEIO::ERR_CONNECTION_BROKEN )
             KPIM::BroadcastStatus::instance()->setStatusMsg(
                 i18n(  "The connection to account %1 was broken." ).arg( name() ) );
-          else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
+          else if ( errorCode == TDEIO::ERR_SERVER_TIMEOUT )
             KPIM::BroadcastStatus::instance()->setStatusMsg(
                 i18n(  "The connection to account %1 timed out." ).arg( name() ) );
         } else {
@@ -997,12 +997,12 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   void ImapAccountBase::cancelMailCheck()
   {
-    TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+    TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
     while ( it != mapJobData.end() ) {
       kdDebug(5006) << "cancelMailCheck: job is cancellable: " << (*it).cancellable << endl;
       if ( (*it).cancellable ) {
         it.key()->kill();
-        TQMap<KIO::Job*, jobData>::Iterator rmit = it;
+        TQMap<TDEIO::Job*, jobData>::Iterator rmit = it;
         ++it;
         mapJobData.remove( rmit );
         // We killed a job -> this kills the slave
@@ -1209,13 +1209,13 @@ namespace KMail {
      if ( makeConnection() != Connected )
        return; // can't happen with dimap
 
-     KIO::SimpleJob *job = KIO::special(url, packedArgs, false);
-     KIO::Scheduler::assignJobToSlave(slave(), job);
+     TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);
+     TDEIO::Scheduler::assignJobToSlave(slave(), job);
      ImapAccountBase::jobData jd( url.url(), folder );
      jd.path = path;
      insertJob(job, jd);
-     connect(job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotSetStatusResult(KIO::Job *)));
+     connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+           TQT_SLOT(slotSetStatusResult(TDEIO::Job *)));
   }
 
   void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen)
@@ -1231,24 +1231,24 @@ namespace KMail {
      if ( makeConnection() != Connected )
        return; // can't happen with dimap
 
-     KIO::SimpleJob *job = KIO::special(url, packedArgs, false);
-     KIO::Scheduler::assignJobToSlave(slave(), job);
+     TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);
+     TDEIO::Scheduler::assignJobToSlave(slave(), job);
      ImapAccountBase::jobData jd( url.url(), folder );
      jd.path = path;
      insertJob(job, jd);
-     connect(job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotSetStatusResult(KIO::Job *)));
+     connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+           TQT_SLOT(slotSetStatusResult(TDEIO::Job *)));
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSetStatusResult(KIO::Job * job)
+  void ImapAccountBase::slotSetStatusResult(TDEIO::Job * job)
   {
      ImapAccountBase::JobIterator it = findJob(job);
      if ( it == jobsEnd() ) return;
      int errorCode = job->error();
      KMFolder * const parent = (*it).parent;
      const TQString path = (*it).path;
-     if (errorCode && errorCode != KIO::ERR_CANNOT_OPEN_FOR_WRITING)
+     if (errorCode && errorCode != TDEIO::ERR_CANNOT_OPEN_FOR_WRITING)
      {
        bool cont = handleJobError( job, i18n( "Error while uploading status of messages to server: " ) + '\n' );
        emit imapStatusChanged( parent, path, cont );
@@ -1282,7 +1282,7 @@ namespace KMail {
   }
 
   //-----------------------------------------------------------------------------
-  void KMail::ImapAccountBase::removeJob( KIO::Job* job )
+  void KMail::ImapAccountBase::removeJob( TDEIO::Job* job )
   {
     mapJobData.remove( job );
   }
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 26e5f5e3d..ec08ea5f4 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -34,14 +34,14 @@
 
 class AccountManager;
 class KMFolder;
-class KConfig/*Base*/;
+class TDEConfig/*Base*/;
 class KMMessagePart;
 class DwBodyPart;
 class DwMessage;
 class FolderStorage;
 template <typename T> class TQValueVector;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -97,10 +97,10 @@ namespace KMail {
     virtual void setListOnlyOpenFolders( bool only );
 
     /** Configure the slave by adding to the meta data map */
-    virtual KIO::MetaData slaveConfig() const;
+    virtual TDEIO::MetaData slaveConfig() const;
 
-    virtual void readConfig( KConfig& config );
-    virtual void writeConfig( KConfig& config );
+    virtual void readConfig( TDEConfig& config );
+    virtual void writeConfig( TDEConfig& config );
 
     /**
      * The state of the kioslave connection
@@ -119,7 +119,7 @@ namespace KMail {
     /**
      * Connect to the server, if no connection is active
      * Returns Connected (ok), Error (ko) or Connecting - which means
-     * that one should wait for the slaveConnected signal from KIO::Scheduler
+     * that one should wait for the slaveConnected signal from TDEIO::Scheduler
      * before proceeding.
      */
     ConnectionState makeConnection();
@@ -164,17 +164,17 @@ namespace KMail {
       bool onlySubscribed, quiet, cancellable;
     };
 
-    typedef TQMap<KIO::Job *, jobData>::Iterator JobIterator;
+    typedef TQMap<TDEIO::Job *, jobData>::Iterator JobIterator;
     /**
      * Call this when starting a new job
      */
-    void insertJob( KIO::Job* job, const jobData& data ) {
+    void insertJob( TDEIO::Job* job, const jobData& data ) {
       mapJobData.insert( job, data );
     }
     /**
      * Look for the jobData related to a given job. Compare with end()
      */
-    JobIterator findJob( KIO::Job* job ) { return mapJobData.find( job ); }
+    JobIterator findJob( TDEIO::Job* job ) { return mapJobData.find( job ); }
     JobIterator jobsEnd() { return mapJobData.end(); }
     /**
      * Call this when a job is finished.
@@ -182,7 +182,7 @@ namespace KMail {
      */
     void removeJob( JobIterator& it );
 
-    void removeJob( KIO::Job* job );
+    void removeJob( TDEIO::Job* job );
 
     /**
      * Subscribe (@p subscribe = TRUE) / Unsubscribe the folder
@@ -322,7 +322,7 @@ namespace KMail {
      * React to an error from the job. Uses job->error and job->errorString and calls
      * the protected virtual handleJobError with them. See handleError below for details.
      */
-    bool handleJobError( KIO::Job* job, const TQString& context, bool abortSync = false );
+    bool handleJobError( TDEIO::Job* job, const TQString& context, bool abortSync = false );
 
     /**
      * Returns the root folder of this account
@@ -425,29 +425,29 @@ namespace KMail {
      * is called when the changeSubscription has finished
      * emits subscriptionChanged
      */
-    void slotSubscriptionResult(KIO::Job * job);
+    void slotSubscriptionResult(TDEIO::Job * job);
 
   protected slots:
     virtual void slotCheckQueuedFolders();
 
     /// Handle a message coming from the KIO scheduler saying that the slave is now connected
-    void slotSchedulerSlaveConnected(KIO::Slave *aSlave);
+    void slotSchedulerSlaveConnected(TDEIO::Slave *aSlave);
     /// Handle an error coming from the KIO scheduler
-    void slotSchedulerSlaveError(KIO::Slave *aSlave, int, const TQString &errorMsg);
+    void slotSchedulerSlaveError(TDEIO::Slave *aSlave, int, const TQString &errorMsg);
 
     /**
      * Only delete information about the job and ignore write errors
      */
-    void slotSetStatusResult(KIO::Job * job);
+    void slotSetStatusResult(TDEIO::Job * job);
 
     /// Result of getUserRights() job
-    void slotGetUserRightsResult( KIO::Job* _job );
+    void slotGetUserRightsResult( TDEIO::Job* _job );
 
     /// Result of getACL() job
-    void slotGetACLResult( KIO::Job* _job );
+    void slotGetACLResult( TDEIO::Job* _job );
 
     /// Result of getStorageQuotaInfo() job
-    void slotGetStorageQuotaInfoResult( KIO::Job* _job );
+    void slotGetStorageQuotaInfoResult( TDEIO::Job* _job );
 
     /**
      * Send a NOOP command regularly to keep the slave from disconnecting
@@ -466,10 +466,10 @@ namespace KMail {
     /**
      * Only delete information about the job
      */
-    void slotSimpleResult(KIO::Job * job);
+    void slotSimpleResult(TDEIO::Job * job);
 
     /** Gets and parses the namespaces */
-    void slotNamespaceResult( KIO::Job*, const TQString& str );
+    void slotNamespaceResult( TDEIO::Job*, const TQString& str );
 
     /**
      * Saves the fetched namespaces
@@ -479,7 +479,7 @@ namespace KMail {
     /**
      * Saves the capabilities list
      */
-    void slotCapabilitiesResult( KIO::Job*, const TQString& result );
+    void slotCapabilitiesResult( TDEIO::Job*, const TQString& result );
 
   protected:
 
@@ -499,10 +499,10 @@ namespace KMail {
      * @param abortSync if true, abort sync in all cases (see above). If false, ask the user (when possible).
      * @return false when aborting, true when continuing
      */
-    virtual bool handleError( int error, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync = false );
+    virtual bool handleError( int error, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync = false );
 
-    /** Handle an error during KIO::put - helper method */
-    bool handlePutError( KIO::Job* job, jobData& jd, KMFolder* folder );
+    /** Handle an error during TDEIO::put - helper method */
+    bool handlePutError( TDEIO::Job* job, jobData& jd, KMFolder* folder );
 
     virtual TQString protocol() const;
     virtual unsigned short int defaultPort() const;
@@ -519,13 +519,13 @@ namespace KMail {
     // used for writing the blacklist out to the config file
     TQStringList locallyBlacklistedFolders() const;
     void localBlacklistFromStringList( const TQStringList & );
-    TQString prettifyQuotaError( const TQString& _error, KIO::Job * job );
+    TQString prettifyQuotaError( const TQString& _error, TDEIO::Job * job );
 
   protected:
     TQPtrList<TQGuardedPtr<KMFolder> > mOpenFolders;
     TQStringList mSubfolderNames, mSubfolderPaths,
         mSubfolderMimeTypes, mSubfolderAttributes;
-    TQMap<KIO::Job *, jobData> mapJobData;
+    TQMap<TDEIO::Job *, jobData> mapJobData;
     /** used to detect when the slave has not been used for a while */
     TQTimer mIdleTimer;
     /** used to send a noop to the slave in regular intervals to keep it from disonnecting */
@@ -579,7 +579,7 @@ namespace KMail {
      * Emitted when the slave managed or failed to connect
      * This is always emitted at some point after makeConnection returned Connecting.
      * @param errorCode 0 for success, != 0 in case of error
-     * @param errorMsg if errorCode is != 0, this goes with errorCode to call KIO::buildErrorString
+     * @param errorMsg if errorCode is != 0, this goes with errorCode to call TDEIO::buildErrorString
      */
     void connectionResult( int errorCode, const TQString& errorMsg );
 
@@ -617,7 +617,7 @@ namespace KMail {
      * @param job the job that was used for doing so (can be used to display errors)
      * @param entries the ACL list. Make your copy of it, it comes from the job.
      */
-    void receivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& entries );
+    void receivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& entries );
 
     /**
      * Emitted when the getQuotaInfo job is done,
@@ -627,7 +627,7 @@ namespace KMail {
      * @param info The quota information for this folder. Make your copy of it,
      * it comes from the job.
      */
-    void receivedStorageQuotaInfo( KMFolder* folder, KIO::Job* job, const KMail::QuotaInfo& entries );
+    void receivedStorageQuotaInfo( KMFolder* folder, TDEIO::Job* job, const KMail::QuotaInfo& entries );
 
     /**
      * Emitted when we got the namespaces
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index ab57da23a..2fee6acf1 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -157,17 +157,17 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
       jd.progressItem->setTotalItems( jd.total );
       connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)),
           account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
-      KIO::SimpleJob *job = KIO::put( url, 0, false, false, false );
-      KIO::Scheduler::assignJobToSlave( account->slave(), job );
+      TDEIO::SimpleJob *job = TDEIO::put( url, 0, false, false, false );
+      TDEIO::Scheduler::assignJobToSlave( account->slave(), job );
       account->insertJob( job, jd );
-      connect( job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_SLOT(slotPutMessageResult(KIO::Job *)) );
-      connect( job, TQT_SIGNAL(dataReq(KIO::Job *, TQByteArray &)),
-          TQT_SLOT(slotPutMessageDataReq(KIO::Job *, TQByteArray &)) );
-      connect( job, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)),
-          TQT_SLOT(slotPutMessageInfoData(KIO::Job *, const TQString &)) );
-      connect( job, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)),
-          TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t)));
+      connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_SLOT(slotPutMessageResult(TDEIO::Job *)) );
+      connect( job, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)),
+          TQT_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) );
+      connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+          TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) );
+      connect( job, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+          TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
     }
   }
   else if ( jt == tCopyMessage || jt == tMoveMessage )
@@ -198,16 +198,16 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
     jd.progressItem->setTotalItems( jd.total );
     connect ( jd.progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
               account, TQT_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) );
-    KIO::SimpleJob *simpleJob = KIO::special( url, packedArgs, false );
-    KIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
+    TDEIO::SimpleJob *simpleJob = TDEIO::special( url, packedArgs, false );
+    TDEIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
     mJob = simpleJob;
     account->insertJob( mJob, jd );
-    connect( mJob, TQT_SIGNAL(result(KIO::Job *)),
-             TQT_SLOT(slotCopyMessageResult(KIO::Job *)) );
+    connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
+             TQT_SLOT(slotCopyMessageResult(TDEIO::Job *)) );
     if ( jt == tMoveMessage )
     {
-      connect( mJob, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)),
-               TQT_SLOT(slotCopyMessageInfoData(KIO::Job *, const TQString &)) );
+      connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)),
+               TQT_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) );
     }
   }
   else {
@@ -321,30 +321,30 @@ void ImapJob::slotGetNextMessage()
             account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) );
   jd.progressItem->setTotalItems( jd.total );
 
-  KIO::SimpleJob *simpleJob = KIO::get( url, false, false );
-  KIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
+  TDEIO::SimpleJob *simpleJob = TDEIO::get( url, false, false );
+  TDEIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
   mJob = simpleJob;
   account->insertJob( mJob, jd );
   if ( mPartSpecifier.find( "STRUCTURE", 0, false ) != -1 )
   {
-    connect( mJob, TQT_SIGNAL(result(KIO::Job *)),
-             this, TQT_SLOT(slotGetBodyStructureResult(KIO::Job *)) );
+    connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
+             this, TQT_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) );
   } else {
-    connect( mJob, TQT_SIGNAL(result(KIO::Job *)),
-             this, TQT_SLOT(slotGetMessageResult(KIO::Job *)) );
+    connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)),
+             this, TQT_SLOT(slotGetMessageResult(TDEIO::Job *)) );
   }
-  connect( mJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-           msgParent, TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)) );
+  connect( mJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+           msgParent, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) );
   if ( jd.total > 1 )
   {
-    connect(mJob, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)),
-        this, TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t)));
+    connect(mJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)),
+        this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotGetMessageResult( KIO::Job * job )
+void ImapJob::slotGetMessageResult( TDEIO::Job * job )
 {
   KMMessage *msg = mMsgList.first();
   if (!msg || !msg->parent() || !job) {
@@ -461,7 +461,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
 }
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotGetBodyStructureResult( KIO::Job * job )
+void ImapJob::slotGetBodyStructureResult( TDEIO::Job * job )
 {
   KMMessage *msg = mMsgList.first();
   if (!msg || !msg->parent() || !job) {
@@ -499,7 +499,7 @@ void ImapJob::slotGetBodyStructureResult( KIO::Job * job )
 }
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotPutMessageDataReq( KIO::Job *job, TQByteArray &data )
+void ImapJob::slotPutMessageDataReq( TDEIO::Job *job, TQByteArray &data )
 {
   KMAcctImap *account = static_cast<KMFolderImap*>(mDestFolder->storage())->account();
   if ( !account )
@@ -525,7 +525,7 @@ void ImapJob::slotPutMessageDataReq( KIO::Job *job, TQByteArray &data )
 
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotPutMessageResult( KIO::Job *job )
+void ImapJob::slotPutMessageResult( TDEIO::Job *job )
 {
   KMAcctImap *account = static_cast<KMFolderImap*>(mDestFolder->storage())->account();
   if ( !account )
@@ -570,7 +570,7 @@ void ImapJob::slotPutMessageResult( KIO::Job *job )
 }
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotCopyMessageInfoData(KIO::Job * job, const TQString & data)
+void ImapJob::slotCopyMessageInfoData(TDEIO::Job * job, const TQString & data)
 {
   KMFolderImap * imapFolder = static_cast<KMFolderImap*>(mDestFolder->storage());
   KMAcctImap *account = imapFolder->account();
@@ -609,7 +609,7 @@ void ImapJob::slotCopyMessageInfoData(KIO::Job * job, const TQString & data)
 }
 
 //----------------------------------------------------------------------------
-void ImapJob::slotPutMessageInfoData(KIO::Job *job, const TQString &data)
+void ImapJob::slotPutMessageInfoData(TDEIO::Job *job, const TQString &data)
 {
   KMFolderImap * imapFolder = static_cast<KMFolderImap*>(mDestFolder->storage());
   KMAcctImap *account = imapFolder->account();
@@ -634,7 +634,7 @@ void ImapJob::slotPutMessageInfoData(KIO::Job *job, const TQString &data)
 
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotCopyMessageResult( KIO::Job *job )
+void ImapJob::slotCopyMessageResult( TDEIO::Job *job )
 {
   KMAcctImap *account = static_cast<KMFolderImap*>(mDestFolder->storage())->account();
   if ( !account )
@@ -684,7 +684,7 @@ void ImapJob::setParentFolder( const KMFolderImap* parent )
 }
 
 //-----------------------------------------------------------------------------
-void ImapJob::slotProcessedSize(KIO::Job * job, KIO::filesize_t processed)
+void ImapJob::slotProcessedSize(TDEIO::Job * job, TDEIO::filesize_t processed)
 {
   KMMessage *msg = mMsgList.first();
   if (!msg || !job) {
diff --git a/kmail/imapjob.h b/kmail/imapjob.h
index 5cbbd69ee..2f7a04010 100644
--- a/kmail/imapjob.h
+++ b/kmail/imapjob.h
@@ -69,23 +69,23 @@ public:
   void setParentProgressItem( KPIM::ProgressItem *p ) { mParentProgressItem = p; }
 
 private slots:
-  void slotGetMessageResult( KIO::Job * job );
-  void slotGetBodyStructureResult( KIO::Job * job );
+  void slotGetMessageResult( TDEIO::Job * job );
+  void slotGetBodyStructureResult( TDEIO::Job * job );
   void slotGetNextMessage();
   /** Feeds the message in pieces to the server */
-  void slotPutMessageDataReq( KIO::Job *job, TQByteArray &data );
-  void slotPutMessageResult( KIO::Job *job );
-  void slotPutMessageInfoData(KIO::Job *, const TQString &data);
+  void slotPutMessageDataReq( TDEIO::Job *job, TQByteArray &data );
+  void slotPutMessageResult( TDEIO::Job *job );
+  void slotPutMessageInfoData(TDEIO::Job *, const TQString &data);
   /** result of a copy-operation */
-  void slotCopyMessageResult( KIO::Job *job );
-  void slotCopyMessageInfoData( KIO::Job *, const TQString &data );
-  void slotProcessedSize( KIO::Job *, KIO::filesize_t processed );
+  void slotCopyMessageResult( TDEIO::Job *job );
+  void slotCopyMessageInfoData( TDEIO::Job *, const TQString &data );
+  void slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t processed );
 
 private:
   void execute();
   void init( JobType jt, TQString sets, KMFolderImap *folder,
              TQPtrList<KMMessage>& msgList );
-  KIO::Job *mJob;
+  TDEIO::Job *mJob;
   TQByteArray mData;
   const AttachmentStrategy *mAttachmentStrategy;
   KMFolderImap *mParentFolder;
diff --git a/kmail/index.cpp b/kmail/index.cpp
index 9a4d73b1d..17de11d78 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -100,7 +100,7 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
 	//connect( mSyncTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( syncIndex() ) );
 
 #ifdef HAVE_INDEXLIB
-	KConfigGroup cfg( KMKernel::config(), "text-index" );
+	TDEConfigGroup cfg( KMKernel::config(), "text-index" );
 	if ( !cfg.readBoolEntry( "enabled", false ) ) {
 		indexlib::remove( mIndexPath );
 		mLockFile.force_unlock();
@@ -138,7 +138,7 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
 KMMsgIndex::~KMMsgIndex() {
 	kdDebug( 5006 ) << "KMMsgIndex::~KMMsgIndex()" << endl;
 #ifdef HAVE_INDEXLIB
-	KConfigGroup cfg( KMKernel::config(), "text-index" );
+	TDEConfigGroup cfg( KMKernel::config(), "text-index" );
 	cfg.writeEntry( "creating", mState == s_creating );
 	TQValueList<int> pendingMsg;
 	if ( mState == s_processing ) {
@@ -159,15 +159,15 @@ bool KMMsgIndex::isIndexable( KMFolder* folder ) const {
 
 bool KMMsgIndex::isIndexed( KMFolder* folder ) const {
 	if ( !isIndexable( folder ) ) return false;
-	KConfig* config = KMKernel::config();
-	KConfigGroupSaver saver( config, "Folder-" + folder->idString() );
+	TDEConfig* config = KMKernel::config();
+	TDEConfigGroupSaver saver( config, "Folder-" + folder->idString() );
 	return !config->readBoolEntry( folderIndexDisabledKey, false );
 }
 
 void KMMsgIndex::setEnabled( bool e ) {
 	kdDebug( 5006 ) << "KMMsgIndex::setEnabled( " << e << " )" << endl;
-	KConfig* config = KMKernel::config();
-	KConfigGroupSaver saver( config, "text-index" );
+	TDEConfig* config = KMKernel::config();
+	TDEConfigGroupSaver saver( config, "text-index" );
 	if ( config->readBoolEntry( "enabled", !e ) == e ) return;
 	config->writeEntry( "enabled", e );
 	if ( e ) {
@@ -191,8 +191,8 @@ void KMMsgIndex::setEnabled( bool e ) {
 }
 
 void KMMsgIndex::setIndexingEnabled( KMFolder* folder, bool e ) {
-	KConfig* config = KMKernel::config();
-	KConfigGroupSaver saver( config, "Folder-" + folder->idString() );
+	TDEConfig* config = KMKernel::config();
+	TDEConfigGroupSaver saver( config, "Folder-" + folder->idString() );
 	if ( config->readBoolEntry( folderIndexDisabledKey, e ) == e ) return; // nothing to do
 	config->writeEntry( folderIndexDisabledKey, e );
 
@@ -328,8 +328,8 @@ void KMMsgIndex::act() {
 			f->open("msgindex");
 		}
 		const KMMsgDict* dict = KMMsgDict::instance();
-		KConfig* config = KMKernel::config();
-		KConfigGroupSaver saver( config, "Folder-" + f->idString() );
+		TDEConfig* config = KMKernel::config();
+		TDEConfigGroupSaver saver( config, "Folder-" + f->idString() );
 		if ( config->readBoolEntry( folderIndexDisabledKey, true ) ) {
 			for ( int i = 0; i < f->count(); ++i ) {
 				mPendingMsgs.push_back( dict->getMsgSerNum( f, i ) );
diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp
index 3ba43637d..eaea2b500 100644
--- a/kmail/kcm_kmail.cpp
+++ b/kmail/kcm_kmail.cpp
@@ -31,7 +31,7 @@
 //----------------------------
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmail_config_misc( TQWidget *parent, const char * )
   {
     MiscPage *page = new MiscPage( parent, "kcmkmail_config_misc" );
     return page;
@@ -40,7 +40,7 @@ extern "C"
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmail_config_appearance( TQWidget *parent, const char * )
   {
     AppearancePage *page =
        new AppearancePage( parent, "kcmkmail_config_appearance" );
@@ -50,7 +50,7 @@ extern "C"
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmail_config_composer( TQWidget *parent, const char * )
   {
     ComposerPage *page = new ComposerPage( parent, "kcmkmail_config_composer" );
     return page;
@@ -59,7 +59,7 @@ extern "C"
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmail_config_identity( TQWidget *parent, const char * )
   {
     IdentityPage *page = new IdentityPage( parent, "kcmkmail_config_identity" );
     return page;
@@ -68,7 +68,7 @@ extern "C"
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmail_config_accounts( TQWidget *parent, const char * )
   {
     AccountsPage *page = new AccountsPage( parent, "kcmkmail_config_accounts" );
     return page;
@@ -77,7 +77,7 @@ extern "C"
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *parent, const char * )
+  KDE_EXPORT TDECModule *create_kmail_config_security( TQWidget *parent, const char * )
   {
     SecurityPage *page = new SecurityPage( parent, "kcmkmail_config_security" );
     return page;
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index e7d884101..64f13d76f 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -142,7 +142,7 @@ void KMAccount::setFolder(KMFolder* aFolder, bool addAccount)
 
 
 //-----------------------------------------------------------------------------
-void KMAccount::readConfig(KConfig& config)
+void KMAccount::readConfig(TDEConfig& config)
 {
   TQString folderName;
   mFolder = 0;
@@ -175,7 +175,7 @@ void KMAccount::readTimerConfig()
 }
 
 //-----------------------------------------------------------------------------
-void KMAccount::writeConfig(KConfig& config)
+void KMAccount::writeConfig(TDEConfig& config)
 {
   // ID, Name
   KAccount::writeConfig(config);
@@ -196,10 +196,10 @@ void KMAccount::writeConfig(KConfig& config)
 //-----------------------------------------------------------------------------
 void KMAccount::sendReceipt(KMMessage* aMsg)
 {
-  KConfig* cfg = KMKernel::config();
+  TDEConfig* cfg = KMKernel::config();
   bool sendReceipts;
 
-  KConfigGroupSaver saver(cfg, "General");
+  TDEConfigGroupSaver saver(cfg, "General");
 
   sendReceipts = cfg->readBoolEntry("send-receipts", false);
   if (!sendReceipts) return;
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 258fe9c02..f0455b3b9 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -33,7 +33,7 @@ class TQTimer;
 
 class KMFolder;
 class KMAcctFolder;
-class KConfig;
+class TDEConfig;
 class KMFolderJob;
 class KMFolderCachedImap;
 class AccountsPageReceivingTab;
@@ -143,14 +143,14 @@ public:
    * manager when a new account is created. The config group is
    * already properly set by the caller.
    */
-  virtual void readConfig(KConfig& config);
+  virtual void readConfig(TDEConfig& config);
   void readTimerConfig();
 
   /**
    * Write all account information to given config file. The config group
    * is already properly set by the caller.
    */
-  virtual void writeConfig(KConfig& config);
+  virtual void writeConfig(TDEConfig& config);
 
   /**
    * Set/get interval for checking if new mail arrived (in minutes).
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 2a797acbb..473b0b99c 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -132,7 +132,7 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis
   // Make list of folders to reset. This must be done last, since folderComplete
   // can trigger the next queued mail check already.
   TQValueList<KMFolderCachedImap*> folderList;
-  TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+  TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for (; it != mapJobData.end(); ++it) {
     if ((*it).parent)
       folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
@@ -150,7 +150,7 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis
   KMAccount::deleteFolderJobs();
 
   if ( disconnectSlave && mSlave ) {
-    KIO::Scheduler::disconnectSlave( mSlave );
+    TDEIO::Scheduler::disconnectSlave( mSlave );
     mSlave = 0;
   }
   return folderList;
@@ -161,7 +161,7 @@ void KMAcctCachedImap::cancelMailCheck()
 {
   // Make list of folders to reset, like in killAllJobs
   TQValueList<KMFolderCachedImap*> folderList;
-  TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+  TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for (; it != mapJobData.end(); ++it) {
     if ( (*it).cancellable && (*it).parent )
       folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
@@ -308,7 +308,7 @@ void KMAcctCachedImap::addLastUnreadMsgCount( const KMFolderCachedImap *folder,
 //
 //
 
-void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
+void KMAcctCachedImap::readConfig( /*const*/ TDEConfig/*Base*/ & config ) {
   ImapAccountBase::readConfig( config );
   // Apparently this method is only ever called once (from KMKernel::init) so this is ok
   mPreviouslyDeletedFolders = config.readListEntry( "deleted-folders" );
@@ -323,7 +323,7 @@ void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
   mGroupwareType = (GroupwareType)config.readNumEntry( "groupwareType", GroupwareKolab );
 }
 
-void KMAcctCachedImap::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
+void KMAcctCachedImap::writeConfig( TDEConfig/*Base*/ & config ) /*const*/ {
   ImapAccountBase::writeConfig( config );
   config.writeEntry( "deleted-folders", mDeletedFolders + mPreviouslyDeletedFolders );
   config.writeEntry( "renamed-folders-paths", mRenamedFolders.keys() );
@@ -447,7 +447,7 @@ void KMAcctCachedImap::slotProgressItemCanceled( ProgressItem* )
   killAllJobs( abortConnection );
   if ( abortConnection ) {
     // If we were trying to connect, tell kmfoldercachedimap so that it moves on
-    emit connectionResult( KIO::ERR_USER_CANCELED, TQString() );
+    emit connectionResult( TDEIO::ERR_USER_CANCELED, TQString() );
   }
 }
 
diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h
index a896fc42b..a580b90cf 100644
--- a/kmail/kmacctcachedimap.h
+++ b/kmail/kmacctcachedimap.h
@@ -47,7 +47,7 @@ namespace KMail {
 using KMail::ImapJob;
 using KMail::CachedImapJob;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -92,8 +92,8 @@ public:
   virtual void setImapFolder(KMFolderCachedImap *);
   KMFolderCachedImap* imapFolder() const { return mFolder; }
 
-  virtual void readConfig( /*const*/ KConfig/*Base*/ & config );
-  virtual void writeConfig( KConfig/*Base*/ & config ) /*const*/;
+  virtual void readConfig( /*const*/ TDEConfig/*Base*/ & config );
+  virtual void writeConfig( TDEConfig/*Base*/ & config ) /*const*/;
 
   /**
    * Invalidate the local cache.
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index e57543d30..a70091e79 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -70,7 +70,7 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin
 
   TQString serNumUri = locateLocal( "data", "kmail/unfiltered." +
 				   TQString("%1").arg(KAccount::id()) );
-  KConfig config( serNumUri );
+  TDEConfig config( serNumUri );
   TQStringList serNums = config.readListEntry( "unfiltered" );
   mFilterSerNumsToSave.setAutoDelete( false );
 
@@ -89,7 +89,7 @@ KMAcctImap::~KMAcctImap()
 
   TQString serNumUri = locateLocal( "data", "kmail/unfiltered." +
 				   TQString("%1").arg(KAccount::id()) );
-  KConfig config( serNumUri );
+  TDEConfig config( serNumUri );
   TQStringList serNums;
   TQDictIterator<int> it( mFilterSerNumsToSave );
   for( ; it.current(); ++it )
@@ -125,10 +125,10 @@ void KMAcctImap::setImapFolder(KMFolderImap *aFolder)
 
 //-----------------------------------------------------------------------------
 
-bool KMAcctImap::handleError( int errorCode, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync )
+bool KMAcctImap::handleError( int errorCode, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync )
 {
   /* TODO check where to handle this one better. */
-  if ( errorCode == KIO::ERR_DOES_NOT_EXIST ) {
+  if ( errorCode == TDEIO::ERR_DOES_NOT_EXIST ) {
     // folder is gone, so reload the folderlist
     if ( mFolder )
       mFolder->listDirectory();
@@ -141,7 +141,7 @@ bool KMAcctImap::handleError( int errorCode, const TQString &errorMsg, KIO::Job*
 //-----------------------------------------------------------------------------
 void KMAcctImap::killAllJobs( bool disconnectSlave )
 {
-  TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+  TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for ( ; it != mapJobData.end(); ++it)
   {
     TQPtrList<KMMessage> msgList = (*it).msgList;
@@ -193,7 +193,7 @@ void KMAcctImap::killAllJobs( bool disconnectSlave )
     mCountRemainChecks = 0;
   }
   if ( disconnectSlave && slave() ) {
-    KIO::Scheduler::disconnectSlave( slave() );
+    TDEIO::Scheduler::disconnectSlave( slave() );
     mSlave = 0;
   }
 }
@@ -233,9 +233,9 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder )
 void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder )
 {
   // Make sure the folder is not referenced in any kio slave jobs
-  TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+  TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
   while ( it != mapJobData.end() ) {
-     TQMap<KIO::Job*, jobData>::Iterator i = it;
+     TQMap<TDEIO::Job*, jobData>::Iterator i = it;
      it++;
      if ( (*i).parent ) {
         if ( (*i).parent == folder ) {
@@ -250,7 +250,7 @@ void KMAcctImap::cancelMailCheck()
 {
   // Make list of folders to reset, like in killAllJobs
   TQValueList<KMFolderImap*> folderList;
-  TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+  TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for (; it != mapJobData.end(); ++it) {
     if ( (*it).cancellable && (*it).parent ) {
       folderList << static_cast<KMFolderImap*>((*it).parent->storage());
@@ -533,7 +533,7 @@ void KMAcctImap::listDirectory()
 }
 
 //-----------------------------------------------------------------------------
-void KMAcctImap::readConfig(KConfig& config)
+void KMAcctImap::readConfig(TDEConfig& config)
 {
   ImapAccountBase::readConfig( config );
 }
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index 455ab931a..99f07f168 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -31,7 +31,7 @@ namespace KMail {
   class ImapJob;
   class ActionScheduler;
 }
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 class FolderStorage;
@@ -83,7 +83,7 @@ public:
    * manager when a new account is created. The config group is
    * already properly set by the caller.
    */
-  virtual void readConfig(KConfig& config);
+  virtual void readConfig(TDEConfig& config);
 
   /**
    * Returns the root folder of this account
@@ -109,7 +109,7 @@ protected:
    * Handle an error coming from a KIO job
    * See ImapAccountBase::handleJobError for details.
    */
-  virtual bool handleError( int error, const TQString &errorMsg, KIO::Job* job, const TQString& context, bool abortSync = false );
+  virtual bool handleError( int error, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync = false );
   virtual void cancelMailCheck();
 
   TQPtrList<KMail::ImapJob> mJobList;
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index d1e15f83a..813d180cb 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -270,7 +270,7 @@ void KMAcctLocal::postProcess()
 
 
 //-----------------------------------------------------------------------------
-void KMAcctLocal::readConfig(KConfig& config)
+void KMAcctLocal::readConfig(TDEConfig& config)
 {
   KMAccount::readConfig(config);
   mLocation = config.readPathEntry("Location", mLocation);
@@ -291,7 +291,7 @@ void KMAcctLocal::readConfig(KConfig& config)
 
 
 //-----------------------------------------------------------------------------
-void KMAcctLocal::writeConfig(KConfig& config)
+void KMAcctLocal::writeConfig(TDEConfig& config)
 {
   KMAccount::writeConfig(config);
 
diff --git a/kmail/kmacctlocal.h b/kmail/kmacctlocal.h
index 2abe34f5b..398dd16ef 100644
--- a/kmail/kmacctlocal.h
+++ b/kmail/kmacctlocal.h
@@ -34,8 +34,8 @@ public:
 
   virtual TQString type(void) const;
   virtual void processNewMail(bool);
-  virtual void readConfig(KConfig&);
-  virtual void writeConfig(KConfig&);
+  virtual void readConfig(TDEConfig&);
+  virtual void writeConfig(TDEConfig&);
 
 private:
   bool preProcess();
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index b3c5d31c7..5a203c2d1 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -213,7 +213,7 @@ void KMAcctMaildir::processNewMail(bool)
 
 
 //-----------------------------------------------------------------------------
-void KMAcctMaildir::readConfig(KConfig& config)
+void KMAcctMaildir::readConfig(TDEConfig& config)
 {
   KMAccount::readConfig(config);
   mLocation = config.readPathEntry("Location", mLocation);
@@ -221,7 +221,7 @@ void KMAcctMaildir::readConfig(KConfig& config)
 
 
 //-----------------------------------------------------------------------------
-void KMAcctMaildir::writeConfig(KConfig& config)
+void KMAcctMaildir::writeConfig(TDEConfig& config)
 {
   KMAccount::writeConfig(config);
   config.writePathEntry("Location", mLocation);
diff --git a/kmail/kmacctmaildir.h b/kmail/kmacctmaildir.h
index 1c655861a..e62796069 100644
--- a/kmail/kmacctmaildir.h
+++ b/kmail/kmacctmaildir.h
@@ -26,8 +26,8 @@ public:
 
   virtual TQString type(void) const;
   virtual void processNewMail(bool);
-  virtual void readConfig(KConfig&);
-  virtual void writeConfig(KConfig&);
+  virtual void readConfig(TDEConfig&);
+  virtual void writeConfig(TDEConfig&);
 
 protected:
   TQString mLocation;
diff --git a/kmail/kmail_config_accounts.desktop b/kmail/kmail_config_accounts.desktop
index e510c7d4c..ca6099e01 100644
--- a/kmail/kmail_config_accounts.desktop
+++ b/kmail/kmail_config_accounts.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=network
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_appearance.desktop b/kmail/kmail_config_appearance.desktop
index 753a66bb9..4ffe54b13 100644
--- a/kmail/kmail_config_appearance.desktop
+++ b/kmail/kmail_config_appearance.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_composer.desktop b/kmail/kmail_config_composer.desktop
index bdb44e282..b40fd5c9e 100644
--- a/kmail/kmail_config_composer.desktop
+++ b/kmail/kmail_config_composer.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=edit
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_identity.desktop b/kmail/kmail_config_identity.desktop
index cba142ff3..bf489e60e 100644
--- a/kmail/kmail_config_identity.desktop
+++ b/kmail/kmail_config_identity.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_misc.desktop b/kmail/kmail_config_misc.desktop
index 3cc3e3201..79a646e74 100644
--- a/kmail/kmail_config_misc.desktop
+++ b/kmail/kmail_config_misc.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=misc
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_security.desktop b/kmail/kmail_config_security.desktop
index a99d19536..a4d385cc4 100644
--- a/kmail/kmail_config_security.desktop
+++ b/kmail/kmail_config_security.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=encrypted
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index abf480c99..fbafbc1b5 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -1073,7 +1073,7 @@ void KMailICalIfaceImpl::slotFolderRemoved( KMFolder* folder )
   // pretend the folder just changed back to the mail type, which
   // does the right thing, namely remove resource
   folderContentsTypeChanged( folder, KMail::ContentsTypeMail );
-  KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+  TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
   configGroup.deleteEntry( folder->idString() + "-storageFormat" );
   configGroup.deleteEntry( folder->idString() + "-changes" );
 }
@@ -1493,7 +1493,7 @@ void KMailICalIfaceImpl::setStorageFormat( KMFolder* folder, StorageFormat forma
     FolderInfo info( format, NoChange );
     mFolderInfoMap.insert( folder, info );
   }
-  KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+  TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
   configGroup.writeEntry( folder->idString() + "-storageFormat",
                           format == StorageXML ? "xml" : "icalvcard" );
 }
@@ -1506,13 +1506,13 @@ void KMailICalIfaceImpl::addFolderChange( KMFolder* folder, FolderChanges change
   } else { // Otherwise, well, it's a folder we don't care about.
     kdDebug(5006) << "addFolderChange: nothing known about folder " << folder->location() << endl;
   }
-  KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+  TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
   configGroup.writeEntry( folder->idString() + "-changes", (*it).mChanges );
 }
 
 KMailICalIfaceImpl::FolderInfo KMailICalIfaceImpl::readFolderInfo( const KMFolder * const folder ) const
 {
-  KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+  TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
   TQString str = configGroup.readEntry( folder->idString() + "-storageFormat", "unset" );
   FolderInfo info;
   if ( str == "unset" ) {
@@ -1591,7 +1591,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
   kdDebug() << "Triggering PFB update for " << folderURL << " : getting " << httpURL << endl;
   // "Fire and forget". No need for error handling, nor for explicit deletion.
   // Maybe we should try to prevent launching it if it's already running (for this URL) though.
-  /*KIO::Job* job =*/ KIO::get( httpURL, false, false /*no progress info*/ );
+  /*TDEIO::Job* job =*/ TDEIO::get( httpURL, false, false /*no progress info*/ );
 }
 
 void KMailICalIfaceImpl::slotFolderPropertiesChanged( KMFolder* folder )
@@ -1660,7 +1660,7 @@ void KMailICalIfaceImpl::changeResourceUIName( const TQString &folderPath, const
   if ( f ) {
     KMailICalIfaceImpl::getResourceMap()->insert( folderPath, newName );
     kmkernel->folderMgr()->renameFolder( f, newName );
-    KConfigGroup configGroup( kmkernel->config(), "Resource UINames" );
+    TDEConfigGroup configGroup( kmkernel->config(), "Resource UINames" );
     configGroup.writeEntry( folderPath, newName );
   }
 }
@@ -1950,7 +1950,7 @@ void KMailICalIfaceImpl::readConfig()
     subresourceAdded( folderContentsType( KMail::ContentsTypeNote ), mNotes->location(), mNotes->label(), true, false );
   }
 
-  KConfig *config = kmkernel->config();
+  TDEConfig *config = kmkernel->config();
   config->setGroup("Resource UINames");
   *KMailICalIfaceImpl::mSubResourceUINamesMap =  config->entryMap( "Resource UINames" );
 
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 7108fff65..9c1d25f96 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -636,7 +636,7 @@ KMCommand::Result KMUrlSaveCommand::execute()
                                          parentWidget() );
   if ( saveUrl.isEmpty() )
     return Canceled;
-  if ( KIO::NetAccess::exists( saveUrl, false, parentWidget() ) )
+  if ( TDEIO::NetAccess::exists( saveUrl, false, parentWidget() ) )
   {
     if (KMessageBox::warningContinueCancel(0,
         i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>")
@@ -644,13 +644,13 @@ KMCommand::Result KMUrlSaveCommand::execute()
         != KMessageBox::Continue)
       return Canceled;
   }
-  KIO::Job *job = KIO::file_copy(mUrl, saveUrl, -1, true);
-  connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotUrlSaveResult(KIO::Job*)));
+  TDEIO::Job *job = TDEIO::file_copy(mUrl, saveUrl, -1, true);
+  connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotUrlSaveResult(TDEIO::Job*)));
   setEmitsCompletedItself( true );
   return OK;
 }
 
-void KMUrlSaveCommand::slotUrlSaveResult( KIO::Job *job )
+void KMUrlSaveCommand::slotUrlSaveResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     job->showErrorDialog();
@@ -841,14 +841,14 @@ KURL KMSaveMsgCommand::url()
 
 KMCommand::Result KMSaveMsgCommand::execute()
 {
-  mJob = KIO::put( mUrl, S_IRUSR|S_IWUSR, false, false );
+  mJob = TDEIO::put( mUrl, S_IRUSR|S_IWUSR, false, false );
   mJob->slotTotalSize( mTotalSize );
   mJob->setAsyncDataEnabled( true );
   mJob->setReportDataSent( true );
-  connect(mJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray &)),
+  connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)),
     TQT_SLOT(slotSaveDataReq()));
-  connect(mJob, TQT_SIGNAL(result(KIO::Job*)),
-    TQT_SLOT(slotSaveResult(KIO::Job*)));
+  connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)),
+    TQT_SLOT(slotSaveResult(TDEIO::Job*)));
   setEmitsCompletedItself( true );
   return OK;
 }
@@ -904,7 +904,7 @@ void KMSaveMsgCommand::slotSaveDataReq()
         }
       }
     } else {
-      mJob->slotError( KIO::ERR_ABORTED,
+      mJob->slotError( TDEIO::ERR_ABORTED,
                        i18n("The message was removed while saving it. "
                             "It has not been saved.") );
     }
@@ -955,11 +955,11 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
   }
 }
 
-void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
+void KMSaveMsgCommand::slotSaveResult(TDEIO::Job *job)
 {
   if (job->error())
   {
-    if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
+    if (job->error() == TDEIO::ERR_FILE_ALREADY_EXIST)
     {
       if (KMessageBox::warningContinueCancel(0,
         i18n("File %1 exists.\nDo you want to replace it?")
@@ -967,14 +967,14 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
         == KMessageBox::Continue) {
         mOffset = 0;
 
-        mJob = KIO::put( mUrl, S_IRUSR|S_IWUSR, true, false );
+        mJob = TDEIO::put( mUrl, S_IRUSR|S_IWUSR, true, false );
         mJob->slotTotalSize( mTotalSize );
         mJob->setAsyncDataEnabled( true );
         mJob->setReportDataSent( true );
-        connect(mJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray &)),
+        connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)),
             TQT_SLOT(slotSaveDataReq()));
-        connect(mJob, TQT_SIGNAL(result(KIO::Job*)),
-            TQT_SLOT(slotSaveResult(KIO::Job*)));
+        connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)),
+            TQT_SLOT(slotSaveResult(TDEIO::Job*)));
       }
     }
     else
@@ -1012,17 +1012,17 @@ KMCommand::Result KMOpenMsgCommand::execute()
     setDeletesItself( false );
     return Canceled;
   }
-  mJob = KIO::get( mUrl, false, false );
+  mJob = TDEIO::get( mUrl, false, false );
   mJob->setReportDataSent( true );
-  connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           this, TQT_SLOT( slotDataArrived( KIO::Job*, const TQByteArray & ) ) );
-  connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotResult( KIO::Job * ) ) );
+  connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           this, TQT_SLOT( slotDataArrived( TDEIO::Job*, const TQByteArray & ) ) );
+  connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
   setEmitsCompletedItself( true );
   return OK;
 }
 
-void KMOpenMsgCommand::slotDataArrived( KIO::Job *, const TQByteArray & data )
+void KMOpenMsgCommand::slotDataArrived( TDEIO::Job *, const TQByteArray & data )
 {
   if ( data.isEmpty() )
     return;
@@ -1030,7 +1030,7 @@ void KMOpenMsgCommand::slotDataArrived( KIO::Job *, const TQByteArray & data )
   mMsgString.append( data.data(), data.size() );
 }
 
-void KMOpenMsgCommand::slotResult( KIO::Job *job )
+void KMOpenMsgCommand::slotResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     // handle errors
@@ -1607,7 +1607,7 @@ KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg,
   if ( GlobalSettings::useDefaultFonts() )
     mOverrideFont = TDEGlobalSettings::generalFont();
   else {
-    KConfigGroup fonts( KMKernel::config(), "Fonts" );
+    TDEConfigGroup fonts( KMKernel::config(), "Fonts" );
     TQString tmp = fonts.readEntry( "print-font", TDEGlobalSettings::generalFont().toString() );
     mOverrideFont.fromString( tmp );
   }
@@ -2641,7 +2641,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
      }
 
 
-      if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) {
+      if ( TDEIO::NetAccess::exists( curUrl, false, parentWidget() ) ) {
         if ( KMessageBox::warningContinueCancel( parentWidget(),
               i18n( "A file named %1 already exists. Do you want to overwrite it?" )
               .arg( curUrl.fileName() ),
@@ -2773,7 +2773,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
   if ( !url.isLocalFile() )
   {
     tf.close();
-    if ( !KIO::NetAccess::upload( tf.name(), url, parentWidget() ) )
+    if ( !TDEIO::NetAccess::upload( tf.name(), url, parentWidget() ) )
     {
       KMessageBox::error( parentWidget(),
           i18n( "Could not write the file %1." )
@@ -3334,13 +3334,13 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E
     return;
 
   d.setDisabled( true ); // we got this far, don't delete yet
-  KIO::Job * uploadJob = KIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ );
+  TDEIO::Job * uploadJob = TDEIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ );
   uploadJob->setWindow( parentWidget() );
-  connect( uploadJob, TQT_SIGNAL(result(KIO::Job*)),
-           this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(KIO::Job*)) );
+  connect( uploadJob, TQT_SIGNAL(result(TDEIO::Job*)),
+           this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(TDEIO::Job*)) );
 }
 
-void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( KIO::Job * job )
+void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( TDEIO::Job * job )
 {
   if ( job->error() )
     job->showErrorDialog();
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 698ae64b9..3bb209882 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -34,7 +34,7 @@ class KMReaderWin;
 class partNode;
 class DwBodyPart;
 class DwEntity;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 namespace KMail {
   class Composer;
   class FolderJob;
@@ -290,7 +290,7 @@ public:
   KMUrlSaveCommand( const KURL &url, TQWidget *parent );
 
 private slots:
-  void slotUrlSaveResult( KIO::Job *job );
+  void slotUrlSaveResult( TDEIO::Job *job );
 
 private:
   virtual Result execute();
@@ -352,7 +352,7 @@ private:
 
 private slots:
   void slotSaveDataReq();
-  void slotSaveResult(KIO::Job *job);
+  void slotSaveResult(TDEIO::Job *job);
   /** the message has been transferred for saving */
   void slotMessageRetrievedForSaving(KMMessage *msg);
 
@@ -366,7 +366,7 @@ private:
   TQByteArray mData;
   int mOffset;
   size_t mTotalSize;
-  KIO::TransferJob *mJob;
+  TDEIO::TransferJob *mJob;
 };
 
 class KDE_EXPORT KMOpenMsgCommand : public KMCommand
@@ -382,14 +382,14 @@ private:
   virtual Result execute();
 
 private slots:
-  void slotDataArrived( KIO::Job *job, const TQByteArray & data );
-  void slotResult( KIO::Job *job );
+  void slotDataArrived( TDEIO::Job *job, const TQByteArray & data );
+  void slotResult( TDEIO::Job *job );
 
 private:
   static const int MAX_CHUNK_SIZE = 64*1024;
   KURL mUrl;
   DwString mMsgString;
-  KIO::TransferJob *mJob;
+  TDEIO::TransferJob *mJob;
   const TQString mEncoding;
 };
 
@@ -1075,7 +1075,7 @@ private slots:
   void slotPartComplete();
 
   void slotAtmDecryptWithChiasmusResult( const GpgME::Error &, const TQVariant & );
-  void slotAtmDecryptWithChiasmusUploadResult( KIO::Job * );
+  void slotAtmDecryptWithChiasmusUploadResult( TDEIO::Job * );
 
 private:
   partNode* mNode;
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 31d36b4d3..0857ae2bd 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -344,7 +344,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
       mSignatureStateIndicator->setAlignment( TQt::AlignHCenter );
       hbox->addWidget( mSignatureStateIndicator );
 
-      KConfigGroup reader( KMKernel::config(), "Reader" );
+      TDEConfigGroup reader( KMKernel::config(), "Reader" );
       TQPalette p( mSignatureStateIndicator->palette() );
 
       TQColor defaultSignedColor( 0x40, 0xFF, 0x40 ); // light green // pgp ok, trusted key
@@ -505,10 +505,10 @@ KMComposeWin::~KMComposeWin()
     delete mMsg;
     mMsg = 0;
   }
-  TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.begin();
+  TQMap<TDEIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.begin();
   while ( it != mMapAtmLoadData.end() )
   {
-    KIO::Job *job = it.key();
+    TDEIO::Job *job = it.key();
     mMapAtmLoadData.remove( it );
     job->kill();
     it = mMapAtmLoadData.begin();
@@ -797,7 +797,7 @@ void KMComposeWin::writeConfig(void)
   GlobalSettings::self()->setComposerSize( size() );
   GlobalSettings::self()->setShowSnippetManager( mSnippetAction->isChecked() );
 
-  KConfigGroupSaver saver( KMKernel::config(), "Geometry" );
+  TDEConfigGroupSaver saver( KMKernel::config(), "Geometry" );
   saveMainWindowSettings( KMKernel::config(), "Composer" );
   GlobalSettings::setSnippetSplitterPosition( mSnippetSplitter->sizes() );
 
@@ -2384,7 +2384,7 @@ Kleo::CryptoMessageFormat KMComposeWin::cryptoMessageFormat() const {
 
 bool KMComposeWin::encryptToSelf() const {
 //   return !Kpgp::Module::getKpgp() || Kpgp::Module::getKpgp()->encryptToSelf();
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-encrypt-to-self", true );
 }
 
@@ -2410,8 +2410,8 @@ bool KMComposeWin::addAttach(const KURL aUrl)
     return false;
   }
 
-  KIO::TransferJob *job = KIO::get(aUrl);
-  KIO::Scheduler::scheduleJob( job );
+  TDEIO::TransferJob *job = TDEIO::get(aUrl);
+  TDEIO::Scheduler::scheduleJob( job );
   atmLoadData ld;
   ld.url = aUrl;
   ld.data = TQByteArray();
@@ -2421,10 +2421,10 @@ bool KMComposeWin::addAttach(const KURL aUrl)
 
   mMapAtmLoadData.insert(job, ld);
   mAttachJobs[job] = aUrl;
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(KIO::Job *)));
-  connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
+  connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
   return true;
 }
 
@@ -2496,7 +2496,7 @@ void KMComposeWin::msgPartToItem(const KMMessagePart* msgPart,
     lvi->setText(0, msgPart->fileName());
   else
     lvi->setText(0, msgPart->name());
-  lvi->setText(1, KIO::convertSize( msgPart->decodedSize()));
+  lvi->setText(1, TDEIO::convertSize( msgPart->decodedSize()));
   lvi->setText(2, msgPart->contentTransferEncodingStr());
   lvi->setText(3, prettyMimeType(msgPart->typeStr() + "/" + msgPart->subtypeStr()));
   lvi->setAttachmentSize(msgPart->decodedSize());
@@ -2753,7 +2753,7 @@ void KMComposeWin::slotAttachFile()
   TQString recent;
   KURL recentURL = KFileDialog::getStartURL( TQString(), recent );
   if ( !recentURL.url().isEmpty() &&
-       !KIO::NetAccess::exists( recentURL, true, this ) ) {
+       !TDEIO::NetAccess::exists( recentURL, true, this ) ) {
     recentURL = KURL( TQDir::homeDirPath() );
   }
 
@@ -2771,9 +2771,9 @@ void KMComposeWin::slotAttachFile()
 
 
 //-----------------------------------------------------------------------------
-void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data)
+void KMComposeWin::slotAttachFileData(TDEIO::Job *job, const TQByteArray &data)
 {
-  TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
+  TQMap<TDEIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
   assert(it != mMapAtmLoadData.end());
   TQBuffer buff((*it).data);
   buff.open(IO_WriteOnly | IO_Append);
@@ -2783,12 +2783,12 @@ void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data)
 
 
 //-----------------------------------------------------------------------------
-void KMComposeWin::slotAttachFileResult(KIO::Job *job)
+void KMComposeWin::slotAttachFileResult(TDEIO::Job *job)
 {
-  TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
+  TQMap<TDEIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
   assert(it != mMapAtmLoadData.end());
   KURL attachURL;
-  TQMap<KIO::Job*, KURL>::iterator jit = mAttachJobs.find(job);
+  TQMap<TDEIO::Job*, KURL>::iterator jit = mAttachJobs.find(job);
   bool attachURLfound = (jit != mAttachJobs.end());
   if (attachURLfound)
   {
@@ -2834,7 +2834,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
   KCursorSaver busy(KBusyPtr::busy());
   TQString name( (*it).url.fileName() );
   // ask the job for the mime type of the file
-  TQString mimeType = static_cast<KIO::MimetypeJob*>(job)->mimetype();
+  TQString mimeType = static_cast<TDEIO::MimetypeJob*>(job)->mimetype();
 
   if ( name.isEmpty() ) {
     // URL ends with '/' (e.g. http://www.kde.org/)
@@ -2901,7 +2901,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
   }
 
   // show message part dialog, if not configured away (default):
-  KConfigGroup composer(KMKernel::config(), "Composer");
+  TDEConfigGroup composer(KMKernel::config(), "Composer");
   if ( GlobalSettings::self()->showMessagePartDialogOnAttach() ) {
     const KCursorSaver saver( TQCursor::ArrowCursor );
     KMMsgPartDialogCompat dlg(mMainWidget);
@@ -2955,8 +2955,8 @@ void KMComposeWin::slotInsertFile()
   mRecentAction->addURL(u);
   // Prevent race condition updating list when multiple composers are open
   {
-    KConfig *config = KMKernel::config();
-    KConfigGroupSaver saver( config, "Composer" );
+    TDEConfig *config = KMKernel::config();
+    TDEConfigGroupSaver saver( config, "Composer" );
     TQString encoding = TDEGlobal::charsets()->encodingForName(combo->currentText()).latin1();
     TQStringList urls = config->readListEntry( "recent-urls" );
     TQStringList encodings = config->readListEntry( "recent-encodings" );
@@ -2987,15 +2987,15 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
 {
   if (u.fileName().isEmpty()) return;
 
-  KIO::Job *job = KIO::get(u);
+  TDEIO::Job *job = TDEIO::get(u);
   atmLoadData ld;
   ld.url = u;
   ld.data = TQByteArray();
   ld.insert = true;
   // Get the encoding previously used when inserting this file
   {
-    KConfig *config = KMKernel::config();
-    KConfigGroupSaver saver( config, "Composer" );
+    TDEConfig *config = KMKernel::config();
+    TDEConfigGroupSaver saver( config, "Composer" );
     TQStringList urls = config->readListEntry( "recent-urls" );
     TQStringList encodings = config->readListEntry( "recent-encodings" );
     int index = urls.findIndex( u.prettyURL() );
@@ -3005,10 +3005,10 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
     }
   }
   mMapAtmLoadData.insert(job, ld);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(KIO::Job *)));
-  connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
+  connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+          TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
 }
 
 
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 02f92154c..840d34347 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -488,8 +488,8 @@ private slots:
   /**
    * KIO slots for attachment insertion
    */
-  void slotAttachFileData(KIO::Job *, const TQByteArray &);
-  void slotAttachFileResult(KIO::Job *);
+  void slotAttachFileData(TDEIO::Job *, const TQByteArray &);
+  void slotAttachFileResult(TDEIO::Job *);
 
   void slotListAction(const TQString &);
   void slotFontAction(const TQString &);
@@ -829,7 +829,7 @@ private:
 
   TQStringList mFolderNames;
   TQValueList<TQGuardedPtr<KMFolder> > mFolderList;
-  TQMap<KIO::Job*, KURL> mAttachJobs;
+  TQMap<TDEIO::Job*, KURL> mAttachJobs;
   KURL::List mAttachFilesPending;
   int mAttachFilesSend;
 
@@ -893,7 +893,7 @@ private:
     bool insert;
     TQCString encoding;
   };
-  TQMap<KIO::Job *, atmLoadData> mMapAtmLoadData;
+  TQMap<TDEIO::Job *, atmLoadData> mMapAtmLoadData;
 
   // These are for passing on methods over the applyChanges calls
   KMail::MessageSender::SendMethod mSendMethod;
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index e4fb46896..044e0541c 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -254,7 +254,7 @@ void KMEdit::initializeAutoSpellChecking()
   TQColor defaultForeground( kapp->palette().active().text() );
 
   TQColor c = TQt::red;
-  KConfigGroup readerConfig( KMKernel::config(), "Reader" );
+  TDEConfigGroup readerConfig( KMKernel::config(), "Reader" );
   TQColor col1;
   if ( !readerConfig.readBoolEntry(  "defaultColors", true ) )
       col1 = readerConfig.readColorEntry( "ForegroundColor", &defaultForeground );
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index 28a64633d..e9e9f3790 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -39,7 +39,7 @@ using KMail::FilterLog;
 #include <assert.h>
 
 
-KMFilter::KMFilter( KConfig* aConfig, bool popFilter )
+KMFilter::KMFilter( TDEConfig* aConfig, bool popFilter )
   : bPopFilter(popFilter)
 {
   if (!bPopFilter)
@@ -210,7 +210,7 @@ bool KMFilter::applyOnAccount( uint id ) const
 
 
 //-----------------------------------------------------------------------------
-void KMFilter::readConfig(KConfig* config)
+void KMFilter::readConfig(TDEConfig* config)
 {
   // MKSearchPattern::readConfig ensures
   // that the pattern is purified.
@@ -295,7 +295,7 @@ void KMFilter::readConfig(KConfig* config)
 }
 
 
-void KMFilter::writeConfig(KConfig* config) const
+void KMFilter::writeConfig(TDEConfig* config) const
 {
   mPattern.writeConfig(config);
 
diff --git a/kmail/kmfilter.h b/kmail/kmfilter.h
index 4414f59d8..109e491eb 100644
--- a/kmail/kmfilter.h
+++ b/kmail/kmfilter.h
@@ -28,7 +28,7 @@
 #include <tqptrlist.h>
 
 class TQString;
-class KConfig;
+class TDEConfig;
 class KMMessage;
 class KMFilterAction;
 class KMFolder;
@@ -67,7 +67,7 @@ public:
   /** Constructor that initializes from given config file, if given.
     * Filters are stored one by one in config groups, i.e. one filter, one group.
     * The config group has to be preset if config is not 0. */
-  KMFilter( KConfig* aConfig=0 , bool popFilter = false);
+  KMFilter( TDEConfig* aConfig=0 , bool popFilter = false);
 
   /** Copy constructor. Constructs a deep copy of @p aFilter. */
   KMFilter( const KMFilter & other );
@@ -107,13 +107,13 @@ public:
       constructor above) has to be preset.  The config object will be
       deleted by higher levels, so it is not allowed to store a
       pointer to it anywhere inside this function. */
-  void writeConfig( KConfig* config ) const;
+  void writeConfig( TDEConfig* config ) const;
 
   /** Initialize from given config file. The config group (see
       constructor above) has to be preset. The config object will be
       deleted by higher levels, so it is not allowed to store a
       pointer to it anywhere inside this function. */
-  void readConfig( KConfig* config );
+  void readConfig( TDEConfig* config );
 
   /** Remove empty rules (and actions one day). */
   void purify();
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 4ba4422cb..fd00a3cce 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -339,7 +339,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
   connect( this, TQT_SIGNAL(finished()),
 	   this, TQT_SLOT(slotFinished()) );
 
-  KConfigGroup geometry( KMKernel::config(), "Geometry");
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry");
   const char * configKey
     = bPopFilter ? "popFilterDialogSize" : "filterDialogSize";
   if ( geometry.hasKey( configKey ) )
@@ -356,7 +356,7 @@ void KMFilterDlg::slotFinished() {
 }
 
 void KMFilterDlg::slotSaveSize() {
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
   geometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
 }
 
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index 9118d14c8..1f5d9ad5c 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -67,11 +67,11 @@ void KMFilterMgr::clear()
 //-----------------------------------------------------------------------------
 void KMFilterMgr::readConfig(void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   clear();
   
   if (bPopFilter) {
-    KConfigGroupSaver saver(config, "General");
+    TDEConfigGroupSaver saver(config, "General");
     mShowLater = config->readNumEntry("popshowDLmsgs",0);
   } 
   mFilters = FilterImporterExporter::readFiltersFromConfig( config, bPopFilter );
@@ -80,11 +80,11 @@ void KMFilterMgr::readConfig(void)
 //-----------------------------------------------------------------------------
 void KMFilterMgr::writeConfig(bool withSync)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
 
   // Now, write out the new stuff:  
   FilterImporterExporter::writeFiltersToConfig( mFilters, config, bPopFilter );
-  KConfigGroupSaver saver(config, "General");
+  TDEConfigGroupSaver saver(config, "General");
   if (bPopFilter)
       config->writeEntry("popshowDLmsgs", mShowLater);
 
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index de6814ca9..5c4af4050 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -158,7 +158,7 @@ KMFolder::~KMFolder()
   delete mStorage;
 }
 
-void KMFolder::readConfig( KConfig* config )
+void KMFolder::readConfig( TDEConfig* config )
 {
   if ( !config->readEntry("SystemLabel").isEmpty() )
     mSystemLabel = config->readEntry("SystemLabel");
@@ -197,7 +197,7 @@ void KMFolder::readConfig( KConfig* config )
   }
 }
 
-void KMFolder::writeConfig( KConfig* config ) const
+void KMFolder::writeConfig( TDEConfig* config ) const
 {
   config->writeEntry("SystemLabel", mSystemLabel);
   config->writeEntry("ExpireMessages", mExpireMessages);
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index fe2900008..87be58407 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -128,10 +128,10 @@ public:
   bool hasAccounts() const { return (mAcctList != 0); }
 
   /** This is used by the storage to read the folder specific configuration */
-  void readConfig( KConfig* config );
+  void readConfig( TDEConfig* config );
 
   /** This is used by the storage to save the folder specific configuration */
-  void writeConfig( KConfig* config ) const;
+  void writeConfig( TDEConfig* config ) const;
 
   FolderStorage* storage() { return mStorage; }
   /** if the folder is const, the storage should be as well */
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index e7009a237..4ce92cb1d 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -250,8 +250,8 @@ void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* parent )
 
 void KMFolderCachedImap::readConfig()
 {
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver( config, "Folder-" + folder()->idString() );
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver( config, "Folder-" + folder()->idString() );
   if( mImapPath.isEmpty() ) mImapPath = config->readEntry( "ImapPath" );
   if( TQString( name() ).upper() == "INBOX" && mImapPath == "/INBOX/" )
   {
@@ -329,7 +329,7 @@ void KMFolderCachedImap::writeConfig()
   if ( mFolderRemoved )
     return;
 
-  KConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
+  TDEConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
   configGroup.writeEntry( "ImapPath", mImapPath );
   configGroup.writeEntry( "NoContent", mNoContent );
   configGroup.writeEntry( "ReadOnly", mReadOnly );
@@ -369,7 +369,7 @@ void KMFolderCachedImap::writeConfig()
 
 void KMFolderCachedImap::writeConfigKeysWhichShouldNotGetOverwrittenByReadConfig()
 {
-  KConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
+  TDEConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
   if ( !folder()->noContent() )
   {
     configGroup.writeEntry( "AnnotationFolderTypeChanged", mAnnotationFolderTypeChanged );
@@ -1148,13 +1148,13 @@ void KMFolderCachedImap::serverSyncInternal()
       annotations.append( attr );
 
       kdDebug(5006) << "Setting test attribute to "<< url << endl;
-      KIO::Job* job = AnnotationJobs::multiSetAnnotation( mAccount->slave(),
+      TDEIO::Job* job = AnnotationJobs::multiSetAnnotation( mAccount->slave(),
           url, annotations );
       ImapAccountBase::jobData jd( url.url(), folder() );
       jd.cancellable = true; // we can always do so later
       mAccount->insertJob(job, jd);
-       connect(job, TQT_SIGNAL(result(KIO::Job *)),
-              TQT_SLOT(slotTestAnnotationResult(KIO::Job *)));
+       connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+              TQT_SLOT(slotTestAnnotationResult(TDEIO::Job *)));
       break;
     }
 
@@ -1199,8 +1199,8 @@ void KMFolderCachedImap::serverSyncInternal()
 
         connect( job, TQT_SIGNAL(annotationResult(const TQString&, const TQString&, bool)),
                  TQT_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) );
-        connect( job, TQT_SIGNAL(result(KIO::Job *)),
-                 TQT_SLOT(slotGetAnnotationResult(KIO::Job *)) );
+        connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+                 TQT_SLOT(slotGetAnnotationResult(TDEIO::Job *)) );
         break;
       }
     }
@@ -1232,7 +1232,7 @@ void KMFolderCachedImap::serverSyncInternal()
         kdDebug(5006) << k_funcinfo << "Setting sharedseen annotation for " << label() << " to " << val << endl;
       }
       if ( !annotations.isEmpty() ) {
-        KIO::Job* job =
+        TDEIO::Job* job =
           AnnotationJobs::multiSetAnnotation( mAccount->slave(), url, annotations );
         ImapAccountBase::jobData jd( url.url(), folder() );
         jd.cancellable = true; // we can always do so later
@@ -1240,8 +1240,8 @@ void KMFolderCachedImap::serverSyncInternal()
 
         connect(job, TQT_SIGNAL(annotationChanged( const TQString&, const TQString&, const TQString& ) ),
                 TQT_SLOT( slotAnnotationChanged( const TQString&, const TQString&, const TQString& ) ));
-        connect(job, TQT_SIGNAL(result(KIO::Job *)),
-                TQT_SLOT(slotSetAnnotationResult(KIO::Job *)));
+        connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+                TQT_SLOT(slotSetAnnotationResult(TDEIO::Job *)));
         break;
       }
     }
@@ -1260,12 +1260,12 @@ void KMFolderCachedImap::serverSyncInternal()
         newState( mProgress, i18n("Setting permissions"));
         KURL url = mAccount->getUrl();
         url.setPath( imapPath() );
-        KIO::Job* job = KMail::ACLJobs::multiSetACL( mAccount->slave(), url, mACLList );
+        TDEIO::Job* job = KMail::ACLJobs::multiSetACL( mAccount->slave(), url, mACLList );
         ImapAccountBase::jobData jd( url.url(), folder() );
         mAccount->insertJob(job, jd);
 
-        connect(job, TQT_SIGNAL(result(KIO::Job *)),
-                TQT_SLOT(slotMultiSetACLResult(KIO::Job *)));
+        connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+                TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *)));
         connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )),
                 TQT_SLOT(slotACLChanged( const TQString&, int )) );
         break;
@@ -1278,8 +1278,8 @@ void KMFolderCachedImap::serverSyncInternal()
     if( !mQuotaOnly && !noContent() && mAccount->hasACLSupport() ) {
       newState( mProgress, i18n( "Retrieving permissions" ) );
       mAccount->getACL( folder(), mImapPath );
-      connect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-               this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+      connect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+               this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
       break;
     }
   case SYNC_STATE_FIND_SUBFOLDERS:
@@ -1306,13 +1306,13 @@ void KMFolderCachedImap::serverSyncInternal()
       newState( mProgress, i18n("Getting quota information"));
       KURL url = mAccount->getUrl();
       url.setPath( imapPath() );
-      KIO::Job* job = KMail::QuotaJobs::getStorageQuota( mAccount->slave(), url );
+      TDEIO::Job* job = KMail::QuotaJobs::getStorageQuota( mAccount->slave(), url );
       ImapAccountBase::jobData jd( url.url(), folder() );
       mAccount->insertJob(job, jd);
       connect( job, TQT_SIGNAL( storageQuotaResult( const QuotaInfo& ) ),
           TQT_SLOT( slotStorageQuotaResult( const QuotaInfo& ) ) );
-      connect( job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_SLOT(slotQuotaResult(KIO::Job *)) );
+      connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_SLOT(slotQuotaResult(TDEIO::Job *)) );
       break;
     }
   case SYNC_STATE_CLOSE:
@@ -1437,7 +1437,7 @@ void KMFolderCachedImap::slotConnectionResult( int errorCode, const TQString& er
     serverSyncInternal();
   } else {
     // Error (error message already shown by the account)
-    newState( mProgress, KIO::buildErrorString( errorCode, errorMsg ));
+    newState( mProgress, TDEIO::buildErrorString( errorCode, errorMsg ));
     emit folderComplete(this, false);
   }
 }
@@ -1819,7 +1819,7 @@ void KMFolderCachedImap::slotGetLastMessagesResult(KMail::FolderJob *job)
 }
 
 // Connected to the listMessages job in CachedImapJob
-void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
+void KMFolderCachedImap::slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) { // Shouldn't happen
@@ -2347,8 +2347,8 @@ void KMFolderCachedImap::listDirectory2()
     ImapAccountBase::jobData jd( TQString(), folder() );
     jd.cancellable = true;
     mAccount->insertJob(job, jd);
-    connect( job, TQT_SIGNAL(result(KIO::Job *)),
-        TQT_SLOT(slotMultiUrlGetAnnotationResult(KIO::Job *)) );
+    connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+        TQT_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) );
 
   } else {
     createFoldersNewOnServerAndFinishListing( foldersNewOnServer );
@@ -2449,7 +2449,7 @@ void KMFolderCachedImap::slotSubFolderCloseToQuotaChanged()
   }
 }
 
-void KMFolderCachedImap::slotSimpleData(KIO::Job * job, const TQByteArray & data)
+void KMFolderCachedImap::slotSimpleData(TDEIO::Job * job, const TQByteArray & data)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if (it == mAccount->jobsEnd()) return;
@@ -2513,11 +2513,11 @@ KMFolderCachedImap::setReadOnly( bool readOnly )
 }
 
 void
-KMFolderCachedImap::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList )
+KMFolderCachedImap::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList )
 {
   if ( folder->storage() == this ) {
-    disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-                this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+    disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+                this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
     mACLListState = job->error() ? KMail::ACLJobs::FetchFailed : KMail::ACLJobs::Ok;
     mACLList = aclList;
     serverSyncInternal();
@@ -2551,7 +2551,7 @@ KMFolderCachedImap::setACLList( const ACLList& arr )
 }
 
 void
-KMFolderCachedImap::slotMultiSetACLResult(KIO::Job *job)
+KMFolderCachedImap::slotMultiSetACLResult(TDEIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
@@ -2795,7 +2795,7 @@ void KMFolderCachedImap::slotAnnotationResult(const TQString& entry, const TQStr
   }
 }
 
-void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
+void KMFolderCachedImap::slotGetAnnotationResult( TDEIO::Job* job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2805,7 +2805,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
 
   AnnotationJobs::GetAnnotationJob* annjob = static_cast<AnnotationJobs::GetAnnotationJob *>( job );
   if ( annjob->error() ) {
-    if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) {
+    if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) {
       // that's when the imap server doesn't support annotations
       if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
            && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
@@ -2821,7 +2821,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
   serverSyncInternal();
 }
 
-void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
+void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( TDEIO::Job* job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2833,7 +2833,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
   AnnotationJobs::MultiUrlGetAnnotationJob* annjob
     = static_cast<AnnotationJobs::MultiUrlGetAnnotationJob *>( job );
   if ( annjob->error() ) {
-    if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) {
+    if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) {
       // that's when the imap server doesn't support annotations
       if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
            && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
@@ -2873,7 +2873,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
   createFoldersNewOnServerAndFinishListing( folders );
 }
 
-void KMFolderCachedImap::slotQuotaResult( KIO::Job* job )
+void KMFolderCachedImap::slotQuotaResult( TDEIO::Job* job )
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2884,7 +2884,7 @@ void KMFolderCachedImap::slotQuotaResult( KIO::Job* job )
   QuotaJobs::GetStorageQuotaJob* quotajob = static_cast<QuotaJobs::GetStorageQuotaJob *>( job );
   QuotaInfo empty;
   if ( quotajob->error() ) {
-    if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) {
+    if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) {
       // that's when the imap server doesn't support quota
       mAccount->setHasNoQuotaSupport();
       setQuotaInfo( empty );
@@ -2916,7 +2916,7 @@ KMFolderCachedImap::slotAnnotationChanged( const TQString& entry, const TQString
   }
 }
 
-void KMFolderCachedImap::slotTestAnnotationResult(KIO::Job *job)
+void KMFolderCachedImap::slotTestAnnotationResult(TDEIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   Q_ASSERT( it != mAccount->jobsEnd() );
@@ -2936,7 +2936,7 @@ void KMFolderCachedImap::slotTestAnnotationResult(KIO::Job *job)
 }
 
 void
-KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
+KMFolderCachedImap::slotSetAnnotationResult(TDEIO::Job *job)
 {
   KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
   if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
@@ -2945,7 +2945,7 @@ KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
   bool cont = true;
   if ( job->error() ) {
     // Don't show error if the server doesn't support ANNOTATEMORE and this folder only contains mail
-    if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) {
+    if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) {
       if (mAccount->slave()) mAccount->removeJob(job);
     } else {
       cont = mAccount->handleJobError( job, i18n( "Error while setting annotation: " ) + '\n' );
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index 59c444e6b..e82da6c3e 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -341,13 +341,13 @@ public:
   virtual bool mailCheckInProgress() const;
 
 protected slots:
-  void slotGetMessagesData(KIO::Job * job, const TQByteArray & data);
+  void slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data);
   void getMessagesResult(KMail::FolderJob *, bool lastSet);
   void slotGetLastMessagesResult(KMail::FolderJob *);
   void slotProgress(unsigned long done, unsigned long total);
   void slotPutProgress( unsigned long, unsigned long );
 
-  //virtual void slotCheckValidityResult(KIO::Job * job);
+  //virtual void slotCheckValidityResult(TDEIO::Job * job);
   void slotSubFolderComplete(KMFolderCachedImap*, bool);
   void slotSubFolderCloseToQuotaChanged();
 
@@ -356,21 +356,21 @@ protected slots:
 
   void slotCheckUidValidityResult( KMail::FolderJob* job );
   void slotPermanentFlags( int flags );
-  void slotTestAnnotationResult(KIO::Job *job);
-  void slotGetAnnotationResult( KIO::Job* );
-  void slotMultiUrlGetAnnotationResult( KIO::Job* );
-  void slotSetAnnotationResult(KIO::Job *job);
+  void slotTestAnnotationResult(TDEIO::Job *job);
+  void slotGetAnnotationResult( TDEIO::Job* );
+  void slotMultiUrlGetAnnotationResult( TDEIO::Job* );
+  void slotSetAnnotationResult(TDEIO::Job *job);
   void slotReceivedUserRights( KMFolder* );
-  void slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& );
+  void slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& );
 
-  void slotMultiSetACLResult(KIO::Job *);
+  void slotMultiSetACLResult(TDEIO::Job *);
   void slotACLChanged( const TQString&, int );
   void slotAnnotationResult(const TQString& entry, const TQString& value, bool found);
   void slotAnnotationChanged( const TQString& entry, const TQString& attribute, const TQString& value );
   void slotDeleteMessagesResult(KMail::FolderJob *);
   void slotImapStatusChanged(KMFolder* folder, const TQString&, bool);
   void slotStorageQuotaResult( const QuotaInfo& );
-  void slotQuotaResult( KIO::Job* job );
+  void slotQuotaResult( TDEIO::Job* job );
 
 protected:
   /* returns true if there were messages to delete
@@ -414,9 +414,9 @@ protected:
 
 public slots:
   /**
-   * Add the data a KIO::Job retrieves to the buffer
+   * Add the data a TDEIO::Job retrieves to the buffer
    */
-  void slotSimpleData(KIO::Job * job, const TQByteArray & data);
+  void slotSimpleData(TDEIO::Job * job, const TQByteArray & data);
 
   /**
    * Troubleshoot the IMAP cache
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 161354bce..3f7208a97 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -225,7 +225,7 @@ void KMFolderDialog::slotCancelAccept()
 void KMFolderDialog::slotChanged( bool )
 {
   // TODO, support for 'changed', and Apply button.
-  // sample code for here: KCMultiDialog calls bool changed() on every KCModuleProxy...
+  // sample code for here: KCMultiDialog calls bool changed() on every TDECModuleProxy...
 }
 
 void KMFolderDialog::setFolder( KMFolder* folder )
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index 6d3d468ec..07a52c5c6 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -186,8 +186,8 @@ void KMFolderImap::setAccount(KMAcctImap *aAccount)
 //-----------------------------------------------------------------------------
 void KMFolderImap::readConfig()
 {
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + folder()->idString());
   mCheckMail = config->readBoolEntry("checkmail", true);
 
   mUidValidity = config->readEntry("UidValidity");
@@ -210,8 +210,8 @@ void KMFolderImap::readConfig()
 //-----------------------------------------------------------------------------
 void KMFolderImap::writeConfig()
 {
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + folder()->idString());
   config->writeEntry("checkmail", mCheckMail);
   config->writeEntry("UidValidity", mUidValidity);
   config->writeEntry("ImapPath", mImapPath);
@@ -239,8 +239,8 @@ void KMFolderImap::remove()
     emit removed(folder(), false);
     return;
   }
-  KIO::SimpleJob *job = KIO::file_delete(url, false);
-  KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+  TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+  TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
   ImapAccountBase::jobData jd(url.url());
   jd.progressItem = ProgressManager::createProgressItem(
                       "ImapFolderRemove" + ProgressManager::getUniqueID(),
@@ -249,12 +249,12 @@ void KMFolderImap::remove()
                       false,
                       account()->useSSL() || account()->useTLS() );
   account()->insertJob(job, jd);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          this, TQT_SLOT(slotRemoveFolderResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          this, TQT_SLOT(slotRemoveFolderResult(TDEIO::Job *)));
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotRemoveFolderResult(KIO::Job *job)
+void KMFolderImap::slotRemoveFolderResult(TDEIO::Job *job)
 {
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
@@ -1076,13 +1076,13 @@ void KMFolderImap::checkValidity()
     account()->mailCheckProgressItem()->setStatus( folder()->prettyURL() );
   }
   ImapAccountBase::jobData jd( url.url() );
-  KIO::SimpleJob *job = KIO::get(url, false, false);
-  KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+  TDEIO::SimpleJob *job = TDEIO::get(url, false, false);
+  TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
   account()->insertJob(job, jd);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_SLOT(slotCheckValidityResult(KIO::Job *)));
-  connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-          TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_SLOT(slotCheckValidityResult(TDEIO::Job *)));
+  connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+          TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)));
   // Only check once at a time.
   mCheckingValidity = true;
 }
@@ -1105,14 +1105,14 @@ ulong KMFolderImap::lastUid()
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotCheckValidityResult(KIO::Job * job)
+void KMFolderImap::slotCheckValidityResult(TDEIO::Job * job)
 {
   kdDebug(5006) << "KMFolderImap::slotCheckValidityResult of: " << fileName() << endl;
   mCheckingValidity = false;
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
   if (job->error()) {
-    if ( job->error() != KIO::ERR_ACCESS_DENIED ) {
+    if ( job->error() != TDEIO::ERR_ACCESS_DENIED ) {
       // we suppress access denied messages because they are normally a result of
       // explicitely set ACLs. Do not save this information (e.g. setNoContent) so that
       // we notice when this changes
@@ -1233,37 +1233,37 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
     if ( mMailCheckProgressItem )
       mMailCheckProgressItem->setStatus( i18n("Retrieving message status") );
     url.setPath(imapPath() + ";SECTION=UID FLAGS");
-    KIO::SimpleJob *job = KIO::listDir(url, false);
-    KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+    TDEIO::SimpleJob *job = TDEIO::listDir(url, false);
+    TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
     ImapAccountBase::jobData jd( url.url(), folder() );
     jd.cancellable = true;
     account()->insertJob(job, jd);
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotListFolderResult(KIO::Job *)));
-    connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)),
-            this, TQT_SLOT(slotListFolderEntries(KIO::Job *,
-            const KIO::UDSEntryList &)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotListFolderResult(TDEIO::Job *)));
+    connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
+            this, TQT_SLOT(slotListFolderEntries(TDEIO::Job *,
+            const TDEIO::UDSEntryList &)));
   } else {
     mContentState = imapDownloadInProgress;
     if ( mMailCheckProgressItem )
       mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
     url.setPath(imapPath() + ";UID=" + startUid
       + ":*;SECTION=ENVELOPE");
-    KIO::SimpleJob *newJob = KIO::get(url, false, false);
-    KIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
+    TDEIO::SimpleJob *newJob = TDEIO::get(url, false, false);
+    TDEIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
     ImapAccountBase::jobData jd( url.url(), folder() );
     jd.cancellable = true;
     account()->insertJob(newJob, jd);
-    connect(newJob, TQT_SIGNAL(result(KIO::Job *)),
-            this, TQT_SLOT(slotGetLastMessagesResult(KIO::Job *)));
-    connect(newJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-            this, TQT_SLOT(slotGetMessagesData(KIO::Job *, const TQByteArray &)));
+    connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)),
+            this, TQT_SLOT(slotGetLastMessagesResult(TDEIO::Job *)));
+    connect(newJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+            this, TQT_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &)));
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotListFolderResult(KIO::Job * job)
+void KMFolderImap::slotListFolderResult(TDEIO::Job * job)
 {
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
@@ -1356,39 +1356,39 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
     mContentState = imapDownloadInProgress;
     KURL url = account()->getUrl();
     url.setPath(imapPath() + ";UID=" + *i + ";SECTION=ENVELOPE");
-    KIO::SimpleJob *newJob = KIO::get(url, false, false);
+    TDEIO::SimpleJob *newJob = TDEIO::get(url, false, false);
     jd.url = url.url();
-    KIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
+    TDEIO::Scheduler::assignJobToSlave(account()->slave(), newJob);
     account()->insertJob(newJob, jd);
-    connect(newJob, TQT_SIGNAL(result(KIO::Job *)),
+    connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)),
         this, (i == sets.at(sets.count() - 1))
-        ? TQT_SLOT(slotGetLastMessagesResult(KIO::Job *))
-        : TQT_SLOT(slotGetMessagesResult(KIO::Job *)));
-    connect(newJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-        this, TQT_SLOT(slotGetMessagesData(KIO::Job *, const TQByteArray &)));
+        ? TQT_SLOT(slotGetLastMessagesResult(TDEIO::Job *))
+        : TQT_SLOT(slotGetMessagesResult(TDEIO::Job *)));
+    connect(newJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+        this, TQT_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &)));
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotListFolderEntries(KIO::Job * job,
-  const KIO::UDSEntryList & uds)
+void KMFolderImap::slotListFolderEntries(TDEIO::Job * job,
+  const TDEIO::UDSEntryList & uds)
 {
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
   TQString mimeType, name;
   long int flags = 0;
-  for (KIO::UDSEntryList::ConstIterator udsIt = uds.begin();
+  for (TDEIO::UDSEntryList::ConstIterator udsIt = uds.begin();
     udsIt != uds.end(); udsIt++)
   {
-    for (KIO::UDSEntry::ConstIterator eIt = (*udsIt).begin();
+    for (TDEIO::UDSEntry::ConstIterator eIt = (*udsIt).begin();
       eIt != (*udsIt).end(); eIt++)
     {
-      if ((*eIt).m_uds == KIO::UDS_NAME)
+      if ((*eIt).m_uds == TDEIO::UDS_NAME)
         name = (*eIt).m_str;
-      else if ((*eIt).m_uds == KIO::UDS_MIME_TYPE)
+      else if ((*eIt).m_uds == TDEIO::UDS_MIME_TYPE)
         mimeType = (*eIt).m_str;
-      else if ((*eIt).m_uds == KIO::UDS_ACCESS)
+      else if ((*eIt).m_uds == TDEIO::UDS_ACCESS)
         flags = (*eIt).m_long;
     }
     if ((mimeType == "message/rfc822-imap" || mimeType == "message/rfc822") &&
@@ -1519,7 +1519,7 @@ KMFolderImap::ignoreJobsForMessage( KMMessage* msg )
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
+void KMFolderImap::slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data)
 {
   if ( data.isEmpty() ) return; // optimization
   ImapAccountBase::JobIterator it = account()->findJob(job);
@@ -1687,7 +1687,7 @@ KMFolderImap::doCreateJob( TQPtrList<KMMessage>& msgList, const TQString& sets,
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::getMessagesResult(KIO::Job * job, bool lastSet)
+void KMFolderImap::getMessagesResult(TDEIO::Job * job, bool lastSet)
 {
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
@@ -1704,14 +1704,14 @@ void KMFolderImap::getMessagesResult(KIO::Job * job, bool lastSet)
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotGetLastMessagesResult(KIO::Job * job)
+void KMFolderImap::slotGetLastMessagesResult(TDEIO::Job * job)
 {
   getMessagesResult(job, true);
 }
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotGetMessagesResult(KIO::Job * job)
+void KMFolderImap::slotGetMessagesResult(TDEIO::Job * job)
 {
   getMessagesResult(job, false);
 }
@@ -1735,18 +1735,18 @@ void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath
   }
   url.setPath( path );
 
-  KIO::SimpleJob *job = KIO::mkdir(url);
-  KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+  TDEIO::SimpleJob *job = TDEIO::mkdir(url);
+  TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
   ImapAccountBase::jobData jd( url.url(), folder() );
   jd.items = name;
   account()->insertJob(job, jd);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          this, TQT_SLOT(slotCreateFolderResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          this, TQT_SLOT(slotCreateFolderResult(TDEIO::Job *)));
 }
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotCreateFolderResult(KIO::Job * job)
+void KMFolderImap::slotCreateFolderResult(TDEIO::Job * job)
 {
   ImapAccountBase::JobIterator it = account()->findJob(job);
   if ( it == account()->jobsEnd() ) return;
@@ -1757,7 +1757,7 @@ void KMFolderImap::slotCreateFolderResult(KIO::Job * job)
 
   if (job->error())
   {
-    if ( job->error() == KIO::ERR_COULD_NOT_MKDIR ) {
+    if ( job->error() == TDEIO::ERR_COULD_NOT_MKDIR ) {
       // Creating a folder failed, remove it from the tree.
       account()->listDirectory( );
     }
@@ -1807,7 +1807,7 @@ bool KMFolderImap::autoExpunge()
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotSimpleData(KIO::Job * job, const TQByteArray & data)
+void KMFolderImap::slotSimpleData(TDEIO::Job * job, const TQByteArray & data)
 {
   if ( data.isEmpty() ) return; // optimization
   ImapAccountBase::JobIterator it = account()->findJob(job);
@@ -1837,12 +1837,12 @@ void KMFolderImap::deleteMessage(KMMessage * msg)
   url.setPath(msg_parent->imapPath() + ";UID=" + TQString::number(uid) );
   if ( account()->makeConnection() != ImapAccountBase::Connected )
     return;
-  KIO::SimpleJob *job = KIO::file_delete(url, false);
-  KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+  TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+  TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
   ImapAccountBase::jobData jd( url.url(), 0 );
   account()->insertJob(job, jd);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          account(), TQT_SLOT(slotSimpleResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
 }
 
 void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
@@ -1870,12 +1870,12 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
     url.setPath(msg_parent->imapPath() + ";UID=" + uid);
     if ( account()->makeConnection() != ImapAccountBase::Connected )
       return;
-    KIO::SimpleJob *job = KIO::file_delete(url, false);
-    KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+    TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+    TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
     ImapAccountBase::jobData jd( url.url(), 0 );
     account()->insertJob(job, jd);
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-        account(), TQT_SLOT(slotSimpleResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+        account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
   }
 }
 
@@ -1968,7 +1968,7 @@ void KMFolderImap::setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool to
     // to make sure that we get the latest flags abort the current listing and
     // create a new one
     kdDebug(5006) << "Set status during folder listing, restarting listing." << endl;
-    disconnect(this, TQT_SLOT(slotListFolderResult(KIO::Job *)));
+    disconnect(this, TQT_SLOT(slotListFolderResult(TDEIO::Job *)));
     quiet( false );
     reallyGetFolder( TQString() );
   }
@@ -2070,13 +2070,13 @@ void KMFolderImap::expungeFolder(KMFolderImap * aFolder, bool quiet)
   url.setPath(aFolder->imapPath() + ";UID=*");
   if ( account()->makeConnection() != ImapAccountBase::Connected )
     return;
-  KIO::SimpleJob *job = KIO::file_delete(url, false);
-  KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+  TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+  TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
   ImapAccountBase::jobData jd( url.url(), 0 );
   jd.quiet = quiet;
   account()->insertJob(job, jd);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          account(), TQT_SLOT(slotSimpleResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
 }
 
 //-----------------------------------------------------------------------------
@@ -2132,19 +2132,19 @@ bool KMFolderImap::processNewMail(bool)
               false,
               account()->useSSL() || account()->useTLS() );
 
-  KIO::SimpleJob *job = KIO::stat(url, false);
-  KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+  TDEIO::SimpleJob *job = TDEIO::stat(url, false);
+  TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
   ImapAccountBase::jobData jd(url.url(), folder() );
   jd.cancellable = true;
   account()->insertJob(job, jd);
-  connect(job, TQT_SIGNAL(result(KIO::Job *)),
-          TQT_SLOT(slotStatResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+          TQT_SLOT(slotStatResult(TDEIO::Job *)));
   return true;
 }
 
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotStatResult(KIO::Job * job)
+void KMFolderImap::slotStatResult(TDEIO::Job * job)
 {
   slotCompleteMailCheckProgress();
   ImapAccountBase::JobIterator it = account()->findJob(job);
@@ -2154,10 +2154,10 @@ void KMFolderImap::slotStatResult(KIO::Job * job)
   {
     account()->handleJobError( job, i18n("Error while getting folder information.") );
   } else {
-    KIO::UDSEntry uds = static_cast<KIO::StatJob*>(job)->statResult();
-    for (KIO::UDSEntry::ConstIterator it = uds.begin(); it != uds.end(); it++)
+    TDEIO::UDSEntry uds = static_cast<TDEIO::StatJob*>(job)->statResult();
+    for (TDEIO::UDSEntry::ConstIterator it = uds.begin(); it != uds.end(); it++)
     {
-      if ((*it).m_uds == KIO::UDS_SIZE)
+      if ((*it).m_uds == TDEIO::UDS_SIZE)
       {
         if (mReadOnly)
         {
@@ -2242,13 +2242,13 @@ int KMFolderImap::expungeContents()
   url.setPath( imapPath() + ";UID=1:*");
   if ( account()->makeConnection() == ImapAccountBase::Connected )
   {
-    KIO::SimpleJob *job = KIO::file_delete(url, false);
-    KIO::Scheduler::assignJobToSlave(account()->slave(), job);
+    TDEIO::SimpleJob *job = TDEIO::file_delete(url, false);
+    TDEIO::Scheduler::assignJobToSlave(account()->slave(), job);
     ImapAccountBase::jobData jd( url.url(), 0 );
     jd.quiet = true;
     account()->insertJob(job, jd);
-    connect(job, TQT_SIGNAL(result(KIO::Job *)),
-            account(), TQT_SLOT(slotSimpleResult(KIO::Job *)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
+            account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *)));
   }
   /* Is the below correct? If we are expunging (in the folder sense, not the imap sense),
      why delete but not (imap-)expunge? Since the folder is not active there is no concept
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 059e1a4cb..490b13a69 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -372,9 +372,9 @@ public slots:
   virtual void take(TQPtrList<KMMessage>);
 
   /**
-   * Add the data a KIO::Job retrieves to the buffer
+   * Add the data a TDEIO::Job retrieves to the buffer
    */
-  void slotSimpleData(KIO::Job * job, const TQByteArray & data);
+  void slotSimpleData(TDEIO::Job * job, const TQByteArray & data);
 
   /**
    * Convert IMAP flags to a message status
@@ -426,7 +426,7 @@ protected:
   virtual FolderJob* doCreateJob( TQPtrList<KMMessage>& msgList, const TQString& sets,
                                   FolderJob::JobType jt, KMFolder *folder ) const;
 
-  void getMessagesResult(KIO::Job * job, bool lastSet);
+  void getMessagesResult(TDEIO::Job * job, bool lastSet);
 
   /** Called by KMFolder::expunge() to delete the actual contents.
     At the time of the call the folder has already been closed, and
@@ -452,7 +452,7 @@ protected slots:
    * Retrieve the whole folder or only the changes
    */
   void checkValidity();
-  void slotCheckValidityResult(KIO::Job * job);
+  void slotCheckValidityResult(TDEIO::Job * job);
 
   /**
    * Get the folder now (internal)
@@ -462,30 +462,30 @@ protected slots:
   /**
    * For listing the contents of a folder
    */
-  void slotListFolderResult(KIO::Job * job);
-  void slotListFolderEntries(KIO::Job * job, const KIO::UDSEntryList & uds);
+  void slotListFolderResult(TDEIO::Job * job);
+  void slotListFolderEntries(TDEIO::Job * job, const TDEIO::UDSEntryList & uds);
 
   /**
    * For retrieving a message digest
    */
-  void slotGetMessagesResult(KIO::Job * job);
-  void slotGetLastMessagesResult(KIO::Job * job);
-  void slotGetMessagesData(KIO::Job * job, const TQByteArray & data);
+  void slotGetMessagesResult(TDEIO::Job * job);
+  void slotGetLastMessagesResult(TDEIO::Job * job);
+  void slotGetMessagesData(TDEIO::Job * job, const TQByteArray & data);
 
   /**
    * For creating a new subfolder
    */
-  void slotCreateFolderResult(KIO::Job * job);
+  void slotCreateFolderResult(TDEIO::Job * job);
 
   /**
    * Remove the folder also locally, if removing on the server succeeded
    */
-  void slotRemoveFolderResult(KIO::Job *job);
+  void slotRemoveFolderResult(TDEIO::Job *job);
 
   /**
    * Update the number of unseen messages
    */
-  void slotStatResult(KIO::Job *job);
+  void slotStatResult(TDEIO::Job *job);
 
   /**
    * notify the progress item that the mail check for this folder is
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index c12a58915..c6fa7be24 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -1012,7 +1012,7 @@ static bool removeDirAndContentsRecursively( const TQString & path )
 //-----------------------------------------------------------------------------
 int KMFolderMaildir::removeContents()
 {
-  // NOTE: Don' use KIO::netaccess, it has reentrancy problems and multiple
+  // NOTE: Don' use TDEIO::netaccess, it has reentrancy problems and multiple
   // mailchecks going on trigger them, when removing dirs
   if ( !removeDirAndContentsRecursively( location() + "/new/" ) ) return 1;
   if ( !removeDirAndContentsRecursively( location() + "/cur/" ) ) return 1;
@@ -1132,14 +1132,14 @@ TQ_INT64 KMFolderMaildir::doFolderSize() const
     //kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder "
     //  << location() << endl;
     KDirSize* job = KDirSize::dirSizeJob( list );
-    connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-             this, TQT_SLOT( slotDirSizeJobResult( KIO::Job* ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+             this, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) );
   }
 
   return -1;
 }
 
-void KMFolderMaildir::slotDirSizeJobResult( KIO::Job* job )
+void KMFolderMaildir::slotDirSizeJobResult( TDEIO::Job* job )
 {
     mCurrentlyCheckingFolderSize = false;
     KDirSize * dirsize = dynamic_cast<KDirSize*>( job );
@@ -1164,8 +1164,8 @@ void KMFolderMaildir::slotDirSizeJobResult( KIO::Job* job )
         //kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder "
         //  << entry.first->location() << endl;
         KDirSize* job = KDirSize::dirSizeJob( entry.second );
-        connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-                 entry.first, TQT_SLOT( slotDirSizeJobResult( KIO::Job* ) ) );
+        connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+                 entry.first, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) );
         break;
       }
       else
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index 832638ad7..fc1990319 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -13,7 +13,7 @@ namespace KMail {
   class MaildirJob;
   class AttachmentStrategy;
 }
-namespace KIO {
+namespace TDEIO {
     class Job;
 }
 
@@ -145,7 +145,7 @@ protected:
   int addMsgInternal( KMMessage* msg, int* index_return = 0, bool stripUid=false );
 
 private slots:
-  void slotDirSizeJobResult( KIO::Job* job );
+  void slotDirSizeJobResult( TDEIO::Job* job );
 
 private:
   void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status);
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index 7e033523d..137996803 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -145,7 +145,7 @@ int KMFolderMbox::open(const char *owner)
         // message boxes don't have a "Don't ask again" checkbox.
         if (kmkernel->startingUp())
         {
-          KConfigGroup configGroup( KMKernel::config(), "Notification Messages" );
+          TDEConfigGroup configGroup( KMKernel::config(), "Notification Messages" );
           bool showMessage =
             configGroup.readBoolEntry( "showIndexRegenerationMessage", true );
           if (showMessage)
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index 34958e5a7..2c3d10a5a 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -59,8 +59,8 @@ KMFolderMgr::~KMFolderMgr()
 
 //-----------------------------------------------------------------------------
 void KMFolderMgr::expireAll() {
-  KConfig             *config = KMKernel::config();
-  KConfigGroupSaver   saver(config, "General");
+  TDEConfig             *config = KMKernel::config();
+  TDEConfigGroupSaver   saver(config, "General");
   int                 ret = KMessageBox::Continue;
 
   if (config->readBoolEntry("warn-before-expire", true)) {
@@ -314,8 +314,8 @@ KMFolder* KMFolderMgr::findOrCreate(const TQString& aFolderName, bool sysFldr,
     if (know_type == false)
     {
       know_type = true;
-      KConfig *config = KMKernel::config();
-      KConfigGroupSaver saver(config, "General");
+      TDEConfig *config = KMKernel::config();
+      TDEConfigGroupSaver saver(config, "General");
       if (config->hasKey("default-mailbox-format"))
       {
         if (config->readNumEntry("default-mailbox-format", 1) == 0)
diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp
index 819d5ff82..fa34f5b99 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -92,7 +92,7 @@ KMSearch::~KMSearch()
 
 bool KMSearch::write(TQString location) const
 {
-    KConfig config(location);
+    TDEConfig config(location);
     config.setGroup("Search Folder");
     if (mSearchPattern)
         mSearchPattern->writeConfig(&config);
@@ -106,7 +106,7 @@ bool KMSearch::write(TQString location) const
 
 bool KMSearch::read(TQString location)
 {
-    KConfig config( location );
+    TDEConfig config( location );
     config.setGroup( "Search Folder" );
     if ( !mSearchPattern )
         mSearchPattern = new KMSearchPattern();
diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp
index 719dce4e0..f30ab4b3d 100644
--- a/kmail/kmfolderseldlg.cpp
+++ b/kmail/kmfolderseldlg.cpp
@@ -122,7 +122,7 @@ void KMFolderSelDlg::setFlags( bool mustBeReadWrite, bool showOutbox,
 
 void KMFolderSelDlg::readConfig()
 {
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup( "FolderSelectionDialog" );
 
   TQSize size = config->readSizeEntry( "Size" );
@@ -143,7 +143,7 @@ void KMFolderSelDlg::readConfig()
 
 void KMFolderSelDlg::writeConfig()
 {
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup( "FolderSelectionDialog" );
   config->writeEntry( "Size", size() );
 
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 7bec817b6..9d259f562 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -480,13 +480,13 @@ void KMFolderTree::connectSignals()
 //-----------------------------------------------------------------------------
 void KMFolderTree::readConfig (void)
 {
-  KConfig* conf = KMKernel::config();
+  TDEConfig* conf = KMKernel::config();
 
   readColorConfig();
 
   // Custom/Ssystem font support
   {
-    KConfigGroupSaver saver(conf, "Fonts");
+    TDEConfigGroupSaver saver(conf, "Fonts");
     if (!conf->readBoolEntry("defaultFonts",true)) {
       TQFont folderFont( TDEGlobalSettings::generalFont() );
       setFont(conf->readFontEntry("folder-font", &folderFont));
@@ -1045,9 +1045,9 @@ void KMFolderTree::doFolderSelected( TQListViewItem* qlvi, bool keepSelection )
 //-----------------------------------------------------------------------------
 void KMFolderTree::resizeEvent(TQResizeEvent* e)
 {
-  KConfig* conf = KMKernel::config();
+  TDEConfig* conf = KMKernel::config();
 
-  KConfigGroupSaver saver(conf, "Geometry");
+  TDEConfigGroupSaver saver(conf, "Geometry");
   conf->writeEntry(name(), size().width());
 
   KListView::resizeEvent(e);
@@ -1321,7 +1321,7 @@ void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent )
 // config file.
 bool KMFolderTree::readIsListViewItemOpen(KMFolderTreeItem *fti)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   KMFolder *folder = fti->folder();
   TQString name;
   if (folder)
@@ -1338,7 +1338,7 @@ bool KMFolderTree::readIsListViewItemOpen(KMFolderTreeItem *fti)
   } else {
     return false;
   }
-  KConfigGroupSaver saver(config, name);
+  TDEConfigGroupSaver saver(config, name);
 
   return config->readBoolEntry("isOpen", false);
 }
@@ -1347,7 +1347,7 @@ bool KMFolderTree::readIsListViewItemOpen(KMFolderTreeItem *fti)
 // Saves open/closed state of a folder directory into the config file
 void KMFolderTree::writeIsListViewItemOpen(KMFolderTreeItem *fti)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   KMFolder *folder = fti->folder();
   TQString name;
   if (folder && !folder->idString().isEmpty())
@@ -1364,7 +1364,7 @@ void KMFolderTree::writeIsListViewItemOpen(KMFolderTreeItem *fti)
   } else {
     return;
   }
-  KConfigGroupSaver saver(config, name);
+  TDEConfigGroupSaver saver(config, name);
   config->writeEntry("isOpen", fti->isOpen() );
 }
 
@@ -1374,7 +1374,7 @@ void KMFolderTree::cleanupConfigFile()
 {
   if ( childCount() == 0 )
     return; // just in case reload wasn't called before
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   TQStringList existingFolders;
   TQListViewItemIterator fldIt(this);
   TQMap<TQString,bool> folderMap;
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index bfe871945..8e142c91e 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -426,9 +426,9 @@ bool KMHeaders::event(TQEvent *e)
 //-----------------------------------------------------------------------------
 void KMHeaders::readColorConfig (void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   // Custom/System colors
-  KConfigGroupSaver saver(config, "Reader");
+  TDEConfigGroupSaver saver(config, "Reader");
   TQColor c1=TQColor(kapp->palette().active().text());
   TQColor c2=TQColor("red");
   TQColor c3=TQColor("blue");
@@ -468,11 +468,11 @@ void KMHeaders::readColorConfig (void)
 //-----------------------------------------------------------------------------
 void KMHeaders::readConfig (void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
 
   // Backing pixmap support
   { // area for config group "Pixmaps"
-    KConfigGroupSaver saver(config, "Pixmaps");
+    TDEConfigGroupSaver saver(config, "Pixmaps");
     TQString pixmapFile = config->readEntry("Headers");
     mPaintInfo.pixmapOn = false;
     if (!pixmapFile.isEmpty()) {
@@ -482,7 +482,7 @@ void KMHeaders::readConfig (void)
   }
 
   { // area for config group "General"
-    KConfigGroupSaver saver(config, "General");
+    TDEConfigGroupSaver saver(config, "General");
     bool show = config->readBoolEntry("showMessageSize");
     slotToggleColumn(KPaintInfo::COL_SIZE, show);
 
@@ -530,7 +530,7 @@ void KMHeaders::readConfig (void)
 
   // Custom/System fonts
   { // area for config group "General"
-    KConfigGroupSaver saver(config, "Fonts");
+    TDEConfigGroupSaver saver(config, "Fonts");
     if (!(config->readBoolEntry("defaultFonts",true)))
     {
       TQFont listFont( TDEGlobalSettings::generalFont() );
@@ -551,13 +551,13 @@ void KMHeaders::readConfig (void)
 
   // Behavior
   {
-    KConfigGroupSaver saver(config, "Geometry");
+    TDEConfigGroupSaver saver(config, "Geometry");
     mReaderWindowActive = config->readEntry( "readerWindowMode", "below" ) != "hide";
   }
 }
 
 //-----------------------------------------------------------------------------
-void KMHeaders::restoreColumnLayout( KConfig *config, const TQString &group )
+void KMHeaders::restoreColumnLayout( TDEConfig *config, const TQString &group )
 {
   // KListView::restoreLayout() will call setSorting(), which is reimplemented by us.
   // We don't want to change the sort order, so we set a flag here that is checked in
@@ -591,8 +591,8 @@ void KMHeaders::refreshNestedState(void)
 {
   bool oldState = isThreaded();
   NestingPolicy oldNestPolicy = nestingPolicy;
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Geometry");
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Geometry");
   mNested = config->readBoolEntry( "nestedMessages", false );
 
   nestingPolicy = (NestingPolicy)config->readNumEntry( "nestingPolicy", OpenUnread );
@@ -609,9 +609,9 @@ void KMHeaders::refreshNestedState(void)
 void KMHeaders::readFolderConfig (void)
 {
   if (!mFolder) return;
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
 
-  KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+  TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
   mNestedOverride = config->readBoolEntry( "threadMessagesOverride", false );
   mSortCol = config->readNumEntry("SortColumn", mSortCol+1 /* inited to  date column */);
   mSortDescending = (mSortCol < 0);
@@ -625,7 +625,7 @@ void KMHeaders::readFolderConfig (void)
   mPaintInfo.status = config->readBoolEntry( "Status", false );
 
   { //area for config group "Geometry"
-    KConfigGroupSaver saver(config, "Geometry");
+    TDEConfigGroupSaver saver(config, "Geometry");
     mNested = config->readBoolEntry( "nestedMessages", false );
     nestingPolicy = (NestingPolicy)config->readNumEntry( "nestingPolicy", OpenUnread );
   }
@@ -639,10 +639,10 @@ void KMHeaders::readFolderConfig (void)
 void KMHeaders::writeFolderConfig (void)
 {
   if (!mFolder) return;
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   int mSortColAdj = mSortCol + 1;
 
-  KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+  TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
   config->writeEntry("SortColumn", (mSortDescending ? -mSortColAdj : mSortColAdj));
   config->writeEntry("Top", topItemIndex());
   config->writeEntry("Current", currentItemIndex());
@@ -659,9 +659,9 @@ void KMHeaders::writeFolderConfig (void)
 //-----------------------------------------------------------------------------
 void KMHeaders::writeConfig (void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   saveLayout(config, "Header-Geometry");
-  KConfigGroupSaver saver(config, "General");
+  TDEConfigGroupSaver saver(config, "General");
   config->writeEntry("showMessageSize"         , mPaintInfo.showSize);
   config->writeEntry("showAttachmentColumn"    , mPaintInfo.showAttachment);
   config->writeEntry("showInvitationColumn"    , mPaintInfo.showInvitation);
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index 28b75142d..b894b0c7f 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -141,7 +141,7 @@ public:
    *
    * Note that if you want to restore the sort order correctly, call readConfig().
    */
-  void restoreColumnLayout( KConfig *config, const TQString &group );
+  void restoreColumnLayout( TDEConfig *config, const TQString &group );
 
   /** Return the current message */
   virtual KMMessage* currentMsg();
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 11e291ef2..e5dd7072a 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -173,10 +173,10 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
 
 KMKernel::~KMKernel ()
 {
-  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.begin();
+  TQMap<TDEIO::Job*, putData>::Iterator it = mPutJobs.begin();
   while ( it != mPutJobs.end() )
   {
-    KIO::Job *job = it.key();
+    TDEIO::Job *job = it.key();
     mPutJobs.remove( it );
     job->kill();
     it = mPutJobs.begin();
@@ -528,7 +528,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
   bool iCalAutoSend = false;
   bool noWordWrap = false;
   bool isICalInvitation = false;
-  KConfigGroup options( config(), "Groupware" );
+  TDEConfigGroup options( config(), "Groupware" );
   if ( !attachData.isEmpty() ) {
     isICalInvitation = attachName == "cal.ics" &&
       attachType == "text" &&
@@ -566,7 +566,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
         msgPart->setCharset( attachCharset );
       }
       // Don't show the composer window, if the automatic sending is checked
-      KConfigGroup options( config(), "Groupware" );
+      TDEConfigGroup options( config(), "Groupware" );
       iCalAutoSend = options.readBoolEntry( "AutomaticSending", true );
     }
   }
@@ -1411,7 +1411,7 @@ void KMKernel::recoverDeadLetters()
 }
 
 //-----------------------------------------------------------------------------
-void KMKernel::initFolders(KConfig* cfg)
+void KMKernel::initFolders(TDEConfig* cfg)
 {
   TQString name;
 
@@ -1498,11 +1498,11 @@ void KMKernel::init()
   the_shuttingDown = false;
   the_server_is_ready = false;
 
-  KConfig* cfg = KMKernel::config();
+  TDEConfig* cfg = KMKernel::config();
 
   TQDir dir;
 
-  KConfigGroupSaver saver(cfg, "General");
+  TDEConfigGroupSaver saver(cfg, "General");
   the_firstStart = cfg->readBoolEntry("first-start", true);
   cfg->writeEntry("first-start", false);
   the_previousVersion = cfg->readEntry("previous-version");
@@ -1547,7 +1547,7 @@ void KMKernel::init()
   the_server_is_ready = true;
   imProxy()->initialize();
   { // area for config group "Composer"
-    KConfigGroupSaver saver(cfg, "Composer");
+    TDEConfigGroupSaver saver(cfg, "Composer");
     if (cfg->readListEntry("pref-charsets").isEmpty())
     {
       cfg->writeEntry("pref-charsets", "us-ascii,iso-8859-1,locale,utf-8");
@@ -1780,8 +1780,8 @@ void KMKernel::cleanup(void)
   the_weaver = 0;
 #endif
 
-  KConfig* config =  KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig* config =  KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
 
   if (the_trashFolder) {
 
@@ -1872,7 +1872,7 @@ bool KMKernel::transferMail( TQString & destinationDir )
   // disabled for now since moving fails in certain cases (e.g. if symbolic links are involved)
   const TQString kmailName = kapp->aboutData()->programName();
   TQString msg;
-  if ( KIO::NetAccess::exists( destinationDir, true, 0 ) ) {
+  if ( TDEIO::NetAccess::exists( destinationDir, true, 0 ) ) {
     // if destinationDir exists, we need to warn about possible
     // overwriting of files. otherwise, we don't have to
     msg = i18n( "%1-%3 is the application name, %4-%7 are folder path",
@@ -1906,10 +1906,10 @@ bool KMKernel::transferMail( TQString & destinationDir )
     return true;
   }
 
-  if ( !KIO::NetAccess::move( dir, destinationDir ) ) {
-    kdDebug(5006) << k_funcinfo << "Moving " << dir << " to " << destinationDir << " failed: " << KIO::NetAccess::lastErrorString() << endl;
+  if ( !TDEIO::NetAccess::move( dir, destinationDir ) ) {
+    kdDebug(5006) << k_funcinfo << "Moving " << dir << " to " << destinationDir << " failed: " << TDEIO::NetAccess::lastErrorString() << endl;
     kdDebug(5006) << k_funcinfo << "Deleting " << destinationDir << endl;
-    KIO::NetAccess::del( destinationDir, 0 );
+    TDEIO::NetAccess::del( destinationDir, 0 );
     destinationDir = dir;
     return false;
   }
@@ -2002,21 +2002,21 @@ void KMKernel::action(bool mailto, bool check, const TQString &to,
 void KMKernel::byteArrayToRemoteFile(const TQByteArray &aData, const KURL &aURL,
   bool overwrite)
 {
-  // ## when KDE 3.3 is out: use KIO::storedPut to remove slotDataReq altogether
-  KIO::Job *job = KIO::put(aURL, -1, overwrite, false);
+  // ## when KDE 3.3 is out: use TDEIO::storedPut to remove slotDataReq altogether
+  TDEIO::Job *job = TDEIO::put(aURL, -1, overwrite, false);
   putData pd; pd.url = aURL; pd.data = aData; pd.offset = 0;
   mPutJobs.insert(job, pd);
-  connect(job, TQT_SIGNAL(dataReq(KIO::Job*,TQByteArray&)),
-    TQT_SLOT(slotDataReq(KIO::Job*,TQByteArray&)));
-  connect(job, TQT_SIGNAL(result(KIO::Job*)),
-    TQT_SLOT(slotResult(KIO::Job*)));
+  connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)),
+    TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
+    TQT_SLOT(slotResult(TDEIO::Job*)));
 }
 
-void KMKernel::slotDataReq(KIO::Job *job, TQByteArray &data)
+void KMKernel::slotDataReq(TDEIO::Job *job, TQByteArray &data)
 {
   // send the data in 64 KB chunks
   const int MAX_CHUNK_SIZE = 64*1024;
-  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.find(job);
+  TQMap<TDEIO::Job*, putData>::Iterator it = mPutJobs.find(job);
   assert(it != mPutJobs.end());
   int remainingBytes = (*it).data.size() - (*it).offset;
   if( remainingBytes > MAX_CHUNK_SIZE )
@@ -2037,13 +2037,13 @@ void KMKernel::slotDataReq(KIO::Job *job, TQByteArray &data)
   }
 }
 
-void KMKernel::slotResult(KIO::Job *job)
+void KMKernel::slotResult(TDEIO::Job *job)
 {
-  TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.find(job);
+  TQMap<TDEIO::Job*, putData>::Iterator it = mPutJobs.find(job);
   assert(it != mPutJobs.end());
   if (job->error())
   {
-    if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
+    if (job->error() == TDEIO::ERR_FILE_ALREADY_EXIST)
     {
       if (KMessageBox::warningContinueCancel(0,
         i18n("File %1 exists.\nDo you want to replace it?")
@@ -2286,7 +2286,7 @@ void KMKernel::slotEmptyTrash()
   }
 }
 
-KConfig* KMKernel::config()
+TDEConfig* KMKernel::config()
 {
   assert(mySelf);
   if (!mySelf->mConfig)
@@ -2352,9 +2352,9 @@ KMMainWidget *KMKernel::getKMMainWidget()
 
 void KMKernel::slotRunBackgroundTasks() // called regularly by timer
 {
-  // Hidden KConfig keys. Not meant to be used, but a nice fallback in case
+  // Hidden TDEConfig keys. Not meant to be used, but a nice fallback in case
   // a stable kmail release goes out with a nasty bug in CompactionJob...
-  KConfigGroup generalGroup( config(), "General" );
+  TDEConfigGroup generalGroup( config(), "General" );
 
   if ( generalGroup.readBoolEntry( "auto-expiring", true ) ) {
     the_folderMgr->expireAllFolders( false /*scheduled, not immediate*/ );
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 471a77400..fb01231bf 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -21,7 +21,7 @@
 #define kmkernel KMKernel::self()
 #define kmconfig KMKernel::config()
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 namespace KWallet {
@@ -249,7 +249,7 @@ public:
   /** normal control stuff */
 
   static KMKernel *self() { return mySelf; }
-  static KConfig *config();
+  static TDEConfig *config();
 
   void init();
   void readConfig();
@@ -257,7 +257,7 @@ public:
   void recreateCorruptIndexFiles();
   void testDir(const char *_name);
   void recoverDeadLetters();
-  void initFolders(KConfig* cfg);
+  void initFolders(TDEConfig* cfg);
   void closeAllKMailWindows();
   void cleanup(void);
   void quit();
@@ -416,7 +416,7 @@ public slots:
   /// Save contents of all open composer widnows to ~/dead.letter
   void dumpDeadLetters();
 
-  /** Call this slot instead of directly KConfig::sync() to
+  /** Call this slot instead of directly TDEConfig::sync() to
       minimize the overall config writes. Calling this slot will
       schedule a sync of the application config file using a timer, so
       that many consecutive calls can be condensed into a single
@@ -432,8 +432,8 @@ public slots:
   void slotConfigChanged();
 
 protected slots:
-  void slotDataReq(KIO::Job*,TQByteArray&);
-  void slotResult(KIO::Job*);
+  void slotDataReq(TDEIO::Job*,TQByteArray&);
+  void slotResult(TDEIO::Job*);
 
 signals:
   void configChanged();
@@ -470,7 +470,7 @@ private:
     TQByteArray data;
     int offset;
   };
-  TQMap<KIO::Job *, putData> mPutJobs;
+  TQMap<TDEIO::Job *, putData> mPutJobs;
   /** previous KMail version. If different from current,
       the user has just updated. read from config */
   TQString the_previousVersion;
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index c078cfe7a..acf0b0c03 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -119,7 +119,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
       else {
         KABC::VCardConverter converter;
         TQString fileName;
-        if ( KIO::NetAccess::download( (*it), fileName, parentWidget() ) ) {
+        if ( TDEIO::NetAccess::download( (*it), fileName, parentWidget() ) ) {
           TQFile file( fileName );
           file.open( IO_ReadOnly );
           const TQByteArray data = file.readAll();
@@ -129,7 +129,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
 #else
           list += converter.parseVCards( data );
 #endif
-          KIO::NetAccess::removeTempFile( fileName );
+          TDEIO::NetAccess::removeTempFile( fileName );
         } else {
           TQString caption( i18n( "vCard Import Failed" ) );
           TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).arg( (*it).url() );
@@ -188,7 +188,7 @@ void KMLineEdit::loadContacts()
       TQStringList::Iterator it = recent.begin();
       TQString name, email;
 
-      KConfig config( "kpimcompletionorder" );
+      TDEConfig config( "kpimcompletionorder" );
       config.setGroup( "CompletionWeights" );
       int weight = config.readEntry( "Recent Addresses", "10" ).toInt();
       int idx = addCompletionSource( i18n( "Recent Addresses" ), weight );
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 622e70ad7..14ccaba02 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -137,7 +137,7 @@ static KStaticDeleter<TQValueList<KMMainWidget*> > mwlsd;
 //-----------------------------------------------------------------------------
 KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
                            KXMLGUIClient *aGUIClient,
-                           KActionCollection *actionCollection, KConfig* config ) :
+                           KActionCollection *actionCollection, TDEConfig* config ) :
     TQWidget(parent, name),
     mFavoritesCheckMailAction( 0 ),
     mFavoriteFolderView( 0 ),
@@ -287,8 +287,8 @@ void KMMainWidget::destruct()
 //-----------------------------------------------------------------------------
 void KMMainWidget::readPreConfig(void)
 {
-  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short";
   mReaderWindowActive = geometry.readEntry( "readerWindowMode", "below" ) != "hide";
@@ -307,8 +307,8 @@ void KMMainWidget::readFolderConfig(void)
   if (!mFolder)
     return;
 
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
   mFolderThreadPref = config->readBoolEntry( "threadMessagesOverride", false );
   mFolderThreadSubjPref = config->readBoolEntry( "threadMessagesBySubject", true );
   mFolderHtmlPref = config->readBoolEntry( "htmlMailOverride", false );
@@ -322,8 +322,8 @@ void KMMainWidget::writeFolderConfig(void)
   if (!mFolder)
     return;
 
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
   config->writeEntry( "threadMessagesOverride", mFolderThreadPref );
   config->writeEntry( "threadMessagesBySubject", mFolderThreadSubjPref );
   config->writeEntry( "htmlMailOverride", mFolderHtmlPref );
@@ -334,7 +334,7 @@ void KMMainWidget::writeFolderConfig(void)
 //-----------------------------------------------------------------------------
 void KMMainWidget::readConfig(void)
 {
-  KConfig *config = KMKernel::config();
+  TDEConfig *config = KMKernel::config();
 
   bool oldLongFolderList =  mLongFolderList;
   bool oldReaderWindowActive = mReaderWindowActive;
@@ -367,7 +367,7 @@ void KMMainWidget::readConfig(void)
   }
 
   { // area for config group "Geometry"
-    KConfigGroupSaver saver(config, "Geometry");
+    TDEConfigGroupSaver saver(config, "Geometry");
     // size of the mainwin
     TQSize defaultSize(750,560);
     siz = config->readSizeEntry("MainWin", &defaultSize);
@@ -458,7 +458,7 @@ void KMMainWidget::readConfig(void)
   mFavoritesCheckMailAction->setEnabled( GlobalSettings::self()->enableFavoriteFolderView() );
 
   { // area for config group "General"
-    KConfigGroupSaver saver(config, "General");
+    TDEConfigGroupSaver saver(config, "General");
     mBeepOnNew = config->readBoolEntry("beep-on-mail", false);
     mConfirmEmpty = config->readBoolEntry("confirm-before-empty", true);
     // startup-Folder, defaults to system-inbox
@@ -515,8 +515,8 @@ void KMMainWidget::readConfig(void)
 void KMMainWidget::writeConfig(void)
 {
   TQString s;
-  KConfig *config = KMKernel::config();
-  KConfigGroup geometry( config, "Geometry" );
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroup geometry( config, "Geometry" );
 
   if (mMsgView)
     mMsgView->writeConfig();
@@ -1125,8 +1125,8 @@ void KMMainWidget::slotExpireFolder()
     KMessageBox::information(this, str);
     return;
   }
-  KConfig           *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig           *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
 
   if (config->readBoolEntry("warn-before-expire", true)) {
     str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").arg(TQStyleSheet::escape( mFolder->label() ));
@@ -1319,10 +1319,10 @@ void KMMainWidget::slotInvalidateIMAPFolders() {
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotExpireAll() {
-  KConfig    *config = KMKernel::config();
+  TDEConfig    *config = KMKernel::config();
   int        ret = 0;
 
-  KConfigGroupSaver saver(config, "General");
+  TDEConfigGroupSaver saver(config, "General");
 
   if (config->readBoolEntry("warn-before-expire", true)) {
     ret = KMessageBox::warningContinueCancel(KMainWindow::memberList->first(),
@@ -1811,7 +1811,7 @@ void KMMainWidget::slotPrintMsg()
 
   bool htmlOverride = mMsgView ? mMsgView->htmlOverride() : false;
   bool htmlLoadExtOverride = mMsgView ? mMsgView->htmlLoadExtOverride() : false;
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
   bool useFixedFont = mMsgView ? mMsgView->isFixedFont()
                                : reader.readBoolEntry( "useFixedFont", false );
 
@@ -2335,7 +2335,7 @@ void KMMainWidget::slotMsgActivated(KMMessage *msg)
 
   assert( msg != 0 );
   KMReaderMainWin *win = new KMReaderMainWin( mFolderHtmlPref, mFolderHtmlLoadExtPref );
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
   bool useFixedFont = mMsgView ? mMsgView->isFixedFont()
                                : reader.readBoolEntry( "useFixedFont", false );
   win->setUseFixedFont( useFixedFont );
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index fbfd9eeb8..959d581dc 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -39,7 +39,7 @@ class TQSignalMapper;
 
 class KActionMenu;
 class KActionCollection;
-class KConfig;
+class TDEConfig;
 class KRadioAction;
 class KToggleAction;
 class KMenuBar;
@@ -62,7 +62,7 @@ template <typename T> class TQValueList;
 template <typename T, typename S> class TQMap;
 template <typename T> class TQGuardedPtr;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -88,7 +88,7 @@ public:
   KMMainWidget(TQWidget *parent, const char *name,
                KXMLGUIClient *aGUIClient,
                KActionCollection *actionCollection,
-         KConfig*config = KMKernel::config() );
+         TDEConfig*config = KMKernel::config() );
   virtual ~KMMainWidget();
   void destruct();
 
@@ -265,7 +265,7 @@ protected:
   /** @return the correct config dialog depending on whether the parent of the mainWidget
    *          is a KPart or a KMMainWindow. When dealing with geometries, use this pointer
    */
-  KConfig * config();
+  TDEConfig * config();
 
 protected slots:
   void slotCheckOneAccount(int);
@@ -564,7 +564,7 @@ private:
   TQPtrList<KAction> mCustomTemplateActions;
 
   KMSystemTray  *mSystemTray;
-  KConfig *mConfig;
+  TDEConfig *mConfig;
   KXMLGUIClient *mGUIClient;
 
   KMail::MessageActions *mMsgActions;
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 6f7d2b12a..20f9ce4c3 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -1425,7 +1425,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
 
   MDN::SendingMode s = MDN::SentAutomatically; // set to manual if asked user
   TQString special; // fill in case of error, warning or failure
-  KConfigGroup mdnConfig( KMKernel::config(), "MDN" );
+  TDEConfigGroup mdnConfig( KMKernel::config(), "MDN" );
 
   // default:
   int mode = mdnConfig.readNumEntry( "default-policy", 0 );
@@ -1794,7 +1794,7 @@ void KMMessage::setAutomaticFields(bool aIsMulti)
 //-----------------------------------------------------------------------------
 TQString KMMessage::dateStr() const
 {
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
   DwHeaders& header = mMsg->Headers();
   time_t unixTime;
 
@@ -3364,7 +3364,7 @@ TQString KMMessage::generateMessageId( const TQString& addr )
   msgIdStr = '<' + datetime.toString( "yyyyMMddhhmm.sszzz" );
 
   TQString msgIdSuffix;
-  KConfigGroup general( KMKernel::config(), "General" );
+  TDEConfigGroup general( KMKernel::config(), "General" );
 
   if( general.readBoolEntry( "useCustomMessageIdSuffix", false ) )
     msgIdSuffix = general.readEntry( "myMessageIdSuffix" );
@@ -3976,7 +3976,7 @@ TQString KMMessage::expandAliases( const TQString& recipients )
     // check whether the address is missing the domain part
     // FIXME: looking for '@' might be wrong
     if ( receiver.find('@') == -1 ) {
-      KConfigGroup general( KMKernel::config(), "General" );
+      TDEConfigGroup general( KMKernel::config(), "General" );
       TQString defaultdomain = general.readEntry( "Default domain" );
       if( !defaultdomain.isEmpty() ) {
         expandedRecipients += receiver + "@" + defaultdomain;
@@ -4029,15 +4029,15 @@ void KMMessage::readConfig()
 {
   KMMsgBase::readConfig();
 
-  KConfig *config=KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig *config=KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
 
   config->setGroup("General");
 
   int languageNr = config->readNumEntry("reply-current-language",0);
 
   { // area for config group "KMMessage #n"
-    KConfigGroupSaver saver(config, TQString("KMMessage #%1").arg(languageNr));
+    TDEConfigGroupSaver saver(config, TQString("KMMessage #%1").arg(languageNr));
     sReplyLanguage = config->readEntry("language",TDEGlobal::locale()->language());
     sReplyStr = config->readEntry("phrase-reply",
       i18n("On %D, you wrote:"));
@@ -4049,7 +4049,7 @@ void KMMessage::readConfig()
   }
 
   { // area for config group "Composer"
-    KConfigGroupSaver saver(config, "Composer");
+    TDEConfigGroupSaver saver(config, "Composer");
     sSmartQuote = GlobalSettings::self()->smartQuote();
     sWordWrap = GlobalSettings::self()->wordWrap();
     sWrapCol = GlobalSettings::self()->lineWrapWidth();
@@ -4062,7 +4062,7 @@ void KMMessage::readConfig()
   }
 
   { // area for config group "Reader"
-    KConfigGroupSaver saver(config, "Reader");
+    TDEConfigGroupSaver saver(config, "Reader");
     sHeaderStrategy = HeaderStrategy::create( config->readEntry( "header-set-displayed", "rich" ) );
   }
 }
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 50af4a428..74cbe62e5 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -236,7 +236,7 @@ void KMMimePartTree::correctSize( TQListViewItem * item )
 {
   if (!item) return;
 
-  KIO::filesize_t totalSize = 0;
+  TDEIO::filesize_t totalSize = 0;
   TQListViewItem * myChild = item->firstChild();
   while ( myChild )
   {
@@ -244,7 +244,7 @@ void KMMimePartTree::correctSize( TQListViewItem * item )
     myChild = myChild->nextSibling();
   }
   if ( totalSize > static_cast<KMMimePartTreeItem*>(item)->origSize() )
-    item->setText( mSizeColumn, KIO::convertSize(totalSize) );
+    item->setText( mSizeColumn, TDEIO::convertSize(totalSize) );
   if ( item->parent() )
     correctSize( item->parent() );
 }
@@ -318,11 +318,11 @@ KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * parent,
                                         const TQString & description,
                                         const TQString & mimetype,
                                         const TQString & encoding,
-                                        KIO::filesize_t size )
+                                        TDEIO::filesize_t size )
   : TQListViewItem( parent, description,
 		   TQString(), // set by setIconAndTextForType()
 		   encoding,
-		   KIO::convertSize( size ) ),
+		   TDEIO::convertSize( size ) ),
     mPartNode( node ), mOrigSize(size)
 {
   if( node )
@@ -337,12 +337,12 @@ KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTreeItem * parent,
                                         const TQString & description,
                                         const TQString & mimetype,
                                         const TQString & encoding,
-                                        KIO::filesize_t size,
+                                        TDEIO::filesize_t size,
                                         bool revertOrder )
   : TQListViewItem( parent, description,
 		   TQString(), // set by setIconAndTextForType()
 		   encoding,
-		   KIO::convertSize( size ) ),
+		   TDEIO::convertSize( size ) ),
     mPartNode( node ), mOrigSize(size)
 {
   if( revertOrder && nextSibling() ){
diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h
index e6985d2c5..a5634b099 100644
--- a/kmail/kmmimeparttree.h
+++ b/kmail/kmmimeparttree.h
@@ -103,24 +103,24 @@ public:
                       const TQString & labelDescr,
                       const TQString & labelCntType  = TQString(),
                       const TQString & labelEncoding = TQString(),
-                      KIO::filesize_t size=0 );
+                      TDEIO::filesize_t size=0 );
   KMMimePartTreeItem( KMMimePartTreeItem * parent,
                       partNode* node,
                       const TQString & labelDescr,
                       const TQString & labelCntType  = TQString(),
                       const TQString & labelEncoding = TQString(),
-                      KIO::filesize_t size=0,
+                      TDEIO::filesize_t size=0,
                       bool revertOrder = false );
   partNode* node() const { return mPartNode; }
 
-  KIO::filesize_t origSize() const { return mOrigSize; }
-  void setOrigSize( KIO::filesize_t size ) { mOrigSize = size; }
+  TDEIO::filesize_t origSize() const { return mOrigSize; }
+  void setOrigSize( TDEIO::filesize_t size ) { mOrigSize = size; }
 
 private:
   void setIconAndTextForType( const TQString & mimetype );
 
   partNode* mPartNode;
-  KIO::filesize_t mOrigSize;
+  TDEIO::filesize_t mOrigSize;
 };
 
 #endif // KMMIMEPARTTREE_H
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index 3cd4f658f..eaac2ebfc 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -1446,7 +1446,7 @@ static bool sReplaceSubjPrefix, sReplaceForwSubjPrefix;
 //-----------------------------------------------------------------------------
 void KMMsgBase::readConfig()
 {
-  KConfigGroup composerGroup( KMKernel::config(), "Composer" );
+  TDEConfigGroup composerGroup( KMKernel::config(), "Composer" );
   sReplySubjPrefixes = composerGroup.readListEntry("reply-prefixes", ',');
   if (sReplySubjPrefixes.isEmpty())
     sReplySubjPrefixes << "Re\\s*:" << "Re\\[\\d+\\]:" << "Re\\d+:";
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index 3af55f520..dc0815f81 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -94,7 +94,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
 
   // row 1: Size label:
   mSize = new TQLabel( plainPage() );
-  setSize( KIO::filesize_t(0) );
+  setSize( TDEIO::filesize_t(0) );
   glay->addWidget( mSize, 1, 1 );
 
   msg = i18n("<qt><p>The size of the part:</p>"
@@ -217,8 +217,8 @@ void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) {
   mMimeType->insertStringList( mimeTypes );
 }
 
-void KMMsgPartDialog::setSize( KIO::filesize_t size, bool estimated ) {
-  TQString text = KIO::convertSize( size );
+void KMMsgPartDialog::setSize( TDEIO::filesize_t size, bool estimated ) {
+  TQString text = TDEIO::convertSize( size );
   if ( estimated )
     text = i18n("%1: a filesize incl. unit (e.g. \"1.3 KB\")",
 		"%1 (est.)").arg( text );
diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h
index 1a7a83d38..78588eb10 100644
--- a/kmail/kmmsgpartdlg.h
+++ b/kmail/kmmsgpartdlg.h
@@ -63,7 +63,7 @@ public:
   /** Sets the size of the file to be attached in bytes. This is
       strictly informational and thus can't be queried. If @p approx
       is true, the size is an estimation based on typical */
-  void setSize( KIO::filesize_t size, bool estimated=false );
+  void setSize( TDEIO::filesize_t size, bool estimated=false );
 
   /** Returns the current file name of the attachment. Note that this
       doesn't define which file is being attached. It only defines
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index ed406209f..5cbbacda4 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -401,7 +401,7 @@ void KMPopFilterCnfrmDlg::setupLVI(KMPopHeadersViewItem *lvi, KMMessage *msg)
       // set the date
       lvi->setText(6, KMime::DateFormatter::formatDate( KMime::DateFormatter::Fancy, msg->date() ) );
       // set the size
-      lvi->setText(7, KIO::convertSize(msg->msgLength()));
+      lvi->setText(7, TDEIO::convertSize(msg->msgLength()));
       // Date for sorting
       lvi->setText(8, msg->dateIsoStr());
 }
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 80d461205..2ce6c8623 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -877,8 +877,8 @@ bool KMReaderWin::event(TQEvent *e)
 //-----------------------------------------------------------------------------
 void KMReaderWin::readConfig(void)
 {
-  const KConfigGroup mdnGroup( KMKernel::config(), "MDN" );
-  /*should be: const*/ KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup mdnGroup( KMKernel::config(), "MDN" );
+  /*should be: const*/ TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   delete mCSSHelper;
   mCSSHelper = new KMail::CSSHelper( TQPaintDeviceMetrics( mViewer->view() ) );
@@ -957,7 +957,7 @@ void KMReaderWin::adjustLayout() {
 }
 
 
-void KMReaderWin::saveSplitterSizes( KConfigBase & c ) const {
+void KMReaderWin::saveSplitterSizes( TDEConfigBase & c ) const {
   if ( !mSplitter || !mMimePartTree )
     return;
   if ( mMimePartTree->isHidden() )
@@ -969,7 +969,7 @@ void KMReaderWin::saveSplitterSizes( KConfigBase & c ) const {
 
 //-----------------------------------------------------------------------------
 void KMReaderWin::writeConfig( bool sync ) const {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   reader.writeEntry( "useFixedFont", mUseFixedFont );
   if ( headerStyle() )
@@ -1443,7 +1443,7 @@ void KMReaderWin::showHideMimeTree( bool isPlainTextTopLevel ) {
     mMimePartTree->show();
   else {
     // don't rely on TQSplitter maintaining sizes for hidden widgets:
-    KConfigGroup reader( KMKernel::config(), "Reader" );
+    TDEConfigGroup reader( KMKernel::config(), "Reader" );
     saveSplitterSizes( reader );
     mMimePartTree->hide();
   }
@@ -1513,7 +1513,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg)
   TQString cntDesc = aMsg->subject();
   if( cntDesc.isEmpty() )
     cntDesc = i18n("( body part )");
-  KIO::filesize_t cntSize = aMsg->msgSize();
+  TDEIO::filesize_t cntSize = aMsg->msgSize();
   TQString cntEnc;
   if( aMsg->contentTransferEncodingStr().isEmpty() )
     cntEnc = "7bit";
@@ -1574,7 +1574,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg)
   }
 
   bool emitReplaceMsgByUnencryptedVersion = false;
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
   if ( reader.readBoolEntry( "store-displayed-messages-unencrypted", false ) ) {
 
   // Hack to make sure the S/MIME CryptPlugs follows the strict requirement
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index f8c4e74e5..b8dd3f9ff 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -34,7 +34,7 @@ class KActionMenu;
 class KSelectAction;
 class KRadioAction;
 class KToggleAction;
-class KConfigBase;
+class TDEConfigBase;
 class KHTMLPart;
 class KURL;
 
@@ -529,7 +529,7 @@ private:
   void adjustLayout();
   void createWidgets();
   void createActions( KActionCollection * ac );
-  void saveSplitterSizes( KConfigBase & c ) const;
+  void saveSplitterSizes( TDEConfigBase & c ) const;
 
   KRadioAction * actionForHeaderStyle( const KMail::HeaderStyle *,
                                        const KMail::HeaderStrategy * );
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index 2c003e49e..0d94c149f 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -125,7 +125,7 @@ KMSearchRule * KMSearchRule::createInstance( const KMSearchRule & other )
   return ( createInstance( other.field(), other.function(), other.contents() ) );
 }
 
-KMSearchRule * KMSearchRule::createInstanceFromConfig( const KConfig * config, int aIdx )
+KMSearchRule * KMSearchRule::createInstanceFromConfig( const TDEConfig * config, int aIdx )
 {
   const char cIdx = char( int('A') + aIdx );
 
@@ -161,7 +161,7 @@ TQString KMSearchRule::functionToString( Function function )
     return "invalid";
 }
 
-void KMSearchRule::writeConfig( KConfig * config, int aIdx ) const {
+void KMSearchRule::writeConfig( TDEConfig * config, int aIdx ) const {
   const char cIdx = char('A' + aIdx);
   static const TQString & field = TDEGlobal::staticQString( "field" );
   static const TQString & func = TDEGlobal::staticQString( "func" );
@@ -712,7 +712,7 @@ bool KMSearchRuleStatus::matches( const KMMessage * msg ) const
 //
 //==================================================
 
-KMSearchPattern::KMSearchPattern( const KConfig * config )
+KMSearchPattern::KMSearchPattern( const TDEConfig * config )
   : TQPtrList<KMSearchRule>()
 {
   setAutoDelete( true );
@@ -827,7 +827,7 @@ void KMSearchPattern::purify() {
     }
 }
 
-void KMSearchPattern::readConfig( const KConfig * config ) {
+void KMSearchPattern::readConfig( const TDEConfig * config ) {
   init();
 
   mName = config->readEntry("name");
@@ -850,7 +850,7 @@ void KMSearchPattern::readConfig( const KConfig * config ) {
   }
 }
 
-void KMSearchPattern::importLegacyConfig( const KConfig * config ) {
+void KMSearchPattern::importLegacyConfig( const TDEConfig * config ) {
   KMSearchRule * rule = KMSearchRule::createInstance( config->readEntry("fieldA").latin1(),
 					  config->readEntry("funcA").latin1(),
 					  config->readEntry("contentsA") );
@@ -893,7 +893,7 @@ void KMSearchPattern::importLegacyConfig( const KConfig * config ) {
   // treat any other case as "and" (our default).
 }
 
-void KMSearchPattern::writeConfig( KConfig * config ) const {
+void KMSearchPattern::writeConfig( TDEConfig * config ) const {
   config->writeEntry("name", mName);
   config->writeEntry("operator", (mOperator == KMSearchPattern::OpOr) ? "or" : "and" );
 
diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index b60e9cdc8..d532602ea 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -13,7 +13,7 @@
 #include "kmmsgbase.h" // for KMMsgStatus
 
 class KMMessage;
-class KConfig;
+class TDEConfig;
 class DwBoyerMoore;
 class DwString;
 
@@ -70,7 +70,7 @@ public:
       rules within a single config group. This function does no
       validation of the data obtained from the config file. You should
       call isEmpty yourself if you need valid rules. */
-  static KMSearchRule* createInstanceFromConfig( const KConfig * config, int aIdx );
+  static KMSearchRule* createInstanceFromConfig( const TDEConfig * config, int aIdx );
 
   virtual ~KMSearchRule() {};
 
@@ -104,7 +104,7 @@ public:
       rules within a single config group. This function will happily
       write itself even when it's not valid, assuming higher layers to
       Do The Right Thing(TM). */
-  void writeConfig( KConfig * config, int aIdx ) const;
+  void writeConfig( TDEConfig * config, int aIdx ) const;
 
   /** Return filter function. This can be any of the operators
       defined in Function. */
@@ -290,8 +290,8 @@ public:
 /** This class is an abstraction of a search over messages.  It is
     intended to be used inside a KFilter (which adds KFilterAction's),
     as well as in KMSearch. It can read and write itself into a
-    KConfig group and there is a constructor, mainly used by KMFilter
-    to initialize from a preset KConfig-Group.
+    TDEConfig group and there is a constructor, mainly used by KMFilter
+    to initialize from a preset TDEConfig-Group.
 
     From a class hierarchy point of view, it is a TQPtrList of
     KMSearchRule's that adds the boolean operators (see Operator)
@@ -315,7 +315,7 @@ public:
       any of it's rules matches.
   */
   enum Operator { OpAnd, OpOr };
-  /** Constructor that initializes from a given KConfig group, if
+  /** Constructor that initializes from a given TDEConfig group, if
       given. This feature is mainly (solely?) used in KMFilter,
       as we don't allow to store search patterns in the config (yet).
       If config is 0, provides a pattern with minimal, but
@@ -323,7 +323,7 @@ public:
       to match any KMMessage. You can query for such an empty
       rule by using isEmpty, which is inherited from TQPtrList.
   */
-  KMSearchPattern( const KConfig * config=0 );
+  KMSearchPattern( const TDEConfig * config=0 );
 
   /** Destructor. Deletes all stored rules! */
   ~KMSearchPattern();
@@ -351,7 +351,7 @@ public:
   */
   void purify();
 
-  /** Reads a search pattern from a KConfig.  The group has to be
+  /** Reads a search pattern from a TDEConfig.  The group has to be
       preset. If it does not find a valid saerch pattern in the preset
       group, initializes the pattern as if it were constructed using
       the default constructor.
@@ -363,14 +363,14 @@ public:
       Derived classes reimplementing readConfig() should also call this
       method, or else the rules will not be loaded.
   */
-  void readConfig( const KConfig * config );
+  void readConfig( const TDEConfig * config );
   /** Writes itself into @p config. The group has to be preset. Tries
       to delete old-style keys by overwriting them with TQString().
 
       Derived classes reimplementing writeConfig() should also call this
       method, or else the rules will not be stored.
   */
-  void writeConfig( KConfig * config ) const;
+  void writeConfig( TDEConfig * config ) const;
 
   /** Get the name of the search pattern. */
   TQString name() const { return mName; }
@@ -397,7 +397,7 @@ private:
       and also makes sure that this method is called from an initialized
       object.
   */
-  void importLegacyConfig( const KConfig * config );
+  void importLegacyConfig( const TDEConfig * config );
   /** Initializes the object. Clears the list of rules, sets the name
       to "<i18n("unnamed")>", and the boolean operator to @p OpAnd. */
   void init();
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index a8953b6e4..d6a2f8add 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -87,7 +87,7 @@ void KMSender::setStatusMsg(const TQString &msg)
 void KMSender::readConfig(void)
 {
   TQString str;
-  KConfigGroup config(KMKernel::config(), SENDER_GROUP);
+  TDEConfigGroup config(KMKernel::config(), SENDER_GROUP);
 
   mSendImmediate = config.readBoolEntry("Immediate", true);
   mSendQuotedPrintable = config.readBoolEntry("Quoted-Printable", true);
@@ -97,7 +97,7 @@ void KMSender::readConfig(void)
 //-----------------------------------------------------------------------------
 void KMSender::writeConfig(bool aWithSync)
 {
-  KConfigGroup config(KMKernel::config(), SENDER_GROUP);
+  TDEConfigGroup config(KMKernel::config(), SENDER_GROUP);
 
   config.writeEntry("Immediate", mSendImmediate);
   config.writeEntry("Quoted-Printable", mSendQuotedPrintable);
@@ -1043,8 +1043,8 @@ KMSendSMTP::KMSendSMTP(KMSender *sender)
     mJob(0),
     mSlave(0)
 {
-  KIO::Scheduler::connect(TQT_SIGNAL(slaveError(KIO::Slave *, int,
-    const TQString &)), this, TQT_SLOT(slaveError(KIO::Slave *, int,
+  TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave *, int,
+    const TQString &)), this, TQT_SLOT(slaveError(TDEIO::Slave *, int,
     const TQString &)));
 }
 
@@ -1096,7 +1096,7 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const
 
       KCursorSaver idle(KBusyPtr::idle());
       TQString passwd = ti->passwd();
-      result = KIO::PasswordDialog::getNameAndPassword(ti->user, passwd,
+      result = TDEIO::PasswordDialog::getNameAndPassword(ti->user, passwd,
 	&b, i18n("You need to supply a username and a password to use this "
 	     "SMTP server."), false, TQString(), ti->name, TQString());
 
@@ -1119,10 +1119,10 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const
 
   if (!mSlave || !mInProcess)
   {
-    KIO::MetaData slaveConfig;
+    TDEIO::MetaData slaveConfig;
     slaveConfig.insert("tls", (ti->encryption == "TLS") ? "on" : "off");
     if (ti->auth) slaveConfig.insert("sasl", ti->authType);
-    mSlave = KIO::Scheduler::getConnectedSlave(destination, slaveConfig);
+    mSlave = TDEIO::Scheduler::getConnectedSlave(destination, slaveConfig);
   }
 
   if (!mSlave)
@@ -1144,16 +1144,16 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const
   destination.setPath("/send");
   destination.setQuery( query );
 
-  mJob = KIO::put( destination, -1, false, false, false );
+  mJob = TDEIO::put( destination, -1, false, false, false );
   if ( !mJob ) {
     abort();
     return false;
   }
   mJob->addMetaData( "lf2crlf+dotstuff", "slave" );
-  KIO::Scheduler::assignJobToSlave(mSlave, mJob);
-  connect(mJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(result(KIO::Job *)));
-  connect(mJob, TQT_SIGNAL(dataReq(KIO::Job *, TQByteArray &)),
-          this, TQT_SLOT(dataReq(KIO::Job *, TQByteArray &)));
+  TDEIO::Scheduler::assignJobToSlave(mSlave, mJob);
+  connect(mJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(result(TDEIO::Job *)));
+  connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)),
+          this, TQT_SLOT(dataReq(TDEIO::Job *, TQByteArray &)));
   mSendOk = true;
   mInProcess = true;
   return true;
@@ -1169,7 +1169,7 @@ void KMSendSMTP::cleanup() {
 
   if (mSlave)
   {
-    KIO::Scheduler::disconnectSlave(mSlave);
+    TDEIO::Scheduler::disconnectSlave(mSlave);
     mSlave = 0;
   }
 
@@ -1185,7 +1185,7 @@ void KMSendSMTP::doFinish() {
   cleanup();
 }
 
-void KMSendSMTP::dataReq(KIO::Job *, TQByteArray &array)
+void KMSendSMTP::dataReq(TDEIO::Job *, TQByteArray &array)
 {
   // Send it by 32K chuncks
   const int chunkSize = TQMIN( mMessageLength - mMessageOffset, 32*1024 );
@@ -1200,7 +1200,7 @@ void KMSendSMTP::dataReq(KIO::Job *, TQByteArray &array)
   mSender->emitProgressInfo( mMessageOffset );
 }
 
-void KMSendSMTP::result(KIO::Job *_job)
+void KMSendSMTP::result(TDEIO::Job *_job)
 {
   if (!mJob) return;
   mJob = 0;
@@ -1208,7 +1208,7 @@ void KMSendSMTP::result(KIO::Job *_job)
   if(_job->error())
   {
     mSendOk = false;
-    if (_job->error() == KIO::ERR_SLAVE_DIED) mSlave = 0;
+    if (_job->error() == TDEIO::ERR_SLAVE_DIED) mSlave = 0;
     failed(_job->errorString());
     abort();
   } else {
@@ -1216,14 +1216,14 @@ void KMSendSMTP::result(KIO::Job *_job)
   }
 }
 
-void KMSendSMTP::slaveError(KIO::Slave *aSlave, int error, const TQString &errorMsg)
+void KMSendSMTP::slaveError(TDEIO::Slave *aSlave, int error, const TQString &errorMsg)
 {
   if (aSlave == mSlave)
   {
-    if (error == KIO::ERR_SLAVE_DIED) mSlave = 0;
+    if (error == TDEIO::ERR_SLAVE_DIED) mSlave = 0;
     mSendOk = false;
     mJob = 0;
-    failed(KIO::buildErrorString(error, errorMsg));
+    failed(TDEIO::buildErrorString(error, errorMsg));
     abort();
   }
 }
diff --git a/kmail/kmsender.h b/kmail/kmsender.h
index 478b941cd..8ae577b06 100644
--- a/kmail/kmsender.h
+++ b/kmail/kmsender.h
@@ -37,7 +37,7 @@
 class KMMessage;
 class KMFolder;
 class KMFolderMgr;
-class KConfig;
+class TDEConfig;
 class TDEProcess;
 class KMSendProc;
 class KMSendSendmail;
diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h
index 811eb559b..f87fd2a3a 100644
--- a/kmail/kmsender_p.h
+++ b/kmail/kmsender_p.h
@@ -14,7 +14,7 @@
 
 class TDEProcess;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class TransferJob;
   class Slave;
@@ -126,9 +126,9 @@ public:
   void abort();
 
 private slots:
-  void dataReq(KIO::Job *, TQByteArray &);
-  void result(KIO::Job *);
-  void slaveError(KIO::Slave *, int, const TQString &);
+  void dataReq(TDEIO::Job *, TQByteArray &);
+  void result(TDEIO::Job *);
+  void slaveError(TDEIO::Slave *, int, const TQString &);
 
 private:
   /** implemented from KMSendProc */
@@ -147,8 +147,8 @@ private:
 
   bool mInProcess;
 
-  KIO::TransferJob *mJob;
-  KIO::Slave *mSlave;
+  TDEIO::TransferJob *mJob;
+  TDEIO::Slave *mSlave;
 };
 
 #endif /* __KMAIL_SENDER_P_H__ */
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index c7f96ce36..8548670a4 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -50,9 +50,9 @@ KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, in
     mProtocol( protocol ), mHost( host ),
     mSSL( false ), mJob( 0 ), mSlave( 0 ), mConnectionErrorCount( 0 )
 {
-  KIO::Scheduler::connect(
-    TQT_SIGNAL(slaveError(KIO::Slave *, int, const TQString &)),
-    this, TQT_SLOT(slotSlaveResult(KIO::Slave *, int, const TQString &)));
+  TDEIO::Scheduler::connect(
+    TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)),
+    this, TQT_SLOT(slotSlaveResult(TDEIO::Slave *, int, const TQString &)));
 
   if ( port == 993 || port == 995 || port == 465 )
     port = 0;
@@ -67,8 +67,8 @@ KMServerTest::~KMServerTest()
 }
 
 
-KIO::MetaData KMServerTest::slaveConfig() const {
-  KIO::MetaData md;
+TDEIO::MetaData KMServerTest::slaveConfig() const {
+  TDEIO::MetaData md;
   md.insert( "nologin", "on" );
   return md;
 }
@@ -80,29 +80,29 @@ void KMServerTest::startOffSlave( int port ) {
   if ( port )
     url.setPort( port );
 
-  mSlave = KIO::Scheduler::getConnectedSlave( url, slaveConfig() );
+  mSlave = TDEIO::Scheduler::getConnectedSlave( url, slaveConfig() );
   if ( !mSlave ) {
     slotSlaveResult( 0, 1 );
     return;
   }
-  connect( mSlave, TQT_SIGNAL(metaData(const KIO::MetaData&)),
-	   TQT_SLOT(slotMetaData(const KIO::MetaData&)) );
+  connect( mSlave, TQT_SIGNAL(metaData(const TDEIO::MetaData&)),
+	   TQT_SLOT(slotMetaData(const TDEIO::MetaData&)) );
 
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
 
   stream << (int) 'c';
 
-  mJob = KIO::special( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( mSlave, mJob );
-  connect( mJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*)) );
-  connect( mJob, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
-	   TQT_SLOT(slotData(KIO::Job*,const TQString&)) );
+  mJob = TDEIO::special( url, packedArgs, false );
+  TDEIO::Scheduler::assignJobToSlave( mSlave, mJob );
+  connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) );
+  connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+	   TQT_SLOT(slotData(TDEIO::Job*,const TQString&)) );
 }
 
 
 //-----------------------------------------------------------------------------
-void KMServerTest::slotData(KIO::Job *, const TQString &data)
+void KMServerTest::slotData(TDEIO::Job *, const TQString &data)
 {
   if ( mSSL )
     mListSSL = TQStringList::split(' ', data);
@@ -111,8 +111,8 @@ void KMServerTest::slotData(KIO::Job *, const TQString &data)
 }
 
 
-void KMServerTest::slotMetaData( const KIO::MetaData & md ) {
-  KIO::MetaData::const_iterator it = md.find( "PLAIN AUTH METHODS" );
+void KMServerTest::slotMetaData( const TDEIO::MetaData & md ) {
+  TDEIO::MetaData::const_iterator it = md.find( "PLAIN AUTH METHODS" );
   if ( it != md.end() ) {
     mAuthNone = it.data();
     kdDebug(5006) << "mAuthNone: " << mAuthNone << endl;
@@ -130,13 +130,13 @@ void KMServerTest::slotMetaData( const KIO::MetaData & md ) {
 }
 
 //-----------------------------------------------------------------------------
-void KMServerTest::slotResult(KIO::Job *job)
+void KMServerTest::slotResult(TDEIO::Job *job)
 {
   slotSlaveResult(mSlave, job->error());
 }
 
 //-----------------------------------------------------------------------------
-void KMServerTest::slotSlaveResult(KIO::Slave *aSlave, int error,
+void KMServerTest::slotSlaveResult(TDEIO::Slave *aSlave, int error,
   const TQString &errorText)
 {
   if (aSlave != mSlave) return;
@@ -147,13 +147,13 @@ void KMServerTest::slotSlaveResult(KIO::Slave *aSlave, int error,
     mListSSL.append("SSL");
   }
 
-  if (error != KIO::ERR_SLAVE_DIED && mSlave)
+  if (error != TDEIO::ERR_SLAVE_DIED && mSlave)
   {
     // disconnect slave after every connect
-    KIO::Scheduler::disconnectSlave(mSlave);
+    TDEIO::Scheduler::disconnectSlave(mSlave);
     mSlave = 0;
   }
-  if ( error == KIO::ERR_COULD_NOT_CONNECT )
+  if ( error == TDEIO::ERR_COULD_NOT_CONNECT )
   {
     // if one of the two connection tests fails we ignore the error
     // if both fail the host is probably not correct so we display the error
@@ -167,7 +167,7 @@ void KMServerTest::slotSlaveResult(KIO::Slave *aSlave, int error,
   {
     mJob = 0;
     KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()),
-        KIO::buildErrorString( error, errorText ),
+        TDEIO::buildErrorString( error, errorText ),
         i18n("Error") );
     emit capabilities( mListNormal, mListSSL );
     emit capabilities( mListNormal, mListSSL, mAuthNone, mAuthSSL, mAuthTLS );
diff --git a/kmail/kmservertest.h b/kmail/kmservertest.h
index 74fa88335..5d5cddf13 100644
--- a/kmail/kmservertest.h
+++ b/kmail/kmservertest.h
@@ -37,7 +37,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class Slave;
   class SimpleJob;
@@ -62,14 +62,14 @@ signals:
                      const TQString & authTLS );
 
 protected slots:
-  void slotData(KIO::Job *job, const TQString &data);
-  void slotResult(KIO::Job *job);
-  void slotMetaData( const KIO::MetaData & );
-  void slotSlaveResult(KIO::Slave *aSlave, int error,
+  void slotData(TDEIO::Job *job, const TQString &data);
+  void slotResult(TDEIO::Job *job);
+  void slotMetaData( const TDEIO::MetaData & );
+  void slotSlaveResult(TDEIO::Slave *aSlave, int error,
     const TQString &errorText = TQString());
 
 protected:
-  KIO::MetaData slaveConfig() const;
+  TDEIO::MetaData slaveConfig() const;
   void startOffSlave( int port=0 );
 
 protected:
@@ -81,8 +81,8 @@ protected:
   TQString        mAuthNone;
   TQString        mAuthSSL;
   TQString        mAuthTLS;
-  KIO::SimpleJob *mJob;
-  KIO::Slave     *mSlave;
+  TDEIO::SimpleJob *mJob;
+  TDEIO::Slave     *mSlave;
   int            mConnectionErrorCount;
 };
 
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index 6c041b0f1..43346fbcf 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -123,8 +123,8 @@ void checkConfigUpdates() {
   static const int numUpdates = sizeof updates / sizeof *updates;
   // Warning: do not remove entries in the above array, or the update-level check below will break
 
-  KConfig * config = KMKernel::config();
-  KConfigGroup startup( config, "Startup" );
+  TDEConfig * config = KMKernel::config();
+  TDEConfigGroup startup( config, "Startup" );
   const int configUpdateLevel = startup.readNumEntry( "update-level", 0 );
   if ( configUpdateLevel == numUpdates ) // Optimize for the common case that everything is OK
     return;
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index c9efd8a31..e17fdaf0e 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -66,8 +66,8 @@ KMTransportInfo::~KMTransportInfo()
 
 void KMTransportInfo::readConfig(int id)
 {
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Transport " + TQString::number(id));
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Transport " + TQString::number(id));
   mId = config->readUnsignedNumEntry( "id", 0 );
   type = config->readEntry("type", "smtp");
   name = config->readEntry("name", i18n("Unnamed"));
@@ -105,8 +105,8 @@ void KMTransportInfo::readConfig(int id)
 
 void KMTransportInfo::writeConfig(int id)
 {
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Transport " + TQString::number(id));
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Transport " + TQString::number(id));
   if (!mId)
     mId = TransportManager::createId();
   config->writeEntry("id", mId);
@@ -170,12 +170,12 @@ void KMTransportInfo::writeConfig(int id)
 
 int KMTransportInfo::findTransport(const TQString &name)
 {
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
   int numTransports = config->readNumEntry("transports", 0);
   for (int i = 1; i <= numTransports; i++)
   {
-    KConfigGroupSaver saver(config, "Transport " + TQString::number(i));
+    TDEConfigGroupSaver saver(config, "Transport " + TQString::number(i));
     if (config->readEntry("name") == name) return i;
   }
   return 0;
@@ -185,12 +185,12 @@ int KMTransportInfo::findTransport(const TQString &name)
 TQStringList KMTransportInfo::availableTransports()
 {
   TQStringList result;
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
   int numTransports = config->readNumEntry("transports", 0);
   for (int i = 1; i <= numTransports; i++)
   {
-    KConfigGroupSaver saver(config, "Transport " + TQString::number(i));
+    TDEConfigGroupSaver saver(config, "Transport " + TQString::number(i));
     result.append(config->readEntry("name"));
   }
   return result;
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index 67a21fc65..79efe49c6 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -142,13 +142,13 @@ void ListJob::execute()
       + section );
   // go
   //kdDebug(5006) << "start listjob for " << url.path() << endl;
-  KIO::SimpleJob *job = KIO::listDir( url, false );
-  KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+  TDEIO::SimpleJob *job = TDEIO::listDir( url, false );
+  TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
   mAccount->insertJob( job, jd );
-  connect( job, TQT_SIGNAL(result(KIO::Job *)),
-      this, TQT_SLOT(slotListResult(KIO::Job *)) );
-  connect( job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)),
-      this, TQT_SLOT(slotListEntries(KIO::Job *, const KIO::UDSEntryList &)) );
+  connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+      this, TQT_SLOT(slotListResult(TDEIO::Job *)) );
+  connect( job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
+      this, TQT_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)) );
 }
 
 void ListJob::slotConnectionResult( int errorCode, const TQString& errorMsg )
@@ -163,7 +163,7 @@ void ListJob::slotConnectionResult( int errorCode, const TQString& errorMsg )
   }
 }
 
-void ListJob::slotListResult( KIO::Job* job )
+void ListJob::slotListResult( TDEIO::Job* job )
 {
   ImapAccountBase::JobIterator it = mAccount->findJob( job );
   if ( it == mAccount->jobsEnd() )
@@ -186,7 +186,7 @@ void ListJob::slotListResult( KIO::Job* job )
   delete this;
 }
 
-void ListJob::slotListEntries( KIO::Job* job, const KIO::UDSEntryList& uds )
+void ListJob::slotListEntries( TDEIO::Job* job, const TDEIO::UDSEntryList& uds )
 {
   ImapAccountBase::JobIterator it = mAccount->findJob( job );
   if ( it == mAccount->jobsEnd() )
@@ -200,22 +200,22 @@ void ListJob::slotListEntries( KIO::Job* job, const KIO::UDSEntryList& uds )
   KURL url;
   TQString mimeType;
   TQString attributes;
-  for ( KIO::UDSEntryList::ConstIterator udsIt = uds.begin();
+  for ( TDEIO::UDSEntryList::ConstIterator udsIt = uds.begin();
         udsIt != uds.end(); udsIt++ )
   {
     mimeType = TQString();
     attributes = TQString();
-    for ( KIO::UDSEntry::ConstIterator eIt = (*udsIt).begin();
+    for ( TDEIO::UDSEntry::ConstIterator eIt = (*udsIt).begin();
           eIt != (*udsIt).end(); eIt++ )
     {
       // get the needed information
-      if ( (*eIt).m_uds == KIO::UDS_NAME )
+      if ( (*eIt).m_uds == TDEIO::UDS_NAME )
         name = (*eIt).m_str;
-      else if ( (*eIt).m_uds == KIO::UDS_URL )
+      else if ( (*eIt).m_uds == TDEIO::UDS_URL )
         url = KURL((*eIt).m_str, 106); // utf-8
-      else if ( (*eIt).m_uds == KIO::UDS_MIME_TYPE )
+      else if ( (*eIt).m_uds == TDEIO::UDS_MIME_TYPE )
         mimeType = (*eIt).m_str;
-      else if ( (*eIt).m_uds == KIO::UDS_EXTRA )
+      else if ( (*eIt).m_uds == TDEIO::UDS_EXTRA )
         attributes = (*eIt).m_str;
     }
     if ( (mimeType == "inode/directory" || mimeType == "message/digest"
diff --git a/kmail/listjob.h b/kmail/listjob.h
index fc2895690..3b53ea61d 100644
--- a/kmail/listjob.h
+++ b/kmail/listjob.h
@@ -38,7 +38,7 @@ class KMAcctCachedImap;
 class FolderStorage;
 class KURL;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -109,12 +109,12 @@ protected slots:
    * Is called when the listing is done
    * Passes the folders and the jobData to the responding folder
    */
-  void slotListResult( KIO::Job* job );
+  void slotListResult( TDEIO::Job* job );
 
   /**
    * Collects the folder information
    */
-  void slotListEntries( KIO::Job* job, const KIO::UDSEntryList& uds );
+  void slotListEntries( TDEIO::Job* job, const TDEIO::UDSEntryList& uds );
 
   /**
    * Called from the account when a connection was established
diff --git a/kmail/mailinglist-magic.cpp b/kmail/mailinglist-magic.cpp
index 0b646e94a..e199e3d09 100644
--- a/kmail/mailinglist-magic.cpp
+++ b/kmail/mailinglist-magic.cpp
@@ -386,7 +386,7 @@ MailingList::id() const
 }
 
 void
-MailingList::writeConfig( KConfig* config ) const
+MailingList::writeConfig( TDEConfig* config ) const
 {
   config->writeEntry( "MailingListFeatures", mFeatures );
   config->writeEntry( "MailingListHandler", mHandler );
@@ -399,7 +399,7 @@ MailingList::writeConfig( KConfig* config ) const
 }
 
 void
-MailingList::readConfig( KConfig* config )
+MailingList::readConfig( TDEConfig* config )
 {
   mFeatures =  config->readNumEntry( "MailingListFeatures", 0 );
   mHandler = static_cast<MailingList::Handler>(
diff --git a/kmail/mailinglist-magic.h b/kmail/mailinglist-magic.h
index bcccf66f5..eaa645929 100644
--- a/kmail/mailinglist-magic.h
+++ b/kmail/mailinglist-magic.h
@@ -6,7 +6,7 @@
 #include <tqstring.h>
 
 class KMMessage;
-class KConfig;
+class TDEConfig;
 
 namespace KMail
 {
@@ -67,8 +67,8 @@ public:
   void setId( const TQString& );
   TQString id() const;
 
-  void writeConfig( KConfig* config ) const;
-  void readConfig( KConfig* config );
+  void writeConfig( TDEConfig* config ) const;
+  void readConfig( TDEConfig* config );
 private:
   int        mFeatures;
   Handler    mHandler;
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index f14366184..da10d4428 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -93,29 +93,29 @@
 // This should be ported to a .kcfg one day I suppose (dfaure).
 
 static inline bool warnSendUnsigned() {
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-warning-unsigned", false );
 }
 static inline bool warnSendUnencrypted() {
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-warning-unencrypted", false );
 }
 static inline bool saveMessagesEncrypted() {
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-store-encrypted", true );
 }
 static inline bool encryptToSelf() {
     // return !Kpgp::Module::getKpgp() || Kpgp::Module::getKpgp()->encryptToSelf();
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-encrypt-to-self", true );
 }
 static inline bool showKeyApprovalDialog() {
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-show-keys-for-approval", true );
 }
 
 static inline int encryptKeyNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-encr-key-near-expire-int", 14 );
@@ -123,7 +123,7 @@ static inline int encryptKeyNearExpiryWarningThresholdInDays() {
 }
 
 static inline int signingKeyNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-sign-key-near-expire-int", 14 );
@@ -131,7 +131,7 @@ static inline int signingKeyNearExpiryWarningThresholdInDays() {
 }
 
 static inline int encryptRootCertNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-encr-root-near-expire-int", 14 );
@@ -139,7 +139,7 @@ static inline int encryptRootCertNearExpiryWarningThresholdInDays() {
 }
 
 static inline int signingRootCertNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-sign-root-near-expire-int", 14 );
@@ -147,7 +147,7 @@ static inline int signingRootCertNearExpiryWarningThresholdInDays() {
 }
 
 static inline int encryptChainCertNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-encr-chaincert-near-expire-int", 14 );
@@ -155,7 +155,7 @@ static inline int encryptChainCertNearExpiryWarningThresholdInDays() {
 }
 
 static inline int signingChainCertNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-sign-chaincert-near-expire-int", 14 );
diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 145ab2b2d..e0b682746 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -38,7 +38,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kwallet.h>
-using KIO::MetaData;
+using TDEIO::MetaData;
 using KWallet::Wallet;
 
 #include <climits>
@@ -147,7 +147,7 @@ namespace KMail {
   //
   //
 
-  void NetworkAccount::readConfig( /*const*/ KConfig/*Base*/ & config ) {
+  void NetworkAccount::readConfig( /*const*/ TDEConfig/*Base*/ & config ) {
     KMAccount::readConfig( config );
 
     setLogin( config.readEntry( "login" ) );
@@ -195,7 +195,7 @@ namespace KMail {
     mSieveConfig.readConfig( config );
   }
 
-  void NetworkAccount::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
+  void NetworkAccount::writeConfig( TDEConfig/*Base*/ & config ) /*const*/ {
     KMAccount::writeConfig( config );
 
     config.writeEntry( "login", login() );
diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h
index 112cc71d2..dd62b0cdc 100644
--- a/kmail/networkaccount.h
+++ b/kmail/networkaccount.h
@@ -34,9 +34,9 @@
 #include <tqstring.h>
 
 class AccountManager;
-class KConfig/*Base*/;
+class TDEConfig/*Base*/;
 class KURL;
-namespace KIO {
+namespace TDEIO {
   class Slave;
   class MetaData;
 }
@@ -99,16 +99,16 @@ namespace KMail {
     virtual void setSieveConfig( const KMail::SieveConfig & config );
 
     /** Configure the slave by adding to the meta data map */
-    virtual KIO::MetaData slaveConfig() const;
+    virtual TDEIO::MetaData slaveConfig() const;
 
-    virtual void readConfig( /*const*/ KConfig/*Base*/ & config );
-    virtual void writeConfig( KConfig/*Base*/ & config ) /*const*/;
+    virtual void readConfig( /*const*/ TDEConfig/*Base*/ & config );
+    virtual void writeConfig( TDEConfig/*Base*/ & config ) /*const*/;
 
     /** @return an URL for this account */
     virtual KURL getUrl() const;
 
     /** @return the KIO slave for this account */
-    KIO::Slave * slave() const { return mSlave; }
+    TDEIO::Slave * slave() const { return mSlave; }
 
     /** Kill all jobs that are currently in progress */
     virtual void killAllJobs( bool disconnectSlave = false ) = 0;
@@ -128,7 +128,7 @@ namespace KMail {
 
   protected:
     KMail::SieveConfig mSieveConfig;
-    TQGuardedPtr<KIO::Slave> mSlave;
+    TQGuardedPtr<TDEIO::Slave> mSlave;
     TQString mLogin, mPasswd, mAuth, mHost;
     unsigned short int mPort;
     bool mStorePasswd : 1;
diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp
index 12c5cb00f..21d39cd6b 100644
--- a/kmail/newfolderdialog.cpp
+++ b/kmail/newfolderdialog.cpp
@@ -105,8 +105,8 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
     // does the below make any sense?
     //  mFormatComboBox->insertItem("search", 2);
     {
-      KConfig *config = KMKernel::config();
-      KConfigGroupSaver saver(config, "General");
+      TDEConfig *config = KMKernel::config();
+      TDEConfigGroupSaver saver(config, "General");
       int type = config->readNumEntry("default-mailbox-format", 1);
       if ( type < 0 || type > 1 ) type = 1;
       mFormatComboBox->setCurrentItem( type );
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index fe0592d51..9c8c673a9 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -1646,7 +1646,7 @@ namespace KMail {
       if ( !smimeCrypto || !mReader )
         return false;
 
-      const KConfigGroup reader( KMKernel::config(), "Reader" );
+      const TDEConfigGroup reader( KMKernel::config(), "Reader" );
       if ( !reader.readBoolEntry( "AutoImportKeys", false ) )
         return false;
 
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index 705a0e2cc..9bfe46b90 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -468,7 +468,7 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem,
                                  TQString labelDescr,
                                  TQString labelCntType,
                                  TQString labelEncoding,
-                                 KIO::filesize_t size,
+                                 TDEIO::filesize_t size,
                                  bool revertOrder )
 {
   if( parentItem || mimePartTree ) {
@@ -479,7 +479,7 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem,
                                  revertOrder );
 
     TQString cntDesc, cntType, cntEnc;
-    KIO::filesize_t cntSize = 0;
+    TDEIO::filesize_t cntSize = 0;
 
     if( labelDescr.isEmpty() ) {
         DwHeaders* headers = 0;
diff --git a/kmail/partNode.h b/kmail/partNode.h
index 242223a31..b764c9dfe 100644
--- a/kmail/partNode.h
+++ b/kmail/partNode.h
@@ -184,7 +184,7 @@ public:
                            TQString labelDescr    = TQString(),
                            TQString labelCntType  = TQString(),
                            TQString labelEncoding = TQString(),
-                           KIO::filesize_t size=0,
+                           TDEIO::filesize_t size=0,
                            bool revertOrder = false );
 
     void adjustDefaultType( partNode* node );
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index 8caba1e44..0d6c6e757 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -45,7 +45,7 @@ using KPIM::BroadcastStatus;
 #include <kio/scheduler.h>
 #include <kio/passdlg.h>
 #include <kconfig.h>
-using KIO::MetaData;
+using TDEIO::MetaData;
 
 #include <tqstylesheet.h>
 
@@ -73,9 +73,9 @@ PopAccount::PopAccount(AccountManager* aOwner, const TQString& aAccountName, uin
 
   headersOnServer.setAutoDelete(true);
   connect(&processMsgsTimer,TQT_SIGNAL(timeout()),TQT_SLOT(slotProcessPendingMsgs()));
-  KIO::Scheduler::connect(
-    TQT_SIGNAL(slaveError(KIO::Slave *, int, const TQString &)),
-    this, TQT_SLOT(slotSlaveError(KIO::Slave *, int, const TQString &)));
+  TDEIO::Scheduler::connect(
+    TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)),
+    this, TQT_SLOT(slotSlaveError(TDEIO::Slave *, int, const TQString &)));
 
   mHeaderDeleteUids.clear();
   mHeaderDownUids.clear();
@@ -150,7 +150,7 @@ void PopAccount::processNewMail(bool _interactive)
       mAuth != "GSSAPI" ) {
       TQString passwd = NetworkAccount::passwd();
       bool b = storePasswd();
-      if (KIO::PasswordDialog::getNameAndPassword(mLogin, passwd, &b,
+      if (TDEIO::PasswordDialog::getNameAndPassword(mLogin, passwd, &b,
         i18n("You need to supply a username and a password to access this "
         "mailbox."), false, TQString(), mName, i18n("Account:"))
         != TQDialog::Accepted)
@@ -168,7 +168,7 @@ void PopAccount::processNewMail(bool _interactive)
 
     TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" +
                                        mHost + ":" + TQString("%1").arg(mPort) );
-    KConfig config( seenUidList );
+    TDEConfig config( seenUidList );
     TQStringList uidsOfSeenMsgs = config.readListEntry( "seenUidList" );
     TQValueList<int> timeOfSeenMsgs = config.readIntListEntry( "seenUidTimeList" );
     mUidsOfSeenMsgsDict.clear();
@@ -212,7 +212,7 @@ void PopAccount::processNewMail(bool _interactive)
 
 
 //-----------------------------------------------------------------------------
-void PopAccount::readConfig(KConfig& config)
+void PopAccount::readConfig(TDEConfig& config)
 {
   NetworkAccount::readConfig(config);
 
@@ -227,7 +227,7 @@ void PopAccount::readConfig(KConfig& config)
 
 
 //-----------------------------------------------------------------------------
-void PopAccount::writeConfig(KConfig& config)
+void PopAccount::writeConfig(TDEConfig& config)
 {
   NetworkAccount::writeConfig(config);
 
@@ -285,13 +285,13 @@ void PopAccount::setFilterOnServerCheckSize(unsigned int aSize)
 
 //-----------------------------------------------------------------------------
 void PopAccount::connectJob() {
-  KIO::Scheduler::assignJobToSlave(mSlave, job);
-  connect(job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray &)),
-         TQT_SLOT( slotData( KIO::Job*, const TQByteArray &)));
-  connect(job, TQT_SIGNAL( result( KIO::Job * ) ),
-         TQT_SLOT( slotResult( KIO::Job * ) ) );
-  connect(job, TQT_SIGNAL(infoMessage( KIO::Job*, const TQString & )),
-         TQT_SLOT( slotMsgRetrieved(KIO::Job*, const TQString &)));
+  TDEIO::Scheduler::assignJobToSlave(mSlave, job);
+  connect(job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
+         TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
+  connect(job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+         TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+  connect(job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )),
+         TQT_SLOT( slotMsgRetrieved(TDEIO::Job*, const TQString &)));
 }
 
 
@@ -410,14 +410,14 @@ void PopAccount::startJob()
   numBytes = 0;
   numBytesRead = 0;
   stage = List;
-  mSlave = KIO::Scheduler::getConnectedSlave( url, slaveConfig() );
+  mSlave = TDEIO::Scheduler::getConnectedSlave( url, slaveConfig() );
   if (!mSlave)
   {
-    slotSlaveError(0, KIO::ERR_CANNOT_LAUNCH_PROCESS, url.protocol());
+    slotSlaveError(0, TDEIO::ERR_CANNOT_LAUNCH_PROCESS, url.protocol());
     return;
   }
   url.setPath(TQString("/index"));
-  job = KIO::get( url, false, false );
+  job = TDEIO::get( url, false, false );
   connectJob();
 }
 
@@ -441,7 +441,7 @@ MetaData PopAccount::slaveConfig() const {
 //-----------------------------------------------------------------------------
 // one message is finished
 // add data to a KMMessage
-void PopAccount::slotMsgRetrieved(KIO::Job*, const TQString & infoMsg)
+void PopAccount::slotMsgRetrieved(TDEIO::Job*, const TQString & infoMsg)
 {
   if (infoMsg != "message complete") return;
   KMMessage *msg = new KMMessage;
@@ -482,7 +482,7 @@ void PopAccount::slotJobFinished() {
     mUidsOfNextSeenMsgsDict.resize( KMail::nextPrime( ( idsOfMsgs.count() * 11 ) / 10 ) );
     KURL url = getUrl();
     url.setPath(TQString("/uidl"));
-    job = KIO::get( url, false, false );
+    job = TDEIO::get( url, false, false );
     connectJob();
     stage = Uidl;
   }
@@ -544,7 +544,7 @@ void PopAccount::slotJobFinished() {
       }
       headerIt.toFirst();
       url.setPath(TQString("/headers/") + headerIds);
-      job = KIO::get( url, false, false );
+      job = TDEIO::get( url, false, false );
       connectJob();
       slotGetNextHdr();
       stage = Head;
@@ -560,7 +560,7 @@ void PopAccount::slotJobFinished() {
       idsOfMsgs = TQStringList( mMsgsPendingDownload.keys() );
       KURL url = getUrl();
       url.setPath( "/download/" + idsOfMsgs.join(",") );
-      job = KIO::get( url, false, false );
+      job = TDEIO::get( url, false, false );
       connectJob();
       slotGetNextMsg();
       processMsgsTimer.start(processingDelay);
@@ -656,7 +656,7 @@ void PopAccount::slotJobFinished() {
     idsOfMsgs = TQStringList( mMsgsPendingDownload.keys() );
     KURL url = getUrl();
     url.setPath( "/download/" + idsOfMsgs.join(",") );
-    job = KIO::get( url, false, false );
+    job = TDEIO::get( url, false, false );
     connectJob();
     slotGetNextMsg();
     processMsgsTimer.start(processingDelay);
@@ -765,7 +765,7 @@ void PopAccount::slotJobFinished() {
       url.setPath(TQString("/commit"));
       kdDebug(5006) << "url: " << url.prettyURL() << endl;
     }
-    job = KIO::get( url, false, false );
+    job = TDEIO::get( url, false, false );
     connectJob();
   }
   else if (stage == Dele) {
@@ -784,7 +784,7 @@ void PopAccount::slotJobFinished() {
         .arg( mHost ) );
     KURL url = getUrl();
     url.setPath(TQString("/commit"));
-    job = KIO::get( url, false, false );
+    job = TDEIO::get( url, false, false );
     stage = Quit;
     connectJob();
   }
@@ -792,7 +792,7 @@ void PopAccount::slotJobFinished() {
     kdDebug(5006) << k_funcinfo << "stage == Quit" << endl;
     saveUidList();
     job = 0;
-    if (mSlave) KIO::Scheduler::disconnectSlave(mSlave);
+    if (mSlave) TDEIO::Scheduler::disconnectSlave(mSlave);
     mSlave = 0;
     stage = Idle;
     if( mMailCheckProgressItem ) { // do this only once...
@@ -842,7 +842,7 @@ void PopAccount::saveUidList()
   }
   TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" +
                                       mHost + ":" + TQString("%1").arg(mPort) );
-  KConfig config( seenUidList );
+  TDEConfig config( seenUidList );
   config.writeEntry( "seenUidList", uidsOfNextSeenMsgs );
   config.writeEntry( "seenUidTimeList", seenUidTimeList );
   config.writeEntry( "downloadLater", TQStringList( mHeaderLaterUids.keys() ) );
@@ -874,7 +874,7 @@ void PopAccount::slotGetNextMsg()
 
 
 //-----------------------------------------------------------------------------
-void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
+void PopAccount::slotData( TDEIO::Job* job, const TQByteArray &data)
 {
   if (data.size() == 0) {
     kdDebug(5006) << "Data: <End>" << endl;
@@ -1012,7 +1012,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
 }
 
 //-----------------------------------------------------------------------------
-void PopAccount::slotResult( KIO::Job* )
+void PopAccount::slotResult( TDEIO::Job* )
 {
   if (!job) return;
   if ( job->error() )
@@ -1021,7 +1021,7 @@ void PopAccount::slotResult( KIO::Job* )
       if (headers) { // nothing to be done for headers
         idsOfMsgs.clear();
       }
-      if (stage == Head && job->error() == KIO::ERR_COULD_NOT_READ)
+      if (stage == Head && job->error() == TDEIO::ERR_COULD_NOT_READ)
       {
         KMessageBox::error(0, i18n("Your server does not support the "
           "TOP command. Therefore it is not possible to fetch the headers "
@@ -1041,25 +1041,25 @@ void PopAccount::slotResult( KIO::Job* )
 
 
 //-----------------------------------------------------------------------------
-void PopAccount::slotSlaveError(KIO::Slave *aSlave, int error,
+void PopAccount::slotSlaveError(TDEIO::Slave *aSlave, int error,
   const TQString &errorMsg)
 {
   if (aSlave != mSlave) return;
-  if (error == KIO::ERR_SLAVE_DIED) mSlave = 0;
+  if (error == TDEIO::ERR_SLAVE_DIED) mSlave = 0;
 
   // explicitely disconnect the slave if the connection went down
-  if ( error == KIO::ERR_CONNECTION_BROKEN && mSlave ) {
-    KIO::Scheduler::disconnectSlave( mSlave );
+  if ( error == TDEIO::ERR_CONNECTION_BROKEN && mSlave ) {
+    TDEIO::Scheduler::disconnectSlave( mSlave );
     mSlave = 0;
   }
 
   if (interactive && kmkernel) {
-    KMessageBox::error(kmkernel->mainWin(), KIO::buildErrorString(error, errorMsg));
+    KMessageBox::error(kmkernel->mainWin(), TDEIO::buildErrorString(error, errorMsg));
   }
 
 
   stage = Quit;
-  if (error == KIO::ERR_COULD_NOT_LOGIN && !mStorePasswd)
+  if (error == TDEIO::ERR_COULD_NOT_LOGIN && !mStorePasswd)
     mAskAgain = true;
   /* We need a timer, otherwise slotSlaveError of the next account is also
      executed, if it reuses the slave, because the slave member variable
diff --git a/kmail/popaccount.h b/kmail/popaccount.h
index 51cb84520..afa0acf27 100644
--- a/kmail/popaccount.h
+++ b/kmail/popaccount.h
@@ -13,7 +13,7 @@
 class KMPopHeaders;
 class KMMessage;
 class TQDataStream;
-namespace KIO {
+namespace TDEIO {
   class MetaData;
   class Slave;
   class SimpleJob;
@@ -33,7 +33,7 @@ public:
   virtual ~PopAccount();
   virtual void init(void);
 
-  virtual KIO::MetaData slaveConfig() const;
+  virtual TDEIO::MetaData slaveConfig() const;
 
   /** A weak assignment operator */
   virtual void pseudoAssign( const KMAccount * a );
@@ -90,8 +90,8 @@ public:
    * Inherited methods.
    */
   virtual TQString type(void) const;
-  virtual void readConfig(KConfig&);
-  virtual void writeConfig(KConfig&);
+  virtual void readConfig(TDEConfig&);
+  virtual void writeConfig(TDEConfig&);
   virtual void processNewMail(bool _interactive);
 
   virtual void killAllJobs( bool disconnectSlave=false ); // NOOP currently
@@ -130,7 +130,7 @@ protected:
   bool    mFilterOnServer;
   unsigned int mFilterOnServerCheckSize;
 
-  KIO::SimpleJob *job;
+  TDEIO::SimpleJob *job;
   //Map of ID's vs. sizes of messages which should be downloaded
   TQMap<TQString, int> mMsgsPendingDownload;
 
@@ -194,19 +194,19 @@ protected slots:
    * A messages has been retrieved successfully. The next data belongs to the
    * next message.
    */
-  void slotMsgRetrieved(KIO::Job*, const TQString &);
+  void slotMsgRetrieved(TDEIO::Job*, const TQString &);
 
   /**
    * New data has arrived append it to the end of the current message
    */
-  void slotData( KIO::Job*, const TQByteArray &);
+  void slotData( TDEIO::Job*, const TQByteArray &);
 
   /**
    * Finished downloading the current kio job, either due to an error
    * or because the job has been canceled or because the complete message
    * has been downloaded
    */
-  void slotResult( KIO::Job* );
+  void slotResult( TDEIO::Job* );
 
   /**
    * Cleans up after a user cancels the current job
@@ -227,7 +227,7 @@ protected slots:
   /**
    * Slave error handling
    */
-  void slotSlaveError(KIO::Slave *, int, const TQString &);
+  void slotSlaveError(TDEIO::Slave *, int, const TQString &);
 
   /**
    * If there are more headers to be downloaded then start a new kio job
diff --git a/kmail/quotajobs.cpp b/kmail/quotajobs.cpp
index 3dd5aa49e..b08d7f91d 100644
--- a/kmail/quotajobs.cpp
+++ b/kmail/quotajobs.cpp
@@ -35,27 +35,27 @@
 using namespace KMail;
 
 QuotaJobs::GetQuotarootJob* QuotaJobs::getQuotaroot(
-    KIO::Slave* slave, const KURL& url )
+    TDEIO::Slave* slave, const KURL& url )
 {
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'Q' << (int)'R' << url;
 
   GetQuotarootJob* job = new GetQuotarootJob( url, packedArgs, false );
-  KIO::Scheduler::assignJobToSlave( slave, job );
+  TDEIO::Scheduler::assignJobToSlave( slave, job );
   return job;
 }
 
 QuotaJobs::GetQuotarootJob::GetQuotarootJob( const KURL& url,
                                              const TQByteArray &packedArgs,
                                              bool showProgressInfo )
-  : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
+  : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
 {
-  connect( this, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
-           TQT_SLOT(slotInfoMessage(KIO::Job*,const TQString&)) );
+  connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+           TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) );
 }
 
-void QuotaJobs::GetQuotarootJob::slotInfoMessage( KIO::Job*, const TQString& str )
+void QuotaJobs::GetQuotarootJob::slotInfoMessage( TDEIO::Job*, const TQString& str )
 {
   // Parse the result
   TQStringList results = TQStringList::split("\r", str);
@@ -90,15 +90,15 @@ void QuotaJobs::GetQuotarootJob::slotInfoMessage( KIO::Job*, const TQString& str
 }
 
 QuotaJobs::GetStorageQuotaJob* QuotaJobs::getStorageQuota(
-    KIO::Slave* slave, const KURL& url )
+    TDEIO::Slave* slave, const KURL& url )
 {
   GetStorageQuotaJob* job = new GetStorageQuotaJob( slave, url );
   return job;
 }
 
 
-QuotaJobs::GetStorageQuotaJob::GetStorageQuotaJob( KIO::Slave* slave, const KURL& url )
-  : KIO::Job( false )
+QuotaJobs::GetStorageQuotaJob::GetStorageQuotaJob( TDEIO::Slave* slave, const KURL& url )
+  : TDEIO::Job( false )
 {
     TQByteArray packedArgs;
     TQDataStream stream( packedArgs, IO_WriteOnly );
@@ -110,7 +110,7 @@ QuotaJobs::GetStorageQuotaJob::GetStorageQuotaJob( KIO::Slave* slave, const KURL
             TQT_SLOT(slotQuotaInfoReceived(const QuotaInfoList&)));
     connect(job, TQT_SIGNAL(quotaRootResult(const TQStringList&)),
             TQT_SLOT(slotQuotarootResult(const TQStringList&)));
-    KIO::Scheduler::assignJobToSlave( slave, job );
+    TDEIO::Scheduler::assignJobToSlave( slave, job );
     addSubjob( job );
 }
 
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index 1db1b3d2c..3e453b504 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -123,7 +123,7 @@ class GetQuotarootJob;
  * @param slave Slave object the job should be assigned to
  * @param url URL for which to get the quotaroot
  */
-GetQuotarootJob* getQuotaroot( KIO::Slave* slave, const KURL& url );
+GetQuotarootJob* getQuotaroot( TDEIO::Slave* slave, const KURL& url );
 
 class GetStorageQuotaJob;
 /**
@@ -131,10 +131,10 @@ class GetStorageQuotaJob;
  * @param slave Slave object the job should be assigned to
  * @param url URL for which to get the storage quota
  */
-GetStorageQuotaJob* getStorageQuota( KIO::Slave* slave, const KURL& url );
+GetStorageQuotaJob* getStorageQuota( TDEIO::Slave* slave, const KURL& url );
 
 /// for getQuotaroot()
-class GetQuotarootJob : public KIO::SimpleJob
+class GetQuotarootJob : public TDEIO::SimpleJob
 {
   Q_OBJECT
   
@@ -157,16 +157,16 @@ signals:
   void quotaInfoReceived( const QuotaInfoList& info );
 
 protected slots:
-  void slotInfoMessage( KIO::Job*, const TQString& );
+  void slotInfoMessage( TDEIO::Job*, const TQString& );
 };
 
 /// for getStorageQuota()
-class GetStorageQuotaJob : public KIO::Job
+class GetStorageQuotaJob : public TDEIO::Job
 {
   Q_OBJECT
   
 public:
-  GetStorageQuotaJob( KIO::Slave* slave, const KURL& url );
+  GetStorageQuotaJob( TDEIO::Slave* slave, const KURL& url );
 
   /**  Returns the storage quota info, if any, can be queried on result(). */
   QuotaInfo storageQuotaInfo() const;
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index de577a7cc..0d938bde2 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -577,7 +577,7 @@ void RecipientsPicker::insertRecentAddresses()
 {
   RecipientsCollection *collection = new RecipientsCollection( i18n("Recent Addresses") );
 
-  KConfig config( "kmailrc" );
+  TDEConfig config( "kmailrc" );
   KABC::Addressee::List recents =
     KRecentAddress::RecentAddresses::self( &config )->kabcAddresses();
 
@@ -810,7 +810,7 @@ void RecipientsPicker::keyPressEvent( TQKeyEvent *ev )
 
 void RecipientsPicker::readConfig()
 {
-  KConfig *cfg = TDEGlobal::config();
+  TDEConfig *cfg = TDEGlobal::config();
   cfg->setGroup( "RecipientsPicker" );
   TQSize size = cfg->readSizeEntry( "Size" );
   if ( !size.isEmpty() ) {
@@ -825,7 +825,7 @@ void RecipientsPicker::readConfig()
 
 void RecipientsPicker::writeConfig()
 {
-  KConfig *cfg = TDEGlobal::config();
+  TDEConfig *cfg = TDEGlobal::config();
   cfg->setGroup( "RecipientsPicker" );
   cfg->writeEntry( "Size", size() );
   cfg->writeEntry( "CurrentCollection", mCollectionCombo->currentItem() );
diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp
index 7715c5871..5e2a43d3f 100644
--- a/kmail/renamejob.cpp
+++ b/kmail/renamejob.cpp
@@ -143,18 +143,18 @@ void RenameJob::execute()
     src.setPath( mOldImapPath );
     KURL dst( account->getUrl() );
     dst.setPath( mNewImapPath );
-    KIO::SimpleJob *job = KIO::rename( src, dst, true );
+    TDEIO::SimpleJob *job = TDEIO::rename( src, dst, true );
     kdDebug(5006)<< "RenameJob::rename - " << src.prettyURL()
       << " |=> " << dst.prettyURL() << endl;
     ImapAccountBase::jobData jd( src.url() );
     account->insertJob( job, jd );
-    KIO::Scheduler::assignJobToSlave( account->slave(), job );
-    connect( job, TQT_SIGNAL(result(KIO::Job*)),
-        TQT_SLOT(slotRenameResult(KIO::Job*)) );
+    TDEIO::Scheduler::assignJobToSlave( account->slave(), job );
+    connect( job, TQT_SIGNAL(result(TDEIO::Job*)),
+        TQT_SLOT(slotRenameResult(TDEIO::Job*)) );
   }
 }
 
-void RenameJob::slotRenameResult( KIO::Job *job )
+void RenameJob::slotRenameResult( TDEIO::Job *job )
 {
   ImapAccountBase* account = static_cast<KMFolderImap*>(mStorage)->account();
   ImapAccountBase::JobIterator it = account->findJob(job);
@@ -208,9 +208,9 @@ void RenameJob::folderCopyComplete(bool success)
   // move complete or not necessary
   // save our settings
   TQString oldconfig = "Folder-" + mStorage->folder()->idString();
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   TQMap<TQString, TQString> entries = config->entryMap( oldconfig );
-  KConfigGroupSaver saver(config, "Folder-" + mNewFolder->idString());
+  TDEConfigGroupSaver saver(config, "Folder-" + mNewFolder->idString());
   for ( TQMap<TQString, TQString>::Iterator it = entries.begin();
         it != entries.end(); ++it )
   {
diff --git a/kmail/renamejob.h b/kmail/renamejob.h
index 58a8f6d3a..9e3cea432 100644
--- a/kmail/renamejob.h
+++ b/kmail/renamejob.h
@@ -35,7 +35,7 @@ class KMFolderDir;
 class KMFolder;
 class KMCommand;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -68,7 +68,7 @@ public:
 
 protected slots:
   /** Rename the folder */
-  void slotRenameResult( KIO::Job* job );
+  void slotRenameResult( TDEIO::Job* job );
 
   /** All messages are copied so remove the original folder */
   void folderCopyComplete( bool success );
diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index 154bfdfe7..6e3040bd2 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -88,14 +88,14 @@ void SearchJob::searchCompleteFolder()
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int) 'E' << url;
-  KIO::SimpleJob *job = KIO::special( url, packedArgs, false );
+  TDEIO::SimpleJob *job = TDEIO::special( url, packedArgs, false );
   if ( mFolder->imapPath() != TQString( "/" ) )
   {
-    KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
-    connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
-      TQT_SLOT( slotSearchData( KIO::Job*, const TQString& ) ) );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-      TQT_SLOT( slotSearchResult( KIO::Job * ) ) );
+    TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
+    connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+      TQT_SLOT( slotSearchData( TDEIO::Job*, const TQString& ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+      TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) );
   }
   else
   { // for the "/ folder" of an imap account, searching blocks the kioslave
@@ -176,7 +176,7 @@ TQString SearchJob::searchStringFromPattern( const KMSearchPattern* pattern )
 }
 
 //-----------------------------------------------------------------------------
-void SearchJob::slotSearchData( KIO::Job* job, const TQString& data )
+void SearchJob::slotSearchData( TDEIO::Job* job, const TQString& data )
 {
   if ( job && job->error() ) {
     // error is handled in slotSearchResult
@@ -344,7 +344,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg )
 }
 
 //-----------------------------------------------------------------------------
-void SearchJob::slotSearchResult( KIO::Job *job )
+void SearchJob::slotSearchResult( TDEIO::Job *job )
 {
   if ( job->error() )
   {
@@ -385,17 +385,17 @@ void SearchJob::searchSingleMessage()
     TQByteArray packedArgs;
     TQDataStream stream( packedArgs, IO_WriteOnly );
     stream << (int) 'E' << url;
-    KIO::SimpleJob *job = KIO::special( url, packedArgs, false );
-    KIO::Scheduler::assignJobToSlave(mAccount->slave(), job);
-    connect( job, TQT_SIGNAL(infoMessage(KIO::Job*,const TQString&)),
-        TQT_SLOT(slotSearchDataSingleMessage(KIO::Job*,const TQString&)) );
-    connect( job, TQT_SIGNAL(result(KIO::Job *)),
-        TQT_SLOT(slotSearchResult(KIO::Job *)) );
+    TDEIO::SimpleJob *job = TDEIO::special( url, packedArgs, false );
+    TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), job);
+    connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)),
+        TQT_SLOT(slotSearchDataSingleMessage(TDEIO::Job*,const TQString&)) );
+    connect( job, TQT_SIGNAL(result(TDEIO::Job *)),
+        TQT_SLOT(slotSearchResult(TDEIO::Job *)) );
   }
 }
 
 //-----------------------------------------------------------------------------
-void SearchJob::slotSearchDataSingleMessage( KIO::Job* job, const TQString& data )
+void SearchJob::slotSearchDataSingleMessage( TDEIO::Job* job, const TQString& data )
 {
   if ( job && job->error() ) {
     // error is handled in slotSearchResult
diff --git a/kmail/searchjob.h b/kmail/searchjob.h
index d90f7fa18..85fd5c2a2 100644
--- a/kmail/searchjob.h
+++ b/kmail/searchjob.h
@@ -35,7 +35,7 @@ class KMFolderImap;
 class KMSearchPattern;
 class KURL;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -92,16 +92,16 @@ protected slots:
   void slotSearchFolder();
 
   // processes the server answer
-  void slotSearchData( KIO::Job* job, const TQString& data );
+  void slotSearchData( TDEIO::Job* job, const TQString& data );
 
   // message is downloaded and searched
   void slotSearchMessageArrived( KMMessage* msg );
 
   // error handling for all cases
-  void slotSearchResult( KIO::Job *job );
+  void slotSearchResult( TDEIO::Job *job );
 
   // imap search result from a single message
-  void slotSearchDataSingleMessage( KIO::Job* job, const TQString& data );
+  void slotSearchDataSingleMessage( TDEIO::Job* job, const TQString& data );
 
   // the user cancelled the search progress
   void slotAbortSearch( KPIM::ProgressItem* item );
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index dc226b9b0..de5e2d7e8 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -129,7 +129,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
 #endif
   KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   config->setGroup("SearchDialog");
 
   TQWidget* searchWidget = new TQWidget(this);
@@ -170,7 +170,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   if (curFolder)
       searchFolder = dynamic_cast<KMFolderSearch*>(curFolder->storage());
   if (searchFolder) {
-      KConfig config(curFolder->location());
+      TDEConfig config(curFolder->location());
       KMFolder *root = searchFolder->search()->root();
       config.setGroup("Search Folder");
       mSearchPattern->readConfig(&config);
@@ -379,7 +379,7 @@ SearchWindow::~SearchWindow()
     (*fit)->close("searchwindow");
   }
 
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   config->setGroup("SearchDialog");
   config->writeEntry("SubjectWidth", mLbxMatches->columnWidth(0));
   config->writeEntry("SenderWidth", mLbxMatches->columnWidth(1));
diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp
index 9c22539c2..8e185f3a9 100644
--- a/kmail/sieveconfig.cpp
+++ b/kmail/sieveconfig.cpp
@@ -31,7 +31,7 @@
 
 namespace KMail {
 
-  void SieveConfig::readConfig( const KConfigBase & config ) {
+  void SieveConfig::readConfig( const TDEConfigBase & config ) {
     mManagesieveSupported = config.readBoolEntry( "sieve-support", false );
     mReuseConfig = config.readBoolEntry( "sieve-reuse-config", true );
 
@@ -45,7 +45,7 @@ namespace KMail {
       mVacationFileName = "kmail-vacation.siv";
   }
 
-  void SieveConfig::writeConfig( KConfigBase & config ) const {
+  void SieveConfig::writeConfig( TDEConfigBase & config ) const {
     config.writeEntry( "sieve-support", managesieveSupported() );
     config.writeEntry( "sieve-reuse-config", reuseConfig() );
     config.writeEntry( "sieve-port", port() );
diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h
index 5c6fb4add..ac296375f 100644
--- a/kmail/sieveconfig.h
+++ b/kmail/sieveconfig.h
@@ -22,7 +22,7 @@
 class TQCheckBox;
 class TQLineEdit;
 class KIntSpinBox;
-class KConfigBase;
+class TDEConfigBase;
 
 namespace KMail {
 
@@ -74,8 +74,8 @@ namespace KMail {
 
     TQString vacationFileName() const { return mVacationFileName; }
 
-    void readConfig( const KConfigBase & config );
-    void writeConfig( KConfigBase & config ) const;
+    void readConfig( const TDEConfigBase & config );
+    void writeConfig( TDEConfigBase & config ) const;
 
   protected:
     bool mManagesieveSupported;
diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index 6993f8f66..3e823a7a7 100644
--- a/kmail/sievejob.cpp
+++ b/kmail/sievejob.cpp
@@ -19,11 +19,11 @@
 #include "sievejob.h"
 
 #include <kio/job.h>
-using KIO::Job;
+using TDEIO::Job;
 // <kio/global.h>
-using KIO::UDSAtomTypes;
-using KIO::UDSEntryList;
-using KIO::UDSEntry;
+using TDEIO::UDSAtomTypes;
+using TDEIO::UDSEntryList;
+using TDEIO::UDSEntry;
 #include <kdebug.h>
 
 #include <tqtextcodec.h>
@@ -71,25 +71,25 @@ namespace KMail {
     switch ( command ) {
     case Get:
       kdDebug(5006) << "SieveJob::schedule: get( " << mUrl.prettyURL() << " )" << endl;
-      mJob = KIO::get( mUrl, false /*reload*/, showProgressInfo );
-      connect( mJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)),
-	       TQT_SLOT(slotData(KIO::Job*,const TQByteArray&)) );
+      mJob = TDEIO::get( mUrl, false /*reload*/, showProgressInfo );
+      connect( mJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
+	       TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) );
       break;
     case Put:
       kdDebug(5006) << "SieveJob::schedule: put( " << mUrl.prettyURL() << " )" << endl;
-      mJob = KIO::put( mUrl, 0600, true /*overwrite*/, false /*resume*/, showProgressInfo );
-      connect( mJob, TQT_SIGNAL(dataReq(KIO::Job*,TQByteArray&)),
-	       TQT_SLOT(slotDataReq(KIO::Job*,TQByteArray&)) );
+      mJob = TDEIO::put( mUrl, 0600, true /*overwrite*/, false /*resume*/, showProgressInfo );
+      connect( mJob, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)),
+	       TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)) );
       break;
     case Activate:
       kdDebug(5006) << "SieveJob::schedule: chmod( " << mUrl.prettyURL() << ", 0700 )"
 		<< endl;
-      mJob = KIO::chmod( mUrl, 0700 );
+      mJob = TDEIO::chmod( mUrl, 0700 );
       break;
     case Deactivate:
       kdDebug(5006) << "SieveJob::schedule: chmod( " << mUrl.prettyURL() << ", 0600 )"
 		<< endl;
-      mJob = KIO::chmod( mUrl, 0600 );
+      mJob = TDEIO::chmod( mUrl, 0600 );
       break;
     case SearchActive:
       kdDebug(5006) << "SieveJob::schedule: listDir( " << mUrl.prettyURL() << " )" << endl;
@@ -101,29 +101,29 @@ namespace KMail {
 	url.setQuery( query );
 	kdDebug(5006) << "SieveJob::schedule: listDir's real URL: " << url.prettyURL()
 		  << endl;
-	mJob = KIO::listDir( url, showProgressInfo );
-	connect( mJob, TQT_SIGNAL(entries(KIO::Job*,const KIO::UDSEntryList&)),
-		 TQT_SLOT(slotEntries(KIO::Job*,const KIO::UDSEntryList&)) );
+	mJob = TDEIO::listDir( url, showProgressInfo );
+	connect( mJob, TQT_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)),
+		 TQT_SLOT(slotEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) );
 	break;
       }
     case List:
       kdDebug(5006) << "SieveJob::schedule: listDir( " << mUrl.prettyURL() << " )" << endl;
       {
-	mJob = KIO::listDir( mUrl, showProgressInfo );
-	connect( mJob, TQT_SIGNAL( entries(KIO::Job *, const KIO::UDSEntryList & ) ),
-		 TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList & ) ) );
+	mJob = TDEIO::listDir( mUrl, showProgressInfo );
+	connect( mJob, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList & ) ),
+		 TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) );
 	break;
       }
     case Delete:
       kdDebug(5006) << "SieveJob::schedule: delete( " << mUrl.prettyURL() << " )" << endl;
-      mJob = KIO::del( mUrl, false/*shred*/, showProgressInfo );
+      mJob = TDEIO::del( mUrl, false/*shred*/, showProgressInfo );
       break;
     default:
       assert( 0 );
     }
     mJob->setInteractive(showProgressInfo);
     // common to all jobs:
-    connect( mJob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*)) );
+    connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) );
   }
 
   void SieveJob::slotData( Job *, const TQByteArray & data ) {
@@ -166,10 +166,10 @@ namespace KMail {
       TQString filename;
       bool isActive = false;
       for ( UDSEntry::const_iterator et = (*it).begin() ; et != (*it).end() ; ++ et ) {
-	if ( ( *et ).m_uds == KIO::UDS_NAME ) {
+	if ( ( *et ).m_uds == TDEIO::UDS_NAME ) {
 	  filename = ( *et ).m_str;
 	  mAvailableScripts.append( filename );
-	} else if ( ( *et ).m_uds == KIO::UDS_ACCESS && ( *et ).m_long == 0700 )
+	} else if ( ( *et ).m_uds == TDEIO::UDS_ACCESS && ( *et ).m_long == 0700 )
 	  isActive = true;
       }
 
diff --git a/kmail/sievejob.h b/kmail/sievejob.h
index a350740ff..84e316140 100644
--- a/kmail/sievejob.h
+++ b/kmail/sievejob.h
@@ -25,7 +25,7 @@
 #include <kio/global.h>
 
 class TQTextDecoder;
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -104,14 +104,14 @@ namespace KMail {
     void schedule( Command command, bool showProgressInfo );
 
   protected slots:
-    void slotData( KIO::Job *, const TQByteArray & ); // for get
-    void slotDataReq( KIO::Job *, TQByteArray & ); // for put
-    void slotEntries( KIO::Job *, const KIO::UDSEntryList & ); // for listDir
-    void slotResult( KIO::Job * ); // for all commands
+    void slotData( TDEIO::Job *, const TQByteArray & ); // for get
+    void slotDataReq( TDEIO::Job *, TQByteArray & ); // for put
+    void slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ); // for listDir
+    void slotResult( TDEIO::Job * ); // for all commands
 
   protected:
     KURL mUrl;
-    KIO::Job * mJob;
+    TDEIO::Job * mJob;
     TQTextDecoder * mDec;
     TQString mScript;
     TQString mActiveScriptName;
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index 0b4f271a0..4997386e7 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -418,7 +418,7 @@ void SnippetWidget::writeConfig()
 void SnippetWidget::initConfig()
 {
   if (_cfg == NULL)
-    _cfg = new KConfig("kmailsnippetrc", false, false);
+    _cfg = new TDEConfig("kmailsnippetrc", false, false);
 
   _cfg->setGroup("SnippetPart");
 
diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h
index 120f64ad1..18573c38b 100644
--- a/kmail/snippetwidget.h
+++ b/kmail/snippetwidget.h
@@ -32,7 +32,7 @@ class TQPoint;
 class SnippetDlg;
 class SnippetItem;
 class KTextEdit;
-class KConfig;
+class TDEConfig;
 class KMEdit;
 class KActionCollection;
 
@@ -72,7 +72,7 @@ private:
 
     TQPtrList<SnippetItem> _list;
     TQMap<TQString, TQString> _mapSaved;
-    KConfig * _cfg;
+    TDEConfig * _cfg;
     SnippetConfig _SnippetConfig;
     KMEdit* mEditor;
     KActionCollection* mActionCollection;
diff --git a/kmail/transportmanager.cpp b/kmail/transportmanager.cpp
index e80d1cb27..ced8f7710 100644
--- a/kmail/transportmanager.cpp
+++ b/kmail/transportmanager.cpp
@@ -27,7 +27,7 @@ namespace KMail {
 
   TQStringList TransportManager::transportNames()
   {
-    KConfigGroup general( KMKernel::config(), "General");
+    TDEConfigGroup general( KMKernel::config(), "General");
 
     int numTransports = general.readNumEntry("transports", 0);
 
@@ -46,7 +46,7 @@ namespace KMail {
   {
     TQValueList<unsigned int> usedIds;
 
-    KConfigGroup general( KMKernel::config(), "General");
+    TDEConfigGroup general( KMKernel::config(), "General");
     int numTransports = general.readNumEntry( "transports", 0 );
 
     for ( int i = 1 ; i <= numTransports ; i++ ) {
diff --git a/kmail/util.h b/kmail/util.h
index 9f291a2e0..30b01cbaf 100644
--- a/kmail/util.h
+++ b/kmail/util.h
@@ -201,7 +201,7 @@ namespace Util {
     // return true if we should proceed, false if we should abort
     inline bool checkOverwrite( const KURL& url, TQWidget* w )
     {
-        if ( KIO::NetAccess::exists( url, false /*dest*/, w ) ) {
+        if ( TDEIO::NetAccess::exists( url, false /*dest*/, w ) ) {
             if ( KMessageBox::Cancel ==
                     KMessageBox::warningContinueCancel(
                         w,
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index 5279b78b2..5a279b92f 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -45,7 +45,7 @@
 #include <kmessagebox.h>
 #include <kurl.h>
 #include <kio/netaccess.h>
-using namespace KIO;
+using namespace TDEIO;
 #include <kxface.h>
 using namespace KPIM;
 #include <kabc/stdaddressbook.h>
@@ -211,13 +211,13 @@ namespace KMail {
   void XFaceConfigurator::setXfaceFromFile( const KURL &url )
   {
     TQString tmpFile;
-    if( KIO::NetAccess::download( url, tmpFile, this ) )
+    if( TDEIO::NetAccess::download( url, tmpFile, this ) )
     {
       KXFace xf;
       mTextEdit->setText( xf.fromImage( TQImage( tmpFile ) ) );
-      KIO::NetAccess::removeTempFile( tmpFile );
+      TDEIO::NetAccess::removeTempFile( tmpFile );
     } else {
-      KMessageBox::error(this, KIO::NetAccess::lastErrorString() );
+      KMessageBox::error(this, TDEIO::NetAccess::lastErrorString() );
     }
   }