Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 10 insertions, 10 deletions

diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp
index 802b3cdc8..781e37ca5 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/kioslaves/sieve/sieve.cpp
@@ -307,8 +307,8 @@ void kio_sieveProtocol::changeCheck( const KURL &url )
 		TQStringList::iterator it;
 
 		for ( it = q.begin(); it != q.end(); ++it ) {
-			if ( ( (*it).section('=',0,0) ).lower() == "x-mech" ) {
-				auth = ( (*it).section('=',1) ).upper();
+			if ( TQString( (*it).section('=',0,0) ).lower() == "x-mech" ) {
+				auth = TQString( (*it).section('=',1) ).upper();
 				break;
 			}
 		}
@@ -340,7 +340,7 @@ bool kio_sieveProtocol::connect(bool useTLSIfAvailable)
 
 	if (isConnectionValid()) return true;
 
-	infoMessage(i18n("Connecting to %1...").arg( m_sServer));
+	infoMessage(i18n("Connecting to %1...").tqarg( m_sServer));
 
 	if (m_connMode == CONNECTION_ORIENTED && m_shouldBeConnected) {
 		error(ERR_CONNECTION_BROKEN, i18n("The connection to the server was lost."));
@@ -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")
-							.arg(r.getAction().right(r.getAction().length() - 3)));
+							.tqarg(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").arg(errmsg));
+							"The server responded:\n%1").tqarg(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").arg(r.getKey()));
+							"The server responded:\n%1").tqarg(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").arg( \
+#define SASLERROR  error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occurred during authentication: %1").tqarg( \
       TQString::fromUtf8( sasl_errdetail( conn ) )));
 
 bool kio_sieveProtocol::authenticate()
@@ -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.").arg(mechusing));
+							"Choose a different authentication method to %1.").tqarg(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.").arg(mechusing));
+							"Choose a different authentication method to %1.").tqarg(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").arg( r.getAction() ) );
+		error(ERR_COULD_NOT_AUTHENTICATE, i18n("Authentication failed.\nMost likely the password is wrong.\nThe server responded:\n%1").tqarg( TQString(r.getAction()) ) );
 		return false;
 	}
 }