Rename a number of old tq methods that are no longer tq specific

60 files changed, 242 insertions, 242 deletions

diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index cb9c7928..d6d89a25 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -308,13 +308,13 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password )
 	// contact details listed
 	TQObject::connect( m_client, TQT_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ), TQT_SLOT( receiveContactUserDetails( const GroupWise::ContactDetails & ) ) );
 	// contact status changed
-	TQObject::connect( m_client, TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SLOT( receivetqStatus( const TQString &, TQ_UINT16 , const TQString & ) ) );
+	TQObject::connect( m_client, TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SLOT( receiveStatus( const TQString &, TQ_UINT16 , const TQString & ) ) );
 	// incoming message
 	TQObject::connect( m_client, TQT_SIGNAL( messageReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) );
 	// auto reply to one of our messages because the recipient is away
 	TQObject::connect( m_client, TQT_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) );
 
-	TQObject::connect( m_client, TQT_SIGNAL( ourStatusChanged( GroupWise::tqStatus, const TQString &, const TQString & ) ), TQT_SLOT( changeOurtqStatus( GroupWise::tqStatus, const TQString &, const TQString & ) ) );
+	TQObject::connect( m_client, TQT_SIGNAL( ourStatusChanged( GroupWise::Status, const TQString &, const TQString & ) ), TQT_SLOT( changeOurStatus( GroupWise::Status, const TQString &, const TQString & ) ) );
 	// conference events
 	TQObject::connect( m_client,
 		TQT_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ),
@@ -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 )
@@ -390,9 +390,9 @@ void GroupWiseAccount::setOnlineStatus( const Kopete::OnlineStatus& status, cons
 		// Appear Offline is achieved by explicitly setting the status to offline, 
 		// rather than disconnecting as when really going offline.
 		if ( status == protocol()->groupwiseAppearOffline )
-			m_client->settqStatus( GroupWise::Offline, reason, configGroup()->readEntry( "AutoReply" ) );
+			m_client->setStatus( GroupWise::Offline, reason, configGroup()->readEntry( "AutoReply" ) );
 		else
-			m_client->settqStatus( ( GroupWise::tqStatus )status.internalStatus(), reason, configGroup()->readEntry( "AutoReply" ) );
+			m_client->setStatus( ( GroupWise::Status )status.internalStatus(), reason, configGroup()->readEntry( "AutoReply" ) );
 	}
 	// going online
 	else
@@ -474,11 +474,11 @@ void GroupWiseAccount::slotLoggedIn()
 	// set local status display
 	myself()->setOnlineStatus( protocol()->groupwiseAvailable );
 	// set status on server
-	if ( initialtqStatus() != Kopete::OnlineStatus(Kopete::OnlineStatus::Online) &&
-		( ( GroupWise::tqStatus )initialtqStatus().internalStatus() != GroupWise::Unknown ) )
+	if ( initialStatus() != Kopete::OnlineStatus(Kopete::OnlineStatus::Online) &&
+		( ( GroupWise::Status )initialStatus().internalStatus() != GroupWise::Unknown ) )
 	{
-		kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Initial status is not online, setting status to " << initialtqStatus().internalStatus() << endl;
-		m_client->settqStatus( ( GroupWise::tqStatus )initialtqStatus().internalStatus(), m_initialReason, configGroup()->readEntry( "AutoReply" ) );
+		kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Initial status is not online, setting status to " << initialStatus().internalStatus() << endl;
+		m_client->setStatus( ( GroupWise::Status )initialStatus().internalStatus(), m_initialReason, configGroup()->readEntry( "AutoReply" ) );
 	}
 }
 
@@ -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();
 }
@@ -664,7 +664,7 @@ void GroupWiseAccount::slotCSDisconnected()
 	TQValueList<GroupWiseChatSession *>::ConstIterator it;
 	for ( it = m_chatSessions.begin() ; it != m_chatSessions.end(); ++it )
 		(*it)->setClosed();
-	setAllContactstqStatus( protocol()->groupwiseOffline );
+	setAllContactsStatus( protocol()->groupwiseOffline );
 	client()->close();
 }
 
@@ -807,8 +807,8 @@ void GroupWiseAccount::handleIncomingMessage( const ConferenceEvent & message )
 
     // if we receive a message from an Offline contact, they are probably blocking us
     // but we have to set their status to Unknown so that we can reply to them.
-    kdDebug( GROUPWISE_DEBUG_GLOBAL) << "sender is: " << sender->onlinetqStatus().description() << endl;
-    if ( sender->onlinetqStatus() == protocol()->groupwiseOffline ) {
+    kdDebug( GROUPWISE_DEBUG_GLOBAL) << "sender is: " << sender->onlineStatus().description() << endl;
+    if ( sender->onlineStatus() == protocol()->groupwiseOffline ) {
         sender->setMessageReceivedOffline( true );
     }
 
@@ -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;
 	}
 
@@ -1040,14 +1040,14 @@ GroupWiseContact * GroupWiseAccount::createTemporaryContact( const TQString & dn
 		Kopete::ContactList::self()->addMetaContact( metaContact );
 		// the contact details probably don't contain status - but we can ask for it
 		if ( details.status == GroupWise::Invalid && isConnected() )
-			m_client->requesttqStatus( details.dn );
+			m_client->requestStatus( details.dn );
 	}
 	else
 		kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Notified of existing temporary contact DN: " << details.dn << endl;
 	return c;
 }
 
-void GroupWiseAccount::receivetqStatus( const TQString & contactId, TQ_UINT16 status, const TQString &awayMessage )
+void GroupWiseAccount::receiveStatus( const TQString & contactId, TQ_UINT16 status, const TQString &awayMessage )
 {
 	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "got status for: " << contactId << ", status: " << status << ", away message: " << awayMessage << endl;
 	GroupWiseContact * c = contactForDN( contactId );
@@ -1062,7 +1062,7 @@ void GroupWiseAccount::receivetqStatus( const TQString & contactId, TQ_UINT16 st
 		kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " couldn't find " << contactId << endl;
 }
 
-void GroupWiseAccount::changeOurtqStatus( GroupWise::tqStatus status, const TQString & awayMessage, const TQString & autoReply )
+void GroupWiseAccount::changeOurStatus( GroupWise::Status status, const TQString & awayMessage, const TQString & autoReply )
 {
 	if ( status == GroupWise::Offline )
 		myself()->setOnlineStatus( protocol()->groupwiseAppearOffline );
@@ -1189,7 +1189,7 @@ void GroupWiseAccount::receiveContactCreated()
 		else
 		{
 			client()->requestDetails( TQStringList( cct->dn() ) );
-			client()->requesttqStatus( cct->dn() );
+			client()->requestStatus( cct->dn() );
 		}
 	}
 	else
@@ -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
@@ -1400,7 +1400,7 @@ void GroupWiseAccount::slotSetAutoReply()
 void GroupWiseAccount::slotTestRTFize()
 {
 /*	bool ok;
-	const TQString query = TQString::tqfromLatin1("Enter a string to rtfize:");
+	const TQString query = TQString::fromLatin1("Enter a string to rtfize:");
 	TQString testText = KLineEditDlg::getText( query, TQString(), &ok, Kopete::UI::Global::mainWidget() );
 	if ( ok )
 		kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Converted text is: '" << protocol()->rtfizeText( testText ) << "'" << endl;*/
diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h
index f05f00a1..ff6cca19 100644
--- a/kopete/protocols/groupwise/gwaccount.h
+++ b/kopete/protocols/groupwise/gwaccount.h
@@ -225,11 +225,11 @@ protected slots:
 	/**
 	 * A contact changed status
 	 */
-	void receivetqStatus( const TQString &, TQ_UINT16, const TQString & );
+	void receiveStatus( const TQString &, TQ_UINT16, const TQString & );
 	/**
 	 * Our status changed on the server
 	 */
-	void changeOurtqStatus( GroupWise::tqStatus, const TQString &, const TQString & );
+	void changeOurStatus( GroupWise::Status, const TQString &, const TQString & );
 	/**
 	 * Called when we've been disconnected for logging in as this user somewhere else
 	 */
@@ -307,7 +307,7 @@ protected:
 	/**
 	 * Sends a status message to the server - called by the status specific slotGoAway etc
 	 */
-	//void settqStatus( GroupWise::tqStatus status, const TQString & reason = TQString() );
+	//void setStatus( GroupWise::Status status, const TQString & reason = TQString() );
 
 	int handleTLSWarning (int warning, TQString server, TQString accountId);
 
diff --git a/kopete/protocols/groupwise/gwaddui.ui b/kopete/protocols/groupwise/gwaddui.ui
index 6302f869..25be8093 100644
--- a/kopete/protocols/groupwise/gwaddui.ui
+++ b/kopete/protocols/groupwise/gwaddui.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -100,7 +100,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>100</height>
diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp
index 11f2d23b..1aef7110 100644
--- a/kopete/protocols/groupwise/gwcontact.cpp
+++ b/kopete/protocols/groupwise/gwcontact.cpp
@@ -134,9 +134,9 @@ bool GroupWiseContact::isReachable()
 	// in GWChatSession
 	// (This is a GroupWise rule, not a problem in Kopete)
 
-	if ( account()->isConnected() && ( isOnline() || messageReceivedOffline() ) /* && account()->myself()->onlinetqStatus() != protocol()->groupwiseAppearOffline */)
+	if ( account()->isConnected() && ( isOnline() || messageReceivedOffline() ) /* && account()->myself()->onlineStatus() != protocol()->groupwiseAppearOffline */)
 		return true;
-	if ( !account()->isConnected()/* || account()->myself()->onlinetqStatus() == protocol()->groupwiseAppearOffline*/ )
+	if ( !account()->isConnected()/* || account()->myself()->onlineStatus() == protocol()->groupwiseAppearOffline*/ )
 		return false;
 
 	// fallback, something went wrong
@@ -222,22 +222,22 @@ void GroupWiseContact::receivePrivacyChanged( const TQString & dn, bool allow )
 {
 	Q_UNUSED( allow );
 	if ( dn == m_dn )	// set the online status back to itself. this will set the blocking state
-		setOnlineStatus( this->onlinetqStatus() );
+		setOnlineStatus( this->onlineStatus() );
 }
 
 void GroupWiseContact::setOnlineStatus( const Kopete::OnlineStatus& status )
 {
 	setMessageReceivedOffline( false );
-	if ( status == protocol()->groupwiseAwayIdle && status != onlinetqStatus() )
+	if ( status == protocol()->groupwiseAwayIdle && status != onlineStatus() )
 		setIdleTime( 1 );
-	else if ( onlinetqStatus() == protocol()->groupwiseAwayIdle && status != onlinetqStatus() )
+	else if ( onlineStatus() == protocol()->groupwiseAwayIdle && status != onlineStatus() )
 		setIdleTime( 0 );
 	
 	if ( account()->isContactBlocked( m_dn ) && status.internalStatus() < 15 )
 	{
 		Kopete::Contact::setOnlineStatus(Kopete::OnlineStatus(status.status() , (status.weight()==0) ? 0 : (status.weight() -1)  ,
-			protocol() , status.internalStatus()+15 , TQString::tqfromLatin1("msn_blocked"),
-			i18n("%1|Blocked").tqarg( status.description() ) ) );
+			protocol() , status.internalStatus()+15 , TQString::fromLatin1("msn_blocked"),
+			i18n("%1|Blocked").arg( status.description() ) ) );
 	}
 	else
 	{
diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp
index 424a1545..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();
 	}
@@ -206,7 +206,7 @@ void GroupWiseChatSession::slotSendTypingNotification( bool typing )
 {
 	// only send a notification if we've got a conference going and we are not Appear Offline
 	if ( !m_guid.isEmpty() && m_memberCount &&
-		  ( account()->myself()->onlinetqStatus() != GroupWiseProtocol::protocol()->groupwiseAppearOffline ) )
+		  ( account()->myself()->onlineStatus() != GroupWiseProtocol::protocol()->groupwiseAppearOffline ) )
 				account()->client()->sendTyping( guid(), typing );
 }
 
@@ -221,7 +221,7 @@ void GroupWiseChatSession::slotMessageSent( Kopete::Message & message, Kopete::C
 			appendMessage( failureNotify );
 			messageSucceeded();
 		}
-		else*/ if ( account()->myself()->onlinetqStatus() == ( static_cast<GroupWiseProtocol *>( protocol() ) )->groupwiseAppearOffline )
+		else*/ if ( account()->myself()->onlineStatus() == ( static_cast<GroupWiseProtocol *>( protocol() ) )->groupwiseAppearOffline )
 		{
 			Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("Your message could not be sent. You cannot send messages while your status is Appear Offline. "), Kopete::Message::Internal, Kopete::Message::PlainText);
 			appendMessage( failureNotify );
@@ -330,7 +330,7 @@ void GroupWiseChatSession::slotInviteContact( Kopete::Contact * contact )
 	}
 	else
 	{
-		TQWidget * w = view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L;
+		TQWidget * w = view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L;
 		
 		bool ok;
 		TQRegExp rx( ".*" );
@@ -358,7 +358,7 @@ void GroupWiseChatSession::slotInviteOtherContact()
 	if ( !m_searchDlg )
 	{
 		// show search dialog
-		TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 
+		TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 
 					Kopete::UI::Global::mainWidget() );
 		m_searchDlg = new KDialogBase( w, "invitesearchdialog", false, i18n( "Search for Contact to Invite" ), KDialogBase::Ok|KDialogBase::Cancel );
 		m_search = new GroupWiseContactSearch( account(), TQListView::Single, true, m_searchDlg, "invitesearchwidget" );
@@ -375,7 +375,7 @@ void GroupWiseChatSession::slotSearchedForUsers()
 	TQValueList< ContactDetails > selected = m_search->selectedResults();
 	if ( selected.count() )
 	{
-		TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) :
+		TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) :
 				Kopete::UI::Global::mainWidget() ); 
 		ContactDetails cd = selected.first();
 		bool ok;
@@ -399,7 +399,7 @@ void GroupWiseChatSession::addInvitee( const Kopete::Contact * c )
 	Kopete::MetaContact * inviteeMC = new Kopete::MetaContact();
 	inviteeMC->setDisplayName( c->metaContact()->displayName() + pending );
 	GroupWiseContact * invitee = new GroupWiseContact( account(), c->contactId() + " " + pending, inviteeMC, 0, 0, 0 );
-	invitee->setOnlineStatus( c->onlinetqStatus() );
+	invitee->setOnlineStatus( c->onlineStatus() );
 	// TODO: we could set all the placeholder's properties etc here too
 	addContact( invitee, true );
 	m_invitees.append( invitee );
@@ -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 );
 }
@@ -501,14 +501,14 @@ void GroupWiseChatSession::updateArchiving()
 
 void GroupWiseChatSession::slotShowSecurity()
 {
-	TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) :
+	TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) :
 				Kopete::UI::Global::mainWidget() ); 
 	KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security Status" ) );
 }
 
 void GroupWiseChatSession::slotShowArchiving()
 {
-	TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) :
+	TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) :
 				Kopete::UI::Global::mainWidget() ); 
 	KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving Status" ) );
 }
diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp
index 0b4d351a..68a31fb4 100644
--- a/kopete/protocols/groupwise/gwprotocol.cpp
+++ b/kopete/protocols/groupwise/gwprotocol.cpp
@@ -173,7 +173,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain )
 	// of multi-byte UTF-8 characters 2 to 6 bytes long (with first byte > 0x7f), these are recoded as 32 bit values, escaped as \u<val>? strings
 
 	// vanilla RTF "envelope" that doesn't say much but causes other clients to accept the message
-	TQString rtfTemplate = TQString::tqfromLatin1("{\\rtf1\\ansi\n"
+	TQString rtfTemplate = TQString::fromLatin1("{\\rtf1\\ansi\n"
 						"{\\fonttbl{\\f0\\fnil Unknown;}}\n"
 						"{\\colortbl ;\\red0\\green0\\blue0;}\n"
 						"\\uc1\\cf1\\f0\\fs18 %1\\par\n}");
@@ -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 );
-			kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "tqunicode escaped char: " << escapedUnicodeChar << endl;
+			escapedUnicodeChar = TQString("\\u%1?").arg( ucs4Char );
+			kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "unicode 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 e7395157..5df0d1de 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/client.cpp
@@ -63,7 +63,7 @@ public:
 	UserDetailsManager * userDetailsMgr;
 	PrivacyManager * privacyMgr;
 	uint protocolVersion;
-	TQValueList<GroupWise::CustomtqStatus> customStatuses;
+	TQValueList<GroupWise::CustomStatus> customStatuses;
 	TQTimer * keepAliveTimer;
 };
 
@@ -151,8 +151,8 @@ void Client::start( const TQString &host, const uint port, const TQString &userI
 	connect( login, TQT_SIGNAL( gotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ),
 			privacyManager(), TQT_SLOT( slotGotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ) );
 
-	connect( login, TQT_SIGNAL( gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ), 
-			TQT_SLOT( lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ) );
+	connect( login, TQT_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ), 
+			TQT_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) );
 
 	connect( login, TQT_SIGNAL( gotKeepalivePeriod( int ) ), TQT_SLOT( lt_gotKeepalivePeriod( int ) ) );
 
@@ -185,7 +185,7 @@ int Client::port()
 	return d->port;
 }
 
-TQValueList<GroupWise::CustomtqStatus> Client::customStatuses()
+TQValueList<GroupWise::CustomStatus> Client::customStatuses()
 {
 	return d->customStatuses;
 }
@@ -194,7 +194,7 @@ void Client::initialiseEventTasks()
 {
 	// The StatusTask handles incoming status changes
 	StatusTask * st = new StatusTask( d->root ); // FIXME - add an additional EventRoot?
-	connect( st, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
+	connect( st, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
 	// The ConferenceTask handles incoming conference events, messages, joins, leaves, etc
 	ConferenceTask * ct = new ConferenceTask( d->root ); 
 	connect( ct, TQT_SIGNAL( message( const ConferenceEvent & ) ), TQT_SLOT( ct_messageReceived( const ConferenceEvent & ) ) );
@@ -216,9 +216,9 @@ void Client::initialiseEventTasks()
 	connect( cont, TQT_SIGNAL( connectedElsewhere() ), TQT_SIGNAL( connectedElsewhere() ) );
 }
 
-void Client::settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply )
+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() ) );
@@ -226,11 +226,11 @@ void Client::settqStatus( GroupWise::tqStatus status, const TQString & reason, c
 	// TODO: set status change in progress flag
 }
 
-void Client::requesttqStatus( const TQString & userDN )
+void Client::requestStatus( const TQString & userDN )
 {
 	GetStatusTask * gst = new GetStatusTask( d->root );
 	gst->userDN( userDN );
-	connect( gst, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
+	connect( gst, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
 	gst->go( true );
 }
 
@@ -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()
@@ -348,7 +348,7 @@ void Client::sst_statusChanged()
 	const SetStatusTask * sst = (SetStatusTask *)sender();
 	if ( sst->success() )
 	{
-		emit ourStatusChanged( sst->requestedtqStatus(), sst->awayMessage(), sst->autoReply() );
+		emit ourStatusChanged( sst->requestedStatus(), sst->awayMessage(), sst->autoReply() );
 	}
 }
 
@@ -390,19 +390,19 @@ 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() );
 }
 
-void Client::lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & custom )
+void Client::lt_gotCustomStatus( const GroupWise::CustomStatus & custom )
 {
 	d->customStatuses.append( custom );
 }
@@ -431,7 +431,7 @@ TQString Client::password()
 
 TQString Client::userAgent()
 {
-	return TQString::tqfromLatin1( "%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/client.h b/kopete/protocols/groupwise/libgroupwise/client.h
index 8bdd236d..542d32eb 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.h
+++ b/kopete/protocols/groupwise/libgroupwise/client.h
@@ -92,7 +92,7 @@ fd		 * @param password
 		 * @param reason custom status name for away statuses
 		 * @param autoReply auto reply message for use in this status
 		 */
-		void settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply );
+		void setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply );
 
 		/**
 		 * Send a message 
@@ -118,7 +118,7 @@ fd		 * @param password
 		/**
 		 * Request the status of a single user, for example, if they have messaged us and are not on our contact list
 		 */
-		void requesttqStatus( const TQString & userDN );
+		void requestStatus( const TQString & userDN );
 		
 		/**
 		 * Add a contact to the contact list
@@ -211,7 +211,7 @@ fd		 * @param password
 		/**
 		 * Obtain the list of custom statuses stored on the server 
 		 */
-		TQValueList<GroupWise::CustomtqStatus> customStatuses();
+		TQValueList<GroupWise::CustomStatus> customStatuses();
 
 		/**
 		 * Get a reference to the RequestFactory for this Client. 
@@ -281,7 +281,7 @@ fd		 * @param password
 		/** 
 		 * Our status changed on the server
 		 */
-		void ourStatusChanged( GroupWise::tqStatus status, const TQString & statusText, const TQString & autoReply );
+		void ourStatusChanged( GroupWise::Status status, const TQString & statusText, const TQString & autoReply );
 		
 		/** CONFERENCE (MANAGEMENT) EVENTS */
 		/** 
@@ -371,7 +371,7 @@ fd		 * @param password
 		/**
 		 * Receive a custom status during login and record it
 		 */
-		void lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & );
+		void lt_gotCustomStatus( const GroupWise::CustomStatus & );
 		/**
 		 * Notify us of the keepalive period contained in the login response
 		 */
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
index 79ecf419..6cfa01b9 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
@@ -26,7 +26,7 @@
 
 #include <tqdatastream.h>
 #include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 
 #include <kdebug.h>
@@ -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/coreprotocol.h b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
index ea3a2626..d1b2486c 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
@@ -108,7 +108,7 @@ class Transfer;
  * any of three ways -
  *      ascii text,
  *      latin1 as hexadecimal,
- *      escaped tqunicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the tqunicode value and the ? )
+ *      escaped unicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the unicode value and the ? )
  * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is apparently ignored by the server
  *
  */
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
index b6ff646d..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;
 	}
@@ -71,7 +71,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 	
 	// now create an event object
 	//HACK: lowercased DN
-	EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::tqcurrentDateTime() );
+	EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::currentDateTime() );
 
 	// add any additional data depending on the type of event
 	// Note: if there are any errors in the way the data is read below, we will soon be OutOfSync
@@ -96,9 +96,9 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 				m_din.unsetDevice();
 				return 0;
 			}
-			debug( TQString( "got status: %1").tqarg( status ) );
-			tentative->settqStatus( status );
-			debug( TQString( "tentative status: %1").tqarg( tentative->status() ) );
+			debug( TQString( "got status: %1").arg( status ) );
+			tentative->setStatus( status );
+			debug( TQString( "tentative status: %1").arg( tentative->status() ) );
 			tentative->setStatusText( statusText );
 			break;
 		case ConferenceJoined:		// 106 - GUID + FLAGS
@@ -116,7 +116,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 			}
 			tentative->setFlags( flags );
 			break;
-		case UndeliverabletqStatus:	//102 - GUID
+		case UndeliverableStatus:	//102 - GUID
 		case ConferenceClosed:		//105
 		case ConferenceInviteNotify://118
 		case ConferenceReject:		//119
@@ -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/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
index 97e48c22..49d1d9dd 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
@@ -50,7 +50,7 @@ class EventTransfer;
 	All Events contain an event code, and a source ( a DN )
 	NOTHANDLED indicates that there is no further data and we don't handle events of that type, because they are not sent by the server
 	NONE indicates there is no further data
-	STATUSTEXT, GUID, MESSAGE indicate a string encoded in the usual GroupWise binary string encoding: a UINT32 containing the string length in little-endian, followed by the string itself, as UTF-8 encoded tqunicode.  The string length value includes a terminating NUL, so when converting to a TQString, subtract one from the string length.
+	STATUSTEXT, GUID, MESSAGE indicate a string encoded in the usual GroupWise binary string encoding: a UINT32 containing the string length in little-endian, followed by the string itself, as UTF-8 encoded unicode.  The string length value includes a terminating NUL, so when converting to a TQString, subtract one from the string length.
 	FLAGS contains a UINT32 containing the server's flags for this conference.  See gwerror.h for the possible values and meanings of these flags.  Only Logging has been observed in practice.
 
 	All events are timestamped with the local time on receipt.
@@ -58,7 +58,7 @@ class EventTransfer;
 	From gwerror.h:
 	enum Event {		InvalidRecipient 		= 101,
 							NOTHANDLED
-						UndeliverabletqStatus 	= 102,
+						UndeliverableStatus 	= 102,
 							NOTHANDLED * 
 						StatusChange 			= 103,
 							TQ_UINT16 STATUS
diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp
index be645abb..fb9ab8b3 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp
@@ -60,9 +60,9 @@ bool EventTransfer::hasMessage()
 	return ( m_contentFlags & Message );
 }
 
-bool EventTransfer::hastqStatus()
+bool EventTransfer::hasStatus()
 {
-	return ( m_contentFlags & tqStatus );
+	return ( m_contentFlags & Status );
 }
 
 bool EventTransfer::hasStatusText()
@@ -131,10 +131,10 @@ void EventTransfer::setMessage( const TQString & message )
 	m_message = message;
 }
 
-void EventTransfer::settqStatus( const TQ_UINT16 intqStatus )
+void EventTransfer::setStatus( const TQ_UINT16 inStatus )
 {
-	m_contentFlags |= tqStatus;
-	m_status = intqStatus;
+	m_contentFlags |= Status;
+	m_status = inStatus;
 }
 
 void EventTransfer::setStatusText( const TQString & statusText )
diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
index 594d0d16..ad325619 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
@@ -47,7 +47,7 @@ public:
 					Guid = 			0x00000008,
 					Flags = 		0x00000010,
 					Message = 		0x00000020,
-					tqStatus = 		0x00000040,
+					Status = 		0x00000040,
 					StatusText = 	0x00000080 };
 	/**
 	 * Constructor
@@ -70,7 +70,7 @@ public:
 	bool hasGuid();
 	bool hasFlags();
 	bool hasMessage();
-	bool hastqStatus();
+	bool hasStatus();
 	bool hasStatusText();
 	
 	/**
@@ -92,7 +92,7 @@ public:
 	void setGuid( const GroupWise::ConferenceGuid & guid );
 	void setFlags( const TQ_UINT32 flags );
 	void setMessage( const TQString & message );
-	void settqStatus( const TQ_UINT16 status );
+	void setStatus( const TQ_UINT16 status );
 	void setStatusText( const TQString & statusText);
 	
 private:
diff --git a/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h b/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h
index 5349fd30..4e73955a 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h
@@ -44,7 +44,7 @@ struct ChatroomSearchResult
 class Chatroom
 {
 	public:
-		enum UsertqStatus { Participating, NotParticipating };
+		enum UserStatus { Participating, NotParticipating };
 		enum Rights { Read = 1, Write = 2, Modify = 4, Moderator = 8, Owner = 16 };
 		TQString creatorDN;
 		TQString description;
@@ -57,7 +57,7 @@ class Chatroom
 		bool archive;
 		uint maxUsers;
 		uint chatRights;
-		UsertqStatus usertqStatus;
+		UserStatus userStatus;
 		TQDateTime createdOn;
 		uint participantsCount;
 		// haveParticipants, Acl, Invites indicate if we have obtained these lists from the server, so we can tell 'not fetched list' and 'fetched empty list' apart.
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
index 7305f7bc..e3827622 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -19,7 +19,7 @@
     *************************************************************************
 */
 
-//#include<tqtextstream.h>
+//#include<textstream.h>
 //#include<tqguardedptr.h>
 // #include<qca.h>
 // #include<stdlib.h>
@@ -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/gwerror.h b/kopete/protocols/groupwise/libgroupwise/gwerror.h
index f5de53ce..f19d3d39 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwerror.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwerror.h
@@ -36,7 +36,7 @@ typedef TQ_UINT16 NMERR_T;
 
 namespace GroupWise
 {
-	enum tqStatus {	Unknown = 0,
+	enum Status {	Unknown = 0,
 					Offline = 1,
 					Available = 2,
 					Busy = 3,
@@ -58,7 +58,7 @@ namespace GroupWise
 				};
 	
 	enum Event {		InvalidRecipient 		= 101,
-						UndeliverabletqStatus 	= 102,
+						UndeliverableStatus 	= 102,
 						StatusChange 			= 103,
 						ContactAdd 				= 104,
 						ConferenceClosed 		= 105,
@@ -164,9 +164,9 @@ namespace GroupWise
 		int operation;
 	};
 
-	struct CustomtqStatus
+	struct CustomStatus
 	{
-		GroupWise::tqStatus status;
+		GroupWise::Status status;
 		TQString name;
 		TQString autoReply;
 	};
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/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
index 9aa7d80b..7e7dbeed 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
@@ -586,7 +586,7 @@ TQString RSAKey::toPEM(bool publicOnly) const
 	TQCString cs;
 	cs.resize(out.size()+1);
 	memcpy(cs.data(), out.data(), out.size());
-	return TQString::tqfromLatin1(cs);
+	return TQString::fromLatin1(cs);
 }
 
 bool RSAKey::fromPEM(const TQString &str)
@@ -798,7 +798,7 @@ TQString Cert::toPEM() const
 	TQCString cs;
 	cs.resize(out.size()+1);
 	memcpy(cs.data(), out.data(), out.size());
-	return TQString::tqfromLatin1(cs);
+	return TQString::fromLatin1(cs);
 }
 
 bool Cert::fromPEM(const TQString &str)
diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
index 50788178..a3c82b51 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) )
@@ -248,9 +248,9 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
 					m_packetState = ProtocolError;
 					break;
 				}
-				// convert to tqunicode - ignore the terminating NUL, because TQt<3.3.2 doesn't sanity check val.
+				// convert to unicode - 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/rtf2html.h b/kopete/protocols/groupwise/libgroupwise/rtf2html.h
index 5685e4a1..3a3122d8 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf2html.h
+++ b/kopete/protocols/groupwise/libgroupwise/rtf2html.h
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 #include <stdio.h>
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqcolor.h>
 #include <tqregexp.h>
 #include <kdebug.h>
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/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
index 7744552c..a62cf022 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
@@ -62,7 +62,7 @@ bool GetChatSearchResultsTask::take( Transfer * transfer )
 	// look for the status code
 	Field::FieldList responseFields = response->fields();
 	Field::SingleField * sf = responseFields.findSingleField( NM_A_UW_STATUS );
-	m_querytqStatus = (SearchResultCode)sf->value().toInt();
+	m_queryStatus = (SearchResultCode)sf->value().toInt();
 	
 	Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS );
 	if ( !resultsArray )
@@ -82,12 +82,12 @@ bool GetChatSearchResultsTask::take( Transfer * transfer )
 		m_results.append( cd );
 	}
 	
-	if ( m_querytqStatus != DataRetrieved )
-		setError( m_querytqStatus );
+	if ( m_queryStatus != DataRetrieved )
+		setError( m_queryStatus );
 	else
 	{
 		kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << " we won!" << endl;
-		setSuccess( m_querytqStatus );
+		setSuccess( m_queryStatus );
 	}
 	return true;
 }
@@ -97,9 +97,9 @@ TQValueList< GroupWise::ChatroomSearchResult > GetChatSearchResultsTask::results
 	return m_results;
 }
 
-int GetChatSearchResultsTask::querytqStatus()
+int GetChatSearchResultsTask::queryStatus()
 {
-	return m_querytqStatus;
+	return m_queryStatus;
 }
 
 GroupWise::ChatroomSearchResult GetChatSearchResultsTask::extractChatDetails( Field::FieldList & fields )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
index bebe8ff7..5671a122 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
@@ -42,11 +42,11 @@ class GetChatSearchResultsTask : public RequestTask
 		~GetChatSearchResultsTask();
 		void poll( int queryHandle);
 		bool take( Transfer * transfer );
-		int querytqStatus();
+		int queryStatus();
 		TQValueList< GroupWise::ChatroomSearchResult > results();
 	private:
 		GroupWise::ChatroomSearchResult extractChatDetails( Field::FieldList & fields );
-		SearchResultCode m_querytqStatus;
+		SearchResultCode m_queryStatus;
 		TQValueList< GroupWise::ChatroomSearchResult > m_results;
 };
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
index 86179b62..2b77e33e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
@@ -61,7 +61,7 @@ bool GetStatusTask::take( Transfer * transfer )
 		// TODO: Check that the change to sending DNs above has fixed this problem.
 		status = sf->value().toInt();
 		// unfortunately getstatus doesn't give us an away message so we pass TQString() here
-		emit gottqStatus( m_userDN, status, TQString() );
+		emit gotStatus( m_userDN, status, TQString() );
 		setSuccess();
 	}	
 	else
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
index bd291c62..aec5050f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
@@ -37,7 +37,7 @@ public:
 	void userDN( const TQString & dn );
 	bool take( Transfer * transfer );
 signals:
-	void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
+	void gotStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
 private:
 	TQString m_userDN;
 };
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 f3d55583..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::tqfromLatin1("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 );
 }
@@ -319,21 +319,21 @@ void LoginTask::extractCustomStatuses( Field::FieldList & fields )
 				Field::MultiField * mf2 = dynamic_cast<Field::MultiField *>( *custStatIt );
 				if ( mf2 && ( mf2->tag() == NM_A_FA_STATUS ) )
 				{
-					GroupWise::CustomtqStatus custom;
+					GroupWise::CustomStatus custom;
 					Field::FieldList fl2 = mf2->fields();
 					for ( Field::FieldListIterator custContentIt = fl2.begin(); custContentIt != fl2.end(); ++custContentIt )
 					{
 						if ( Field::SingleField * sf3 = dynamic_cast<Field::SingleField *>( *custContentIt ) )
 						{
 							if ( sf3->tag() == NM_A_SZ_TYPE )
-								custom.status = (GroupWise::tqStatus)sf3->value().toInt();
+								custom.status = (GroupWise::Status)sf3->value().toInt();
 							else if ( sf3->tag() == NM_A_SZ_DISPLAY_NAME )
 								custom.name = sf3->value().toString();
 							else if ( sf3->tag() == NM_A_SZ_MESSAGE_BODY )
 								custom.autoReply = sf3->value().toString();
 						}
 					}
-					emit gotCustomtqStatus( custom );
+					emit gotCustomStatus( custom );
 				}
 			}
 		}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
index f37add97..fdeaeb9d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
@@ -58,7 +58,7 @@ signals:
 	void gotContact( const ContactItem & );
 	void gotContactUserDetails( const GroupWise::ContactDetails & );
 	void gotPrivacySettings( bool locked, bool defaultDeny, const TQStringList & allowList, const TQStringList & denyList );
-	void gotCustomtqStatus( const GroupWise::CustomtqStatus & );
+	void gotCustomStatus( const GroupWise::CustomStatus & );
 	void gotKeepalivePeriod( int );
 };
 
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/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
index 38870112..d65a5a20 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
@@ -59,7 +59,7 @@ bool PollSearchResultsTask::take( Transfer * transfer )
 	// look for the status code
 	Field::FieldList responseFields = response->fields();
 	Field::SingleField * sf = responseFields.findSingleField( NM_A_SZ_STATUS );
-	m_querytqStatus = sf->value().toInt();
+	m_queryStatus = sf->value().toInt();
 	
 	Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS );
 	if ( !resultsArray )
@@ -90,10 +90,10 @@ bool PollSearchResultsTask::take( Transfer * transfer )
 	// followed by NM_A_FA_RESULTS, looks like a getdetails
 	// add an accessor to get at the results list of ContactItems, probably
 	
-	if ( m_querytqStatus != 2 )
-		setError( m_querytqStatus );
+	if ( m_queryStatus != 2 )
+		setError( m_queryStatus );
 	else
-		setSuccess( m_querytqStatus );
+		setSuccess( m_queryStatus );
 	return true;
 }
 
@@ -102,9 +102,9 @@ TQValueList< GroupWise::ContactDetails > PollSearchResultsTask::results()
 	return m_results;
 }
 
-int PollSearchResultsTask::querytqStatus()
+int PollSearchResultsTask::queryStatus()
 {
-	return m_querytqStatus;
+	return m_queryStatus;
 }
 
 GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::FieldList & fields )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
index ccf0560b..c69b7e0c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
@@ -42,11 +42,11 @@ public:
 	~PollSearchResultsTask();
 	void poll( const TQString & queryHandle);
 	bool take( Transfer * transfer );
-	int querytqStatus();
+	int queryStatus();
 	TQValueList< GroupWise::ContactDetails > results();
 GroupWise::ContactDetails extractUserDetails( Field::FieldList & fields );
 private:
-	int m_querytqStatus;
+	int m_queryStatus;
 	TQValueList< GroupWise::ContactDetails > m_results;
 };
 
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/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
index 946450e9..87694eb4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
@@ -91,9 +91,9 @@ void SearchChatTask::slotPollForResults()
 void SearchChatTask::slotGotPollResults()
 {
 	GetChatSearchResultsTask * gcsrt = (GetChatSearchResultsTask *)sender();
-	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->querytqStatus() << endl;
+	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->queryStatus() << endl;
 	m_polls++;
-	switch ( gcsrt->querytqStatus() )
+	switch ( gcsrt->queryStatus() )
 	{
 		case GetChatSearchResultsTask::GettingData:
 			if ( m_polls < GW_POLL_MAXIMUM ) // restart timer
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
index 3dde5297..1b64c47d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
@@ -50,7 +50,7 @@ SearchUserTask::~SearchUserTask()
 
 void SearchUserTask::search( const TQValueList<UserSearchQueryTerm> & query )
 {
-	m_queryHandle = TQString::number( TQDateTime::tqcurrentDateTime().toTime_t () );
+	m_queryHandle = TQString::number( TQDateTime::currentDateTime().toTime_t () );
 	Field::FieldList lst;
 	if ( query.isEmpty() )
 	{
@@ -102,9 +102,9 @@ void SearchUserTask::slotPollForResults()
 void SearchUserTask::slotGotPollResults()
 {
 	PollSearchResultsTask * psrt = (PollSearchResultsTask *)sender();
-	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->querytqStatus() << endl;
+	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->queryStatus() << endl;
 	m_polls++;
-	switch ( psrt->querytqStatus() )
+	switch ( psrt->queryStatus() )
 	{
 		case PollSearchResultsTask::Pending:
 		case PollSearchResultsTask::InProgess:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
index 817df4a6..bf463407 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
@@ -30,20 +30,20 @@ SetStatusTask::~SetStatusTask()
 {
 }
 
-void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply )
+void SetStatusTask::status( Status newStatus, const TQString &awayMessage, const TQString &autoReply )
 {
-	if ( newtqStatus > GroupWise::Invalid )
+	if ( newStatus > GroupWise::Invalid )
 	{
 		setError( 1, "Invalid Status" );
 		return;
 	}
 	
-	m_status = newtqStatus;
+	m_status = newStatus;
 	m_awayMessage = awayMessage;
 	m_autoReply = autoReply;
 	
 	Field::FieldList lst;
-	lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newtqStatus ) ) );
+	lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newStatus ) ) );
 	if ( !awayMessage.isNull() )
 		lst.append( new Field::SingleField( NM_A_SZ_STATUS_TEXT, 0, NMFIELD_TYPE_UTF8, awayMessage ) );
 	if ( !autoReply.isNull() )
@@ -51,7 +51,7 @@ void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, c
 	createTransfer( "setstatus", lst );
 }
 
-tqStatus SetStatusTask::requestedtqStatus() const
+Status SetStatusTask::requestedStatus() const
 {
 	return m_status;
 }
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
index 0c316220..4a7a753d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
@@ -34,12 +34,12 @@ Q_OBJECT
 public:
 	SetStatusTask(Task* parent);
 	~SetStatusTask();
-	void status( GroupWise::tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply );
-	GroupWise::tqStatus requestedtqStatus() const;
+	void status( GroupWise::Status newStatus, const TQString &awayMessage, const TQString &autoReply );
+	GroupWise::Status requestedStatus() const;
 	TQString awayMessage() const;
 	TQString autoReply() const; 
 private:
-	GroupWise::tqStatus m_status;
+	GroupWise::Status m_status;
 	TQString m_awayMessage;
 	TQString m_autoReply;
 };
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
index 7076324a..e7272402 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
@@ -37,8 +37,8 @@ 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() ) );
-		emit gottqStatus( event->source().lower(), event->status(), 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;
 	}
 	else
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
index de5839d7..cc14bace 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
@@ -35,7 +35,7 @@ public:
 	~StatusTask();
 	bool take( Transfer * transfer );
 signals:
-	void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
+	void gotStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
 };
 
 #endif
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
index 0eb61409..2dace60b 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
@@ -62,15 +62,15 @@ void buildList()
 	//				sf - contactlist (empty field array)
 	//				sf - message body 
 	
-	Field::SingleField* sf = new Field::SingleField( NM_A_FA_MESSAGE, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "Da steh ich nun, ich armer Tor! Und bin so klug als wie zuvor..." ) );
+	Field::SingleField* sf = new Field::SingleField( NM_A_FA_MESSAGE, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "Da steh ich nun, ich armer Tor! Und bin so klug als wie zuvor..." ) );
 	fl.append( sf );
-	sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "maeuschen" ) );
+	sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "maeuschen" ) );
 	fl.append( sf );
 	// nested list
 	Field::FieldList nl;
 	sf = new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UDWORD, 123 );
 	nl.append( sf );
-	sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "bla bla" ) );
+	sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "bla bla" ) );
 	nl.append( sf );
 	Field::MultiField* mf = new Field::MultiField( NM_A_FA_PARTICIPANTS, NMFIELD_METHOD_VALID, 0, NMFIELD_TYPE_ARRAY );
 	mf->setFields( nl );
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 21f774b5..40917ccf 100644
--- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
+++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
@@ -53,7 +53,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout1</cstring>
+                                    <cstring>layout1</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -121,7 +121,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout66</cstring>
+                                    <cstring>layout66</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -269,7 +269,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>91</height>
@@ -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/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
index 5ece3882..a10bcc16 100644
--- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
+++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
@@ -23,7 +23,7 @@
 
 //#include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
index 726376a5..c4f9a9c6 100644
--- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
@@ -29,7 +29,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout16</cstring>
+                <cstring>layout16</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -341,7 +341,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout15</cstring>
+                <cstring>layout15</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
index 63ffca38..1899a525 100644
--- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
+++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
@@ -65,7 +65,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -89,7 +89,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>340</width>
                             <height>20</height>
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
index e7b6ecb2..5a991a42 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
@@ -16,7 +16,7 @@
     *************************************************************************
 */
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqheader.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -47,7 +47,7 @@ GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * conta
 	init();
 	// set up the contents of the props widget
 	m_propsWidget->m_userId->setText( contact->contactId() );
-	m_propsWidget->m_status->setText( contact->onlinetqStatus().description() );
+	m_propsWidget->m_status->setText( contact->onlineStatus().description() );
 	m_propsWidget->m_displayName->setText( contact->metaContact()->displayName() );
 	m_propsWidget->m_firstName->setText( contact->property( Kopete::Global::Properties::self()->firstName() ).value().toString() );
 	m_propsWidget->m_lastName->setText( contact->property( Kopete::Global::Properties::self()->lastName() ).value().toString() );
@@ -137,7 +137,7 @@ void GroupWiseContactProperties::slotCopy()
 	kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl;
 	if ( m_propsWidget->m_propsView->currentItem() )
 	{
-		TQClipboard *cb = kapp->tqclipboard();
+		TQClipboard *cb = kapp->clipboard();
 		cb->setText( m_propsWidget->m_propsView->currentItem()->text( 1 ) );
 	}
 }
diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
index b403abec..95481add 100644
--- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
@@ -48,7 +48,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout15</cstring>
+                <cstring>layout15</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -73,7 +73,7 @@
                         <cstring>textLabel14</cstring>
                     </property>
                     <property name="text">
-                        <string>tqStatus:</string>
+                        <string>Status:</string>
                     </property>
                 </widget>
                 <widget class="TQLineEdit" row="2" column="1">
diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui
index e6c6a2f6..3713e31b 100644
--- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui
+++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -255,7 +255,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -264,7 +264,7 @@
                 <widget class="TQListView">
                     <column>
                         <property name="text">
-                            <string>tqStatus</string>
+                            <string>Status</string>
                         </property>
                         <property name="clickable">
                             <bool>true</bool>
@@ -318,7 +318,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -345,7 +345,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>141</height>
diff --git a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui
index 9ef4caad..0e81a783 100644
--- a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui
+++ b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -43,7 +43,7 @@
                 </widget>
                 <widget class="TQComboBox" row="0" column="1">
                     <property name="name">
-                        <cstring>m_cmbtqStatus</cstring>
+                        <cstring>m_cmbStatus</cstring>
                     </property>
                 </widget>
                 <widget class="TQLabel" row="0" column="0">
@@ -51,7 +51,7 @@
                         <cstring>textLabel3</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;tqStatus:</string>
+                        <string>&amp;Status:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>comboBox1</cstring>
diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
index 821c6030..0c3efcac 100644
--- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
@@ -54,7 +54,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -94,7 +94,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>41</height>
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
index 7f049d7c..87296ab2 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqspinbox.h>
 
diff --git a/kopete/protocols/groupwise/ui/gwprivacy.ui b/kopete/protocols/groupwise/ui/gwprivacy.ui
index 1f4b6bcb..60fb63db 100644
--- a/kopete/protocols/groupwise/ui/gwprivacy.ui
+++ b/kopete/protocols/groupwise/ui/gwprivacy.ui
@@ -26,7 +26,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout11</cstring>
+                <cstring>layout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -34,7 +34,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -60,7 +60,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -76,7 +76,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>21</height>
@@ -109,7 +109,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>53</height>
@@ -142,7 +142,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>52</height>
@@ -153,7 +153,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <vbox>
                         <property name="name">
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 48c061a9..2027c579 100644
--- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui
+++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -82,13 +82,13 @@
             <property name="text">
                 <string>INVITE_MESSAGE</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout14</cstring>
+                <cstring>layout14</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -112,7 +112,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>31</height>