summaryrefslogtreecommitdiffstats
path: root/kioslaves/sieve/sieve.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kioslaves/sieve/sieve.cpp')
-rw-r--r--kioslaves/sieve/sieve.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp
index 0b547fd0a..4e7e75d30 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/kioslaves/sieve/sieve.cpp
@@ -340,7 +340,7 @@ bool kio_sieveProtocol::connect(bool useTLSIfAvailable)
if (isConnectionValid()) return true;
- infoMessage(i18n("Connecting to %1...").tqarg( m_sServer));
+ infoMessage(i18n("Connecting to %1...").arg( m_sServer));
if (m_connMode == CONNECTION_ORIENTED && m_shouldBeConnected) {
error(ERR_CONNECTION_BROKEN, i18n("The connection to the server was lost."));
@@ -453,7 +453,7 @@ void kio_sieveProtocol::disconnect(bool forcibly)
/* ---------------------------------------------------------------------------------- */
/*void kio_sieveProtocol::slave_status()
{
- slavetqStatus(isConnectionValid() ? m_sServer : "", isConnectionValid());
+ slaveStatus(isConnectionValid() ? m_sServer : "", isConnectionValid());
finished();
}*/
@@ -626,7 +626,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri
error(ERR_UNSUPPORTED_PROTOCOL, i18n("A protocol error occurred "
"while trying to negotiate script uploading.\n"
"The server responded:\n%1")
- .tqarg(r.getAction().right(r.getAction().length() - 3)));
+ .arg(r.getAction().right(r.getAction().length() - 3)));
return;
}
}*/
@@ -672,7 +672,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri
error(ERR_INTERNAL_SERVER,
i18n("The script did not upload successfully.\n"
"This is probably due to errors in the script.\n"
- "The server responded:\n%1").tqarg(TQString(errmsg)));
+ "The server responded:\n%1").arg(TQString(errmsg)));
// clear the rest of the incoming data
receiveData();
@@ -680,7 +680,7 @@ void kio_sieveProtocol::put(const KURL& url, int /*permissions*/, bool /*overwri
error(ERR_INTERNAL_SERVER,
i18n("The script did not upload successfully.\n"
"This is probably due to errors in the script.\n"
- "The server responded:\n%1").tqarg(TQString(r.getKey())));
+ "The server responded:\n%1").arg(TQString(r.getKey())));
} else
error(ERR_INTERNAL_SERVER,
i18n("The script did not upload successfully.\n"
@@ -1016,7 +1016,7 @@ bool kio_sieveProtocol::saslInteract( void *in, AuthInfo &ai )
return true;
}
-#define SASLERROR error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occurred during authentication: %1").tqarg( \
+#define SASLERROR error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occurred during authentication: %1").arg( \
TQString::fromUtf8( sasl_errdetail( conn ) )));
bool kio_sieveProtocol::authenticate()
@@ -1082,13 +1082,13 @@ bool kio_sieveProtocol::authenticate()
ksDebug() << "Preferred authentication method is " << mechusing << "." << endl;
- TQString firstCommand = "AUTHENTICATE \"" + TQString::tqfromLatin1( mechusing ) + "\"";
+ TQString firstCommand = "AUTHENTICATE \"" + TQString::fromLatin1( mechusing ) + "\"";
tmp.setRawData( out, outlen );
KCodecs::base64Encode( tmp, challenge );
tmp.resetRawData( out, outlen );
if ( !challenge.isEmpty() ) {
firstCommand += " \"";
- firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() );
+ firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
firstCommand += "\"";
}
@@ -1109,7 +1109,7 @@ bool kio_sieveProtocol::authenticate()
sasl_dispose( &conn );
error(ERR_SLAVE_DEFINED,
i18n("A protocol error occurred during authentication.\n"
- "Choose a different authentication method to %1.").tqarg(mechusing));
+ "Choose a different authentication method to %1.").arg(mechusing));
return false;
}
@@ -1121,7 +1121,7 @@ bool kio_sieveProtocol::authenticate()
sasl_dispose( &conn );
error(ERR_UNSUPPORTED_PROTOCOL,
i18n("A protocol error occurred during authentication.\n"
- "Choose a different authentication method to %1.").tqarg(mechusing));
+ "Choose a different authentication method to %1.").arg(mechusing));
return false;
}
@@ -1168,7 +1168,7 @@ bool kio_sieveProtocol::authenticate()
return true;
} else {
// Authentication failed.
- error(ERR_COULD_NOT_AUTHENTICATE, i18n("Authentication failed.\nMost likely the password is wrong.\nThe server responded:\n%1").tqarg( TQString(r.getAction()) ) );
+ error(ERR_COULD_NOT_AUTHENTICATE, i18n("Authentication failed.\nMost likely the password is wrong.\nThe server responded:\n%1").arg( TQString(r.getAction()) ) );
return false;
}
}