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

1 files changed, 9 insertions, 9 deletions

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" ) );
   }
 }