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

90 files changed, 599 insertions, 599 deletions

diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index a86fc490..a8597658 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -111,7 +111,7 @@ JabberAccount::JabberAccount (JabberProtocol * parent, const TQString & accountI
 
 	TQObject::connect(Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ) );
 
-	m_initialPresence = XMPP::tqStatus ( "", "", 5, true );
+	m_initialPresence = XMPP::Status ( "", "", 5, true );
 
 }
 
@@ -323,8 +323,8 @@ void JabberAccount::connectWithPassword ( const TQString &password )
 				   this, TQT_SLOT ( slotGroupChatJoined ( const XMPP::Jid & ) ) );
 		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatLeft ( const XMPP::Jid & ) ),
 				   this, TQT_SLOT ( slotGroupChatLeft ( const XMPP::Jid & ) ) );
-		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::tqStatus & ) ),
-				   this, TQT_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::tqStatus & ) ) );
+		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ),
+				   this, TQT_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ) );
 		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatError ( const XMPP::Jid &, int, const TQString & ) ),
 				   this, TQT_SLOT ( slotGroupChatError ( const XMPP::Jid &, int, const TQString & ) ) );
 		TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ),
@@ -414,7 +414,7 @@ void JabberAccount::connectWithPassword ( const TQString &password )
 
 	kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Connecting to Jabber server " << server() << ":" << port() << endl;
 
-	setPresence( XMPP::tqStatus ("connecting", "", 0, true) );
+	setPresence( XMPP::Status ("connecting", "", 0, true) );
 
 	switch ( m_jabberClient->connect ( XMPP::Jid ( accountId () + TQString("/") + resource () ), password ) )
 	{
@@ -609,13 +609,13 @@ void JabberAccount::slotIncomingFileTransfer ()
 
 void JabberAccount::setOnlineStatus( const Kopete::OnlineStatus& status  , const TQString &reason)
 {
-	XMPP::tqStatus xmpptqStatus = m_protocol->kosTotqStatus( status, reason);
+	XMPP::Status xmppStatus = m_protocol->kosToStatus( status, reason);
 
 	if( status.status() == Kopete::OnlineStatus::Offline )
 	{
-			xmpptqStatus.setIsAvailable( false );
+			xmppStatus.setIsAvailable( false );
 			kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "CROSS YOUR FINGERS! THIS IS GONNA BE WILD" << endl;
-            disconnect (Manual, xmpptqStatus);
+            disconnect (Manual, xmppStatus);
             return;
     }
 
@@ -628,12 +628,12 @@ void JabberAccount::setOnlineStatus( const Kopete::OnlineStatus& status  , const
 	if ( !isConnected () )
 	{
 		// we are not connected yet, so connect now
-		m_initialPresence = xmpptqStatus;
+		m_initialPresence = xmppStatus;
 		connect ( status );
 	}
 	else
 	{
-		setPresence ( xmpptqStatus );
+		setPresence ( xmppStatus );
 	}
 }
 
@@ -650,8 +650,8 @@ void JabberAccount::disconnect ( Kopete::Account::DisconnectReason reason )
 
 	// make sure that the connection animation gets stopped if we're still
 	// in the process of connecting
-	setPresence ( XMPP::tqStatus ("", "", 0, false) );
-	m_initialPresence = XMPP::tqStatus ("", "", 5, true);
+	setPresence ( XMPP::Status ("", "", 0, false) );
+	m_initialPresence = XMPP::Status ("", "", 5, true);
 
 	/* FIXME:
 	 * We should delete the JabberClient instance here,
@@ -666,7 +666,7 @@ void JabberAccount::disconnect ( Kopete::Account::DisconnectReason reason )
 	disconnected ( reason );
 }
 
-void JabberAccount::disconnect( Kopete::Account::DisconnectReason reason, XMPP::tqStatus &status )
+void JabberAccount::disconnect( Kopete::Account::DisconnectReason reason, XMPP::Status &status )
 {
     kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "disconnect( reason, status ) called" << endl;
     
@@ -787,7 +787,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
 					break;
 			}
 
-			errorText = i18n("There was an error in the protocol stream: %1").tqarg(errorCondition);
+			errorText = i18n("There was an error in the protocol stream: %1").arg(errorCondition);
 			break;
 
 		case XMPP::ClientStream::ErrConnection:
@@ -845,7 +845,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
 					break;
 			}
 			if(!errorCondition.isEmpty())
-				errorText = i18n("There was a connection error: %1").tqarg(errorCondition);
+				errorText = i18n("There was a connection error: %1").arg(errorCondition);
 			break;
 
 		case XMPP::ClientStream::ErrNeg:
@@ -870,7 +870,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
 					break;
 			}
 
-			errorText = i18n("There was a negotiation error: %1").tqarg(errorCondition);
+			errorText = i18n("There was a negotiation error: %1").arg(errorCondition);
 			break;
 
 		case XMPP::ClientStream::ErrTLS:
@@ -887,7 +887,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
 					break;
 			}
 
-			errorText = i18n("There was a Transport Layer Security (TLS) error: %1").tqarg(errorCondition);
+			errorText = i18n("There was a Transport Layer Security (TLS) error: %1").arg(errorCondition);
 			break;
 
 		case XMPP::ClientStream::ErrAuth:
@@ -931,7 +931,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
 					break;
 			}
 
-			errorText = i18n("There was an error authenticating with the server: %1").tqarg(errorCondition);
+			errorText = i18n("There was an error authenticating with the server: %1").arg(errorCondition);
 			break;
 
 		case XMPP::ClientStream::ErrSecurityLayer:
@@ -948,7 +948,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
 					break;
 			}
 
-			errorText = i18n("There was an error in the security layer: %1").tqarg(errorCondition);
+			errorText = i18n("There was an error in the security layer: %1").arg(errorCondition);
 			break;
 
 		case XMPP::ClientStream::ErrBind:
@@ -965,7 +965,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
 					break;
 			}
 
-			errorText = i18n("Could not bind a resource: %1").tqarg(errorCondition);
+			errorText = i18n("Could not bind a resource: %1").arg(errorCondition);
 			break;
 
 		default:
@@ -981,7 +981,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
 	if(!errorText.isEmpty())
 		KMessageBox::error (Kopete::UI::Global::mainWidget (),
 						errorText,
-						i18n("Connection problem with Jabber server %1").tqarg(server));
+						i18n("Connection problem with Jabber server %1").arg(server));
 
 
 }
@@ -1015,27 +1015,27 @@ void JabberAccount::slotCSError ( int error )
 }
 
 /* Set presence (usually called by dialog widget). */
-void JabberAccount::setPresence ( const XMPP::tqStatus &status )
+void JabberAccount::setPresence ( const XMPP::Status &status )
 {
 	kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Status: " << status.show () << ", Reason: " << status.status () << endl;
 
 	// fetch input status
-	XMPP::tqStatus newtqStatus = status;
+	XMPP::Status newStatus = status;
 	
 	// TODO: Check if Caps is enabled
 	// Send entity capabilities
 	if( client() )
 	{
-		newtqStatus.setCapsNode( client()->capsNode() );
-		newtqStatus.setCapsVersion( client()->capsVersion() );
-		newtqStatus.setCapsExt( client()->capsExt() );
+		newStatus.setCapsNode( client()->capsNode() );
+		newStatus.setCapsVersion( client()->capsVersion() );
+		newStatus.setCapsExt( client()->capsExt() );
 	}
 
 	// make sure the status gets the correct priority
-	newtqStatus.setPriority ( configGroup()->readNumEntry ( "Priority", 5 ) );
+	newStatus.setPriority ( configGroup()->readNumEntry ( "Priority", 5 ) );
 
 	XMPP::Jid jid ( myself()->contactId () );
-	XMPP::Resource newResource ( resource (), newtqStatus );
+	XMPP::Resource newResource ( resource (), newStatus );
 
 	// update our resource in the resource pool
 	resourcePool()->addResource ( jid, newResource );
@@ -1057,7 +1057,7 @@ void JabberAccount::setPresence ( const XMPP::tqStatus &status )
 
 			XMPP::JT_Presence * task = new XMPP::JT_Presence ( client()->rootTask ());
 
-			task->pres ( newtqStatus );
+			task->pres ( newStatus );
 			task->go ( true );
 		}
 		else
@@ -1299,11 +1299,11 @@ void JabberAccount::slotContactUpdated (const XMPP::RosterItem & item)
 		*/
 		if ( !item.ask().isEmpty () )
 		{
-			contact->setProperty ( protocol()->propAuthorizationtqStatus, i18n ( "Waiting for authorization" ) );
+			contact->setProperty ( protocol()->propAuthorizationStatus, i18n ( "Waiting for authorization" ) );
 		}
 		else
 		{
-			contact->removeProperty ( protocol()->propAuthorizationtqStatus );
+			contact->removeProperty ( protocol()->propAuthorizationStatus );
 		}
 	}
 	else if(c)  //we don't need to add it, and it is in the contactlist
@@ -1469,7 +1469,7 @@ void JabberAccount::slotGroupChatLeft (const XMPP::Jid & jid)
 	
 }
 
-void JabberAccount::slotGroupChatPresence (const XMPP::Jid & jid, const XMPP::tqStatus & status)
+void JabberAccount::slotGroupChatPresence (const XMPP::Jid & jid, const XMPP::Status & status)
 {
 	kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Received groupchat presence for room " << jid.full () << endl;
 
@@ -1512,7 +1512,7 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T
 	case JabberClient::InvalidPasswordForMUC:
 		{
 			TQCString password;
- 			int result = KPasswordDialog::getPassword(password, i18n("A password is required to join the room %1.").tqarg(jid.node()));
+ 			int result = KPasswordDialog::getPassword(password, i18n("A password is required to join the room %1.").arg(jid.node()));
 			if (result == KPasswordDialog::Accepted)
 				m_jabberClient->joinGroupChat(jid.domain(), jid.node(), jid.resource(), password);
 		}
@@ -1521,7 +1521,7 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T
 	case JabberClient::NicknameConflict:
 		{
 			bool ok;
-			TQString nickname = KInputDialog::getText(i18n("Error trying to join %1 : nickname %2 is already in use").tqarg(jid.node(), jid.resource()),
+			TQString nickname = KInputDialog::getText(i18n("Error trying to join %1 : nickname %2 is already in use").arg(jid.node(), jid.resource()),
 									i18n("Give your nickname"),
 									TQString(),
 									&ok);
@@ -1535,14 +1535,14 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T
 	case JabberClient::BannedFromThisMUC:
 		KMessageBox::queuedMessageBox ( Kopete::UI::Global::mainWidget (),
 									KMessageBox::Error,
-									i18n ("You can't join the room %1 because you were banned").tqarg(jid.node()),
+									i18n ("You can't join the room %1 because you were banned").arg(jid.node()),
 									i18n ("Jabber Group Chat") );
 		break;
 
 	case JabberClient::MaxUsersReachedForThisMuc:
 		KMessageBox::queuedMessageBox ( Kopete::UI::Global::mainWidget (),
 									KMessageBox::Error,
-									i18n ("You can't join the room %1 because the maximum users has been reached").tqarg(jid.node()),
+									i18n ("You can't join the room %1 because the maximum users has been reached").arg(jid.node()),
 									i18n ("Jabber Group Chat") );
 		break;
 
@@ -1659,7 +1659,7 @@ void JabberAccount::slotIncomingVoiceCall( const Jid &jid )
 // 	if(sessionType == "http://www.google.com/session/phone")
 // 	{
 // 		TQString from = ((XMPP::Jid)session->peers().first()).full();
-// 		//KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, TQString("Received a voice session invitation from %1.").tqarg(from) );
+// 		//KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, TQString("Received a voice session invitation from %1.").arg(from) );
 // 		JingleVoiceSessionDialog *voiceDialog = new JingleVoiceSessionDialog( static_cast<JingleVoiceSession*>(session) );
 // 		voiceDialog->show();
 // 	}
@@ -1687,7 +1687,7 @@ bool JabberAccount::removeAccount( )
 		int result=KMessageBox::warningYesNoCancel( Kopete::UI::Global::mainWidget () ,
 				   i18n( "Do you want to also unregister \"%1\" from the Jabber server ?\n"
 				   			    "If you unregister, all your contact list may be removed on the server,"
-							    "And you will never be able to connect to this account with any client").tqarg( accountLabel() ),
+							    "And you will never be able to connect to this account with any client").arg( accountLabel() ),
 					i18n("Unregister"),
 					KGuiItem(i18n( "Remove and Unregister" ), "editdelete"),
 					KGuiItem(i18n( "Remove from kopete only"), "edittrash"),
@@ -1734,7 +1734,7 @@ void JabberAccount::slotUnregisterFinished( )
 	if ( task && ! task->success ())
 	{
 		KMessageBox::queuedMessageBox ( 0L, KMessageBox::Error,
-			i18n ("An error occured when trying to remove the account:\n%1").tqarg(task->statusString()),
+			i18n ("An error occured when trying to remove the account:\n%1").arg(task->statusString()),
 			i18n ("Jabber Account Unregistration"));
 		m_removing=false;
 		return;
diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h
index 17286a90..9ce7c9c4 100644
--- a/kopete/protocols/jabber/jabberaccount.h
+++ b/kopete/protocols/jabber/jabberaccount.h
@@ -147,7 +147,7 @@ public slots:
 	void disconnect ( Kopete::Account::DisconnectReason reason );
 
     /* Disconnect with a reason, and status */
-    void disconnect( Kopete::Account::DisconnectReason reason, XMPP::tqStatus &status );
+    void disconnect( Kopete::Account::DisconnectReason reason, XMPP::Status &status );
 	/* Reimplemented from Kopete::Account */
 	void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString());
 	
@@ -199,13 +199,13 @@ private:
 	void cleanup ();
 
 	/* Initial presence to set after connecting. */
-	XMPP::tqStatus m_initialPresence;
+	XMPP::Status m_initialPresence;
 
 	/**
 	 * Sets our own presence. Updates our resource in the
 	 * resource pool and sends a presence packet to the server.
 	 */
-	void setPresence ( const XMPP::tqStatus &status );
+	void setPresence ( const XMPP::Status &status );
 
 	/**
 	 * Returns if a connection attempt is currently in progress.
@@ -257,7 +257,7 @@ private slots:
 	void slotJoinNewChat ();
 	void slotGroupChatJoined ( const XMPP::Jid &jid );
 	void slotGroupChatLeft ( const XMPP::Jid &jid );
-	void slotGroupChatPresence ( const XMPP::Jid &jid, const XMPP::tqStatus &status );
+	void slotGroupChatPresence ( const XMPP::Jid &jid, const XMPP::Status &status );
 	void slotGroupChatError ( const XMPP::Jid &jid, int error, const TQString &reason );
 
 	/* Incoming subscription request. */
diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp
index 2ee8423e..5dac2e18 100644
--- a/kopete/protocols/jabber/jabberbasecontact.cpp
+++ b/kopete/protocols/jabber/jabberbasecontact.cpp
@@ -129,19 +129,19 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
 	switch ( item.subscription().type () )
 	{
 		case XMPP::Subscription::None:
-			setProperty ( protocol()->propSubscriptiontqStatus,
+			setProperty ( protocol()->propSubscriptionStatus,
 						  i18n ( "You cannot see each others' status." ) );
 			break;
 		case XMPP::Subscription::To:
-			setProperty ( protocol()->propSubscriptiontqStatus,
+			setProperty ( protocol()->propSubscriptionStatus,
 						  i18n ( "You can see this contact's status but they cannot see your status." ) );
 			break;
 		case XMPP::Subscription::From:
-			setProperty ( protocol()->propSubscriptiontqStatus,
+			setProperty ( protocol()->propSubscriptionStatus,
 						  i18n ( "This contact can see your status but you cannot see their status." ) );
 			break;
 		case XMPP::Subscription::Both:
-			setProperty ( protocol()->propSubscriptiontqStatus,
+			setProperty ( protocol()->propSubscriptionStatus,
 						  i18n ( "You can see each others' status." ) );
 			break;
 	}
@@ -217,7 +217,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
 	setDontSync ( false );
 	
 	//can't do it now because it's called from contructor at a point some virtual function are not available
-	TQTimer::singleShot(0, this, TQT_SLOT(reevaluatetqStatus()));
+	TQTimer::singleShot(0, this, TQT_SLOT(reevaluateStatus()));
 
 }
 
@@ -295,7 +295,7 @@ void JabberBaseContact::updateResourceList ()
 	setProperty ( protocol()->propAvailableResources, resourceListStr );
 }
 
-void JabberBaseContact::reevaluatetqStatus ()
+void JabberBaseContact::reevaluateStatus ()
 {
 	kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Determining new status for " << contactId () << endl;
 
@@ -390,7 +390,7 @@ void JabberBaseContact::serialize (TQMap < TQString, TQString > &serializedData,
 	// Contact id and display name are already set for us, only add the rest
 	serializedData["JID"] = mRosterItem.jid().full();
 
-	serializedData["groups"] = mRosterItem.groups ().join (TQString::tqfromLatin1 (","));
+	serializedData["groups"] = mRosterItem.groups ().join (TQString::fromLatin1 (","));
 }
 
 void JabberBaseContact::slotUserInfo( )
@@ -414,7 +414,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard )
 	// update vCard cache timestamp if this is not a temporary contact
 	if ( metaContact() && !metaContact()->isTemporary () )
 	{
-		setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::tqcurrentDateTime().toString ( Qt::ISODate ) );
+		setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( Qt::ISODate ) );
 	}
 
 	
diff --git a/kopete/protocols/jabber/jabberbasecontact.h b/kopete/protocols/jabber/jabberbasecontact.h
index c3453344..2dcc26b7 100644
--- a/kopete/protocols/jabber/jabberbasecontact.h
+++ b/kopete/protocols/jabber/jabberbasecontact.h
@@ -158,7 +158,7 @@ public slots:
 	 * whenever a resource is added, removed, or
 	 * changed in the resource pool.
 	 */
-	void reevaluatetqStatus ();
+	void reevaluateStatus ();
 
 protected:
 	/**
diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
index bb637870..1d5657e8 100644
--- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
+++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
@@ -24,7 +24,7 @@
 #include <tqtimer.h>
 #include <tqpair.h>
 #include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kstandarddirs.h>
 #include <kdebug.h>
@@ -240,7 +240,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::setFeatures(const TQStr
 	
 void JabberCapabilitiesManager::CapabilitiesInformation::updateLastSeen()
 {
-	m_lastSeen = TQDate::tqcurrentDate();
+	m_lastSeen = TQDate::currentDate();
 }
 
 TQDomElement JabberCapabilitiesManager::CapabilitiesInformation::toXml(TQDomDocument *doc) const
@@ -351,7 +351,7 @@ void JabberCapabilitiesManager::removeAccount(JabberAccount *account)
 	}
 }
 
-void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::tqStatus &status )
+void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::Status &status )
 {
 	if( !account->client() || !account->client()->rootTask() )
 		return;
@@ -400,7 +400,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const
 			{
 				if( !d->capabilitiesInformationMap[*newCapsIt].discovered() && d->capabilitiesInformationMap[*newCapsIt].pendingRequests() == 0 ) 
 				{
-					kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node + "#" + (*newCapsIt).extensions()) << endl;
+					kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").arg(TQString(jid.full()).replace('%',"%%")).arg(node + "#" + (*newCapsIt).extensions()) << endl;
 
 					d->capabilitiesInformationMap[*newCapsIt].setPendingRequests(1);
 					requestDiscoInfo(account, jid, node + "#" + (*newCapsIt).extensions());
@@ -410,7 +410,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const
 		else 
 		{
 			// Remove all caps specifications
-			kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node).tqarg(version) << endl;
+			kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").arg(TQString(jid.full()).replace('%',"%%")).arg(node).arg(version) << endl;
 
 			d->jidCapabilitiesMap.remove( jid.full() );
 		}
@@ -448,7 +448,7 @@ void JabberCapabilitiesManager::discoRequestFinished()
 
 	DiscoItem item = discoInfo->item();
 	Jid jid = discoInfo->jid();
-	kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(discoInfo->node()).tqarg(discoInfo->success()) << endl;
+	kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").arg(TQString(jid.full()).replace('%',"%%")).arg(discoInfo->node()).arg(discoInfo->success()) << endl;
 
 	TQStringList tokens = TQStringList::split("#",discoInfo->node());
 
@@ -486,7 +486,7 @@ void JabberCapabilitiesManager::discoRequestFinished()
 			TQPair<Jid,JabberAccount*> jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->parent());
 			if( jidAccountPair.second ) 
 			{
-				kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl;
+				kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").arg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl;
 				requestDiscoInfo( jidAccountPair.second, jidAccountPair.first, discoInfo->node() );
 			}
 			else 
@@ -497,7 +497,7 @@ void JabberCapabilitiesManager::discoRequestFinished()
 		}
 	}
 	else 
-		kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Current client node '%1' does not match response '%2'").tqarg(jidCapabilities.node()).tqarg(node) << endl;
+		kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Current client node '%1' does not match response '%2'").arg(jidCapabilities.node()).arg(node) << endl;
 
 	//for (unsigned int i = 0; i < item.features().list().count(); i++) 
 	//	printf("    Feature: %s\n",item.features().list()[i].latin1());
diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.h b/kopete/protocols/jabber/jabbercapabilitiesmanager.h
index f314d760..8e2a95a6 100644
--- a/kopete/protocols/jabber/jabbercapabilitiesmanager.h
+++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.h
@@ -81,12 +81,12 @@ public slots:
 	/**
 	 * Update if necessary the capabities for the JID passed in args.
 	 * Caps are received in Presence messages so that's why we are
-	 * passing a XMPP::tqStatus object.
+	 * passing a XMPP::Status object.
 	 *
 	 * @param jid JID that capabilities was updated.
-	 * @param status The XMPP::tqStatus that contain the caps.
+	 * @param status The XMPP::Status that contain the caps.
 	 */
-	void updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::tqStatus &status);
+	void updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::Status &status);
 
 private slots:
 	/**
diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp
index d10f4201..c18c9071 100644
--- a/kopete/protocols/jabber/jabberchatsession.cpp
+++ b/kopete/protocols/jabber/jabberchatsession.cpp
@@ -118,7 +118,7 @@ void JabberChatSession::slotUpdateDisplayName ()
 		jid.setResource ( mResource );
 
 	TQString statusText = i18n("a contact's online status in parenthesis.", " (%1)")
-							.tqarg( chatMembers.first()->onlinetqStatus().description() );
+							.arg( chatMembers.first()->onlineStatus().description() );
 	if ( jid.resource().isEmpty () )
 		setDisplayName ( chatMembers.first()->metaContact()->displayName () + statusText );
 	else
diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp
index cf37ffd8..fddd588f 100644
--- a/kopete/protocols/jabber/jabberclient.cpp
+++ b/kopete/protocols/jabber/jabberclient.cpp
@@ -724,8 +724,8 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt
 				   this, TQT_SLOT ( slotGroupChatJoined (const Jid &) ) );
 		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatLeft (const Jid &) ),
 				   this, TQT_SLOT ( slotGroupChatLeft (const Jid &) ) );
-		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatPresence (const Jid &, const tqStatus &) ),
-				   this, TQT_SLOT ( slotGroupChatPresence (const Jid &, const tqStatus &) ) );
+		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatPresence (const Jid &, const Status &) ),
+				   this, TQT_SLOT ( slotGroupChatPresence (const Jid &, const Status &) ) );
 		TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatError (const Jid &, int, const TQString &) ),
 				   this, TQT_SLOT ( slotGroupChatError (const Jid &, int, const TQString &) ) );
 		//TQObject::connect ( d->jabberClient, TQT_SIGNAL (debugText (const TQString &) ),
@@ -769,7 +769,7 @@ void JabberClient::disconnect ()
 
 }
 
-void JabberClient::disconnect( XMPP::tqStatus &reason )
+void JabberClient::disconnect( XMPP::Status &reason )
 {
     if ( d->jabberClient )
     {
@@ -823,12 +823,12 @@ void JabberClient::leaveGroupChat ( const TQString &host, const TQString &room )
 
 }
 
-void JabberClient::setGroupChattqStatus( const TQString & host, const TQString & room, const XMPP::tqStatus & status )
+void JabberClient::setGroupChatStatus( const TQString & host, const TQString & room, const XMPP::Status & status )
 {
-	client()->groupChatSettqStatus( host, room, status);
+	client()->groupChatSetStatus( host, room, status);
 }
 
-void JabberClient::changeGroupChatNick( const TQString & host, const TQString & room, const TQString & nick, const XMPP::tqStatus & status )
+void JabberClient::changeGroupChatNick( const TQString & host, const TQString & room, const TQString & nick, const XMPP::Status & status )
 {
 	client()->groupChatChangeNick( host, room, nick, status );
 }
@@ -1112,7 +1112,7 @@ void JabberClient::slotGroupChatLeft ( const Jid &jid )
 
 }
 
-void JabberClient::slotGroupChatPresence ( const Jid &jid, const tqStatus &status)
+void JabberClient::slotGroupChatPresence ( const Jid &jid, const Status &status)
 {
 
 	emit groupChatPresence ( jid, status );
diff --git a/kopete/protocols/jabber/jabberclient.h b/kopete/protocols/jabber/jabberclient.h
index 05324824..7ba389f9 100644
--- a/kopete/protocols/jabber/jabberclient.h
+++ b/kopete/protocols/jabber/jabberclient.h
@@ -96,7 +96,7 @@ public:
 	 * Disconnect from Jabber server with reason
 	 * @param reason The reason for disconnecting
 	 */
-	void disconnect (XMPP::tqStatus &reason);
+	void disconnect (XMPP::Status &reason);
 
 	/**
 	 * Returns if this instance is connected to a server.
@@ -379,11 +379,11 @@ public:
 	/**
 	 * change the status of a group chat
 	 */
-	void setGroupChattqStatus(const TQString &host, const TQString &room, const XMPP::tqStatus &);
+	void setGroupChatStatus(const TQString &host, const TQString &room, const XMPP::Status &);
 	/**
 	 * change the nick in a group chat
 	 */
-	void changeGroupChatNick(const TQString &host, const TQString &room, const TQString &nick, const XMPP::tqStatus &status =XMPP::tqStatus());
+	void changeGroupChatNick(const TQString &host, const TQString &room, const TQString &nick, const XMPP::Status &status =XMPP::Status());
 
 	/**
 	 * Send a message.
@@ -492,7 +492,7 @@ signals:
 	/**
 	 * A presence to a group chat has been signalled.
 	 */
-	void groupChatPresence ( const XMPP::Jid &jid, const XMPP::tqStatus &status );
+	void groupChatPresence ( const XMPP::Jid &jid, const XMPP::Status &status );
 
 	/**
 	 * An error was encountered joining or processing a group chat.
@@ -590,7 +590,7 @@ private slots:
 	/* Slots for handling group chats. */
 	void slotGroupChatJoined (const Jid & jid);
 	void slotGroupChatLeft (const Jid & jid);
-	void slotGroupChatPresence (const Jid & jid, const tqStatus & status);
+	void slotGroupChatPresence (const Jid & jid, const Status & status);
 	void slotGroupChatError (const Jid & jid, int error, const TQString & reason);
 
 	/* Incoming subscription request. */
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index c6147ae1..5fa3dad7 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -23,7 +23,7 @@
 
 #include <tqtimer.h>
 #include <tqdatetime.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqimage.h>
 #include <tqregexp.h>
 #include <tqbuffer.h>
@@ -107,7 +107,7 @@ JabberContact::JabberContact (const XMPP::RosterItem &rosterItem, Kopete::Accoun
 		 * Trigger update once if we're already connected for contacts
 		 * that are being added while we are online.
 		 */
-		if ( account()->myself()->onlinetqStatus().isDefinitelyOnline() )
+		if ( account()->myself()->onlineStatus().isDefinitelyOnline() )
 		{
 			slotGetTimedVCard ();
 		}
@@ -170,7 +170,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions ()
 
 	// if the contact is online, display the resources we have for it,
 	// otherwise disable the menu
-	if (onlinetqStatus ().status () == Kopete::OnlineStatus::Offline)
+	if (onlineStatus ().status () == Kopete::OnlineStatus::Offline)
 	{
 		actionSelectResource->setEnabled ( false );
 	}
@@ -263,11 +263,11 @@ void JabberContact::handleIncomingMessage (const XMPP::Message & message)
 		{
 			TQString room=message.invite();
 			TQString originalBody=message.body().isEmpty() ? TQString() :
-					i18n( "The original message is : <i>\" %1 \"</i><br>" ).tqarg(TQStyleSheet::escape(message.body()));
+					i18n( "The original message is : <i>\" %1 \"</i><br>" ).arg(TQStyleSheet::escape(message.body()));
 			TQString mes=i18n("<qt><i>%1</i> invited you to join the conference <b>%2</b><br>%3<br>"
 					"If you want to accept and join, just <b>enter your nickname</b> and press ok<br>"
 							 "If you want to decline, press cancel</qt>")
-					.tqarg(message.from().full(), room , originalBody);
+					.arg(message.from().full(), room , originalBody);
 			
 			bool ok=false;
 			TQString futureNewNickName = KInputDialog::getText( i18n( "Invited to a conference - Jabber Plugin" ),
@@ -299,7 +299,7 @@ void JabberContact::handleIncomingMessage (const XMPP::Message & message)
 				if(mManager->view( Kopete::Contact::CannotCreate ))
 				{   //show an internal message if the user has not already closed his window
 					Kopete::Message m=Kopete::Message ( this, mManager->members(),
-						i18n("%1 has ended their participation in the chat session.").tqarg(metaContact()->displayName()),
+						i18n("%1 has ended their participation in the chat session.").arg(metaContact()->displayName()),
 						Kopete::Message::Internal  );
 					m.setImportance(Kopete::Message::Low);
 					mManager->view()->appendMessage ( m ); //use KopeteView::AppendMessage to bypass notifications
@@ -415,7 +415,7 @@ void JabberContact::slotCheckVCard ()
 	Kopete::ContactProperty cacheDateString = property ( protocol()->propVCardCacheTimeStamp );
 
 	// don't do anything while we are offline
-	if ( !account()->myself()->onlinetqStatus().isDefinitelyOnline () )
+	if ( !account()->myself()->onlineStatus().isDefinitelyOnline () )
 	{
 		return;
 	}
@@ -440,13 +440,13 @@ void JabberContact::slotCheckVCard ()
 
 	// avoid warning if key does not exist in configuration file
 	if ( cacheDateString.isNull () )
-		cacheDate = TQDateTime::tqcurrentDateTime().addDays ( -2 );
+		cacheDate = TQDateTime::currentDateTime().addDays ( -2 );
 	else
 		cacheDate = TQDateTime::fromString ( cacheDateString.value().toString (), Qt::ISODate );
 
 	kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Cached vCard data for " << contactId () << " from " << cacheDate.toString () << endl;
 
-	if ( !mVCardUpdateInProgress && ( cacheDate.addDays ( 1 ) < TQDateTime::tqcurrentDateTime () ) )
+	if ( !mVCardUpdateInProgress && ( cacheDate.addDays ( 1 ) < TQDateTime::currentDateTime () ) )
 	{
 		kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Scheduling update." << endl;
 
@@ -463,7 +463,7 @@ void JabberContact::slotGetTimedVCard ()
 	mVCardUpdateInProgress = false;
 
 	// check if we are still connected - eventually we lost our connection in the meantime
-	if ( !account()->myself()->onlinetqStatus().isDefinitelyOnline () )
+	if ( !account()->myself()->onlineStatus().isDefinitelyOnline () )
 	{
 		// we are not connected, discard this update
 		return;
@@ -506,7 +506,7 @@ void JabberContact::slotGotVCard ()
 	// update timestamp of last vCard retrieval
 	if ( metaContact() && !metaContact()->isTemporary () )
 	{
-		setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::tqcurrentDateTime().toString ( Qt::ISODate ) );
+		setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( Qt::ISODate ) );
 	}
 
 	mVCardUpdateInProgress = false;
@@ -527,7 +527,7 @@ void JabberContact::slotGotVCard ()
 
 }
 
-void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &newtqStatus, const Kopete::OnlineStatus &oldtqStatus )
+void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &newStatus, const Kopete::OnlineStatus &oldStatus )
 {
 
 	/*
@@ -541,13 +541,13 @@ void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::Onl
 	 * to query its activity after we are already connected.
 	 */
 
-	if ( onlinetqStatus().isDefinitelyOnline () )
+	if ( onlineStatus().isDefinitelyOnline () )
 	{
 		// Kopete already deals with lastSeen if the contact is online
 		return;
 	}
 	
-	if ( ( oldtqStatus.status () == Kopete::OnlineStatus::Connecting ) && newtqStatus.isDefinitelyOnline () )
+	if ( ( oldStatus.status () == Kopete::OnlineStatus::Connecting ) && newStatus.isDefinitelyOnline () )
 	{
 		kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Scheduling request for last activity for " << mRosterItem.jid().bare () << endl;
 
@@ -567,13 +567,13 @@ void JabberContact::slotGetTimedLastActivity ()
 	 * maintained by Kopete)
 	 */
 
-	if ( onlinetqStatus().isDefinitelyOnline () )
+	if ( onlineStatus().isDefinitelyOnline () )
 	{
 		// Kopete already deals with setting lastSeen if the contact is online
 		return;
 	}
 
-	if ( account()->myself()->onlinetqStatus().isDefinitelyOnline () )
+	if ( account()->myself()->onlineStatus().isDefinitelyOnline () )
 	{
 		kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Requesting last activity from timer for " << mRosterItem.jid().bare () << endl;
 
@@ -591,7 +591,7 @@ void JabberContact::slotGotLastActivity ()
 
 	if ( task->success () )
 	{
-		setProperty ( protocol()->propLastSeen, TQDateTime(TQDateTime::tqcurrentDateTime().addSecs ( -task->seconds () )));
+		setProperty ( protocol()->propLastSeen, TQDateTime(TQDateTime::currentDateTime().addSecs ( -task->seconds () )));
 		if( !task->message().isEmpty() )
 		{
 			setProperty( protocol()->propAwayMessage, task->message() );
@@ -1110,7 +1110,7 @@ void JabberContact::slotSelectResource ()
 
 }
 
-void JabberContact::sendPresence ( const XMPP::tqStatus status )
+void JabberContact::sendPresence ( const XMPP::Status status )
 {
 
 	if ( !account()->isConnected () )
@@ -1119,15 +1119,15 @@ void JabberContact::sendPresence ( const XMPP::tqStatus status )
 		return;
 	}
 
-	XMPP::tqStatus newtqStatus = status;
+	XMPP::Status newStatus = status;
 
 	// honour our priority
-	if(newtqStatus.isAvailable())
-		newtqStatus.setPriority ( account()->configGroup()->readNumEntry ( "Priority", 5 ) );
+	if(newStatus.isAvailable())
+		newStatus.setPriority ( account()->configGroup()->readNumEntry ( "Priority", 5 ) );
 
 	XMPP::JT_Presence * task = new XMPP::JT_Presence ( account()->client()->rootTask () );
 
-	task->pres ( bestAddress (), newtqStatus);
+	task->pres ( bestAddress (), newStatus);
 	task->go ( true );
 
 }
@@ -1136,7 +1136,7 @@ void JabberContact::sendPresence ( const XMPP::tqStatus status )
 void JabberContact::slotStatusOnline ()
 {
 
-	XMPP::tqStatus status;
+	XMPP::Status status;
 	status.setShow("");
 
 	sendPresence ( status );
@@ -1146,7 +1146,7 @@ void JabberContact::slotStatusOnline ()
 void JabberContact::slotStatusChatty ()
 {
 
-	XMPP::tqStatus status;
+	XMPP::Status status;
 	status.setShow ("chat");
 
 	sendPresence ( status );
@@ -1156,7 +1156,7 @@ void JabberContact::slotStatusChatty ()
 void JabberContact::slotStatusAway ()
 {
 
-	XMPP::tqStatus status;
+	XMPP::Status status;
 	status.setShow ("away");
 
 	sendPresence ( status );
@@ -1166,7 +1166,7 @@ void JabberContact::slotStatusAway ()
 void JabberContact::slotStatusXA ()
 {
 
-	XMPP::tqStatus status;
+	XMPP::Status status;
 	status.setShow ("xa");
 
 	sendPresence ( status );
@@ -1176,7 +1176,7 @@ void JabberContact::slotStatusXA ()
 void JabberContact::slotStatusDND ()
 {
 
-	XMPP::tqStatus status;
+	XMPP::Status status;
 	status.setShow ("dnd");
 
 	sendPresence ( status );
@@ -1187,7 +1187,7 @@ void JabberContact::slotStatusDND ()
 void JabberContact::slotStatusInvisible ()
 {
 
-	XMPP::tqStatus status;
+	XMPP::Status status;
 	status.setIsAvailable( false );
 
 	sendPresence ( status );
@@ -1299,7 +1299,7 @@ void JabberContact::slotDiscoFinished( )
 		XMPP::RosterItem ri = rosterItem();
 		Kopete::MetaContact *mc=metaContact();
 		JabberAccount *parentAccount=account();
-		Kopete::OnlineStatus status=onlinetqStatus();
+		Kopete::OnlineStatus status=onlineStatus();
 		
 		kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << ri.jid().full() << " is not a contact but a gateway   - " << this << endl;
 		
diff --git a/kopete/protocols/jabber/jabbercontact.h b/kopete/protocols/jabber/jabbercontact.h
index ce40be30..15b5096e 100644
--- a/kopete/protocols/jabber/jabbercontact.h
+++ b/kopete/protocols/jabber/jabbercontact.h
@@ -228,7 +228,7 @@ private:
 	/**
 	 * Sends a presence packet to this contact
 	 */
-	void sendPresence ( const XMPP::tqStatus status );
+	void sendPresence ( const XMPP::Status status );
 
 	/**
 	 * This variable keeps a list of message managers.
diff --git a/kopete/protocols/jabber/jabberformtranslator.cpp b/kopete/protocols/jabber/jabberformtranslator.cpp
index de789f44..3344f802 100644
--- a/kopete/protocols/jabber/jabberformtranslator.cpp
+++ b/kopete/protocols/jabber/jabberformtranslator.cpp
@@ -31,12 +31,12 @@ JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget *
 
 	emptyForm = privForm;
 
-	/* Add instructions to tqlayout. */
+	/* Add instructions to layout. */
 	TQVBoxLayout *innerLayout = new TQVBoxLayout (this, 0, 4);
 
 	TQLabel *label = new TQLabel (form.instructions (), this, "InstructionLabel");
-	label->tqsetAlignment (int (TQLabel::WordBreak | TQLabel::AlignVCenter));
-	label->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Fixed, true);
+	label->setAlignment (int (TQLabel::WordBreak | TQLabel::AlignVCenter));
+	label->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Fixed, true);
 	label->show ();
 
 	innerLayout->addWidget (label, 0);
diff --git a/kopete/protocols/jabber/jabberformtranslator.h b/kopete/protocols/jabber/jabberformtranslator.h
index 2ee316d6..41d12279 100644
--- a/kopete/protocols/jabber/jabberformtranslator.h
+++ b/kopete/protocols/jabber/jabberformtranslator.h
@@ -19,7 +19,7 @@
 #define JABBERFORMTRANSLATOR_H
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "xmpp_tasks.h"
 
diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp
index f536a1c9..e098fdad 100644
--- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp
+++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp
@@ -145,7 +145,7 @@ void JabberGroupChatManager::inviteContact( const TQString & contactId )
 		jabberMessage.setFrom ( account()->client()->jid() );
 		jabberMessage.setTo ( contactId );
 		jabberMessage.setInvite( mRoomJid.userHost() );
-		jabberMessage.setBody( i18n("You have been invited to %1").tqarg( mRoomJid.userHost() ) );
+		jabberMessage.setBody( i18n("You have been invited to %1").arg( mRoomJid.userHost() ) );
 
 		// send the message
 		account()->client()->sendMessage ( jabberMessage );
diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp
index 7ddf4041..1fa6d884 100644
--- a/kopete/protocols/jabber/jabbergroupcontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupcontact.cpp
@@ -345,8 +345,8 @@ void JabberGroupContact::slotStatusChanged( )
 	}
 	
 	//TODO: away message
-	XMPP::tqStatus newtqStatus = account()->protocol()->kosTotqStatus( account()->myself()->onlinetqStatus() );
-	account()->client()->setGroupChattqStatus( rosterItem().jid().host() , rosterItem().jid().user() , newtqStatus );
+	XMPP::Status newStatus = account()->protocol()->kosToStatus( account()->myself()->onlineStatus() );
+	account()->client()->setGroupChatStatus( rosterItem().jid().host() , rosterItem().jid().user() , newStatus );
 }
 
 void JabberGroupContact::slotChangeNick( )
@@ -354,14 +354,14 @@ void JabberGroupContact::slotChangeNick( )
 	
 	bool ok;
 	TQString futureNewNickName = KInputDialog::getText( i18n( "Change nickanme - Jabber Plugin" ),
-			i18n( "Please enter the new nick name you want to have on the room <i>%1</i>" ).tqarg(rosterItem().jid().userHost()),
+			i18n( "Please enter the new nick name you want to have on the room <i>%1</i>" ).arg(rosterItem().jid().userHost()),
 			mNick, &ok );
 	if ( !ok || !account()->isConnected())
 		return;
 	
 	mNick=futureNewNickName;
 	
-	XMPP::tqStatus status = account()->protocol()->kosTotqStatus( account()->myself()->onlinetqStatus() );
+	XMPP::Status status = account()->protocol()->kosToStatus( account()->myself()->onlineStatus() );
 	account()->client()->changeGroupChatNick( rosterItem().jid().host() , rosterItem().jid().user()  , mNick , status);
 
 }
diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp
index 0b73f38b..a7cf3a78 100644
--- a/kopete/protocols/jabber/jabberprotocol.cpp
+++ b/kopete/protocols/jabber/jabberprotocol.cpp
@@ -90,8 +90,8 @@ JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStr
 	propWorkPhone(Kopete::Global::Properties::self()->workPhone()),
 	propWorkMobilePhone(Kopete::Global::Properties::self()->workMobilePhone()),
 	propNickName(Kopete::Global::Properties::self()->nickName()),
-	propSubscriptiontqStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString(), true, false),
-	propAuthorizationtqStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), TQString(), true, false),
+	propSubscriptionStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString(), true, false),
+	propAuthorizationStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), TQString(), true, false),
 	propAvailableResources("jabberAvailableResources", i18n ("Available Resources"), "jabber_chatty", false, true),
 	propVCardCacheTimeStamp("jabberVCardCacheTimeStamp", i18n ("vCard Cache Timestamp"), TQString(), true, false, true),
 	propPhoto(Kopete::Global::Properties::self()->photo()),
@@ -304,42 +304,42 @@ Kopete::Contact *JabberProtocol::deserializeContact (Kopete::MetaContact * metaC
 	return account->contacts()[contactId];
 }
 
-XMPP::tqStatus JabberProtocol::kosTotqStatus( const Kopete::OnlineStatus & status , const TQString & message )
+XMPP::Status JabberProtocol::kosToStatus( const Kopete::OnlineStatus & status , const TQString & message )
 {
-	XMPP::tqStatus xmpptqStatus ( "", message );
+	XMPP::Status xmppStatus ( "", message );
 
 	if( status.status() == Kopete::OnlineStatus::Offline )
 	{
-		xmpptqStatus.setIsAvailable( false );
+		xmppStatus.setIsAvailable( false );
 	}
 
 	switch ( status.internalStatus () )
 	{
 		case JabberProtocol::JabberFreeForChat:
-			xmpptqStatus.setShow ( "chat" );
+			xmppStatus.setShow ( "chat" );
 			break;
 
 		case JabberProtocol::JabberOnline:
-			xmpptqStatus.setShow ( "" );
+			xmppStatus.setShow ( "" );
 			break;
 
 		case JabberProtocol::JabberAway:
-			xmpptqStatus.setShow ( "away" );
+			xmppStatus.setShow ( "away" );
 			break;
 
 		case JabberProtocol::JabberXA:
-			xmpptqStatus.setShow ( "xa" );
+			xmppStatus.setShow ( "xa" );
 			break;
 
 		case JabberProtocol::JabberDND:
-			xmpptqStatus.setShow ( "dnd" );
+			xmppStatus.setShow ( "dnd" );
 			break;
 
 		case JabberProtocol::JabberInvisible:
-			xmpptqStatus.setIsInvisible ( true );
+			xmppStatus.setIsInvisible ( true );
 			break;
 	}
-	return xmpptqStatus;
+	return xmppStatus;
 }
 
 #include "jabberprotocol.moc"
diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h
index 0e79c357..6e647f74 100644
--- a/kopete/protocols/jabber/jabberprotocol.h
+++ b/kopete/protocols/jabber/jabberprotocol.h
@@ -39,11 +39,11 @@
 namespace XMPP
 {
 	class Resource;
-	class tqStatus;
+	class Status;
 }
 
 class JabberContact;
-class dlgJabbertqStatus;
+class dlgJabberStatus;
 class dlgJabberSendRaw;
 class JabberCapabilitiesManager;
 
@@ -95,8 +95,8 @@ public:
 	const Kopete::ContactPropertyTmpl propWorkPhone;
 	const Kopete::ContactPropertyTmpl propWorkMobilePhone;
 	const Kopete::ContactPropertyTmpl propNickName;
-	const Kopete::ContactPropertyTmpl propSubscriptiontqStatus;
-	const Kopete::ContactPropertyTmpl propAuthorizationtqStatus;
+	const Kopete::ContactPropertyTmpl propSubscriptionStatus;
+	const Kopete::ContactPropertyTmpl propAuthorizationStatus;
 	const Kopete::ContactPropertyTmpl propAvailableResources;
 	const Kopete::ContactPropertyTmpl propVCardCacheTimeStamp;
 	const Kopete::ContactPropertyTmpl propPhoto;
@@ -141,9 +141,9 @@ public:
 	Kopete::OnlineStatus resourceToKOS ( const XMPP::Resource &resource );
 	
 	/**
-	 * Convert an online status to a  XMPP::tqStatus
+	 * Convert an online status to a  XMPP::Status
 	 */
-	XMPP::tqStatus kosTotqStatus( const Kopete::OnlineStatus & status, const TQString& message=TQString() );
+	XMPP::Status kosToStatus( const Kopete::OnlineStatus & status, const TQString& message=TQString() );
 
 	/**
 	 * Return the Entity Capabilities(JEP-0115) manager instance.
diff --git a/kopete/protocols/jabber/jabberresourcepool.cpp b/kopete/protocols/jabber/jabberresourcepool.cpp
index cddffd64..19492790 100644
--- a/kopete/protocols/jabber/jabberresourcepool.cpp
+++ b/kopete/protocols/jabber/jabberresourcepool.cpp
@@ -95,7 +95,7 @@ void JabberResourcePool::notifyRelevantContacts ( const XMPP::Jid &jid )
 
 	for(JabberBaseContact *mContact = list.first (); mContact; mContact = list.next ())
 	{
-		mContact->reevaluatetqStatus ();
+		mContact->reevaluateStatus ();
 	}
 }
 
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index 218c9aae..26d16b28 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -123,11 +123,11 @@ JabberTransport::~JabberTransport ()
 
 KActionMenu *JabberTransport::actionMenu ()
 {
-	KActionMenu *menu = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ),  this );
+	KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ),  this );
 	TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString();
 
-	menu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ),
-	nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick )
+	menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ),
+	nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick )
 								  );
 	
 	TQPtrList<KAction> *customActions = myself()->customContextMenuActions(  );
@@ -203,44 +203,44 @@ void JabberTransport::setOnlineStatus( const Kopete::OnlineStatus& status  , con
 		return;
 	}
 
-	XMPP::tqStatus xmpptqStatus ( "", reason );
+	XMPP::Status xmppStatus ( "", reason );
 
 	switch ( status.internalStatus () )
 	{
 		case JabberProtocol::JabberFreeForChat:
-			xmpptqStatus.setShow ( "chat" );
+			xmppStatus.setShow ( "chat" );
 			break;
 
 		case JabberProtocol::JabberOnline:
-			xmpptqStatus.setShow ( "" );
+			xmppStatus.setShow ( "" );
 			break;
 
 		case JabberProtocol::JabberAway:
-			xmpptqStatus.setShow ( "away" );
+			xmppStatus.setShow ( "away" );
 			break;
 
 		case JabberProtocol::JabberXA:
-			xmpptqStatus.setShow ( "xa" );
+			xmppStatus.setShow ( "xa" );
 			break;
 
 		case JabberProtocol::JabberDND:
-			xmpptqStatus.setShow ( "dnd" );
+			xmppStatus.setShow ( "dnd" );
 			break;
 
 		case JabberProtocol::JabberInvisible:
-			xmpptqStatus.setIsInvisible ( true );
+			xmppStatus.setIsInvisible ( true );
 			break;
 	}
 
 	if ( !isConnected () )
 	{
 		// we are not connected yet, so connect now
-		m_initialPresence = xmpptqStatus;
+		m_initialPresence = xmppStatus;
 		connect ();
 	}
 	else
 	{
-		setPresence ( xmpptqStatus );
+		setPresence ( xmppStatus );
 	}
 #endif
 }
@@ -277,7 +277,7 @@ void JabberTransport::removeAllContacts( )
 
 /*	if ( ! task->success ())
 	KMessageBox::queuedMessageBox ( 0L, KMessageBox::Error,
-									i18n ("An error occured when trying to remove the transport:\n%1").tqarg(task->statusString()),
+									i18n ("An error occured when trying to remove the transport:\n%1").arg(task->statusString()),
 									i18n ("Jabber Service Unregistration"));
 	*/ //we don't really care, we remove everithing anyway.
 
@@ -328,7 +328,7 @@ void JabberTransport::eatContacts( )
 		{
 			XMPP::RosterItem item=contact->rosterItem();
 			Kopete::MetaContact *mc=contact->metaContact();
-			Kopete::OnlineStatus status = contact->onlinetqStatus();
+			Kopete::OnlineStatus status = contact->onlineStatus();
 			kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << item.jid().full() << " will be soon eat  - " << contact << endl;
 			delete contact;
 			Kopete::Contact *c2=account()->contactPool()->addContact( item , mc , false ); //not sure this is false;
diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h
index f0a2ab81..2cfcd4c1 100644
--- a/kopete/protocols/jabber/jabbertransport.h
+++ b/kopete/protocols/jabber/jabbertransport.h
@@ -80,8 +80,8 @@ public:
 	virtual bool removeAccount();
 	
 
-	enum TransporttqStatus { Normal , Creating, Removing , AccountRemoved };
-	TransporttqStatus transporttqStatus() { return m_status; };
+	enum TransportStatus { Normal , Creating, Removing , AccountRemoved };
+	TransportStatus transportStatus() { return m_status; };
 	
 	/**
 	 * return the legacyId conrresponding to the jid
@@ -132,7 +132,7 @@ protected:
 
 private:
 	JabberAccount *m_account;
-	TransporttqStatus m_status;
+	TransportStatus m_status;
 
 };
 
diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
index 4208e0d8..f6911a3b 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
@@ -114,7 +114,7 @@ void JingleClientSlots::callDestroyed(cricket::Call *call)
 	qDebug("JingleClientSlots: Call destroyed");
 	Jid jid(call->sessions()[0]->remote_address().c_str());
 	if (voiceCaller_->calling(jid)) {
-		qDebug(TQString("Removing unterminated call to %1").tqarg(jid.full()));
+		qDebug(TQString("Removing unterminated call to %1").arg(jid.full()));
 		voiceCaller_->removeCall(jid);
 		emit voiceCaller_->terminated(jid);
 	}
@@ -138,7 +138,7 @@ void JingleClientSlots::requestSignaling()
 
 void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *session, cricket::Session::State state) 
 {
-	qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").tqarg(state));
+	qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").arg(state));
 	// Why is c_str() stuff needed to make it compile on OS X ?
 	Jid jid(session->remote_address().c_str());
 
@@ -156,7 +156,7 @@ void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *sess
 	}
 	else if (state == cricket::Session::STATE_SENTMODIFY) { }
 	else if (state == cricket::Session::STATE_RECEIVEDMODIFY) {
-		qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full()));
+		qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full()));
 	}
 	else if (state == cricket::Session::STATE_SENTREJECT) { }
 	else if (state == cricket::Session::STATE_RECEIVEDREJECT) {
@@ -195,7 +195,7 @@ void JingleVoiceCaller::initialize()
 		return;
 
 	TQString jid = ((ClientStream&) account()->client()->client()->stream()).jid().full();
-	qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").tqarg(jid));
+	qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").arg(jid));
 	if (jid.isEmpty()) {
 		qWarning("jinglevoicecaller.cpp: Empty JID");
 		return;
@@ -271,7 +271,7 @@ bool JingleVoiceCaller::calling(const Jid& jid)
 
 void JingleVoiceCaller::call(const Jid& jid)
 {
-	qDebug(TQString("jinglevoicecaller.cpp: Calling %1").tqarg(jid.full()));
+	qDebug(TQString("jinglevoicecaller.cpp: Calling %1").arg(jid.full()));
 	cricket::Call *c = ((cricket::PhoneSessionClient*)(phone_client_))->CreateCall();
 	c->InitiateSession(buzz::Jid(jid.full().ascii()));
 	phone_client_->SetFocus(c);
@@ -299,7 +299,7 @@ void JingleVoiceCaller::reject(const Jid& j)
 
 void JingleVoiceCaller::terminate(const Jid& j)
 {
-	qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").tqarg(j.full()));
+	qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").arg(j.full()));
 	cricket::Call* call = calls_[j.full()];
 	if (call != NULL) {
 		call->Terminate();
@@ -327,7 +327,7 @@ void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call)
 
 void JingleVoiceCaller::removeCall(const Jid& j)
 {
-	qDebug(TQString("JingleVoiceCaller: Removing call to %1").tqarg(j.full()));
+	qDebug(TQString("JingleVoiceCaller: Removing call to %1").arg(j.full()));
 	calls_.remove(j.full());
 }
 
@@ -363,7 +363,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza)
 	
 	// Spread the word
 	if (ok) {
-		qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").tqarg(stanza));
+		qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").arg(stanza));
 		buzz::XmlElement *e = buzz::XmlElement::ForStr(stanza.ascii());
 		phone_client_->OnIncomingStanza(e);
 	}
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
index c5bc775d..daa0d7c0 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
@@ -115,7 +115,7 @@ public:
 		{}
 		else if (state == cricket::Session::STATE_RECEIVEDMODIFY) 
 		{
-			//qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full()));
+			//qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full()));
 		}
 		else if (state == cricket::Session::STATE_SENTREJECT) 
 		{}
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
index a389730b..86fc606f 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
@@ -44,7 +44,7 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall
  : JingleVoiceSessionDialogBase(parent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming)
 {
 	TQString contactJid = m_peerJid.full();
-	setCaption( i18n("Voice session with %1").tqarg(contactJid) );
+	setCaption( i18n("Voice session with %1").arg(contactJid) );
 
 	connect(buttonAccept, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAcceptClicked()));
 	connect(buttonDecline, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeclineClicked()));
@@ -69,7 +69,7 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall
 		setContactInformation( peerContact );
 	}
 	
-	labelSessiontqStatus->setText( i18n("Incoming Session...") );
+	labelSessionStatus->setText( i18n("Incoming Session...") );
 	buttonAccept->setEnabled(true);
 	buttonDecline->setEnabled(true);
 }
@@ -95,7 +95,7 @@ void JingleVoiceSessionDialog::setContactInformation(JabberContact *contact)
 
 void JingleVoiceSessionDialog::start()
 {
-	labelSessiontqStatus->setText( i18n("Waiting for other peer...") );
+	labelSessionStatus->setText( i18n("Waiting for other peer...") );
 	buttonAccept->setEnabled(false);
 	buttonDecline->setEnabled(false);
 	buttonTerminate->setEnabled(true);
@@ -106,7 +106,7 @@ void JingleVoiceSessionDialog::start()
 
 void JingleVoiceSessionDialog::slotAcceptClicked()
 {
-	labelSessiontqStatus->setText( i18n("Session accepted.") );
+	labelSessionStatus->setText( i18n("Session accepted.") );
 	buttonAccept->setEnabled(false);
 	buttonDecline->setEnabled(false);
 	buttonTerminate->setEnabled(true);
@@ -118,7 +118,7 @@ void JingleVoiceSessionDialog::slotAcceptClicked()
 
 void JingleVoiceSessionDialog::slotDeclineClicked()
 {
-	labelSessiontqStatus->setText( i18n("Session declined.") );
+	labelSessionStatus->setText( i18n("Session declined.") );
 	buttonAccept->setEnabled(false);
 	buttonDecline->setEnabled(false);
 	buttonTerminate->setEnabled(false);
@@ -131,7 +131,7 @@ void JingleVoiceSessionDialog::slotDeclineClicked()
 
 void JingleVoiceSessionDialog::slotTerminateClicked()
 {
-	labelSessiontqStatus->setText( i18n("Session terminated.") );
+	labelSessionStatus->setText( i18n("Session terminated.") );
 	buttonAccept->setEnabled(false);
 	buttonDecline->setEnabled(false);
 	buttonTerminate->setEnabled(false);
@@ -147,7 +147,7 @@ void JingleVoiceSessionDialog::sessionStarted(const Jid &jid)
 {
 	if( m_peerJid.compare(jid) )
 	{
-		labelSessiontqStatus->setText( i18n("Session in progress.") );
+		labelSessionStatus->setText( i18n("Session in progress.") );
 		buttonAccept->setEnabled(false);
 		buttonDecline->setEnabled(false);
 		buttonTerminate->setEnabled(true);
@@ -159,7 +159,7 @@ void JingleVoiceSessionDialog::sessionAccepted(const Jid &jid)
 {
 	if( m_peerJid.compare(jid) )
 	{
-		labelSessiontqStatus->setText( i18n("Session accepted.") );
+		labelSessionStatus->setText( i18n("Session accepted.") );
 		buttonAccept->setEnabled(false);
 		buttonDecline->setEnabled(false);
 		buttonTerminate->setEnabled(true);
@@ -171,7 +171,7 @@ void JingleVoiceSessionDialog::sessionDeclined(const Jid &jid)
 {
 	if( m_peerJid.compare(jid) )
 	{
-		labelSessiontqStatus->setText( i18n("Session declined.") );
+		labelSessionStatus->setText( i18n("Session declined.") );
 		buttonAccept->setEnabled(false);
 		buttonDecline->setEnabled(false);
 		buttonTerminate->setEnabled(false);
@@ -183,7 +183,7 @@ void JingleVoiceSessionDialog::sessionTerminated(const Jid &jid)
 {
 	if( m_peerJid.compare(jid) )
 	{
-		labelSessiontqStatus->setText( i18n("Session terminated.") );
+		labelSessionStatus->setText( i18n("Session terminated.") );
 		buttonAccept->setEnabled(false);
 		buttonDecline->setEnabled(false);
 		buttonTerminate->setEnabled(false);
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
index 72e3827c..bea1ac4e 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -45,7 +45,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -70,7 +70,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -81,7 +81,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -97,7 +97,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -116,7 +116,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>128</width>
                                     <height>128</height>
@@ -136,7 +136,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -147,7 +147,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -163,7 +163,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -188,7 +188,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -209,7 +209,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -232,7 +232,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -248,7 +248,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -298,7 +298,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -309,7 +309,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -325,7 +325,7 @@
                 </widget>
                 <widget class="TQLabel">
                     <property name="name">
-                        <cstring>labelSessiontqStatus</cstring>
+                        <cstring>labelSessionStatus</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
@@ -351,7 +351,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
index 6d85cb0d..a5a94941 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
@@ -194,12 +194,12 @@ int Task::Process(int state) {
 
 void
 Task::AddChild(Task * child) {
-  tqchildren_.insert(child);
+  children_.insert(child);
 }
 
 bool
 Task::AllChildrenDone() {
-  for (ChildSet::iterator it = tqchildren_.begin(); it != tqchildren_.end(); ++it) {
+  for (ChildSet::iterator it = children_.begin(); it != children_.end(); ++it) {
     if (!(*it)->IsDone())
       return false;
   }
@@ -213,8 +213,8 @@ Task::AnyChildError() {
 
 void
 Task::AbortAllChildren() {
-  if (tqchildren_.size() > 0) {
-    ChildSet copy = tqchildren_;
+  if (children_.size() > 0) {
+    ChildSet copy = children_;
     for (ChildSet::iterator it = copy.begin(); it != copy.end(); ++it) {
       (*it)->Abort(true); // Note we do not wake
     }
@@ -231,7 +231,7 @@ void
 Task::OnChildStopped(Task * child) {
   if (child->HasError())
     child_error_ = true;
-  tqchildren_.erase(child);
+  children_.erase(child);
 }
 
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
index 7140b691..5a486198 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
@@ -61,13 +61,13 @@
 // might be working on something as you send it infomration, you may want
 // to have a queue in the task.
 // 
-// (3) Finally it helps manage parent tasks and tqchildren.  If a parent
-// task gets aborted, all the tqchildren tasks are too.  The nice thing
+// (3) Finally it helps manage parent tasks and children.  If a parent
+// task gets aborted, all the children tasks are too.  The nice thing
 // about this, for example, is if you have one parent task that
 // represents, say, and Xmpp connection, then you can spawn a whole bunch
 // of infinite lifetime child tasks and now worry about cleaning them up.
 //  When the parent task goes to STATE_DONE, the task engine will make
-// sure all those tqchildren are aborted and get deleted.
+// sure all those children are aborted and get deleted.
 // 
 // Notice that Task has a few built-in states, e.g.,
 // 
@@ -122,7 +122,7 @@ public:
   // Called from outside to stop task without any more callbacks
   void Abort(bool nowake = false);
   
-  // For managing tqchildren
+  // For managing children
   bool AllChildrenDone();
   bool AnyChildError();
 
@@ -153,7 +153,7 @@ protected:
   virtual int ProcessStart() = 0;
   virtual int ProcessResponse() { return STATE_DONE; }
 
-  // for managing tqchildren (if any)
+  // for managing children (if any)
   void AddChild(Task * child);
   void AbortAllChildren();
 
@@ -172,9 +172,9 @@ private:
   bool child_error_;
   unsigned long long start_time_;
 
-  // for managing tqchildren
+  // for managing children
   typedef std::set<Task *> ChildSet;
-  ChildSet tqchildren_;
+  ChildSet children_;
   
 };
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
index 43728eb7..b5ecc55e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
@@ -33,7 +33,7 @@
 namespace buzz {
 
 TaskRunner::~TaskRunner() {
-  // this kills and deletes tqchildren silently!
+  // this kills and deletes children silently!
   AbortAllChildren();
   RunTasks();
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
index 40c1fbfe..6d818932 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
@@ -188,13 +188,13 @@ private:
   CallClient* call_client_;
 };
 
-const char* DescribetqStatus(buzz::tqStatus::Show show, const std::string& desc) {
+const char* DescribeStatus(buzz::Status::Show show, const std::string& desc) {
   switch (show) {
-  case buzz::tqStatus::SHOW_XA:      return desc.c_str();
-  case buzz::tqStatus::SHOW_ONLINE:  return "online";
-  case buzz::tqStatus::SHOW_AWAY:    return "away";
-  case buzz::tqStatus::SHOW_DND:     return "do not disturb";
-  case buzz::tqStatus::SHOW_CHAT:    return "ready to chat";
+  case buzz::Status::SHOW_XA:      return desc.c_str();
+  case buzz::Status::SHOW_ONLINE:  return "online";
+  case buzz::Status::SHOW_AWAY:    return "away";
+  case buzz::Status::SHOW_DND:     return "do not disturb";
+  case buzz::Status::SHOW_CHAT:    return "ready to chat";
   delault:                         return "offline";
   }
 }
@@ -320,11 +320,11 @@ void CallClient::InitPresence() {
     this, &CallClient::OnStatusUpdate);
   presence_push_->Start();
 
-  buzz::tqStatus my_status;
+  buzz::Status my_status;
   my_status.set_jid(xmpp_client_->jid());
   my_status.set_available(true);
   my_status.set_invisible(false);
-  my_status.set_show(buzz::tqStatus::SHOW_ONLINE);
+  my_status.set_show(buzz::Status::SHOW_ONLINE);
   my_status.set_priority(0);
   my_status.set_know_capabilities(true);
   my_status.set_phone_capability(true);
@@ -337,7 +337,7 @@ void CallClient::InitPresence() {
   presence_out_->Start();
 }
 
-void CallClient::OnStatusUpdate(const buzz::tqStatus& status) {
+void CallClient::OnStatusUpdate(const buzz::Status& status) {
   RosterItem item;
   item.jid = status.jid();
   item.show = status.show();
@@ -362,7 +362,7 @@ void CallClient::PrintRoster() {
   while (iter != roster_->end()) {
     Console()->Printf("%s - %s",
                       iter->second.jid.BareJid().Str().c_str(),
-                      DescribetqStatus(iter->second.show, iter->second.status));
+                      DescribeStatus(iter->second.show, iter->second.status));
     iter++;
   }
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h
index 24ce1545..d35a6114 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h
@@ -29,7 +29,7 @@
 
 namespace buzz {
 class PresencePushTask;
-class tqStatus;
+class Status;
 }
 
 namespace cricket {
@@ -43,7 +43,7 @@ class Call;
 
 struct RosterItem {
   buzz::Jid jid;
-  buzz::tqStatus::Show show;
+  buzz::Status::Show show;
   std::string status;
 };
 
@@ -82,7 +82,7 @@ private:
   void OnSendStanza(cricket::SessionClient *client, const buzz::XmlElement* stanza);
 
   void InitPresence();
-  void OnStatusUpdate(const buzz::tqStatus& status);
+  void OnStatusUpdate(const buzz::Status& status);
 };
 
 #endif // CRICKET_EXAMPLES_CALL_CALLCLIENT_H__
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
index 7fd68120..a15a6c83 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
@@ -42,27 +42,27 @@ bool ToString(const T &t,
   return !oss.fail();
 }
 
-XmppReturntqStatus
-PresenceOutTask::Send(const tqStatus & s) {
+XmppReturnStatus
+PresenceOutTask::Send(const Status & s) {
   if (GetState() != STATE_INIT)
     return XMPP_RETURN_BADSTATE;
 
-  stanza_.reset(TranslatetqStatus(s));
+  stanza_.reset(TranslateStatus(s));
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
-PresenceOutTask::SendDirected(const Jid & j, const tqStatus & s) {
+XmppReturnStatus
+PresenceOutTask::SendDirected(const Jid & j, const Status & s) {
   if (GetState() != STATE_INIT)
     return XMPP_RETURN_BADSTATE;
 
-  XmlElement * presence = TranslatetqStatus(s);
+  XmlElement * presence = TranslateStatus(s);
   presence->AddAttr(TQN_TO, j.Str());
   stanza_.reset(presence);
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus PresenceOutTask::SendProbe(const Jid & jid) {
+XmppReturnStatus PresenceOutTask::SendProbe(const Jid & jid) {
   if (GetState() != STATE_INIT)
     return XMPP_RETURN_BADSTATE;
 
@@ -82,7 +82,7 @@ PresenceOutTask::ProcessStart() {
 }
 
 XmlElement *
-PresenceOutTask::TranslatetqStatus(const tqStatus & s) {
+PresenceOutTask::TranslateStatus(const Status & s) {
   XmlElement * result = new XmlElement(TQN_PRESENCE);
   if (!s.available()) {
     result->AddAttr(TQN_TYPE, STR_UNAVAILABLE);
@@ -92,19 +92,19 @@ PresenceOutTask::TranslatetqStatus(const tqStatus & s) {
       result->AddAttr(TQN_TYPE, STR_INVISIBLE);
     }
 
-    if (s.show() != tqStatus::SHOW_ONLINE && s.show() != tqStatus::SHOW_OFFLINE) {
+    if (s.show() != Status::SHOW_ONLINE && s.show() != Status::SHOW_OFFLINE) {
       result->AddElement(new XmlElement(TQN_SHOW));
       switch (s.show()) {
         default:
           result->AddText(STR_SHOW_AWAY, 1);
           break;
-        case tqStatus::SHOW_XA:
+        case Status::SHOW_XA:
           result->AddText(STR_SHOW_XA, 1);
           break;
-        case tqStatus::SHOW_DND:
+        case Status::SHOW_DND:
           result->AddText(STR_SHOW_DND, 1);
           break;
-        case tqStatus::SHOW_CHAT:
+        case Status::SHOW_CHAT:
           result->AddText(STR_SHOW_CHAT, 1);
           break;
       }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h
index 47660514..2b65a553 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h
@@ -31,13 +31,13 @@ public:
   PresenceOutTask(Task * parent) : XmppTask(parent) {}
   virtual ~PresenceOutTask() {}
 
-  XmppReturntqStatus Send(const tqStatus & s);
-  XmppReturntqStatus SendDirected(const Jid & j, const tqStatus & s);
-  XmppReturntqStatus SendProbe(const Jid& jid);
+  XmppReturnStatus Send(const Status & s);
+  XmppReturnStatus SendDirected(const Jid & j, const Status & s);
+  XmppReturnStatus SendProbe(const Jid& jid);
 
   virtual int ProcessStart();
 private:
-  XmlElement * TranslatetqStatus(const tqStatus & s);
+  XmlElement * TranslateStatus(const Status & s);
   scoped_ptr<XmlElement> stanza_;
 };
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
index cee7058a..31d1ae77 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
@@ -77,7 +77,7 @@ PresencePushTask::ProcessStart() {
   const XmlElement * stanza = NextStanza();
   if (stanza == NULL)
     return STATE_BLOCKED;
-  tqStatus s;
+  Status s;
 
   s.set_jid(Jid(stanza->Attr(TQN_FROM)));
 
@@ -114,23 +114,23 @@ PresencePushTask::ProcessStart() {
 
     const XmlElement * show = stanza->FirstNamed(TQN_SHOW);
     if (show == NULL || show->FirstChild() == NULL) {
-      s.set_show(tqStatus::SHOW_ONLINE);
+      s.set_show(Status::SHOW_ONLINE);
     }
     else {
       if (show->BodyText() == "away") {
-        s.set_show(tqStatus::SHOW_AWAY);
+        s.set_show(Status::SHOW_AWAY);
       }
       else if (show->BodyText() == "xa") {
-        s.set_show(tqStatus::SHOW_XA);
+        s.set_show(Status::SHOW_XA);
       }
       else if (show->BodyText() == "dnd") {
-        s.set_show(tqStatus::SHOW_DND);
+        s.set_show(Status::SHOW_DND);
       }
       else if (show->BodyText() == "chat") {
-        s.set_show(tqStatus::SHOW_CHAT);
+        s.set_show(Status::SHOW_CHAT);
       }
       else {
-        s.set_show(tqStatus::SHOW_ONLINE);
+        s.set_show(Status::SHOW_ONLINE);
       }
     }
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h
index 06c68015..77459647 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h
@@ -32,7 +32,7 @@ class PresencePushTask : public XmppTask {
 public:
   PresencePushTask(Task * parent) : XmppTask(parent, XmppEngine::HL_TYPE) {}
   virtual int ProcessStart();
-  sigslot::signal1<const tqStatus &>SignalStatusUpdate;
+  sigslot::signal1<const Status &>SignalStatusUpdate;
 
 protected:
   virtual bool HandleStanza(const XmlElement * stanza);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
index 264ed725..cab9312f 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
@@ -26,9 +26,9 @@
 
 namespace buzz {
 
-class tqStatus {
+class Status {
 public:
-  tqStatus() :
+  Status() :
     pri_(0),
     show_(SHOW_NONE),
     available_(false),
@@ -39,7 +39,7 @@ public:
     is_google_client_(false),
     feedback_probation_(false) {};
 
-  ~tqStatus() {}
+  ~Status() {}
 
   // These are arranged in "priority order", i.e., if we see
   // two statuses at the same priority but with different Shows,
@@ -86,7 +86,7 @@ public:
   void set_feedback_probation(bool f) { feedback_probation_ = f; }
   void set_sent_time(const std::string& time) { sent_time_ = time; }
 
-  void UpdateWith(const tqStatus & new_value) {
+  void UpdateWith(const Status & new_value) {
     if (!new_value.know_capabilities()) {
        bool k = know_capabilities();
        bool i = is_google_client();
@@ -105,15 +105,15 @@ public:
     }
   }
 
-  bool HasQuiettqStatus() const {
+  bool HasQuietStatus() const {
     if (status_.empty())
       return false;
-    return !(QuiettqStatus().empty());
+    return !(QuietStatus().empty());
   }
 
   // Knowledge of other clients' silly automatic status strings -
   // Don't show these.
-  std::string QuiettqStatus() const {
+  std::string QuietStatus() const {
     if (jid_.resource().find("Psi") != std::string::npos) {
       if (status_ == "Online" ||
           status_.find("Auto Status") != std::string::npos)
@@ -123,18 +123,18 @@ public:
       if (status_ == "Sorry, I ran out for a bit!")
         return STR_EMPTY;
     }
-    return TrimtqStatus(status_);
+    return TrimStatus(status_);
   }
 
-  std::string ExplicittqStatus() const {
-    std::string result = QuiettqStatus();
+  std::string ExplicitStatus() const {
+    std::string result = QuietStatus();
     if (result.empty()) {
-      result = ShowtqStatus();
+      result = ShowStatus();
     }
     return result;
   }
 
-  std::string ShowtqStatus() const {
+  std::string ShowStatus() const {
     std::string result;
     if (!available()) {
       result = "Offline";
@@ -159,7 +159,7 @@ public:
     return result;
   }
 
-  static std::string TrimtqStatus(const std::string & st) {
+  static std::string TrimStatus(const std::string & st) {
     std::string s(st);
     int j = 0;
     bool collapsing = true;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
index 40e694e2..7d966fb3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
@@ -68,6 +68,6 @@ void XmppPump::OnMessage(cricket::Message *pmsg) {
   RunTasks();
 }
 
-buzz::XmppReturntqStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) {
+buzz::XmppReturnStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) {
   return client_->SendStanza(stanza);
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h
index 0314b2fd..fd6f88bb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h
@@ -62,7 +62,7 @@ public:
 
   void OnMessage(cricket::Message *pmsg);
 
-  buzz::XmppReturntqStatus SendStanza(const buzz::XmlElement *stanza);
+  buzz::XmppReturnStatus SendStanza(const buzz::XmlElement *stanza);
 
 private:
   buzz::XmppClient *client_;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc
index 8456a90f..f3244c54 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc
@@ -110,8 +110,8 @@ void LinphoneMediaChannel::OnPacketReceived(const void *data, int len) {
     sendto(fd_, buf, len, 0, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
 }
 
-void LinphoneMediaChannel::SetPtqlayout(bool ptqlayout) {
-  play_ = ptqlayout;
+void LinphoneMediaChannel::SetPlayout(bool playout) {
+  play_ = playout;
 }
 
 void LinphoneMediaChannel::SetSend(bool send) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h
index 2639c7ac..0c00be75 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h
@@ -36,7 +36,7 @@ class LinphoneMediaChannel : public MediaChannel {
   virtual void SetCodec(const char *codec);
   virtual void OnPacketReceived(const void *data, int len);
 
-  virtual void SetPtqlayout(bool ptqlayout);
+  virtual void SetPlayout(bool playout);
   virtual void SetSend(bool send);
 
   virtual float GetCurrentQuality();
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h
index 4a2e4560..db2f9654 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h
@@ -41,7 +41,7 @@ class MediaChannel {
   void SetInterface(NetworkInterface *iface) {network_interface_ = iface;}
   virtual void SetCodec(const char *codec) = 0;
   virtual void OnPacketReceived(const void *data, int len) = 0;
-  virtual void SetPtqlayout(bool ptqlayout) = 0;
+  virtual void SetPlayout(bool playout) = 0;
   virtual void SetSend(bool send) = 0;
   virtual float GetCurrentQuality() = 0;
   virtual int GetOutputLevel() = 0;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
index 90092283..24036b02 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
@@ -126,12 +126,12 @@ void PortAudioMediaChannel::OnPacketReceived(const void *data, int len)
 	}
 }
 
-void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout)
+void PortAudioMediaChannel::SetPlayout(bool playout)
 {
 	if (!stream_) 
 		return;
 
-	if (play_ && !ptqlayout) {
+	if (play_ && !playout) {
 		int err = Pa_StopStream(stream_);
 		if (err != paNoError) {
 			fprintf(stderr, "Error stopping PortAudio stream: %s\n", Pa_GetErrorText(err));
@@ -139,7 +139,7 @@ void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout)
 		}
 		play_ = false;
 	}
-	else if (!play_ && ptqlayout) {
+	else if (!play_ && playout) {
 		int err = Pa_StartStream(stream_);
 		if (err != paNoError) {
 			fprintf(stderr, "Error starting PortAudio stream: %s\n", Pa_GetErrorText(err));
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
index 89922e77..95c39a1a 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
@@ -15,7 +15,7 @@ public:
 	virtual void SetCodec(const char *codec);
 	virtual void OnPacketReceived(const void *data, int len);
 
-	virtual void SetPtqlayout(bool ptqlayout);
+	virtual void SetPlayout(bool playout);
 	virtual void SetSend(bool send);
 
 	virtual float GetCurrentQuality();
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc
index c55ef287..58e1db60 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc
@@ -168,15 +168,15 @@ void VoiceChannel::SendPacket(const void *data, size_t len) {
 
 void VoiceChannel::ChangeState() {
   if (paused_ || !enabled_ || !socket_writable_) {
-    channel_->SetPtqlayout(false);
+    channel_->SetPlayout(false);
     channel_->SetSend(false);
   } else {
     if (muted_) {
       channel_->SetSend(false);
-      channel_->SetPtqlayout(true);
+      channel_->SetPlayout(true);
     } else {
       channel_->SetSend(true);
-      channel_->SetPtqlayout(true);
+      channel_->SetPlayout(true);
     }
   }
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
index a021f67a..08ccd288 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
@@ -109,7 +109,7 @@ XmlElement::XmlElement(const XmlElement & elt) :
   }
   pLastAttr_ = newAttr;
 
-  // copy tqchildren
+  // copy children
   XmlChild * pChild;
   XmlChild ** ppLast = &pFirstChild_;
   XmlChild * newChild = NULL;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc
index 8e36ac02..e0d2c006 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc
@@ -123,7 +123,7 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) {
     i += 2;
   }
 
-  // now the tqchildren
+  // now the children
   const XmlChild * pchild = element->FirstChild();
 
   if (pchild == NULL)
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
index fa6a14a6..959b6f88 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
@@ -86,7 +86,7 @@ public:
   void OnSocketClosed();
 };
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppClient::Connect(const XmppClientSettings & settings, AsyncSocket * socket, PreXmppAuth * pre_auth) {
   if (socket == NULL)
     return XMPP_RETURN_BADARGUMENT;
@@ -237,7 +237,7 @@ XmppClient::ProcessResponse() {
   return STATE_BLOCKED;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppClient::Disconnect() {
   if (d_->socket_.get() == NULL)
     return XMPP_RETURN_BADSTATE;
@@ -263,17 +263,17 @@ XmppClient::NextId() {
   return d_->engine_->NextId();
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppClient::SendStanza(const XmlElement * stanza) {
   return d_->engine_->SendStanza(stanza);
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppClient::SendStanzaError(const XmlElement * old_stanza, XmppStanzaError xse, const std::string & message) {
   return d_->engine_->SendStanzaError(old_stanza, xse, message);
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppClient::SendRaw(const std::string & text) {
   return d_->engine_->SendRaw(text);
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
index fd65c39c..f8b4798c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
@@ -74,14 +74,14 @@ public:
   XmppClient(Task * parent);
   ~XmppClient();
 
-  XmppReturntqStatus Connect(const XmppClientSettings & settings,
+  XmppReturnStatus Connect(const XmppClientSettings & settings,
                            AsyncSocket * socket,
                            PreXmppAuth * preauth);
   
   virtual Task * GetParent(int code);
   virtual int ProcessStart();
   virtual int ProcessResponse();
-  XmppReturntqStatus Disconnect();
+  XmppReturnStatus Disconnect();
   const Jid & jid();
   
   sigslot::signal1<XmppEngine::State> SignalStateChange;
@@ -97,9 +97,9 @@ public:
   std::string GetAuthCookie();
 
   std::string NextId();
-  XmppReturntqStatus SendStanza(const XmlElement *stanza);
-  XmppReturntqStatus SendRaw(const std::string & text);
-  XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal,
+  XmppReturnStatus SendStanza(const XmlElement *stanza);
+  XmppReturnStatus SendRaw(const std::string & text);
+  XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal,
                        XmppStanzaError code,
                        const std::string & text);
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
index 58576328..1497c3ec 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
@@ -66,9 +66,9 @@ enum XmppStanzaError {
   XSE_UNEXPECTED_REQUEST,
 };
 
-// XmppReturntqStatus
+// XmppReturnStatus
 //    This is used by API functions to synchronously return status.
-enum XmppReturntqStatus {
+enum XmppReturnStatus {
   XMPP_RETURN_OK,
   XMPP_RETURN_BADARGUMENT,
   XMPP_RETURN_BADSTATE,
@@ -171,34 +171,34 @@ public:
   // SOCKET INPUT AND OUTPUT ------------------------------------------------
 
   //! Registers the handler for socket output
-  virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0;
+  virtual XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0;
 
   //! Provides socket input to the engine
-  virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len) = 0;
+  virtual XmppReturnStatus HandleInput(const char * bytes, size_t len) = 0;
 
   //! Advises the engine that the socket has closed
-  virtual XmppReturntqStatus ConnectionClosed() = 0;
+  virtual XmppReturnStatus ConnectionClosed() = 0;
 
   // SESSION SETUP ---------------------------------------------------------
 
   //! Indicates the (bare) JID for the user to use.
-  virtual XmppReturntqStatus SetUser(const Jid & jid)= 0;
+  virtual XmppReturnStatus SetUser(const Jid & jid)= 0;
 
   //! Get the login (bare) JID.
   virtual const Jid & GetUser() = 0;
 
   //! Provides different methods for credentials for login.
   //! Takes ownership of this object; deletes when login is done
-  virtual XmppReturntqStatus SetSaslHandler(SaslHandler * h) = 0;
+  virtual XmppReturnStatus SetSaslHandler(SaslHandler * h) = 0;
 
   //! Sets whether TLS will be used within the connection (default true).
-  virtual XmppReturntqStatus SetUseTls(bool useTls) = 0;
+  virtual XmppReturnStatus SetUseTls(bool useTls) = 0;
 
   //! Sets an alternate domain from which we allows TLS certificates.
   //! This is for use in the case where a we want to allow a proxy to
   //! serve up its own certificate rather than one owned by the underlying
   //! domain.
-  virtual XmppReturntqStatus SetTlsServerDomain(const std::string & proxy_domain) = 0;
+  virtual XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain) = 0;
 
   //! Gets whether TLS will be used within the connection.
   virtual bool GetUseTls() = 0;
@@ -206,7 +206,7 @@ public:
   //! Sets the request resource name, if any (optional).
   //! Note that the resource name may be overridden by the server; after
   //! binding, the actual resource name is available as part of FullJid().
-  virtual XmppReturntqStatus SetRequestedResource(const std::string& resource) = 0;
+  virtual XmppReturnStatus SetRequestedResource(const std::string& resource) = 0;
 
   //! Gets the request resource name.
   virtual const std::string & GetRequestedResource() = 0;
@@ -214,12 +214,12 @@ public:
   // SESSION MANAGEMENT ---------------------------------------------------
 
   //! Set callback for state changes.
-  virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler) = 0;
+  virtual XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler) = 0;
 
   //! Initiates the XMPP connection.
   //! After supplying connection settings, call this once to initiate,
   //! (optionally) encrypt, authenticate, and bind the connection.
-  virtual XmppReturntqStatus Connect() = 0;
+  virtual XmppReturnStatus Connect() = 0;
 
   //! The current engine state.
   virtual State GetState() = 0;
@@ -240,7 +240,7 @@ public:
   //! Sends CloseConnection to output, and disconnects and registered
   //! session handlers.  After Disconnect completes, it is guaranteed
   //! that no further callbacks will be made.
-  virtual XmppReturntqStatus Disconnect() = 0;
+  virtual XmppReturnStatus Disconnect() = 0;
 
   // APPLICATION USE -------------------------------------------------------
 
@@ -257,33 +257,33 @@ public:
   //! Adds a listener for session events.
   //! Stanza delivery is chained to session handlers; the first to
   //! return 'true' is the last to get each stanza.
-  virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0;
+  virtual XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0;
 
   //! Removes a listener for session events.
-  virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0;
+  virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0;
 
   //! Sends a stanza to the server.
-  virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza) = 0;
+  virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza) = 0;
 
   //! Sends raw text to the server
-  virtual XmppReturntqStatus SendRaw(const std::string & text) = 0;
+  virtual XmppReturnStatus SendRaw(const std::string & text) = 0;
 
   //! Sends an iq to the server, and registers a callback for the result.
   //! Returns the cookie passed to the result handler.
-  virtual XmppReturntqStatus SendIq(const XmlElement* pelStanza,
+  virtual XmppReturnStatus SendIq(const XmlElement* pelStanza,
                                   XmppIqHandler* iq_handler,
                                   XmppIqCookie* cookie) = 0;
 
   //! Unregisters an iq callback handler given its cookie.
   //! No callback will come to this handler after it's unregistered.
-  virtual XmppReturntqStatus RemoveIqHandler(XmppIqCookie cookie,
+  virtual XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie,
                                       XmppIqHandler** iq_handler) = 0;
 
 
   //! Forms and sends an error in response to the given stanza.
   //! Swaps to and from, sets type to "error", and adds error information
   //! based on the passed code.  Text is optional and may be STR_EMPTY.
-  virtual XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal,
+  virtual XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal,
                                            XmppStanzaError code,
                                            const std::string & text) = 0;
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc
index c9569524..3d363a78 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc
@@ -85,7 +85,7 @@ XmppEngineImpl::~XmppEngineImpl() {
   DeleteIqCookies();
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -95,7 +95,7 @@ XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -105,7 +105,7 @@ XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::HandleInput(const char * bytes, size_t len) {
   if (state_ < STATE_OPENING || state_ > STATE_OPEN)
     return XMPP_RETURN_BADSTATE;
@@ -117,7 +117,7 @@ XmppEngineImpl::HandleInput(const char * bytes, size_t len) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::ConnectionClosed() {
   if (state_ != STATE_CLOSED) {
     EnterExit ee(this);
@@ -128,7 +128,7 @@ XmppEngineImpl::ConnectionClosed() {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetUseTls(bool useTls) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -138,7 +138,7 @@ XmppEngineImpl::SetUseTls(bool useTls) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetTlsServerDomain(const std::string & tls_server_domain) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -153,7 +153,7 @@ XmppEngineImpl::GetUseTls() {
   return tls_needed_;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetUser(const Jid & jid) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -168,7 +168,7 @@ XmppEngineImpl::GetUser() {
   return user_jid_;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -177,7 +177,7 @@ XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SetRequestedResource(const std::string & resource) {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -192,7 +192,7 @@ XmppEngineImpl::GetRequestedResource() {
   return requested_resource_;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler,
                                  XmppEngine::HandlerLevel level) {
   if (state_ == STATE_CLOSED)
@@ -203,7 +203,7 @@ XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler,
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) {
 
   bool found = false;
@@ -227,7 +227,7 @@ XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::Connect() {
   if (state_ != STATE_START)
     return XMPP_RETURN_BADSTATE;
@@ -245,7 +245,7 @@ XmppEngineImpl::Connect() {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SendStanza(const XmlElement * element) {
   if (state_ == STATE_CLOSED)
     return XMPP_RETURN_BADSTATE;
@@ -263,7 +263,7 @@ XmppEngineImpl::SendStanza(const XmlElement * element) {
   return XMPP_RETURN_OK;
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SendRaw(const std::string & text) {
   if (state_ == STATE_CLOSED || login_task_.get())
     return XMPP_RETURN_BADSTATE;
@@ -282,7 +282,7 @@ XmppEngineImpl::NextId() {
   return ss.str();
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::Disconnect() {
 
   if (state_ != STATE_CLOSED) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h
index 6011d9e8..c36f168c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h
@@ -57,33 +57,33 @@ public:
   // SOCKET INPUT AND OUTPUT ------------------------------------------------
 
   //! Registers the handler for socket output
-  virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh);
+  virtual XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh);
 
   //! Provides socket input to the engine
-  virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len);
+  virtual XmppReturnStatus HandleInput(const char * bytes, size_t len);
 
   //! Advises the engine that the socket has closed
-  virtual XmppReturntqStatus ConnectionClosed();
+  virtual XmppReturnStatus ConnectionClosed();
 
   // SESSION SETUP ---------------------------------------------------------
 
   //! Indicates the (bare) JID for the user to use.
-  virtual XmppReturntqStatus SetUser(const Jid & jid);
+  virtual XmppReturnStatus SetUser(const Jid & jid);
 
   //! Get the login (bare) JID.
   virtual const Jid & GetUser();
 
   //! Indicates the autentication to use.  Takes ownership of the object.
-  virtual XmppReturntqStatus SetSaslHandler(SaslHandler * sasl_handler);
+  virtual XmppReturnStatus SetSaslHandler(SaslHandler * sasl_handler);
 
   //! Sets whether TLS will be used within the connection (default true).
-  virtual XmppReturntqStatus SetUseTls(bool useTls);
+  virtual XmppReturnStatus SetUseTls(bool useTls);
 
   //! Sets an alternate domain from which we allows TLS certificates.
   //! This is for use in the case where a we want to allow a proxy to
   //! serve up its own certificate rather than one owned by the underlying
   //! domain.
-  virtual XmppReturntqStatus SetTlsServerDomain(const std::string & proxy_domain);
+  virtual XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain);
 
   //! Gets whether TLS will be used within the connection.
   virtual bool GetUseTls();
@@ -91,7 +91,7 @@ public:
   //! Sets the request resource name, if any (optional).
   //! Note that the resource name may be overridden by the server; after
   //! binding, the actual resource name is available as part of FullJid().
-  virtual XmppReturntqStatus SetRequestedResource(const std::string& resource);
+  virtual XmppReturnStatus SetRequestedResource(const std::string& resource);
 
   //! Gets the request resource name.
   virtual const std::string & GetRequestedResource();
@@ -99,12 +99,12 @@ public:
   // SESSION MANAGEMENT ---------------------------------------------------
 
   //! Set callback for state changes.
-  virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler);
+  virtual XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler);
 
   //! Initiates the XMPP connection.
   //! After supplying connection settings, call this once to initiate,
   //! (optionally) encrypt, authenticate, and bind the connection.
-  virtual XmppReturntqStatus Connect();
+  virtual XmppReturnStatus Connect();
 
   //! The current engine state.
   virtual State GetState() { return state_; }
@@ -125,40 +125,40 @@ public:
   //! Sends CloseConnection to output, and disconnects and registered
   //! session handlers.  After Disconnect completes, it is guaranteed
   //! that no further callbacks will be made.
-  virtual XmppReturntqStatus Disconnect();
+  virtual XmppReturnStatus Disconnect();
 
   // APPLICATION USE -------------------------------------------------------
 
   //! Adds a listener for session events.
   //! Stanza delivery is chained to session handlers; the first to
   //! return 'true' is the last to get each stanza.
-  virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler,
+  virtual XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler,
                                             XmppEngine::HandlerLevel level);
 
   //! Removes a listener for session events.
-  virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler);
+  virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler);
 
   //! Sends a stanza to the server.
-  virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza);
+  virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza);
 
   //! Sends raw text to the server
-  virtual XmppReturntqStatus SendRaw(const std::string & text);
+  virtual XmppReturnStatus SendRaw(const std::string & text);
 
   //! Sends an iq to the server, and registers a callback for the result.
   //! Returns the cookie passed to the result handler.
-  virtual XmppReturntqStatus SendIq(const XmlElement* pelStanza,
+  virtual XmppReturnStatus SendIq(const XmlElement* pelStanza,
                                   XmppIqHandler* iq_handler,
                                   XmppIqCookie* cookie);
 
   //! Unregisters an iq callback handler given its cookie.
   //! No callback will come to this handler after it's unregistered.
-  virtual XmppReturntqStatus RemoveIqHandler(XmppIqCookie cookie,
+  virtual XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie,
                                       XmppIqHandler** iq_handler);
 
   //! Forms and sends an error in response to the given stanza.
   //! Swaps to and from, sets type to "error", and adds error information
   //! based on the passed code.  Text is optional and may be STR_EMPTY.
-  virtual XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal,
+  virtual XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal,
                                            XmppStanzaError code,
                                            const std::string & text);
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
index 38f268b9..cdcfa9e7 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
@@ -54,7 +54,7 @@ private:
 };
 
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler,
   XmppIqCookie* cookie) {
   if (state_ == STATE_CLOSED)
@@ -85,7 +85,7 @@ XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler,
 }
 
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::RemoveIqHandler(XmppIqCookie cookie,
     XmppIqHandler ** iq_handler) {
 
@@ -199,7 +199,7 @@ AddErrorCode(XmlElement * error_element, XmppStanzaError code) {
 }
 
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppEngineImpl::SendStanzaError(const XmlElement * element_original,
                                 XmppStanzaError code,
                                 const std::string & text) {
@@ -223,7 +223,7 @@ XmppEngineImpl::SendStanzaError(const XmlElement * element_original,
     error_element.AddAttr(name, attribute->Value());
   }
 
-  // copy tqchildren
+  // copy children
   for (const XmlChild * child = element_original->FirstChild();
        child;
        child = child->NextChild()) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
index e7ac0e04..c9d86ba6 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
@@ -55,14 +55,14 @@ XmppTask::StopImpl() {
   }
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppTask::SendStanza(const XmlElement * stanza) {
   if (client_ == NULL)
     return XMPP_RETURN_BADSTATE;
   return client_->SendStanza(stanza);
 }
 
-XmppReturntqStatus
+XmppReturnStatus
 XmppTask::SendStanzaError(const XmlElement * element_original,
                                 XmppStanzaError code,
                                 const std::string & text) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
index a1ed3dd3..0bd7c4b8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
@@ -78,9 +78,9 @@ public:
 protected:
   friend class XmppClient;
   
-  XmppReturntqStatus SendStanza(const XmlElement * stanza);
-  XmppReturntqStatus SetResult(const std::string & code);
-  XmppReturntqStatus SendStanzaError(const XmlElement * element_original,
+  XmppReturnStatus SendStanza(const XmlElement * stanza);
+  XmppReturnStatus SetResult(const std::string & code);
+  XmppReturnStatus SendStanzaError(const XmlElement * element_original,
                                 XmppStanzaError code,
                                 const std::string & text);
 
diff --git a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch
index 4632af45..058825db 100644
--- a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch
+++ b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch
@@ -7,8 +7,8 @@ Index: iris/include/im.h
  
  		bool groupChatJoin(const QString &host, const QString &room, const QString &nick);
 +		bool groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString &password);
- 		void groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &);
- 		void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const tqStatus &);
+ 		void groupChatSetStatus(const QString &host, const QString &room, const Status &);
+ 		void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const Status &);
  		void groupChatLeave(const QString &host, const QString &room);
 Index: iris/xmpp-im/client.cpp
 ===================================================================
@@ -34,20 +34,20 @@ Index: iris/xmpp-im/client.cpp
 +			++it;
 +	}
 +
-+	debug(QString("Client: Joined: [%1]\n").tqarg(jid.full()));
++	debug(QString("Client: Joined: [%1]\n").arg(jid.full()));
 +	GroupChat i;
 +	i.j = jid;
 +	i.status = GroupChat::Connecting;
 +	d->groupChatList += i;
 +
 +	JT_MucPresence *j = new JT_MucPresence(rootTask());
-+	j->pres(jid, tqStatus(), password);
++	j->pres(jid, Status(), password);
 +	j->go(true);
 +
 +	return true;
 +}
 +
- void Client::groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &_s)
+ void Client::groupChatSetStatus(const QString &host, const QString &room, const Status &_s)
  {
  	Jid jid(room + "@" + host);
 Index: iris/xmpp-im/xmpp_tasks.h
@@ -66,8 +66,8 @@ Index: iris/xmpp-im/xmpp_tasks.h
 +		JT_MucPresence(Task *parent);
 +		~JT_MucPresence();
 +
-+		void pres(const tqStatus &);
-+		void pres(const Jid &, const tqStatus &, const QString &password);
++		void pres(const Status &);
++		void pres(const Jid &, const Status &, const QString &password);
 +
 +		void onGo();
 +
@@ -102,7 +102,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp
 +{
 +}
 +
-+void JT_MucPresence::pres(const tqStatus &s)
++void JT_MucPresence::pres(const Status &s)
 +{
 +	type = 0;
 +
@@ -121,7 +121,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp
 +		if(!s.status().isEmpty())
 +			tag.appendChild(textTag(doc(), "status", s.status()));
 +
-+		tag.appendChild( textTag(doc(), "priority", QString("%1").tqarg(s.priority()) ) );
++		tag.appendChild( textTag(doc(), "priority", QString("%1").arg(s.priority()) ) );
 +
 +		if(!s.keyID().isEmpty()) {
 +			QDomElement x = textTag(doc(), "x", s.keyID());
@@ -146,7 +146,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp
 +	}
 +}
 +
-+void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const QString &password)
++void JT_MucPresence::pres(const Jid &to, const Status &s, const QString &password)
 +{
 +	pres(s);
 +	tag.setAttribute("to", to.full());
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
index cd5b2f64..f20c054f 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
@@ -358,7 +358,7 @@ void HttpPoll::resetKey()
 	fprintf(stderr, "HttpPoll: reset key!\n");
 #endif
 	TQByteArray a = randomArray(64);
-	TQString str = TQString::tqfromLatin1(a.data(), a.size());
+	TQString str = TQString::fromLatin1(a.data(), a.size());
 
 	d->key_n = POLL_KEYS;
 	for(int n = 0; n < POLL_KEYS; ++n)
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
index 16f02e07..e4e1b182 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
@@ -122,7 +122,7 @@ static int sp_read_udp(TQByteArray *from, SPS_UDP *s)
 			return 0;
 		TQCString cs(host_len+1);
 		memcpy(cs.data(), from->data() + 5, host_len);
-		host = TQString::tqfromLatin1(cs);
+		host = TQString::fromLatin1(cs);
 	}
 	else if(atype == 0x04) {
 		full_len += 16;
@@ -467,7 +467,7 @@ static int sp_get_request(TQByteArray *from, SPS_CONNREQ *s)
 			return 0;
 		TQCString cs(host_len+1);
 		memcpy(cs.data(), from->data() + 5, host_len);
-		host = TQString::tqfromLatin1(cs);
+		host = TQString::fromLatin1(cs);
 	}
 	else if(atype == 0x04) {
 		full_len += 16;
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
index c9726d75..fcdd3d49 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
@@ -146,7 +146,7 @@ TQString Base64::arrayToString(const TQByteArray &a)
 	TQCString c;
 	c.resize(b.size()+1);
 	memcpy(c.data(), b.data(), b.size());
-	return TQString::tqfromLatin1(c);
+	return TQString::fromLatin1(c);
 }
 
 //!
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
index 0c8b46df..6339d14a 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
@@ -20,11 +20,11 @@
 
 #include"showtextdlg.h"
 
-#include<tqlayout.h>
-#include<tqtextedit.h>
+#include<layout.h>
+#include<textedit.h>
 #include<tqpushbutton.h>
 #include<tqfile.h>
-#include<tqtextstream.h>
+#include<textstream.h>
 
 
 ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, const char *name)
diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h
index 8387d48a..835eed62 100644
--- a/kopete/protocols/jabber/libiris/iris/include/im.h
+++ b/kopete/protocols/jabber/libiris/iris/include/im.h
@@ -136,11 +136,11 @@ namespace XMPP
 		SubType value;
 	};
 
-	class tqStatus
+	class Status
 	{
 	public:
-		tqStatus(const TQString &show="", const TQString &status="", int priority=0, bool available=true);
-		~tqStatus();
+		Status(const TQString &show="", const TQString &status="", int priority=0, bool available=true);
+		~Status();
 
 		int priority() const;
 		const TQString & show() const;
@@ -162,7 +162,7 @@ namespace XMPP
 
 		void setPriority(int);
 		void setShow(const TQString &);
-		void settqStatus(const TQString &);
+		void setStatus(const TQString &);
 		void setTimeStamp(const TQDateTime &);
 		void setKeyID(const TQString &);
 		void setIsAvailable(bool);
@@ -197,19 +197,19 @@ namespace XMPP
 	class Resource
 	{
 	public:
-		Resource(const TQString &name="", const tqStatus &s=tqStatus());
+		Resource(const TQString &name="", const Status &s=Status());
 		~Resource();
 
 		const TQString & name() const;
 		int priority() const;
-		const tqStatus & status() const;
+		const Status & status() const;
 
 		void setName(const TQString &);
-		void settqStatus(const tqStatus &);
+		void setStatus(const Status &);
 
 	private:
 		TQString v_name;
-		tqStatus v_status;
+		Status v_status;
 
 		class ResourcePrivate *d;
 	};
@@ -570,7 +570,7 @@ namespace XMPP
 		void rosterRequest();
 		void sendMessage(const Message &);
 		void sendSubscription(const Jid &, const TQString &);
-		void setPresence(const tqStatus &);
+		void setPresence(const Status &);
 
 		void debug(const TQString &);
 		TQString genUniqueId();
@@ -610,8 +610,8 @@ namespace XMPP
 
 		bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick);
 		bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick, const TQString &password);
-		void groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &);
-		void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &);
+		void groupChatSetStatus(const TQString &host, const TQString &room, const Status &);
+		void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &);
 		void groupChatLeave(const TQString &host, const TQString &room);
 
 	signals:
@@ -632,7 +632,7 @@ namespace XMPP
 		void xmlOutgoing(const TQString &);
 		void groupChatJoined(const Jid &);
 		void groupChatLeft(const Jid &);
-		void groupChatPresence(const Jid &, const tqStatus &);
+		void groupChatPresence(const Jid &, const Status &);
 		void groupChatError(const Jid &, int, const TQString &);
 
 		void incomingJidLink();
@@ -652,7 +652,7 @@ namespace XMPP
 
 		// basic daemons
 		void ppSubscription(const Jid &, const TQString &);
-		void ppPresence(const Jid &, const tqStatus &);
+		void ppPresence(const Jid &, const Status &);
 		void pmMessage(const Message &);
 		void prRoster(const Roster &);
 
@@ -666,8 +666,8 @@ namespace XMPP
 		void distribute(const TQDomElement &);
 		void importRoster(const Roster &);
 		void importRosterItem(const RosterItem &);
-		void updateSelfPresence(const Jid &, const tqStatus &);
-		void updatePresence(LiveRosterItem *, const Jid &, const tqStatus &);
+		void updateSelfPresence(const Jid &, const Status &);
+		void updatePresence(LiveRosterItem *, const Jid &, const Status &);
 
 		class ClientPrivate;
 		ClientPrivate *d;
@@ -689,15 +689,15 @@ namespace XMPP
 		ResourceList::ConstIterator priority() const;
 
 		bool isAvailable() const;
-		const tqStatus & lastUnavailabletqStatus() const;
+		const Status & lastUnavailableStatus() const;
 		bool flagForDelete() const;
 
-		void setLastUnavailabletqStatus(const tqStatus &);
+		void setLastUnavailableStatus(const Status &);
 		void setFlagForDelete(bool);
 
 	private:
 		ResourceList v_resourceList;
-		tqStatus v_lastUnavailabletqStatus;
+		Status v_lastUnavailableStatus;
 		bool v_flagForDelete;
 
 		class LiveRosterItemPrivate;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
index 3fa7d6c3..edd2398b 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
@@ -49,7 +49,7 @@
 
 #include"parser.h"
 
-#include<tqtextcodec.h>
+#include<textcodec.h>
 #include<tqptrlist.h>
 #include<string.h>
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
index 89c98a91..f96fd795 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
@@ -1109,7 +1109,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e)
 		e.setAttribute("mechanism", sasl_mech);
 		if(!sasl_step.isEmpty()) {
 #ifdef XMPP_TEST
-			TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step)));
+			TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step)));
 #endif
 			e.appendChild(doc.createTextNode(Base64::arrayToString(sasl_step)));
 		}
@@ -1143,7 +1143,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e)
 		else {
 			TQByteArray stepData = sasl_step;
 #ifdef XMPP_TEST
-			TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step)));
+			TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step)));
 #endif
 			TQDomElement e = doc.createElementNS(NS_SASL, "response");
 			if(!stepData.isEmpty())
@@ -1289,7 +1289,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e)
 #ifdef XMPP_TEST
 				TQString s = "SASL mechs:";
 				for(TQStringList::ConstIterator it = f.sasl_mechs.begin(); it != f.sasl_mechs.end(); ++it)
-					s += TQString(" [%1]").tqarg((*it));
+					s += TQString(" [%1]").arg((*it));
 				TD::msg(s);
 #endif
 			}
@@ -1341,7 +1341,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e)
 			if(e.tagName() == "challenge") {
 				TQByteArray a = Base64::stringToArray(e.text());
 #ifdef XMPP_TEST
-				TD::msg(TQString("SASL IN: [%1]").tqarg(printArray(a)));
+				TD::msg(TQString("SASL IN: [%1]").arg(printArray(a)));
 #endif
 				sasl_step = a;
 				need = NSASLNext;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
index 0e324cb1..c2f3083e 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -44,7 +44,7 @@
 
 #include"xmpp.h"
 
-#include<tqtextstream.h>
+#include<textstream.h>
 #include<tqguardedptr.h>
 #include<tqtimer.h>
 #include<qca.h>
@@ -1358,9 +1358,9 @@ void ClientStream::processNext()
 #endif
 
 #ifdef XMPP_TEST
-				TQString s = TQString("handshake success (lang=[%1]").tqarg(d->client.lang);
+				TQString s = TQString("handshake success (lang=[%1]").arg(d->client.lang);
 				if(!d->client.from.isEmpty())
-					s += TQString(", from=[%1]").tqarg(d->client.from);
+					s += TQString(", from=[%1]").arg(d->client.from);
 				s += ')';
 				TD::msg(s);
 #endif
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
index d1650842..93748aa8 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
@@ -66,7 +66,7 @@ static TQDomElement stripExtraNS(const TQDomElement &e)
 			i.setAttributeNodeNS(a);
 	}
 
-	// copy tqchildren
+	// copy children
 	TQDomNodeList nl = e.childNodes();
 	for(x = 0; x < nl.count(); ++x) {
 		TQDomNode n = nl.item(x);
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
index 973b6c73..b7d5e00c 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
@@ -208,13 +208,13 @@ void Client::start(const TQString &host, const TQString &user, const TQString &p
 	d->pass = pass;
 	d->resource = _resource;
 
-	tqStatus stat;
+	Status stat;
 	stat.setIsAvailable(false);
 	d->resourceList += Resource(resource(), stat);
 
 	JT_PushPresence *pp = new JT_PushPresence(rootTask());
 	connect(pp, TQT_SIGNAL(subscription(const Jid &, const TQString &)), TQT_SLOT(ppSubscription(const Jid &, const TQString &)));
-	connect(pp, TQT_SIGNAL(presence(const Jid &, const tqStatus &)), TQT_SLOT(ppPresence(const Jid &, const tqStatus &)));
+	connect(pp, TQT_SIGNAL(presence(const Jid &, const Status &)), TQT_SLOT(ppPresence(const Jid &, const Status &)));
 
 	JT_PushMessage *pm = new JT_PushMessage(rootTask());
 	connect(pm, TQT_SIGNAL(message(const Message &)), TQT_SLOT(pmMessage(const Message &)));
@@ -267,7 +267,7 @@ bool Client::isActive() const
 	return d->active;
 }
 
-void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &_s)
+void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &_s)
 {
 	Jid jid(room + "@" + host + "/" + nick);
 	for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
@@ -275,7 +275,7 @@ void Client::groupChatChangeNick(const TQString &host, const TQString &room, con
 		if(i.j.compare(jid, false)) {
 			i.j = jid;
 
-			tqStatus s = _s;
+			Status s = _s;
 			s.setIsAvailable(true);
 
 			JT_Presence *j = new JT_Presence(rootTask());
@@ -303,14 +303,14 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS
 			++it;
 	}
 
-	debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full()));
+	debug(TQString("Client: Joined: [%1]\n").arg(jid.full()));
 	GroupChat i;
 	i.j = jid;
 	i.status = GroupChat::Connecting;
 	d->groupChatList += i;
 
 	JT_Presence *j = new JT_Presence(rootTask());
-	j->pres(jid, tqStatus());
+	j->pres(jid, Status());
 	j->go(true);
 
 	return true;
@@ -332,20 +332,20 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS
 			++it;
 	}
 
-	debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full()));
+	debug(TQString("Client: Joined: [%1]\n").arg(jid.full()));
 	GroupChat i;
 	i.j = jid;
 	i.status = GroupChat::Connecting;
 	d->groupChatList += i;
 
 	JT_MucPresence *j = new JT_MucPresence(rootTask());
-	j->pres(jid, tqStatus(), password);
+	j->pres(jid, Status(), password);
 	j->go(true);
 
 	return true;
 }
 
-void Client::groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &_s)
+void Client::groupChatSetStatus(const TQString &host, const TQString &room, const Status &_s)
 {
 	Jid jid(room + "@" + host);
 	bool found = false;
@@ -360,7 +360,7 @@ void Client::groupChatSettqStatus(const TQString &host, const TQString &room, co
 	if(!found)
 		return;
 
-	tqStatus s = _s;
+	Status s = _s;
 	s.setIsAvailable(true);
 
 	JT_Presence *j = new JT_Presence(rootTask());
@@ -378,10 +378,10 @@ void Client::groupChatLeave(const TQString &host, const TQString &room)
 			continue;
 
 		i.status = GroupChat::Closing;
-		debug(TQString("Client: Leaving: [%1]\n").tqarg(i.j.full()));
+		debug(TQString("Client: Leaving: [%1]\n").arg(i.j.full()));
 
 		JT_Presence *j = new JT_Presence(rootTask());
-		tqStatus s;
+		Status s;
 		s.setIsAvailable(false);
 		j->pres(i.j, s);
 		j->go(true);
@@ -410,7 +410,7 @@ void Client::close(bool)
 				i.status = GroupChat::Closing;
 
 				JT_Presence *j = new JT_Presence(rootTask());
-				tqStatus s;
+				Status s;
 				s.setIsAvailable(false);
 				j->pres(i.j, s);
 				j->go(true);
@@ -493,7 +493,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e)
 	if(!noShowNS)
 		i.setAttribute("xmlns", e.namespaceURI());
 
-	// copy tqchildren
+	// copy children
 	TQDomNodeList nl = e.childNodes();
 	for(x = 0; x < nl.count(); ++x) {
 		TQDomNode n = nl.item(x);
@@ -514,7 +514,7 @@ void Client::streamReadyRead()
 		Stanza s = d->stream->read();
 
 		TQString out = s.toString();
-		debug(TQString("Client: incoming: [\n%1]\n").tqarg(out));
+		debug(TQString("Client: incoming: [\n%1]\n").arg(out));
 		xmlIncoming(out);
 
 		TQDomElement x = oldStyleNS(s.element());
@@ -607,7 +607,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e)
 			i.setAttributeNodeNS(a.cloneNode().toAttr());
 	}
 
-	// copy tqchildren
+	// copy children
 	TQDomNodeList nl = e.childNodes();
 	for(x = 0; x < nl.count(); ++x) {
 		TQDomNode n = nl.item(x);
@@ -631,7 +631,7 @@ void Client::send(const TQDomElement &x)
 	//x.save(ts, 0);
 
 	//TQString out = Stream::xmlToString(x);
-	//debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out));
+	//debug(TQString("Client: outgoing: [\n%1]\n").arg(out));
 	//xmlOutgoing(out);
 
 	TQDomElement e = addCorrectNS(x);
@@ -642,7 +642,7 @@ void Client::send(const TQDomElement &x)
 	}
 
 	TQString out = s.toString();
-	debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out));
+	debug(TQString("Client: outgoing: [\n%1]\n").arg(out));
 	xmlOutgoing(out);
 
 	//printf("x[%s] x2[%s] s[%s]\n", Stream::xmlToString(x).latin1(), Stream::xmlToString(e).latin1(), s.toString().latin1());
@@ -654,7 +654,7 @@ void Client::send(const TQString &str)
 	if(!d->stream)
 		return;
 
-	debug(TQString("Client: outgoing: [\n%1]\n").tqarg(str));
+	debug(TQString("Client: outgoing: [\n%1]\n").arg(str));
 	xmlOutgoing(str);
 	static_cast<ClientStream*>(d->stream)->writeDirect(str);
 }
@@ -713,12 +713,12 @@ void Client::ppSubscription(const Jid &j, const TQString &s)
 	subscription(j, s);
 }
 
-void Client::ppPresence(const Jid &j, const tqStatus &s)
+void Client::ppPresence(const Jid &j, const Status &s)
 {
 	if(s.isAvailable())
-		debug(TQString("Client: %1 is available.\n").tqarg(j.full()));
+		debug(TQString("Client: %1 is available.\n").arg(j.full()));
 	else
-		debug(TQString("Client: %1 is unavailable.\n").tqarg(j.full()));
+		debug(TQString("Client: %1 is unavailable.\n").arg(j.full()));
 
 	for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
 		GroupChat &i = *it;
@@ -726,7 +726,7 @@ void Client::ppPresence(const Jid &j, const tqStatus &s)
 		if(i.j.compare(j, false)) {
 			bool us = (i.j.resource() == j.resource() || j.resource().isEmpty()) ? true: false;
 
-			debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").tqarg(i.j.full()).tqarg(j.full()).tqarg(us));
+			debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").arg(i.j.full()).arg(j.full()).arg(us));
 			switch(i.status) {
 				case GroupChat::Connecting:
 					if(us && s.hasError()) {
@@ -789,7 +789,7 @@ void Client::ppPresence(const Jid &j, const tqStatus &s)
 	}
 }
 
-void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
+void Client::updateSelfPresence(const Jid &j, const Status &s)
 {
 	ResourceList::Iterator rit = d->resourceList.find(j.resource());
 	bool found = (rit == d->resourceList.end()) ? false: true;
@@ -797,8 +797,8 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
 	// unavailable?  remove the resource
 	if(!s.isAvailable()) {
 		if(found) {
-			debug(TQString("Client: Removing self resource: name=[%1]\n").tqarg(j.resource()));
-			(*rit).settqStatus(s);
+			debug(TQString("Client: Removing self resource: name=[%1]\n").arg(j.resource()));
+			(*rit).setStatus(s);
 			resourceUnavailable(j, *rit);
 			d->resourceList.remove(rit);
 		}
@@ -809,19 +809,19 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
 		if(!found) {
 			r = Resource(j.resource(), s);
 			d->resourceList += r;
-			debug(TQString("Client: Adding self resource: name=[%1]\n").tqarg(j.resource()));
+			debug(TQString("Client: Adding self resource: name=[%1]\n").arg(j.resource()));
 		}
 		else {
-			(*rit).settqStatus(s);
+			(*rit).setStatus(s);
 			r = *rit;
-			debug(TQString("Client: Updating self resource: name=[%1]\n").tqarg(j.resource()));
+			debug(TQString("Client: Updating self resource: name=[%1]\n").arg(j.resource()));
 		}
 
 		resourceAvailable(j, r);
 	}
 }
 
-void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
+void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s)
 {
 	ResourceList::Iterator rit = i->resourceList().find(j.resource());
 	bool found = (rit == i->resourceList().end()) ? false: true;
@@ -829,11 +829,11 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
 	// unavailable?  remove the resource
 	if(!s.isAvailable()) {
 		if(found) {
-			(*rit).settqStatus(s);
-			debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource()));
+			(*rit).setStatus(s);
+			debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
 			resourceUnavailable(j, *rit);
 			i->resourceList().remove(rit);
-			i->setLastUnavailabletqStatus(s);
+			i->setLastUnavailableStatus(s);
 		}
 	}
 	// available?  add/update the resource
@@ -842,12 +842,12 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
 		if(!found) {
 			r = Resource(j.resource(), s);
 			i->resourceList() += r;
-			debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource()));
+			debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
 		}
 		else {
-			(*rit).settqStatus(s);
+			(*rit).setStatus(s);
 			r = *rit;
-			debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource()));
+			debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
 		}
 
 		resourceAvailable(j, r);
@@ -856,7 +856,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
 
 void Client::pmMessage(const Message &m)
 {
-	debug(TQString("Client: Message from %1\n").tqarg(m.from().full()));
+	debug(TQString("Client: Message from %1\n").arg(m.from().full()));
 
 	if(m.type() == "groupchat") {
 		for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
@@ -994,7 +994,7 @@ void Client::sendSubscription(const Jid &jid, const TQString &type)
 	j->go(true);
 }
 
-void Client::setPresence(const tqStatus &s)
+void Client::setPresence(const Status &s)
 {
 	JT_Presence *j = new JT_Presence(rootTask());
 	j->pres(s);
@@ -1004,7 +1004,7 @@ void Client::setPresence(const tqStatus &s)
 	ppPresence(jid(), s);
 	//ResourceList::Iterator rit = d->resourceList.find(resource());
 	//Resource &r = *rit;
-	//r.settqStatus(s);
+	//r.setStatus(s);
 }
 
 TQString Client::OSName() const
@@ -1363,7 +1363,7 @@ void Task::debug(const char *fmt, ...)
 
 void Task::debug(const TQString &str)
 {
-	client()->debug(TQString("%1: ").tqarg(className()) + str);
+	client()->debug(TQString("%1: ").arg(className()) + str);
 }
 
 bool Task::iqVerify(const TQDomElement &x, const Jid &to, const TQString &id, const TQString &xmlns)
@@ -1462,9 +1462,9 @@ bool LiveRosterItem::isAvailable() const
 	return false;
 }
 
-const tqStatus & LiveRosterItem::lastUnavailabletqStatus() const
+const Status & LiveRosterItem::lastUnavailableStatus() const
 {
-	return v_lastUnavailabletqStatus;
+	return v_lastUnavailableStatus;
 }
 
 bool LiveRosterItem::flagForDelete() const
@@ -1472,9 +1472,9 @@ bool LiveRosterItem::flagForDelete() const
 	return v_flagForDelete;
 }
 
-void LiveRosterItem::setLastUnavailabletqStatus(const tqStatus &s)
+void LiveRosterItem::setLastUnavailableStatus(const Status &s)
 {
-	v_lastUnavailabletqStatus = s;
+	v_lastUnavailableStatus = s;
 }
 
 void LiveRosterItem::setFlagForDelete(bool b)
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
index 9e742d10..f33e428f 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
@@ -295,7 +295,7 @@ Stanza::Error Message::error() const
 	return d->error;
 }
 
-//! \brief Set tqreceivers information
+//! \brief Set receivers information
 //!
 //! \param to - Receivers Jabber id
 void Message::setTo(const Jid &j)
@@ -697,7 +697,7 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset)
 		d->spooled = true;
 	}
 	else {
-		d->timeStamp = TQDateTime::tqcurrentDateTime();
+		d->timeStamp = TQDateTime::currentDateTime();
 		d->spooled = false;
 	}
 
@@ -801,100 +801,100 @@ bool Subscription::fromString(const TQString &s)
 
 
 //---------------------------------------------------------------------------
-// tqStatus
+// Status
 //---------------------------------------------------------------------------
-tqStatus::tqStatus(const TQString &show, const TQString &status, int priority, bool available)
+Status::Status(const TQString &show, const TQString &status, int priority, bool available)
 {
 	v_isAvailable = available;
 	v_show = show;
 	v_status = status;
 	v_priority = priority;
-	v_timeStamp = TQDateTime::tqcurrentDateTime();
+	v_timeStamp = TQDateTime::currentDateTime();
 	v_isInvisible = false;
 	ecode = -1;
 }
 
-tqStatus::~tqStatus()
+Status::~Status()
 {
 }
 
-bool tqStatus::hasError() const
+bool Status::hasError() const
 {
 	return (ecode != -1);
 }
 
-void tqStatus::setError(int code, const TQString &str)
+void Status::setError(int code, const TQString &str)
 {
 	ecode = code;
 	estr = str;
 }
 
-void tqStatus::setIsAvailable(bool available)
+void Status::setIsAvailable(bool available)
 {
 	v_isAvailable = available;
 }
 
-void tqStatus::setIsInvisible(bool invisible)
+void Status::setIsInvisible(bool invisible)
 {
 	v_isInvisible = invisible;
 }
 
-void tqStatus::setPriority(int x)
+void Status::setPriority(int x)
 {
 	v_priority = x;
 }
 
-void tqStatus::setShow(const TQString & _show)
+void Status::setShow(const TQString & _show)
 {
 	v_show = _show;
 }
 
-void tqStatus::settqStatus(const TQString & _status)
+void Status::setStatus(const TQString & _status)
 {
 	v_status = _status;
 }
 
-void tqStatus::setTimeStamp(const TQDateTime & _timestamp)
+void Status::setTimeStamp(const TQDateTime & _timestamp)
 {
 	v_timeStamp = _timestamp;
 }
 
-void tqStatus::setKeyID(const TQString &key)
+void Status::setKeyID(const TQString &key)
 {
 	v_key = key;
 }
 
-void tqStatus::setXSigned(const TQString &s)
+void Status::setXSigned(const TQString &s)
 {
 	v_xsigned = s;
 }
 
-void tqStatus::setSongTitle(const TQString & _songtitle)
+void Status::setSongTitle(const TQString & _songtitle)
 {
 	v_songTitle = _songtitle;
 }
 
-void tqStatus::setCapsNode(const TQString & _capsNode)
+void Status::setCapsNode(const TQString & _capsNode)
 {
 	v_capsNode = _capsNode;
 }
 
-void tqStatus::setCapsVersion(const TQString & _capsVersion)
+void Status::setCapsVersion(const TQString & _capsVersion)
 {
 	v_capsVersion = _capsVersion;
 }
 
-void tqStatus::setCapsExt(const TQString & _capsExt)
+void Status::setCapsExt(const TQString & _capsExt)
 {
 	v_capsExt = _capsExt;
 }
 
-bool tqStatus::isAvailable() const
+bool Status::isAvailable() const
 {
 	return v_isAvailable;
 }
 
-bool tqStatus::isAway() const
+bool Status::isAway() const
 {
 	if(v_show == "away" || v_show == "xa" || v_show == "dnd")
 		return true;
@@ -902,66 +902,66 @@ bool tqStatus::isAway() const
 	return false;
 }
 
-bool tqStatus::isInvisible() const
+bool Status::isInvisible() const
 {
 	return v_isInvisible;
 }
 
-int tqStatus::priority() const
+int Status::priority() const
 {
 	return v_priority;
 }
 
-const TQString & tqStatus::show() const
+const TQString & Status::show() const
 {
 	return v_show;
 }
-const TQString & tqStatus::status() const
+const TQString & Status::status() const
 {
 	return v_status;
 }
 
-TQDateTime tqStatus::timeStamp() const
+TQDateTime Status::timeStamp() const
 {
 	return v_timeStamp;
 }
 
-const TQString & tqStatus::keyID() const
+const TQString & Status::keyID() const
 {
 	return v_key;
 }
 
-const TQString & tqStatus::xsigned() const
+const TQString & Status::xsigned() const
 {
 	return v_xsigned;
 }
 
-const TQString & tqStatus::songTitle() const
+const TQString & Status::songTitle() const
 {
 	return v_songTitle;
 }
 
-const TQString & tqStatus::capsNode() const
+const TQString & Status::capsNode() const
 {
 	return v_capsNode;
 }
 
-const TQString & tqStatus::capsVersion() const
+const TQString & Status::capsVersion() const
 {
 	return v_capsVersion;
 }
 
-const TQString & tqStatus::capsExt() const
+const TQString & Status::capsExt() const
 {
 	return v_capsExt;
 }
 
-int tqStatus::errorCode() const
+int Status::errorCode() const
 {
 	return ecode;
 }
 
-const TQString & tqStatus::errorString() const
+const TQString & Status::errorString() const
 {
 	return estr;
 }
@@ -970,7 +970,7 @@ const TQString & tqStatus::errorString() const
 //---------------------------------------------------------------------------
 // Resource
 //---------------------------------------------------------------------------
-Resource::Resource(const TQString &name, const tqStatus &stat)
+Resource::Resource(const TQString &name, const Status &stat)
 {
 	v_name = name;
 	v_status = stat;
@@ -990,7 +990,7 @@ int Resource::priority() const
 	return v_status.priority();
 }
 
-const tqStatus & Resource::status() const
+const Status & Resource::status() const
 {
 	return v_status;
 }
@@ -1000,7 +1000,7 @@ void Resource::setName(const TQString & _name)
 	v_name = _name;
 }
 
-void Resource::settqStatus(const tqStatus & _status)
+void Resource::setStatus(const Status & _status)
 {
 	v_status = _status;
 }
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
index 89d66796..edc8762e 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
@@ -485,7 +485,7 @@ JT_Presence::~JT_Presence()
 {
 }
 
-void JT_Presence::pres(const tqStatus &s)
+void JT_Presence::pres(const Status &s)
 {
 	type = 0;
 
@@ -504,7 +504,7 @@ void JT_Presence::pres(const tqStatus &s)
 		if(!s.status().isEmpty())
 			tag.appendChild(textTag(doc(), "status", s.status()));
 
-		tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) );
+		tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) );
 
 		if(!s.keyID().isEmpty()) {
 			TQDomElement x = textTag(doc(), "x", s.keyID());
@@ -529,7 +529,7 @@ void JT_Presence::pres(const tqStatus &s)
 	}
 }
 
-void JT_Presence::pres(const Jid &to, const tqStatus &s)
+void JT_Presence::pres(const Jid &to, const Status &s)
 {
 	pres(s);
 	tag.setAttribute("to", to.full());
@@ -569,7 +569,7 @@ bool JT_PushPresence::take(const TQDomElement &e)
 		return false;
 
 	Jid j(e.attribute("from"));
-	tqStatus p;
+	Status p;
 
 	if(e.hasAttribute("type")) {
 		TQString type = e.attribute("type");
@@ -593,7 +593,7 @@ bool JT_PushPresence::take(const TQDomElement &e)
 
 	tag = findSubTag(e, "status", &found);
 	if(found)
-		p.settqStatus(tagContent(tag));
+		p.setStatus(tagContent(tag));
 	tag = findSubTag(e, "show", &found);
 	if(found)
 		p.setShow(tagContent(tag));
@@ -676,7 +676,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e)
 	if(!noShowNS)
 		i.setAttribute("xmlns", e.namespaceURI());
 
-	// copy tqchildren
+	// copy children
 	TQDomNodeList nl = e.childNodes();
 	for(x = 0; x < nl.count(); ++x) {
 		TQDomNode n = nl.item(x);
@@ -742,7 +742,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e)
 			i.setAttributeNodeNS(al.item(x).cloneNode().toAttr());
 	}
 
-	// copy tqchildren
+	// copy children
 	TQDomNodeList nl = e.childNodes();
 	for(x = 0; x < nl.count(); ++x) {
 		TQDomNode n = nl.item(x);
@@ -1338,12 +1338,12 @@ bool JT_ServInfo::take(const TQDomElement &e)
 	//	TQDomElement query = doc()->createElement("query");
 	//	query.setAttribute("xmlns", "jabber:iq:time");
 	//	iq.appendChild(query);
-	//	TQDateTime local = TQDateTime::tqcurrentDateTime();
+	//	TQDateTime local = TQDateTime::currentDateTime();
 	//	TQDateTime utc = local.addSecs(-getTZOffset() * 3600);
 	//	TQString str = getTZString();
 	//	query.appendChild(textTag("utc", TS2stamp(utc)));
 	//	query.appendChild(textTag("tz", str));
-	//	query.appendChild(textTag("display", TQString("%1 %2").tqarg(local.toString()).tqarg(str)));
+	//	query.appendChild(textTag("display", TQString("%1 %2").arg(local.toString()).arg(str)));
 	//	send(iq);
 	//	return TRUE;
 	//}
@@ -1969,7 +1969,7 @@ JT_MucPresence::~JT_MucPresence()
 {
 }
 
-void JT_MucPresence::pres(const tqStatus &s)
+void JT_MucPresence::pres(const Status &s)
 {
 	type = 0;
 
@@ -1988,7 +1988,7 @@ void JT_MucPresence::pres(const tqStatus &s)
 		if(!s.status().isEmpty())
 			tag.appendChild(textTag(doc(), "status", s.status()));
 
-		tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) );
+		tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) );
 
 		if(!s.keyID().isEmpty()) {
 			TQDomElement x = textTag(doc(), "x", s.keyID());
@@ -2013,7 +2013,7 @@ void JT_MucPresence::pres(const tqStatus &s)
 	}
 }
 
-void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const TQString &password)
+void JT_MucPresence::pres(const Jid &to, const Status &s, const TQString &password)
 {
 	pres(s);
 	tag.setAttribute("to", to.full());
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
index 9a8041e9..0a1fdac5 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
@@ -30,7 +30,7 @@
 namespace XMPP
 {
 	class Roster;
-	class tqStatus;
+	class Status;
 
 	class JT_Register : public Task
 	{
@@ -135,8 +135,8 @@ namespace XMPP
 		JT_Presence(Task *parent);
 		~JT_Presence();
 
-		void pres(const tqStatus &);
-		void pres(const Jid &, const tqStatus &);
+		void pres(const Status &);
+		void pres(const Jid &, const Status &);
 		void sub(const Jid &, const TQString &subType);
 
 		void onGo();
@@ -160,7 +160,7 @@ namespace XMPP
 		bool take(const TQDomElement &);
 
 	signals:
-		void presence(const Jid &, const tqStatus &);
+		void presence(const Jid &, const Status &);
 		void subscription(const Jid &, const TQString &);
 
 	private:
@@ -468,8 +468,8 @@ namespace XMPP
 		JT_MucPresence(Task *parent);
 		~JT_MucPresence();
 
-		void pres(const tqStatus &);
-		void pres(const Jid &, const tqStatus &, const TQString &password);
+		void pres(const Status &);
+		void pres(const Jid &, const Status &, const TQString &password);
 
 		void onGo();
 
diff --git a/kopete/protocols/jabber/libiris/jingle_iris.patch b/kopete/protocols/jabber/libiris/jingle_iris.patch
index 489afab4..41acad0e 100644
--- a/kopete/protocols/jabber/libiris/jingle_iris.patch
+++ b/kopete/protocols/jabber/libiris/jingle_iris.patch
@@ -185,44 +185,44 @@ diff -ur psi/iris/xmpp-im/types.cpp psi-jingle/iris/xmpp-im/types.cpp
  	v_songTitle = _songtitle;
  }
  
-+void tqStatus::setCapsNode(const QString & _capsNode)
++void Status::setCapsNode(const QString & _capsNode)
 +{
 +	v_capsNode = _capsNode;
 +}
 +
-+void tqStatus::setCapsVersion(const QString & _capsVersion)
++void Status::setCapsVersion(const QString & _capsVersion)
 +{
 +	v_capsVersion = _capsVersion;
 +}
 +
-+void tqStatus::setCapsExt(const QString & _capsExt)
++void Status::setCapsExt(const QString & _capsExt)
 +{
 +	v_capsExt = _capsExt;
 +}
 +
- bool tqStatus::isAvailable() const
+ bool Status::isAvailable() const
  {
  	return v_isAvailable;
 @@ -836,6 +851,21 @@
  	return v_songTitle;
  }
  
-+const QString & tqStatus::capsNode() const
++const QString & Status::capsNode() const
 +{
 +	return v_capsNode;
 +}
 +
-+const QString & tqStatus::capsVersion() const
++const QString & Status::capsVersion() const
 +{
 +	return v_capsVersion;
 +}
 +
-+const QString & tqStatus::capsExt() const
++const QString & Status::capsExt() const
 +{
 +	return v_capsExt;
 +}
 +
- int tqStatus::errorCode() const
+ int Status::errorCode() const
  {
  	return ecode;
 @@ -1427,6 +1457,15 @@
diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.cpp b/kopete/protocols/jabber/libiris/qca/src/qca.cpp
index 1996b103..bad05fcd 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qca.cpp
+++ b/kopete/protocols/jabber/libiris/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)
@@ -794,7 +794,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/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui
index c0b3d1cc..30a609a0 100644
--- a/kopete/protocols/jabber/ui/dlgaddcontact.ui
+++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout24</cstring>
+                <cstring>layout24</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -40,7 +40,7 @@
                     <property name="text">
                         <string>&amp;Jabber ID:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -73,7 +73,7 @@
             <property name="text">
                 <string>&lt;i&gt;(for example: [email protected])&lt;/i&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -87,7 +87,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>190</height>
diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui
index cb0f1cc2..66cfcfc5 100644
--- a/kopete/protocols/jabber/ui/dlgbrowse.ui
+++ b/kopete/protocols/jabber/ui/dlgbrowse.ui
@@ -47,7 +47,7 @@
                         <property name="text">
                             <string>Please wait while retrieving search form...</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
@@ -128,7 +128,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>51</width>
                             <height>21</height>
diff --git a/kopete/protocols/jabber/ui/dlgchangepassword.ui b/kopete/protocols/jabber/ui/dlgchangepassword.ui
index 29ae6d33..bed6e8d4 100644
--- a/kopete/protocols/jabber/ui/dlgchangepassword.ui
+++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui
@@ -57,7 +57,7 @@
         </widget>
         <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>lbltqStatus</cstring>
+                <cstring>lblStatus</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
@@ -71,7 +71,7 @@
                 <string>Please enter your current password first
 and then your new password twice.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui
index aa124cc2..f5f40392 100644
--- a/kopete/protocols/jabber/ui/dlgchatjoin.ui
+++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui
@@ -57,7 +57,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="1">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -73,7 +73,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui
index 31f5b201..b158db62 100644
--- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui
+++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -97,7 +97,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -113,7 +113,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>21</height>
diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
index d130fa97..be558388 100644
--- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
@@ -68,7 +68,7 @@ void dlgJabberBrowse::slotGotForm ()
 
 	// translate the form and create it inside the display widget
 	translator = new JabberFormTranslator (task->form (), dynamicForm);
-	dynamicForm->tqlayout()->add( translator );
+	dynamicForm->layout()->add( translator );
 	translator->show();
 
 	// enable the send button
diff --git a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui
index a1b732db..ad52240e 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui
+++ b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui
@@ -12,7 +12,7 @@
             <height>343</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>300</width>
             <height>300</height>
@@ -87,7 +87,7 @@
         </widget>
         <widget class="TQLabel" row="1" column="0">
             <property name="name">
-                <cstring>lbltqStatus</cstring>
+                <cstring>lblStatus</cstring>
             </property>
             <property name="text">
                 <string></string>
diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
index e3599536..e0a14f1c 100644
--- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
+++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
@@ -57,7 +57,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout61</cstring>
+                                    <cstring>layout61</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -153,7 +153,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -162,7 +162,7 @@
                                 <property name="text">
                                     <string>To connect to the Jabber network, you will need an account on a Jabber server.  If you do not yet have an account, please click the button to create one.</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
@@ -227,7 +227,7 @@
                                 <property name="text">
                                     <string>If you have an existing Jabber account and would like to change its password, you can use this button to enter a new password.</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
@@ -243,7 +243,7 @@
                         <property name="sizeType">
                             <enum>Maximum</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -312,7 +312,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout66</cstring>
+                                    <cstring>layout66</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -469,7 +469,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>100</width>
                                         <height>32767</height>
@@ -495,7 +495,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>31</width>
                                         <height>20</height>
@@ -517,7 +517,7 @@
                                 <property name="text">
                                     <string>P&amp;riority:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter</set>
                                 </property>
                                 <property name="buddy" stdset="0">
@@ -542,13 +542,13 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>100</width>
                                         <height>0</height>
                                     </size>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>100</width>
                                         <height>32767</height>
@@ -575,7 +575,7 @@ If two resources have the same priority, the messages will be sent to the one co
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>200</height>
@@ -608,7 +608,7 @@ If two resources have the same priority, the messages will be sent to the one co
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout70</cstring>
+                                    <cstring>layout70</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -632,7 +632,7 @@ If two resources have the same priority, the messages will be sent to the one co
                                     </widget>
                                     <widget class="TQLayoutWidget" row="0" column="1">
                                         <property name="name">
-                                            <cstring>tqlayout68</cstring>
+                                            <cstring>layout68</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -691,7 +691,7 @@ If two resources have the same priority, the messages will be sent to the one co
 &lt;li&gt;Changes to these fields will only take effect the next time you start Kopete.&lt;/li&gt;
 &lt;li&gt;The "Proxy JID" can be configured per account.&lt;/li&gt;&lt;/ul&gt;&lt;/i&gt;</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
@@ -707,7 +707,7 @@ If two resources have the same priority, the messages will be sent to the one co
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>241</height>
@@ -748,7 +748,7 @@ If two resources have the same priority, the messages will be sent to the one co
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>40</width>
                                         <height>20</height>
@@ -798,7 +798,7 @@ If two resources have the same priority, the messages will be sent to the one co
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout10</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -814,7 +814,7 @@ If two resources have the same priority, the messages will be sent to the one co
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>30</width>
                                                 <height>20</height>
@@ -823,7 +823,7 @@ If two resources have the same priority, the messages will be sent to the one co
                                     </spacer>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout9</cstring>
+                                            <cstring>layout9</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -907,7 +907,7 @@ If two resources have the same priority, the messages will be sent to the one co
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>110</height>
diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp
index 8d1324ca..ff324085 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp
@@ -59,9 +59,9 @@ void dlgJabberRegister::slotGotForm ()
 
 	// translate the form and create it inside the box widget
 	translator = new JabberFormTranslator (task->form (), grpForm);
-	static_cast<TQBoxLayout*>(grpForm->tqlayout())->insertWidget(1, translator);
+	static_cast<TQBoxLayout*>(grpForm->layout())->insertWidget(1, translator);
 	translator->show();
-	resize(tqsizeHint());
+	resize(sizeHint());
 
 	// enable the send button
 	btnRegister->setEnabled (true);
diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.h b/kopete/protocols/jabber/ui/dlgjabberregister.h
index bc0bfe44..8fe905ce 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregister.h
+++ b/kopete/protocols/jabber/ui/dlgjabberregister.h
@@ -20,7 +20,7 @@
 #define DLGJABBERREGISTER_H
 
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 
diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
index 32749c18..ea3d51c0 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
+++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
@@ -12,7 +12,7 @@
             <height>376</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>300</width>
             <height>350</height>
@@ -40,13 +40,13 @@
             <property name="name">
                 <cstring>pixPasswordVerify</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>16</width>
                     <height>16</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>32767</height>
@@ -135,13 +135,13 @@
             <property name="name">
                 <cstring>pixJID</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>16</width>
                     <height>16</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>32767</height>
@@ -185,13 +185,13 @@
             <property name="name">
                 <cstring>pixServer</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>16</width>
                     <height>16</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>32767</height>
@@ -213,13 +213,13 @@
             <property name="name">
                 <cstring>pixPassword</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>16</width>
                     <height>16</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>32767</height>
@@ -247,7 +247,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -257,7 +257,7 @@
                     <property name="name">
                         <cstring>lblJIDInformation</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>100</height>
@@ -266,7 +266,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -280,7 +280,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -294,7 +294,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp
index 4b9192dc..97753bb2 100644
--- a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp
@@ -20,7 +20,7 @@
 
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <kdebug.h>
 #include "jabberclient.h"
 
diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp
index 29b2b617..1bd1310c 100644
--- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp
@@ -122,7 +122,7 @@ void dlgJabberServices::slotServiceFinished ()
 	if (!task->success ())
 	{
 		TQString error = task->statusString();
-		KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").tqarg(error), i18n ("Jabber Error"));
+		KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").arg(error), i18n ("Jabber Error"));
 		return;
 	}
 
diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
index 2e81801d..425890af 100644
--- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
@@ -23,7 +23,7 @@
 #include "dlgjabbervcard.h"
 
 // TQt includes
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqwidgetstack.h>
 #include <tqregexp.h>
 #include <tqbuffer.h>
@@ -296,7 +296,7 @@ void dlgJabberVCard::setEnabled(bool state)
 void dlgJabberVCard::slotSaveVCard()
 {
 	setEnabled(false);
-	m_mainWidget->lbltqStatus->setText( i18n("Saving vCard to server...") );
+	m_mainWidget->lblStatus->setText( i18n("Saving vCard to server...") );
 
 	XMPP::VCard vCard;
 	XMPP::VCard::AddressList addressList;
@@ -418,12 +418,12 @@ void dlgJabberVCard::slotVCardSaved()
 	
 	if( vCard->success() )
 	{
-		m_mainWidget->lbltqStatus->setText( i18n("vCard save sucessful.") );
+		m_mainWidget->lblStatus->setText( i18n("vCard save sucessful.") );
 		m_contact->setPropertiesFromVCard( vCard->vcard() );
 	}
 	else
 	{
-		m_mainWidget->lbltqStatus->setText( i18n("Error: Unable to save vCard.") );
+		m_mainWidget->lblStatus->setText( i18n("Error: Unable to save vCard.") );
 	}
 
 	setEnabled(true);
@@ -431,7 +431,7 @@ void dlgJabberVCard::slotVCardSaved()
 
 void dlgJabberVCard::slotGetVCard()
 {
-	m_mainWidget->lbltqStatus->setText( i18n("Fetching contact vCard...") );
+	m_mainWidget->lblStatus->setText( i18n("Fetching contact vCard...") );
 
 	setReadOnly(true);
 	setEnabled(false);
@@ -454,11 +454,11 @@ void dlgJabberVCard::slotGotVCard()
 
 		assignContactProperties();		
 
-		m_mainWidget->lbltqStatus->setText( i18n("vCard fetching Done.") );
+		m_mainWidget->lblStatus->setText( i18n("vCard fetching Done.") );
 	}
 	else
 	{
-		m_mainWidget->lbltqStatus->setText( i18n("Error: vCard could not be fetched correctly. Check connectivity with the Jabber server.") );
+		m_mainWidget->lblStatus->setText( i18n("Error: vCard could not be fetched correctly. Check connectivity with the Jabber server.") );
 		//it is maybe possible to anyway edit our own vCard (if it is new
 		if(m_account->myself() == m_contact)
 			setEnabled( true );
@@ -547,7 +547,7 @@ void dlgJabberVCard::slotClearPhoto()
 
 void dlgJabberVCard::slotOpenURL(const TQString &url)
 {
-	if ( !url.isEmpty () || (url == TQString::tqfromLatin1("mailto:") ) )
+	if ( !url.isEmpty () || (url == TQString::fromLatin1("mailto:") ) )
 		new KRun(KURL( url ) );
 }
 
diff --git a/kopete/protocols/jabber/ui/dlgregister.ui b/kopete/protocols/jabber/ui/dlgregister.ui
index 8a883b65..8ea5d423 100644
--- a/kopete/protocols/jabber/ui/dlgregister.ui
+++ b/kopete/protocols/jabber/ui/dlgregister.ui
@@ -78,7 +78,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -111,7 +111,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui
index 9d56f7bc..eaaf5aa6 100644
--- a/kopete/protocols/jabber/ui/dlgsendraw.ui
+++ b/kopete/protocols/jabber/ui/dlgsendraw.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -42,7 +42,7 @@
                         <string>Type in the packet that should be sent to the server:</string>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>lblRealtqStatus</cstring>
+                        <cstring>lblRealStatus</cstring>
                     </property>
                 </widget>
                 <widget class="TQTextEdit">
@@ -63,7 +63,7 @@
                     </item>
                     <item>
                         <property name="text">
-                            <string>Availability tqStatus</string>
+                            <string>Availability Status</string>
                         </property>
                     </item>
                     <item>
@@ -102,7 +102,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -134,7 +134,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>25</height>
diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui
index fda7bf4a..da690a97 100644
--- a/kopete/protocols/jabber/ui/dlgservices.ui
+++ b/kopete/protocols/jabber/ui/dlgservices.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -112,7 +112,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -128,7 +128,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>111</width>
                             <height>21</height>
diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui
index 8a4aa790..6daa3a4e 100644
--- a/kopete/protocols/jabber/ui/dlgvcard.ui
+++ b/kopete/protocols/jabber/ui/dlgvcard.ui
@@ -33,7 +33,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout13</cstring>
+                            <cstring>layout13</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -64,7 +64,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout12</cstring>
+                            <cstring>layout12</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -90,7 +90,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -159,7 +159,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout14</cstring>
+                            <cstring>layout14</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -190,7 +190,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -221,7 +221,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout10</cstring>
+                            <cstring>layout10</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -255,7 +255,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout9</cstring>
+                            <cstring>layout9</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -294,7 +294,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -311,7 +311,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -357,13 +357,13 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>96</width>
                                         <height>96</height>
                                     </size>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>96</width>
                                         <height>96</height>
@@ -386,7 +386,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>40</width>
                                         <height>20</height>
@@ -403,7 +403,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>40</width>
                                         <height>20</height>
@@ -427,7 +427,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout36</cstring>
+                            <cstring>layout36</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -472,7 +472,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -586,7 +586,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>50</height>
@@ -625,7 +625,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout37</cstring>
+                            <cstring>layout37</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -641,7 +641,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -720,7 +720,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>30</height>
@@ -823,7 +823,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout57</cstring>
+                            <cstring>layout57</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -849,7 +849,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -915,7 +915,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout59</cstring>
+                            <cstring>layout59</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -931,7 +931,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -1015,7 +1015,7 @@
         </widget>
         <widget class="TQLabel" row="1" column="0">
             <property name="name">
-                <cstring>lbltqStatus</cstring>
+                <cstring>lblStatus</cstring>
             </property>
             <property name="text">
                 <string></string>
diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
index 076b92b8..fea94d86 100644
--- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
+++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
@@ -20,7 +20,7 @@
 
 #include "jabberaddcontactpage.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kopeteaccount.h>
diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
index 95272833..63339158 100644
--- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp
+++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
@@ -41,7 +41,7 @@ JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const ch
 	mMainWidget = new DlgJabberChooseServer ( this );
 	setMainWidget ( mMainWidget );
 
-	mMainWidget->lbltqStatus->setText ( i18n ( "Retrieving server list...") );
+	mMainWidget->lblStatus->setText ( i18n ( "Retrieving server list...") );
 
 	mMainWidget->listServers->setLeftMargin ( 0 );
 
@@ -108,7 +108,7 @@ void JabberChooseServer::slotTransferResult ( KIO::Job *job )
 
 	if ( job->error () || mTransferJob->isErrorPage () )
 	{
-		mMainWidget->lbltqStatus->setText ( i18n ( "Could not retrieve server list." ) );
+		mMainWidget->lblStatus->setText ( i18n ( "Could not retrieve server list." ) );
 		return;
 	}
 	else
@@ -116,14 +116,14 @@ void JabberChooseServer::slotTransferResult ( KIO::Job *job )
 		kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Received server list ok!" << endl;
 
 		// clear status message
-		mMainWidget->lbltqStatus->setText ( "" );
+		mMainWidget->lblStatus->setText ( "" );
 
 		// parse XML list
 		TQDomDocument doc;
 
 		if ( !doc.setContent ( xmlServerList ) )
 		{
-			mMainWidget->lbltqStatus->setText ( i18n ( "Could not parse the server list.") );
+			mMainWidget->lblStatus->setText ( i18n ( "Could not parse the server list.") );
 			return;
 		}
 
diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
index 758322cf..b8a9c080 100644
--- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
+++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
@@ -88,7 +88,7 @@ void JabberEditAccountWidget::reopen ()
 	mPass->load (&account()->password ());
 	cbAutoConnect->setChecked (account()->excludeConnect());
 	
-	mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::tqfromLatin1("Kopete")));
+	mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::fromLatin1("Kopete")));
 	mPriority->setValue (account()->configGroup()->readNumEntry ("Priority", 5));
 	mServer->setText (account()->configGroup()->readEntry ("Server", TQString()));
 
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
index 2641ed41..631ec3f4 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
@@ -146,8 +146,8 @@ void JabberRegisterAccount::validateData ()
 	}
 
 	if ( valid &&
-	   ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () ||
-	     TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) )
+	   ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () ||
+	     TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) )
 	{
 		mMainWidget->lblStatusMessage->setText ( i18n ( "Please enter the same password twice." ) );
 		valid = false;
@@ -155,8 +155,8 @@ void JabberRegisterAccount::validateData ()
 	}
 
 	if ( valid &&
-	   ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ) !=
-	     TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) )
+	   ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ) !=
+	     TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) )
 	{
 		mMainWidget->lblStatusMessage->setText ( i18n ( "Password entries do not match." ) );
 		valid = false;