From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kioslaves/sieve/sieve.cpp | 24 ++++++++++++------------ kioslaves/sieve/sieve.h | 18 +++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'kioslaves/sieve') diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp index 6d2f90b8b..802b3cdc8 100644 --- a/kioslaves/sieve/sieve.cpp +++ b/kioslaves/sieve/sieve.cpp @@ -149,10 +149,10 @@ const TQCString& kio_sieveResponse::getExtra() const } /* ---------------------------------------------------------------------------------- */ -void kio_sieveResponse::setQuantity(const uint& newQty) +void kio_sieveResponse::setQuantity(const uint& newTQty) { - rType = QUANTITY; - quantity = newQty; + rType = TQUANTITY; + quantity = newTQty; } /* ---------------------------------------------------------------------------------- */ @@ -453,7 +453,7 @@ void kio_sieveProtocol::disconnect(bool forcibly) /* ---------------------------------------------------------------------------------- */ /*void kio_sieveProtocol::slave_status() { - slaveStatus(isConnectionValid() ? m_sServer : "", isConnectionValid()); + slavetqStatus(isConnectionValid() ? m_sServer : "", isConnectionValid()); finished(); }*/ @@ -661,7 +661,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri // send the extra message off for re-processing receiveData(false, &extra); - if (r.getType() == kio_sieveResponse::QUANTITY) { + if (r.getType() == kio_sieveResponse::TQUANTITY) { // length of the error message uint len = r.getQuantity(); @@ -736,7 +736,7 @@ void kio_sieveProtocol::get(const KURL& url) if (!sendData("GETSCRIPT \"" + filename.utf8() + "\"")) return; - if (receiveData() && r.getType() == kio_sieveResponse::QUANTITY) { + if (receiveData() && r.getType() == kio_sieveResponse::TQUANTITY) { // determine script size ssize_t total_len = r.getQuantity(); totalSize( total_len ); @@ -1105,7 +1105,7 @@ bool kio_sieveProtocol::authenticate() ksDebug() << "Challenge len " << r.getQuantity() << endl; - if (r.getType() != kio_sieveResponse::QUANTITY) { + if (r.getType() != kio_sieveResponse::TQUANTITY) { sasl_dispose( &conn ); error(ERR_SLAVE_DEFINED, i18n("A protocol error occurred during authentication.\n" @@ -1237,10 +1237,10 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse) { // expecting {quantity} start = 0; - end = interpret.find("+}", start + 1); + end = interpret.tqfind("+}", start + 1); // some older versions of Cyrus enclose the literal size just in { } instead of { +} if ( end == -1 ) - end = interpret.find('}', start + 1); + end = interpret.tqfind('}', start + 1); bool ok = false; r.setQuantity(interpret.mid(start + 1, end - start - 1).toUInt( &ok )); @@ -1263,7 +1263,7 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse) start = 0; - end = interpret.find(34, start + 1); + end = interpret.tqfind(34, start + 1); if (end == -1) { ksDebug() << "Possible insufficient buffer size." << endl; r.setKey(interpret.right(interpret.length() - start)); @@ -1272,7 +1272,7 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse) r.setKey(interpret.mid(start + 1, end - start - 1)); - start = interpret.find(34, end + 1); + start = interpret.tqfind(34, end + 1); if (start == -1) { if ((int)interpret.length() > end) // skip " and space @@ -1281,7 +1281,7 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse) return true; } - end = interpret.find(34, start + 1); + end = interpret.tqfind(34, start + 1); if (end == -1) { ksDebug() << "Possible insufficient buffer size." << endl; r.setVal(interpret.right(interpret.length() - start)); diff --git a/kioslaves/sieve/sieve.h b/kioslaves/sieve/sieve.h index 0fc3bbd68..4a22cbe14 100644 --- a/kioslaves/sieve/sieve.h +++ b/kioslaves/sieve/sieve.h @@ -30,7 +30,7 @@ class KURL; class kio_sieveResponse { public: - enum responses { NONE, KEY_VAL_PAIR, ACTION, QUANTITY }; + enum responses { NONE, KEY_VAL_PAIR, ACTION, TQUANTITY }; kio_sieveResponse(); @@ -53,9 +53,9 @@ public: protected: uint rType; uint quantity; - QCString key; - QCString val; - QCString extra; + TQCString key; + TQCString val; + TQCString extra; }; class kio_sieveProtocol : public KIO::TCPSlaveBase @@ -110,17 +110,17 @@ protected: uint m_connMode; // Host-specific data - QStringList m_sasl_caps; + TQStringList m_sasl_caps; bool m_supportsTLS; // Global server respose class kio_sieveResponse r; // connection details - QString m_sServer; - QString m_sUser; - QString m_sPass; - QString m_sAuth; + TQString m_sServer; + TQString m_sUser; + TQString m_sPass; + TQString m_sAuth; bool m_shouldBeConnected; bool m_allowUnencrypted; -- cgit v1.2.1