Remove additional unneeded tq method conversions

26 files changed, 90 insertions, 90 deletions

diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index 2896ccc8..d6d89a25 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -364,7 +364,7 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password )
 void GroupWiseAccount::slotMessageSendingFailed()
 {
 	KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry,
-				i18n("Message Sending Failed", "Kopete was not able to send the last message sent on account '%1'.\nIf possible, please send the console output from Kopete to <wstephenson@novell.com> for analysis." ).tqarg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").tqarg( accountId() ) );
+				i18n("Message Sending Failed", "Kopete was not able to send the last message sent on account '%1'.\nIf possible, please send the console output from Kopete to <wstephenson@novell.com> for analysis." ).arg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").arg( accountId() ) );
 }
 
 void GroupWiseAccount::setOnlineStatus( const Kopete::OnlineStatus& status, const TQString &reason )
@@ -566,7 +566,7 @@ void GroupWiseAccount::reconcileOfflineChanges()
 						break;
 					}
 					else
-						kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "metacontact " << c->metaContact()->displayName( ) << "has multiple tqchildren and group membership, and contact " << c->dn() << " was removed from one group on the server." << endl;
+						kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "metacontact " << c->metaContact()->displayName( ) << "has multiple children and group membership, and contact " << c->dn() << " was removed from one group on the server." << endl;
 						conflicts = true;
 				}
 			} // 
@@ -647,7 +647,7 @@ void GroupWiseAccount::slotConnError()
 {
 	kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl;
 	KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry,
-				i18n( "Error shown when connecting failed", "Kopete was not able to connect to the GroupWise Messenger server for account '%1'.\nPlease check your server and port settings and try again." ).tqarg( accountId() ) , i18n ("Unable to Connect '%1'").tqarg( accountId() ) );
+				i18n( "Error shown when connecting failed", "Kopete was not able to connect to the GroupWise Messenger server for account '%1'.\nPlease check your server and port settings and try again." ).arg( accountId() ) , i18n ("Unable to Connect '%1'").arg( accountId() ) );
 
 	disconnect();
 }
@@ -823,19 +823,19 @@ void GroupWiseAccount::handleIncomingMessage( const ConferenceEvent & message )
 	{
 		TQString prefix = i18n("Prefix used for automatically generated auto-reply"
 			" messages when the contact is Away, contains contact's name",
-			"Auto reply from %1: " ).tqarg( sender->metaContact()->displayName() );
+			"Auto reply from %1: " ).arg( sender->metaContact()->displayName() );
 		messageMunged = prefix + message.message;
 	}
 	if ( message.type == GroupWise::ReceivedBroadcast )
 	{
 		TQString prefix = i18n("Prefix used for broadcast messages",
-			"Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() );
+			"Broadcast message from %1: " ).arg( sender->metaContact()->displayName() );
 		messageMunged = prefix + message.message;
 	}
 	if ( message.type == GroupWise::ReceivedSystemBroadcast )
 	{
 		TQString prefix = i18n("Prefix used for system broadcast messages",
-			"System Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() );
+			"System Broadcast message from %1: " ).arg( sender->metaContact()->displayName() );
 		messageMunged = prefix + message.message;
 	}
 
@@ -1210,7 +1210,7 @@ void GroupWiseAccount::receiveContactCreated()
 
 		KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget (), KMessageBox::Error,
 							i18n ("The contact %1 could not be added to the contact list, with error message: %2").
-							tqarg(cct->userId() ).tqarg( cct->statusString() ),
+							arg(cct->userId() ).arg( cct->statusString() ),
 							i18n ("Error Adding Contact") );
 	}
 }
@@ -1255,8 +1255,8 @@ void GroupWiseAccount::receiveContactDeleted( const ContactItem & instance )
 
 void GroupWiseAccount::slotConnectedElsewhere()
 {
-	KPassivePopup::message( i18n ("Signed in as %1 Elsewhere").tqarg( accountId() ),
-				i18n( "The parameter is the user's own account id for this protocol", "You have been disconnected from GroupWise Messenger because you signed in as %1 elsewhere" ).tqarg( accountId() ) , Kopete::UI::Global::mainWidget() );
+	KPassivePopup::message( i18n ("Signed in as %1 Elsewhere").arg( accountId() ),
+				i18n( "The parameter is the user's own account id for this protocol", "You have been disconnected from GroupWise Messenger because you signed in as %1 elsewhere" ).arg( accountId() ) , Kopete::UI::Global::mainWidget() );
 	disconnect();
 }
 
@@ -1364,7 +1364,7 @@ void GroupWiseAccount::receiveInviteNotify( const ConferenceEvent & event )
 			c = createTemporaryContact( event.user );
 
 		sess->addInvitee( c );
-		Kopete::Message declined = Kopete::Message( myself(), sess->members(), i18n("%1 has been invited to join this conversation.").tqarg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText );
+		Kopete::Message declined = Kopete::Message( myself(), sess->members(), i18n("%1 has been invited to join this conversation.").arg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText );
 		sess->appendMessage( declined );
 	}
 	else
diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp
index 98fd1f81..1aef7110 100644
--- a/kopete/protocols/groupwise/gwcontact.cpp
+++ b/kopete/protocols/groupwise/gwcontact.cpp
@@ -237,7 +237,7 @@ void GroupWiseContact::setOnlineStatus( const Kopete::OnlineStatus& status )
 	{
 		Kopete::Contact::setOnlineStatus(Kopete::OnlineStatus(status.status() , (status.weight()==0) ? 0 : (status.weight() -1)  ,
 			protocol() , status.internalStatus()+15 , TQString::fromLatin1("msn_blocked"),
-			i18n("%1|Blocked").tqarg( status.description() ) ) );
+			i18n("%1|Blocked").arg( status.description() ) ) );
 	}
 	else
 	{
diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp
index 5389e4ac..100bbfdf 100644
--- a/kopete/protocols/groupwise/gwmessagemanager.cpp
+++ b/kopete/protocols/groupwise/gwmessagemanager.cpp
@@ -196,7 +196,7 @@ void GroupWiseChatSession::slotCreationFailed( const int failedId, const int sta
 	{
 		kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " couldn't start a chat, no GUID.\n" << endl;
 		//emit creationFailed();
-		Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("An error occurred when trying to start a chat: %1").tqarg( statusCode ), Kopete::Message::Internal, Kopete::Message::PlainText);
+		Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("An error occurred when trying to start a chat: %1").arg( statusCode ), Kopete::Message::Internal, Kopete::Message::PlainText);
 		appendMessage( failureNotify );
 		setClosed();
 	}
@@ -468,7 +468,7 @@ void GroupWiseChatSession::inviteDeclined( GroupWiseContact * c )
 	TQString from = c->metaContact()->displayName();
 
 	Kopete::Message declined = Kopete::Message( myself(), members(), 
-				i18n("%1 has rejected an invitation to join this conversation.").tqarg( from ), 
+				i18n("%1 has rejected an invitation to join this conversation.").arg( from ), 
 				Kopete::Message::Internal, Kopete::Message::PlainText );
 	appendMessage( declined );
 }
diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp
index cfb506da..539698ec 100644
--- a/kopete/protocols/groupwise/gwprotocol.cpp
+++ b/kopete/protocols/groupwise/gwprotocol.cpp
@@ -190,7 +190,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain )
 				case '{':
 				case '}':
 				case '\\':
-					outputText.append( TQString( "\\%1" ).tqarg( TQChar( current ) ) );
+					outputText.append( TQString( "\\%1" ).arg( TQChar( current ) ) );
 					break;
 				case '\n':
 					outputText.append( "\\par " );
@@ -253,12 +253,12 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain )
 				bytesEncoded = 1;
 			}
 			index += bytesEncoded;
-			escapedUnicodeChar = TQString("\\u%1?").tqarg( ucs4Char );
+			escapedUnicodeChar = TQString("\\u%1?").arg( ucs4Char );
 			kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "tqunicode escaped char: " << escapedUnicodeChar << endl;
 			outputText.append( escapedUnicodeChar );
 		}
 	}
-	return rtfTemplate.tqarg( outputText );
+	return rtfTemplate.arg( outputText );
 }
 
 TQString GroupWiseProtocol::dnToDotted( const TQString & dn )
diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp
index f24946c5..5df0d1de 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/client.cpp
@@ -218,7 +218,7 @@ void Client::initialiseEventTasks()
 
 void Client::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply )
 {
-	debug( TQString("Setting status to %1").tqarg( status ) );;
+	debug( TQString("Setting status to %1").arg( status ) );;
 	SetStatusTask * sst = new SetStatusTask( d->root );
 	sst->status( status, reason, autoReply );
 	connect( sst, TQT_SIGNAL( finished() ), this, TQT_SLOT( sst_statusChanged() ) );
@@ -306,7 +306,7 @@ void Client::sendInvitation( const GroupWise::ConferenceGuid & guid, const TQStr
 // SLOTS //
 void Client::streamError( int error )
 {
-	debug( TQString( "CLIENT ERROR (Error %1)" ).tqarg( error ) );
+	debug( TQString( "CLIENT ERROR (Error %1)" ).arg( error ) );
 }
 
 void Client::streamReadyRead()
@@ -390,14 +390,14 @@ void Client::jct_joinConfCompleted()
 {
 	const JoinConferenceTask * jct = ( JoinConferenceTask * )sender();
 #ifdef LIBGW_DEBUG
-	debug( TQString( "Joined conference %1, participants are: " ).tqarg( jct->guid() ) );
+	debug( TQString( "Joined conference %1, participants are: " ).arg( jct->guid() ) );
 	TQStringList parts = jct->participants();
 	for ( TQStringList::Iterator it = parts.begin(); it != parts.end(); ++it )
-		debug( TQString( " - %1" ).tqarg(*it) );
+		debug( TQString( " - %1" ).arg(*it) );
 	debug( "invitees are: " );
 	TQStringList invitees = jct->invitees();
 	for ( TQStringList::Iterator it = invitees.begin(); it != invitees.end(); ++it )
-		debug( TQString( " - %1" ).tqarg(*it) );
+		debug( TQString( " - %1" ).arg(*it) );
 #endif
 	emit conferenceJoined( jct->guid(), jct->participants(), jct->invitees() );
 }
@@ -431,7 +431,7 @@ TQString Client::password()
 
 TQString Client::userAgent()
 {
-	return TQString::fromLatin1( "%1/%2 (%3)" ).tqarg( d->clientName, d->clientVersion, d->osname );
+	return TQString::fromLatin1( "%1/%2 (%3)" ).arg( d->clientName, d->clientVersion, d->osname );
 }
 
 TQCString Client::ipAddress()
@@ -457,7 +457,7 @@ void Client::send( Request * request )
 		return;
 	}
 // 	TQString out = request.toString();
-// 	debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out));
+// 	debug(TQString("Client: outgoing: [\n%1]\n").arg(out));
 // 	xmlOutgoing(out);
 
 	d->stream->write( request );
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
index 79ecf419..449adfe0 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
@@ -142,7 +142,7 @@ void CoreProtocol::addIncomingData( const TQByteArray & incomingBytes )
 	while ( m_in.size() && ( parsedBytes = wireToTransfer( m_in ) ) )
 	{
 		transferCount++;
-		debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).tqarg( transferCount ) );
+		debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).arg( transferCount ) );
 		int size =  m_in.size();
 		if ( parsedBytes < size )
 		{
@@ -185,7 +185,7 @@ Transfer* CoreProtocol::incomingTransfer()
 void cp_dump( const TQByteArray &bytes )
 {
 #ifdef LIBGW_DEBUG
-	CoreProtocol::debug( TQString( "contains: %1 bytes" ).tqarg( bytes.count() ) );
+	CoreProtocol::debug( TQString( "contains: %1 bytes" ).arg( bytes.count() ) );
 	for ( uint i = 0; i < bytes.count(); ++i )
 	{
 		printf( "%02x ", bytes[ i ] );
@@ -226,7 +226,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing )
 		command = "login";
 		host = request->command().section( ':', 1, 1 ).ascii();
 		port = request->command().section( ':', 2, 2 ).ascii();
-		debug( TQString( "Host: %1 Port: %2" ).tqarg( host.data() ).tqarg( port.data() ) );
+		debug( TQString( "Host: %1 Port: %2" ).arg( host.data() ).arg( port.data() ) );
 	}
 	else
 		command = request->command().ascii();
@@ -246,7 +246,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing )
 	else
 		dout <<  "\r\n";
 
-	debug( TQString( "data out: %1" ).tqarg( bytesOut.data() ) );
+	debug( TQString( "data out: %1" ).arg( bytesOut.data() ) );
 
 	emit outgoingData( bytesOut );
 	// now convert 
@@ -337,7 +337,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth )
 								+ GW_URLVAR_VAL + (const char *)valString 
 								+ GW_URLVAR_TYPE + typeString;
 								
-		debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).tqarg( outgoing.data() ) );
+		debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).arg( outgoing.data() ) );
 		dout.writeRawBytes( outgoing.data(), outgoing.length() );
 		// write what we have so far, we may be calling this function recursively
 		//kdDebug( 14999 ) << k_funcinfo << "writing \'" << bout << "\'" << endl;
@@ -398,12 +398,12 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire )
 		}
 		else // otherwise -> Event code
 		{	
-			debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).tqarg( val ).tqarg( wire.size() ) );
+			debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).arg( val ).arg( wire.size() ) );
 			Transfer * t = m_eventProtocol->parse( wire, bytesParsed );
 			if ( t )
 			{
 				m_inTransfer = t;
-				debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).tqarg( val ).tqarg( bytesParsed ) );
+				debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).arg( val ).arg( bytesParsed ) );
 				m_state = Available;
 				emit incomingData();
 			}
@@ -486,7 +486,7 @@ TQChar CoreProtocol::encode_method( TQ_UINT8 method )
 
 void CoreProtocol::slotOutgoingData( const TQCString &out )
 {
-	debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).tqarg( out.data() ) );
+	debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).arg( out.data() ) );
 }
 
 bool CoreProtocol::okToProceed()
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
index 6ea65595..93ce7c92 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
@@ -53,10 +53,10 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 	m_din >> type;
 	m_bytes += sizeof( TQ_UINT32 );
 	
-	debug( TQString( "EventProtocol::parse() Reading event of type %1" ).tqarg( type ) );
+	debug( TQString( "EventProtocol::parse() Reading event of type %1" ).arg( type ) );
 	if ( type > Stop )
 	{
-		debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).tqarg( type ) );
+		debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).arg( type ) );
 		m_state = OutOfSync;
 		return 0;
 	}
@@ -96,9 +96,9 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 				m_din.unsetDevice();
 				return 0;
 			}
-			debug( TQString( "got status: %1").tqarg( status ) );
+			debug( TQString( "got status: %1").arg( status ) );
 			tentative->setStatus( status );
-			debug( TQString( "tentative status: %1").tqarg( tentative->status() ) );
+			debug( TQString( "tentative status: %1").arg( tentative->status() ) );
 			tentative->setStatusText( statusText );
 			break;
 		case ConferenceJoined:		// 106 - GUID + FLAGS
@@ -191,7 +191,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 			tentative->setMessage( message );
 			break;
 		default:
-			debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).tqarg( type ) );
+			debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).arg( type ) );
 			break;
 	}
 	// if we got this far, the parse succeeded, return the Transfer
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
index 7305f7bc..f39c2ec7 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -378,7 +378,7 @@ void cs_dump( const TQByteArray &bytes )
 {
 //#define GW_CLIENTSTREAM_DEBUG 1
 #ifdef GW_CLIENTSTREAM_DEBUG
-	CoreProtocol::debug( TQString( "contains: %1 bytes " ).tqarg( bytes.count() ) );
+	CoreProtocol::debug( TQString( "contains: %1 bytes " ).arg( bytes.count() ) );
 	uint count = 0;
 	while ( count < bytes.count() )
 	{
@@ -440,7 +440,7 @@ void ClientStream::cp_incomingData()
 		emit doReadyRead();
 	}
 	else
-		CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).tqarg( d->client.state() ) );
+		CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).arg( d->client.state() ) );
 }
 
 void ClientStream::cr_connected()
@@ -520,7 +520,7 @@ void ClientStream::ss_readyRead()
 
 #ifdef LIBGW_DEBUG
 	TQCString cs(a.data(), a.size()+1);
-	CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).tqarg( a.size() ) );
+	CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).arg( a.size() ) );
 	cs_dump( a );
 #endif
 
@@ -532,7 +532,7 @@ void ClientStream::ss_readyRead()
 void ClientStream::ss_bytesWritten(int bytes)
 {
 #ifdef LIBGW_DEBUG
-	CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).tqarg( bytes ) );
+	CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).arg( bytes ) );
 #else
 	Q_UNUSED( bytes );
 #endif
@@ -556,7 +556,7 @@ void ClientStream::ss_tlsClosed()
 
 void ClientStream::ss_error(int x)
 {
-	CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").tqarg( x ) );
+	CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").arg( x ) );
 	if(x == SecureStream::ErrTLS) {
 		reset();
 		d->errCond = TLSFail;
diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp
index 65574eb3..ba2a2a58 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp
@@ -146,7 +146,7 @@ TQString GroupWise::errorCodeToString( int errorCode )
 			errorString = i18n( "Chat has been removed from server" );
 			break;
 		default:
-			errorString = i18n("Unrecognized error code: %s").tqarg( errorCode );
+			errorString = i18n("Unrecognized error code: %s").arg( errorCode );
 #else
 		case NMERR_ACCESS_DENIED:
 			errorString = "Access denied";
@@ -269,7 +269,7 @@ TQString GroupWise::errorCodeToString( int errorCode )
 			errorString = "Chat has been removed from server";
 			break;
 		default:
-			errorString = TQString("Unrecognized error code: %s").tqarg( errorCode );
+			errorString = TQString("Unrecognized error code: %s").arg( errorCode );
 #endif
 	}
 	return errorString;
diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
index 14a5af70..415905bf 100644
--- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
@@ -98,7 +98,7 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len )
 		// if ( (TQ_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF )
 		if ( temp.length() < ( val - 1 ) )
 		{
-			debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).tqarg( temp.length() ).tqarg( val ) );
+			debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).arg( temp.length() ).arg( val ) );
 			m_state = NeedMore;
 			return false;
 		}
diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
index 50788178..2c7f3615 100644
--- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
@@ -71,7 +71,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
 			return 0;
 		}
 		headerRest.append( line );
-		debug( TQString( "- read header line - (%1) : %2" ).tqarg( line.length() ).tqarg( line.data() ) );
+		debug( TQString( "- read header line - (%1) : %2" ).arg( line.length() ).arg( line.data() ) );
 	}
 	debug( "ResponseProtocol::readResponse() header finished" );
 	// if it's a redirect, set flag
@@ -85,14 +85,14 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
 	// other header processing ( 500! )
 	if ( ok && rtnCode == 500 )
 	{
-		debug( TQString( "- server error %1" ).tqarg( rtnCode ) );
+		debug( TQString( "- server error %1" ).arg( rtnCode ) );
 		packetState = ServerError;
 		m_din.unsetDevice();
 		return 0;
 	}
 	if ( ok && rtnCode == 404 )
 	{
-		debug( TQString( "- server error %1" ).tqarg( rtnCode ) );
+		debug( TQString( "- server error %1" ).arg( rtnCode ) );
 		packetState = ServerError;
 		m_din.unsetDevice();
 		return 0;
@@ -123,7 +123,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
 		if ( sf )
 		{
 			tId = sf->value().toInt();
-			debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).tqarg( tId ) );
+			debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).arg( tId ) );
 			m_collatingFields.remove( it );
 			delete sf;
 		}
@@ -135,7 +135,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
 		if ( sf )
 		{
 			resultCode = sf->value().toInt();
-			debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).tqarg( resultCode ) );
+			debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).arg( resultCode ) );
 			m_collatingFields.remove( it );
 			delete sf;
 		}
@@ -143,7 +143,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
 	// append to inQueue
 	if ( tId )
 	{
-		debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).tqarg(m_collatingFields.count() ) );
+		debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).arg(m_collatingFields.count() ) );
 		packetState = Available;
 		bytes = m_bytes;
 		m_din.unsetDevice();
@@ -169,7 +169,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 	// if we find the beginning of a new nested list, push the current list onto m_collatingFields
 	debug( "ResponseProtocol::readFields()" );
 	if ( fieldCount > 0 )
-		debug( TQString( "reading %1 fields" ).tqarg( fieldCount ) );
+		debug( TQString( "reading %1 fields" ).arg( fieldCount ) );
 	Field::FieldList currentList;
 	while ( fieldCount != 0 )  // prevents bad input data from ruining our day
 	{
@@ -209,7 +209,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 			return false;
 		}
 
-		debug( TQString( "- type: %1, method: %2, tag: %3," ).tqarg( type ).tqarg( method ).tqarg( tag.data() ) );
+		debug( TQString( "- type: %1, method: %2, tag: %3," ).arg( type ).arg( method ).arg( tag.data() ) );
 		// if multivalue or array
 		if ( type == NMFIELD_TYPE_MV || type == NMFIELD_TYPE_ARRAY )
 		{
@@ -223,7 +223,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 			m_bytes += sizeof( TQ_UINT32 );
 
 			// create multifield
-			debug( TQString( " multi field containing: %1" ).tqarg( val ) );
+			debug( TQString( " multi field containing: %1" ).arg( val ) );
 			Field::MultiField* m = new Field::MultiField( tag, method, 0, type );
 			currentList.append( m );
 			if ( !readFields( val, &currentList) )
@@ -250,7 +250,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 				}
 				// convert to tqunicode - ignore the terminating NUL, because TQt<3.3.2 doesn't sanity check val.
 				TQString fieldValue = TQString::fromUtf8( rawData.data(), val - 1 );
-				debug( TQString( "- utf/dn single field: %1" ).tqarg( fieldValue ) );
+				debug( TQString( "- utf/dn single field: %1" ).arg( fieldValue ) );
 				// create singlefield
 				Field::SingleField* s = new Field::SingleField( tag, method, 0, type, fieldValue );
 				currentList.append( s );
@@ -266,7 +266,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 				}
 				m_din >> val;
 				m_bytes += sizeof( TQ_UINT32 );
-				debug( TQString( "- numeric field: %1" ).tqarg( val ) );
+				debug( TQString( "- numeric field: %1" ).arg( val ) );
 				Field::SingleField* s = new Field::SingleField( tag, method, 0, type, val );
 				currentList.append( s );
 			}
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc
index afe7b18e..a74b4c67 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf.cc
+++ b/kopete/protocols/groupwise/libgroupwise/rtf.cc
@@ -2182,7 +2182,7 @@ void Level::clearParagraphFormatting()
     // implicitly start a paragraph
     if (!isParagraphOpen())
        startParagraph();
-    // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment),
+    // Since we don't implement any of the paragraph formatting tags (e.g. alignment),
     // we don't clean up anything here. Note that \pard does NOT clean character
     // formatting (such as font size, font weight, italics...).
     p->parStyle.clearFormatting();
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll
index 7f2f1841..67e9f5f5 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf.ll
+++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll
@@ -517,7 +517,7 @@ void Level::clearParagraphFormatting()
     // implicitly start a paragraph
     if (!isParagraphOpen())
        startParagraph();
-    // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment),
+    // Since we don't implement any of the paragraph formatting tags (e.g. alignment),
     // we don't clean up anything here. Note that \pard does NOT clean character
     // formatting (such as font size, font weight, italics...).
     p->parStyle.clearFormatting();
diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp
index 858c8fde..547844d9 100644
--- a/kopete/protocols/groupwise/libgroupwise/task.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/task.cpp
@@ -130,7 +130,7 @@ bool Task::take( Transfer * transfer)
 	if(p.isEmpty())
 		return false;
 
-	// pass along the transfer to our tqchildren
+	// pass along the transfer to our children
 	TQObjectListIt it(p);
 	Task *t;
 	for(; it.current(); ++it) {
@@ -142,7 +142,7 @@ bool Task::take( Transfer * transfer)
 		
 		if(t->take( transfer ))
 		{
-			client()->debug( TQString( "Transfer ACCEPTED by: %1" ).tqarg( t->className() ) );
+			client()->debug( TQString( "Transfer ACCEPTED by: %1" ).arg( t->className() ) );
 			return true;
 		}
 	}
@@ -256,7 +256,7 @@ void Task::clientDisconnected()
 
 void Task::debug(const TQString &str)
 {
-	client()->debug(TQString("%1: ").tqarg(className()) + str);
+	client()->debug(TQString("%1: ").arg(className()) + str);
 }
 
 bool Task::forMe( const Transfer * transfer ) const
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
index 3fccc218..c88e22b4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
@@ -53,10 +53,10 @@ ConferenceTask::~ConferenceTask()
 
 void ConferenceTask::dumpConferenceEvent( ConferenceEvent & evt )
 {
-	client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).tqarg
-			( evt.guid ).tqarg( evt.user.ascii() ).tqarg( evt.timeStamp.time().hour() ).tqarg
-			( evt.timeStamp.time().minute() ).tqarg( evt.timeStamp.time().second() ) ); 
- 	client()->debug( TQString( "                  flags: %1" ).tqarg( evt.flags, 8 ) );
+	client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).arg
+			( evt.guid ).arg( evt.user.ascii() ).arg( evt.timeStamp.time().hour() ).arg
+			( evt.timeStamp.time().minute() ).arg( evt.timeStamp.time().second() ) ); 
+ 	client()->debug( TQString( "                  flags: %1" ).arg( evt.flags, 8 ) );
 }
 
 bool ConferenceTask::take( Transfer * transfer )
@@ -103,7 +103,7 @@ bool ConferenceTask::take( Transfer * transfer )
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ReceiveMessage" );
-				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
+				client()->debug( TQString( "message: %1" ).arg( event.message ) );
 				if ( !queueWhileAwaitingData( event ) )
 					emit message( event );
 				break;
@@ -119,7 +119,7 @@ bool ConferenceTask::take( Transfer * transfer )
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ConferenceInvite" );
-				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
+				client()->debug( TQString( "message: %1" ).arg( event.message ) );
 				if ( !queueWhileAwaitingData( event ) )
 					emit invited( event );
 				break;
@@ -139,14 +139,14 @@ bool ConferenceTask::take( Transfer * transfer )
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ReceiveAutoReply" );
-				client()->debug( TQString( "message: %1" ).tqarg( event.message.ascii() ) );
+				client()->debug( TQString( "message: %1" ).arg( event.message.ascii() ) );
 				emit autoReply( event );
 				break;
 			case GroupWise::ReceivedBroadcast:
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ReceivedBroadCast" );
-				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
+				client()->debug( TQString( "message: %1" ).arg( event.message ) );
 				if ( !queueWhileAwaitingData( event ) )
 					emit broadcast( event );
 				break;
@@ -154,11 +154,11 @@ bool ConferenceTask::take( Transfer * transfer )
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ReceivedSystemBroadCast" );
-				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
+				client()->debug( TQString( "message: %1" ).arg( event.message ) );
 				emit systemBroadcast( event );
 				break;
 			default:
-				client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).tqarg( incomingEvent->eventType() ).tqarg( event.guid.ascii() ) );
+				client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).arg( incomingEvent->eventType() ).arg( event.guid.ascii() ) );
 		}
 		dumpConferenceEvent( event );
 
@@ -181,7 +181,7 @@ void ConferenceTask::slotReceiveUserDetails( const GroupWise::ContactDetails & d
 		// if the details relate to event, try again to handle it
 		if ( details.dn == (*current).user )
 		{
-			client()->debug( TQString( " - got details for event involving %1" ).tqarg( (*current).user ) );
+			client()->debug( TQString( " - got details for event involving %1" ).arg( (*current).user ) );
 			switch ( (*current).type )
 			{
 				case GroupWise::ConferenceJoined:
@@ -220,7 +220,7 @@ bool ConferenceTask::queueWhileAwaitingData( const ConferenceEvent & event )
 	}
 	else
 	{
-		client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).tqarg( event.user ) );
+		client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).arg( event.user ) );
 		client()->userDetailsManager()->requestDetails( event.user );
 		m_pendingEvents.append( event );
 		return true;
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
index 920eec3b..0d167236 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
@@ -71,7 +71,7 @@ void CreateContactTask::onGo()
 	// create contacts on the server
 	for ( ; it != end; ++it )
 	{
-		client()->debug( TQString( " - contact is in folder %1 with id %2" ).tqarg( (*it).name ).tqarg( (*it).id ) );
+		client()->debug( TQString( " - contact is in folder %1 with id %2" ).arg( (*it).name ).arg( (*it).id ) );
 		CreateContactInstanceTask * ccit = new CreateContactInstanceTask( client()->rootTask() );
 		// the add contact action may cause other contacts' sequence numbers to change
 		// CreateContactInstanceTask signals these changes, so we propagate the signal via the Client, to the GroupWiseAccount
@@ -112,8 +112,8 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact )
 		client()->debug( " - addedContact is not the one we were trying to add, ignoring it ( Account will update it )" );
 		return;
 	}
-	client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).tqarg
-			( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.parentId ) );
+	client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).arg
+			( addedContact.displayName ).arg( addedContact.id ).arg( addedContact.parentId ) );
 			
 	if ( m_dn.isEmpty() )
 		m_dn = addedContact.dn;
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
index ed4f6bfd..b7b1f1cc 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
@@ -128,14 +128,14 @@ bool JoinConferenceTask::take( Transfer * transfer )
 
 void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details )
 {
-	client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).tqarg( details.dn ) );
+	client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).arg( details.dn ) );
 	TQStringList::Iterator it = m_unknowns.begin();
 	TQStringList::Iterator end = m_unknowns.end();
 	while( it != end )
 	{
 		TQString current = *it;
 		++it;
-		client()->debug( TQString( " - can we remove %1?" ).tqarg(current ) );
+		client()->debug( TQString( " - can we remove %1?" ).arg(current ) );
 		if ( current == details.dn )
 		{
 			client()->debug( " - it's gone!" );
@@ -143,7 +143,7 @@ void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details
 			break;
 		}
 	}
-	client()->debug( TQString( " - now %1 unknowns").tqarg( m_unknowns.count() ) );
+	client()->debug( TQString( " - now %1 unknowns").arg( m_unknowns.count() ) );
 	if ( m_unknowns.empty() )
 	{
 		client()->debug( " - finished()" );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
index e2637807..6a28124f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
@@ -36,7 +36,7 @@ LoginTask::~LoginTask()
 
 void LoginTask::initialise()
 {
-	TQString command = TQString::fromLatin1("login:%1:%2").tqarg( client()->host() ).tqarg( client()->port() );
+	TQString command = TQString::fromLatin1("login:%1:%2").arg( client()->host() ).arg( client()->port() );
 	
 	Field::FieldList lst;
 	lst.append( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, client()->userId() ) );
@@ -123,7 +123,7 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer )
 	current = fl.findSingleField( NM_A_SZ_PARENT_ID );
 	folder.parentId = current->value().toInt();
 	
-	client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).tqarg( folder.name ).tqarg(  folder.id ).tqarg( folder.parentId ).tqarg( folder.sequence ) );
+	client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).arg( folder.name ).arg(  folder.id ).arg( folder.parentId ).arg( folder.sequence ) );
 	// tell the world about it
 	emit gotFolder( folder );
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
index 5a1eb414..12c7382a 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
@@ -38,7 +38,7 @@ void NeedFolderTask::slotFolderAdded( const FolderItem & addedFolder )
 	// if this is the folder we were trying to create
 	if ( m_folderDisplayName == addedFolder.name )
 	{
-		client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).tqarg( addedFolder.name ).tqarg( addedFolder.id ) );
+		client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).arg( addedFolder.name ).arg( addedFolder.id ) );
 		m_folderId = addedFolder.id;
 	}
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
index 7d4b41aa..44f54124 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
@@ -50,7 +50,7 @@ void RequestTask::onGo()
 {
 	if ( transfer() )
 	{
-		client()->debug( TQString( "%1::onGo() - sending %2 fields" ).tqarg( className() ).tqarg( static_cast<Request *>( transfer() )->command() ) );
+		client()->debug( TQString( "%1::onGo() - sending %2 fields" ).arg( className() ).arg( static_cast<Request *>( transfer() )->command() ) );
 		send( static_cast<Request *>( transfer() ) );
 	}
 	else
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
index 79435010..e7272402 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
@@ -37,7 +37,7 @@ bool StatusTask::take( Transfer * transfer )
 	if ( forMe( transfer, event ) )
 	{
 		client()->debug( "Got a status change!" );
-		client()->debug( TQString( "%1 changed status to %2, message: %3" ).tqarg( event->source() ).tqarg( event->status() ).tqarg( event->statusText() ) );
+		client()->debug( TQString( "%1 changed status to %2, message: %3" ).arg( event->source() ).arg( event->status() ).arg( event->statusText() ) );
 		emit gotStatus( event->source().lower(), event->status(), event->statusText() );
 		return true;
 	}
diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
index f87cfa25..ceb29632 100644
--- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
@@ -88,7 +88,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU
 		TQStringList::Iterator found = m_pendingDNs.find( *it );
 		if ( found == m_pendingDNs.end() )
 		{
-			m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).tqarg( (*it) ) );
+			m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).arg( (*it) ) );
 			requestList.append( *it );
 			m_pendingDNs.append( *it );
 		}
@@ -110,7 +110,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU
 
 void UserDetailsManager::requestDetails( const TQString & dn, bool onlyUnknown )
 {
-	m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).tqarg( dn ) );
+	m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).arg( dn ) );
 	TQStringList list;
 	list.append( dn );
 	requestDetails( list, onlyUnknown );
diff --git a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
index ce17003c..646116e6 100644
--- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
+++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
@@ -286,7 +286,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
index e6179882..80daff71 100644
--- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
@@ -49,7 +49,7 @@ private:
 };
 
 GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *parent, const char *name )
- : KDialogBase(  parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).tqarg( account->accountId() ),
+ : KDialogBase(  parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).arg( account->accountId() ),
  KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ), m_dirty( false ), m_searchDlg(0)
 {
 	m_privacy = new GroupWisePrivacyWidget( this );
@@ -343,7 +343,7 @@ void GroupWisePrivacyDialog::commitChanges()
 void GroupWisePrivacyDialog::errorNotConnected()
 {
 	KMessageBox::queuedMessageBox( this, KMessageBox::Information,
-			i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").tqarg( m_account->accountId() ) );
+			i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").arg( m_account->accountId() ) );
 }
 
 #include "gwprivacydialog.moc"
diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
index 547de1b5..6005f61a 100644
--- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
@@ -50,7 +50,7 @@ ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, co
 		m_wid->m_contactName->setText( event.user );
 		
 	m_wid->m_dateTime->setText( KGlobal::locale()->formatDateTime( event.timeStamp ) );
-	m_wid->m_message->setText( TQString("<b>%1</b>").tqarg( event.message ) );
+	m_wid->m_message->setText( TQString("<b>%1</b>").arg( event.message ) );
 	
 	setMainWidget( m_wid );
 }
diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui
index 4b23a370..7de10328 100644
--- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui
+++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui
@@ -82,7 +82,7 @@
             <property name="text">
                 <string>INVITE_MESSAGE</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>