summaryrefslogtreecommitdiffstats
path: root/kioslaves/sieve
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /kioslaves/sieve
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kioslaves/sieve')
-rw-r--r--kioslaves/sieve/Makefile.am2
-rw-r--r--kioslaves/sieve/sieve.cpp14
2 files changed, 8 insertions, 8 deletions
diff --git a/kioslaves/sieve/Makefile.am b/kioslaves/sieve/Makefile.am
index 830c8258e..844d3f5c7 100644
--- a/kioslaves/sieve/Makefile.am
+++ b/kioslaves/sieve/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
kde_module_LTLIBRARIES = kio_sieve.la
kio_sieve_la_SOURCES = sieve.cpp
-kio_sieve_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS)
+kio_sieve_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_KDECORE)
kio_sieve_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = sieve.h
diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp
index bc7811662..6d2f90b8b 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/kioslaves/sieve/sieve.cpp
@@ -245,14 +245,14 @@ bool kio_sieveProtocol::parseCapabilities(bool requestCapabilities/* = false*/)
ksDebug() << "Looping receive" << endl;
if (r.getType() == kio_sieveResponse::ACTION) {
- if ( r.getAction().contains("ok", false) != -1 ) {
+ if ( r.getAction().tqcontains("ok", false) != -1 ) {
ksDebug() << "Sieve server ready & awaiting authentication." << endl;
break;
} else
ksDebug() << "Unknown action " << r.getAction() << "." << endl;
} else if (r.getKey() == "IMPLEMENTATION") {
- if (r.getVal().contains("sieve", false) != -1) {
+ if (r.getVal().tqcontains("sieve", false) != -1) {
ksDebug() << "Connected to Sieve server: " << r.getVal() << endl;
ret = true;
setMetaData("implementation", r.getVal());
@@ -876,7 +876,7 @@ void kio_sieveProtocol::stat(const KURL& url)
while(receiveData()) {
if (r.getType() == kio_sieveResponse::ACTION) {
- if (r.getAction().contains("OK", false) == 1)
+ if (r.getAction().tqcontains("OK", false) == 1)
// Script list completed
break;
@@ -929,7 +929,7 @@ void kio_sieveProtocol::listDir(const KURL& url)
while(receiveData()) {
if (r.getType() == kio_sieveResponse::ACTION) {
- if (r.getAction().contains("OK", false) == 1)
+ if (r.getAction().tqcontains("OK", false) == 1)
// Script list completed.
break;
@@ -1082,13 +1082,13 @@ bool kio_sieveProtocol::authenticate()
ksDebug() << "Preferred authentication method is " << mechusing << "." << endl;
- TQString firstCommand = "AUTHENTICATE \"" + TQString::fromLatin1( mechusing ) + "\"";
+ TQString firstCommand = "AUTHENTICATE \"" + TQString::tqfromLatin1( mechusing ) + "\"";
tmp.setRawData( out, outlen );
KCodecs::base64Encode( tmp, challenge );
tmp.resetRawData( out, outlen );
if ( !challenge.isEmpty() ) {
firstCommand += " \"";
- firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
+ firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() );
firstCommand += "\"";
}
@@ -1222,7 +1222,7 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse)
buffer[SIEVE_DEFAULT_RECIEVE_BUFFER-1] = '\0';
// strip LF/CR
- interpret = TQCString(buffer).left(qstrlen(buffer) - 2);
+ interpret = TQCString(buffer).left(tqstrlen(buffer) - 2);
} else {
interpret = reparse->copy();