summaryrefslogtreecommitdiffstats
path: root/kioslaves/imap4
diff options
context:
space:
mode:
Diffstat (limited to 'kioslaves/imap4')
-rw-r--r--kioslaves/imap4/imap4.cc24
-rw-r--r--kioslaves/imap4/imap4.h4
-rw-r--r--kioslaves/imap4/imapparser.cc4
-rw-r--r--kioslaves/imap4/imapparser.h2
4 files changed, 17 insertions, 17 deletions
diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index e17808a0d..6654bb3dd 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -96,7 +96,7 @@ extern "C" {
#define IMAP_PROTOCOL "imap"
#define IMAP_SSL_PROTOCOL "imaps"
-using namespace KIO;
+using namespace TDEIO;
extern "C"
{
@@ -768,14 +768,14 @@ void
IMAP4Protocol::setSubURL (const KURL & _url)
{
kdDebug(7116) << "IMAP4::setSubURL - " << _url.prettyURL() << endl;
- KIO::TCPSlaveBase::setSubURL (_url);
+ TDEIO::TCPSlaveBase::setSubURL (_url);
}
void
IMAP4Protocol::put (const KURL & _url, int, bool, bool)
{
kdDebug(7116) << "IMAP4::put - " << _url.prettyURL() << endl;
-// KIO::TCPSlaveBase::put(_url,permissions,overwrite,resume);
+// TDEIO::TCPSlaveBase::put(_url,permissions,overwrite,resume);
TQString aBox, aSequence, aLType, aSection, aValidity, aDelimiter, aInfo;
enum IMAP_TYPE aType =
parseURL (_url, aBox, aSection, aLType, aSequence, aValidity, aDelimiter, aInfo);
@@ -1823,7 +1823,7 @@ void
IMAP4Protocol::dispatch (int command, const TQByteArray & data)
{
kdDebug(7116) << "IMAP4::dispatch - command=" << command << endl;
- KIO::TCPSlaveBase::dispatch (command, data);
+ TDEIO::TCPSlaveBase::dispatch (command, data);
}
void
@@ -1884,7 +1884,7 @@ IMAP4Protocol::stat (const KURL & _url)
if (found)
error(ERR_COULD_NOT_STAT, aBox);
else
- error(KIO::ERR_DOES_NOT_EXIST, aBox);
+ error(TDEIO::ERR_DOES_NOT_EXIST, aBox);
return;
}
if ((aSection == "UIDNEXT" && geStatus().uidNextAvailable())
@@ -2126,7 +2126,7 @@ bool IMAP4Protocol::makeLogin ()
kdDebug(7116) << "IMAP4::makeLogin - attempting login" << endl;
- KIO::AuthInfo authInfo;
+ TDEIO::AuthInfo authInfo;
authInfo.username = myUser;
authInfo.password = myPass;
authInfo.prompt = i18n ("Username and password for your IMAP account:");
@@ -2143,21 +2143,21 @@ bool IMAP4Protocol::makeLogin ()
}
}
if (!clientLogin (myUser, myPass, resultInfo))
- error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the "
+ error(TDEIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to login. Probably the "
"password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo));
}
else
{
#ifdef HAVE_LIBSASL2
if (!clientAuthenticate (this, authInfo, myHost, myAuth, mySSL, resultInfo))
- error(KIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n"
+ error(TDEIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Unable to authenticate via %1.\n"
"The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo));
else {
myUser = authInfo.username;
myPass = authInfo.password;
}
#else
- error(KIO::ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into kio_imap4."));
+ error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("SASL authentication is not compiled into kio_imap4."));
#endif
}
if ( hasCapability("NAMESPACE") )
@@ -2326,7 +2326,7 @@ IMAP4Protocol::doListEntry (const TQString & encodedUrl, int stretch, imapCache
atom.m_str = myUser;
entry.append (atom);
- atom.m_uds = KIO::UDS_ACCESS;
+ atom.m_uds = TDEIO::UDS_ACCESS;
atom.m_long = (withFlags) ? cache->getFlags() : S_IRUSR | S_IXUSR | S_IWUSR;
entry.append (atom);
@@ -2704,7 +2704,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
error(ERR_SLAVE_DEFINED, i18n("Unable to open folder %1. The server replied: %2").arg(aBox).arg(cmdInfo));
}
} else {
- error(KIO::ERR_DOES_NOT_EXIST, aBox);
+ error(TDEIO::ERR_DOES_NOT_EXIST, aBox);
}
return false;
}
@@ -2726,7 +2726,7 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
// if it is the mode we want
if (!getSelected().readWrite() && !readonly)
{
- error(KIO::ERR_CANNOT_OPEN_FOR_WRITING, aBox);
+ error(TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, aBox);
return false;
}
diff --git a/kioslaves/imap4/imap4.h b/kioslaves/imap4/imap4.h
index d03f8c0c8..164cf8556 100644
--- a/kioslaves/imap4/imap4.h
+++ b/kioslaves/imap4/imap4.h
@@ -45,7 +45,7 @@ enum IMAP_TYPE
/** @brief IOSlave derived class */
class IMAP4Protocol:public
- KIO::TCPSlaveBase,
+ TDEIO::TCPSlaveBase,
public
imapParser,
public
@@ -194,7 +194,7 @@ private:
TQByteArray outputCache;
TQBuffer outputBuffer;
TQ_ULONG outputBufferIndex;
- KIO::filesize_t mProcessedSize;
+ TDEIO::filesize_t mProcessedSize;
char readBuffer[IMAP_BUFFER];
ssize_t readBufferLen;
diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc
index d7ad8697e..8cb06e318 100644
--- a/kioslaves/imap4/imapparser.cc
+++ b/kioslaves/imap4/imapparser.cc
@@ -169,7 +169,7 @@ imapParser::clientLogin (const TQString & aUser, const TQString & aPass,
}
#ifdef HAVE_LIBSASL2
-static bool sasl_interact( KIO::SlaveBase *slave, KIO::AuthInfo &ai, void *in )
+static bool sasl_interact( TDEIO::SlaveBase *slave, TDEIO::AuthInfo &ai, void *in )
{
kdDebug(7116) << "sasl_interact" << endl;
sasl_interact_t *interact = ( sasl_interact_t * ) in;
@@ -215,7 +215,7 @@ static bool sasl_interact( KIO::SlaveBase *slave, KIO::AuthInfo &ai, void *in )
#endif
bool
-imapParser::clientAuthenticate ( KIO::SlaveBase *slave, KIO::AuthInfo &ai,
+imapParser::clientAuthenticate ( TDEIO::SlaveBase *slave, TDEIO::AuthInfo &ai,
const TQString & aFTQDN, const TQString & aAuth, bool isSSL, TQString & resultInfo)
{
bool retVal = false;
diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h
index d24e9c813..7c498b09d 100644
--- a/kioslaves/imap4/imapparser.h
+++ b/kioslaves/imap4/imapparser.h
@@ -248,7 +248,7 @@ public:
* @param resultInfo The resultinfo from the command
* @return success or failure
*/
- bool clientAuthenticate (KIO::SlaveBase *slave, KIO::AuthInfo &ai, const TQString & aFTQDN,
+ bool clientAuthenticate (TDEIO::SlaveBase *slave, TDEIO::AuthInfo &ai, const TQString & aFTQDN,
const TQString & aAuth, bool isSSL, TQString & resultInfo);
/**