diff options
Diffstat (limited to 'kioslaves/sieve')
| -rw-r--r-- | kioslaves/sieve/configure.in.in | 4 | ||||
| -rw-r--r-- | kioslaves/sieve/sieve.cpp | 30 | ||||
| -rw-r--r-- | kioslaves/sieve/sieve.h | 4 |
3 files changed, 19 insertions, 19 deletions
diff --git a/kioslaves/sieve/configure.in.in b/kioslaves/sieve/configure.in.in index a722cfebb..ffc1b4b7e 100644 --- a/kioslaves/sieve/configure.in.in +++ b/kioslaves/sieve/configure.in.in @@ -4,7 +4,7 @@ AC_ARG_ENABLE(broken-timsieved-workaround, [versions <= 1.1.0 of the timsieved (part of the Cyrus IMAP suite) do not interpret the HAVESPACE command of the sieve protocol. This option makes the sieve - KIO::Slave simply omit that command.])], + TDEIO::Slave simply omit that command.])], [case "${enableval}" in yes) AC_MSG_RESULT(yes) need_broken_timsieved_support="yes" ;; @@ -14,5 +14,5 @@ esac],[AC_MSG_RESULT(no)]) if test "$need_broken_timsieved_support" = "yes"; then AC_SUBST(HAVE_BROKEN_TIMSIEVED) - AC_DEFINE(HAVE_BROKEN_TIMSIEVED,1,[Define if the sieve KIO::Slave must be able to talk to timsieved <= 1.1.0]) + AC_DEFINE(HAVE_BROKEN_TIMSIEVED,1,[Define if the sieve TDEIO::Slave must be able to talk to timsieved <= 1.1.0]) fi diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp index 4e95c5a16..9d373c2ad 100644 --- a/kioslaves/sieve/sieve.cpp +++ b/kioslaves/sieve/sieve.cpp @@ -77,7 +77,7 @@ static sasl_callback_t callbacks[] = { static const unsigned int SIEVE_DEFAULT_RECIEVE_BUFFER = 512; -using namespace KIO; +using namespace TDEIO; extern "C" { KDE_EXPORT int kdemain(int argc, char **argv) @@ -441,7 +441,7 @@ void kio_sieveProtocol::disconnect(bool forcibly) // This crashes under certain conditions as described in // http://intevation.de/roundup/kolab/issue2442 - // Fixing KIO::TCPSlaveBase::atEnd() for !fd would also work but 3.x is on life support. + // Fixing TDEIO::TCPSlaveBase::atEnd() for !fd would also work but 3.x is on life support. //if (!operationSuccessful()) // ksDebug() << "Server did not logout cleanly." << endl; } @@ -745,7 +745,7 @@ void kio_sieveProtocol::get(const KURL& url) do { // wait for data... if ( !waitForResponse( 600 ) ) { - error( KIO::ERR_SERVER_TIMEOUT, m_sServer ); + error( TDEIO::ERR_SERVER_TIMEOUT, m_sServer ); disconnect( true ); return; } @@ -757,7 +757,7 @@ void kio_sieveProtocol::get(const KURL& url) ssize_t this_recv_len = read( dat.data(), dat.size() ); if ( this_recv_len < 1 && !isConnectionValid() ) { - error( KIO::ERR_CONNECTION_BROKEN, m_sServer ); + error( TDEIO::ERR_CONNECTION_BROKEN, m_sServer ); disconnect( true ); return; } @@ -856,15 +856,15 @@ void kio_sieveProtocol::stat(const KURL& url) if (filename.isEmpty()) { UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = "/"; entry.append(atom); - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFDIR; entry.append(atom); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = 0700; entry.append(atom); @@ -885,22 +885,22 @@ void kio_sieveProtocol::stat(const KURL& url) entry.clear(); UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = TQString::fromUtf8(r.getKey()); entry.append(atom); - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFREG; entry.append(atom); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; if ( r.getExtra() == "ACTIVE" ) atom.m_long = 0700; // mark exec'able else atom.m_long = 0600; entry.append(atom); - atom.m_uds = KIO::UDS_MIME_TYPE; + atom.m_uds = TDEIO::UDS_MIME_TYPE; atom.m_str = "application/sieve"; entry.append(atom); @@ -937,22 +937,22 @@ void kio_sieveProtocol::listDir(const KURL& url) entry.clear(); UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = TQString::fromUtf8(r.getKey()); entry.append(atom); - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFREG; entry.append(atom); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; if ( r.getExtra() == "ACTIVE" ) atom.m_long = 0700; // mark exec'able else atom.m_long = 0600; entry.append(atom); - atom.m_uds = KIO::UDS_MIME_TYPE; + atom.m_uds = TDEIO::UDS_MIME_TYPE; atom.m_str = "application/sieve"; entry.append(atom); diff --git a/kioslaves/sieve/sieve.h b/kioslaves/sieve/sieve.h index d435892ec..2168da723 100644 --- a/kioslaves/sieve/sieve.h +++ b/kioslaves/sieve/sieve.h @@ -58,7 +58,7 @@ protected: TQCString extra; }; -class kio_sieveProtocol : public KIO::TCPSlaveBase +class kio_sieveProtocol : public TDEIO::TCPSlaveBase { public: @@ -104,7 +104,7 @@ protected: int operationResult(); bool parseCapabilities(bool requestCapabilities = false); - bool saslInteract( void *in, KIO::AuthInfo &ai ); + bool saslInteract( void *in, TDEIO::AuthInfo &ai ); // IOSlave global data uint m_connMode; |