From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:37:21 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kmail/kmsender.cpp | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'kmail/kmsender.cpp')

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();
   }
 }
-- 
cgit v1.2.1