rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

54 files changed, 185 insertions, 185 deletions

diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp
index a380d3c4..2ee8423e 100644
--- a/kopete/protocols/jabber/jabberbasecontact.cpp
+++ b/kopete/protocols/jabber/jabberbasecontact.cpp
@@ -164,7 +164,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
 		// find all groups our contact is in but that are not in the server side roster
 		for ( unsigned i = 0; i < metaContact()->groups().count (); i++ )
 		{
-			if ( item.groups().tqfind ( metaContact()->groups().at(i)->displayName () ) == item.groups().end () )
+			if ( item.groups().find ( metaContact()->groups().at(i)->displayName () ) == item.groups().end () )
 				groupsToRemoveFrom.append ( metaContact()->groups().at ( i ) );
 		}
 	
@@ -193,7 +193,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
 		* risk removing the contact from the visible contact list. In this
 		* case, we need to make sure at least the top level group stays.
 		*/
-		if ( ( groupsToAddTo.count () == 0 ) && ( groupsToRemoveFrom.tqcontains ( Kopete::Group::topLevel () ) ) )
+		if ( ( groupsToAddTo.count () == 0 ) && ( groupsToRemoveFrom.contains ( Kopete::Group::topLevel () ) ) )
 		{
 			groupsToRemoveFrom.remove ( Kopete::Group::topLevel () );
 		}
@@ -630,7 +630,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard )
 
 	TQImage contactPhoto;
 	TQString fullJid =  mRosterItem.jid().full();
-	TQString finalPhotoPath = locateLocal("appdata", "jabberphotos/" + fullJid.tqreplace(TQRegExp("[./~]"),"-")  +".png");
+	TQString finalPhotoPath = locateLocal("appdata", "jabberphotos/" + fullJid.replace(TQRegExp("[./~]"),"-")  +".png");
 	
 	// photo() is a TQByteArray
 	if ( !vCard.photo().isEmpty() )
diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp
index 39011f81..5b69d489 100644
--- a/kopete/protocols/jabber/jabberbookmarks.cpp
+++ b/kopete/protocols/jabber/jabberbookmarks.cpp
@@ -96,7 +96,7 @@ void JabberBookmarks::slotReceivedBookmarks( )
 
 void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid)
 {
-	if(m_conferencesJID.tqcontains(jid.full()) || !m_account->isConnected())
+	if(m_conferencesJID.contains(jid.full()) || !m_account->isConnected())
 	{
 		return;
 	}
diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
index eb5efabf..6161099e 100644
--- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
+++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
@@ -117,7 +117,7 @@ TQStringList JabberCapabilitiesManager::CapabilitiesInformation::jids() const
 	for( ; it != itEnd; ++it) 
 	{
 		TQString jid( (*it).first );
-		if( !jids.tqcontains(jid) )
+		if( !jids.contains(jid) )
 			jids.push_back(jid);
 	}
 
@@ -163,7 +163,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::addJid(const Jid& jid,
 {
 	TQPair<TQString,JabberAccount*> jidAccountPair(jid.full(),account);
 
-	if( !m_jids.tqcontains(jidAccountPair) ) 
+	if( !m_jids.contains(jidAccountPair) ) 
 	{
 		m_jids.push_back(jidAccountPair);
 		updateLastSeen();
@@ -172,7 +172,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::addJid(const Jid& jid,
 
 void JabberCapabilitiesManager::CapabilitiesInformation::removeJid(const Jid& jid)
 {
-	kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Unregistering " << TQString(jid.full()).tqreplace('%',"%%") << endl;
+	kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Unregistering " << TQString(jid.full()).replace('%',"%%") << endl;
 
 	TQValueList<TQPair<TQString,JabberAccount*> >::Iterator it = m_jids.begin();
 	while( it != m_jids.end() ) 
@@ -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()).tqreplace('%',"%%")).tqarg(node + "#" + (*newCapsIt).extensions()) << endl;
+					kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(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()).tqreplace('%',"%%")).tqarg(node).tqarg(version) << endl;
+			kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node).tqarg(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()).tqreplace('%',"%%")).tqarg(discoInfo->node()).tqarg(discoInfo->success()) << endl;
+	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;
 
 	TQStringList tokens = TQStringList::split("#",discoInfo->node());
 
@@ -486,7 +486,7 @@ void JabberCapabilitiesManager::discoRequestFinished()
 			TQPair<Jid,JabberAccount*> jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->tqparent());
 			if( jidAccountPair.second ) 
 			{
-				kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).tqreplace('%',"%%")) << endl;
+				kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl;
 				requestDiscoInfo( jidAccountPair.second, jidAccountPair.first, discoInfo->node() );
 			}
 			else 
@@ -563,7 +563,7 @@ void JabberCapabilitiesManager::loadCachedInformation()
 
 bool JabberCapabilitiesManager::capabilitiesEnabled(const Jid &jid) const
 {
-	return d->jidCapabilitiesMap.tqcontains( jid.full() );	
+	return d->jidCapabilitiesMap.contains( jid.full() );	
 }
 
 XMPP::Features JabberCapabilitiesManager::features(const Jid& jid) const
@@ -599,7 +599,7 @@ TQString JabberCapabilitiesManager::clientName(const Jid& jid) const
 			if (name.startsWith("www."))
 				name = name.right(name.length() - 4);
 			
-			int cut_pos = name.tqfind(".");
+			int cut_pos = name.find(".");
 			if (cut_pos != -1) {
 				name = name.left(cut_pos);
 			}
diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp
index 60c109ae..d10f4201 100644
--- a/kopete/protocols/jabber/jabberchatsession.cpp
+++ b/kopete/protocols/jabber/jabberchatsession.cpp
@@ -253,7 +253,7 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat
 		jabberMessage.setSubject ( message.subject () );
 		jabberMessage.setTimeStamp ( message.timestamp () );
 
-		if ( message.plainBody().tqfind ( "-----BEGIN PGP MESSAGE-----" ) != -1 )
+		if ( message.plainBody().find ( "-----BEGIN PGP MESSAGE-----" ) != -1 )
 		{
 			/*
 			 * This message is encrypted, so we need to set
@@ -270,7 +270,7 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat
 
 			// remove PGP header and footer from message
 			encryptedBody.truncate ( encryptedBody.length () - TQString("-----END PGP MESSAGE-----").length () - 2 );
-			encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.tqfind ( "\n\n" ) - 2 );
+			encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.find ( "\n\n" ) - 2 );
 
 			// assign payload to message
 			jabberMessage.setXEncrypted ( encryptedBody );
@@ -286,16 +286,16 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat
 				{
 					TQString xhtmlBody = message.escapedBody();
 
-					// According to JEP-0071 8.9  it is only RECOMMANDED to tqreplace \n with <br/>
+					// According to JEP-0071 8.9  it is only RECOMMANDED to replace \n with <br/>
 					//  which mean that some implementation (gaim 2 beta) may still think that \n are linebreak.
 					// and considered the fact that KTextEditor generate a well indented XHTML, we need to remove all \n from it
 					//  see Bug 121627
 					// Anyway, theses client that do like that are *WRONG*  considreded the example of jep-71 where there are lot of
 					// linebreak that are not interpreted.  - Olivier 2006-31-03
-					xhtmlBody.tqreplace("\n","");
+					xhtmlBody.replace("\n","");
 
 					//&nbsp; is not a valid XML entity
-					xhtmlBody.tqreplace("&nbsp;" , "&#160;");
+					xhtmlBody.replace("&nbsp;" , "&#160;");
 
 					// Remove trailing line break
 					xhtmlBody.remove( TQRegExp( "<br/>$" ) );
@@ -358,4 +358,4 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat
 #include "jabberchatsession.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
-// kate: tab-width 4; tqreplace-tabs off; space-indent off;
+// kate: tab-width 4; replace-tabs off; space-indent off;
diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp
index 99a768fc..cf37ffd8 100644
--- a/kopete/protocols/jabber/jabberclient.cpp
+++ b/kopete/protocols/jabber/jabberclient.cpp
@@ -272,7 +272,7 @@ void JabberClient::addS5BServerAddress ( const TQString &address )
 	// now filter the list without dupes
 	for ( TQStringList::Iterator it = d->s5bAddressList.begin (); it != d->s5bAddressList.end (); ++it )
 	{
-		if ( !newList.tqcontains ( *it ) )
+		if ( !newList.contains ( *it ) )
 			newList.append ( *it );
 	}
 
@@ -284,7 +284,7 @@ void JabberClient::removeS5BServerAddress ( const TQString &address )
 {
 	TQStringList newList;
 
-	TQStringList::iterator it = d->s5bAddressList.tqfind ( address );
+	TQStringList::iterator it = d->s5bAddressList.find ( address );
 	if ( it != d->s5bAddressList.end () )
 	{
 		d->s5bAddressList.remove ( it );
@@ -300,7 +300,7 @@ void JabberClient::removeS5BServerAddress ( const TQString &address )
 		// now filter the list without dupes
 		for ( TQStringList::Iterator it = d->s5bAddressList.begin (); it != d->s5bAddressList.end (); ++it )
 		{
-			if ( !newList.tqcontains ( *it ) )
+			if ( !newList.contains ( *it ) )
 				newList.append ( *it );
 		}
 
@@ -859,8 +859,8 @@ void JabberClient::slotPsiDebug ( const TQString & _msg )
 {
 	TQString msg = _msg;
 
-	msg = msg.tqreplace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" );
-	msg = msg.tqreplace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" );
+	msg = msg.replace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" );
+	msg = msg.replace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" );
 
 	emit debugMessage ( "Psi: " + msg );
 
@@ -870,8 +870,8 @@ void JabberClient::slotIncomingXML ( const TQString & _msg )
 {
 	TQString msg = _msg;
 
-	msg = msg.tqreplace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" );
-	msg = msg.tqreplace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" );
+	msg = msg.replace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" );
+	msg = msg.replace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" );
 
 	emit debugMessage ( "XML IN: " + msg );
 
@@ -881,8 +881,8 @@ void JabberClient::slotOutgoingXML ( const TQString & _msg )
 {
 	TQString msg = _msg;
 
-	msg = msg.tqreplace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" );
-	msg = msg.tqreplace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" );
+	msg = msg.replace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" );
+	msg = msg.replace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" );
 
 	emit debugMessage ( "XML OUT: " + msg );
 
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index f873387f..c6147ae1 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -213,7 +213,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions ()
 				 * and the resources' respective status icons for the rest.
 				 */
 				TQIconSet iconSet ( !i ?
-					protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.tqfind(*it) ).iconFor ( account () ));
+					protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(*it) ).iconFor ( account () ));
 
 				actionSelectResource->insert ( new KAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ),
 											   actionSelectResource, TQString::number( i ).latin1() ) );
@@ -795,7 +795,7 @@ void JabberContact::slotChatSessionDeleted ( TQObject *sender )
 
 	JabberChatSession *manager = static_cast<JabberChatSession *>(sender);
 
-	mManagers.remove ( mManagers.tqfind ( manager ) );
+	mManagers.remove ( mManagers.find ( manager ) );
 
 }
 
diff --git a/kopete/protocols/jabber/jabbercontactpool.cpp b/kopete/protocols/jabber/jabbercontactpool.cpp
index 369cb9d9..43724d28 100644
--- a/kopete/protocols/jabber/jabbercontactpool.cpp
+++ b/kopete/protocols/jabber/jabbercontactpool.cpp
@@ -93,7 +93,7 @@ JabberContact *JabberContactPool::addContact ( const XMPP::RosterItem &contact,
 	JabberTransport *transport=0l;
 	TQString legacyId;
 	//find if the contact should be added to a transport.
-	if(mAccount->transports().tqcontains(contact.jid().domain()))
+	if(mAccount->transports().contains(contact.jid().domain()))
 	{
 		transport=mAccount->transports()[contact.jid().domain()];
 		legacyId=transport->legacyId( contact.jid() );
@@ -222,7 +222,7 @@ void JabberContactPool::slotContactDestroyed ( Kopete::Contact *contact )
 	else
 	{
 		//this is a legacy contact. we have no way to get the real Jid at this point, we can only guess it.
-		TQString contactId= contact->contactId().tqreplace('@','%') + "@" + contact->account()->myself()->contactId();
+		TQString contactId= contact->contactId().replace('@','%') + "@" + contact->account()->myself()->contactId();
 		mAccount->resourcePool()->removeAllResources ( XMPP::Jid ( contactId ) ) ;
 	}
 
diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp
index ff5ae32c..f536a1c9 100644
--- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp
+++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp
@@ -89,7 +89,7 @@ void JabberGroupChatManager::slotMessageSent ( Kopete::Message &message, Kopete:
 		jabberMessage.setSubject ( message.subject () );
 		jabberMessage.setTimeStamp ( message.timestamp () );
 
-		if ( message.plainBody().tqfind ( "-----BEGIN PGP MESSAGE-----" ) != -1 )
+		if ( message.plainBody().find ( "-----BEGIN PGP MESSAGE-----" ) != -1 )
 		{
 			/*
 			 * This message is encrypted, so we need to set
@@ -106,7 +106,7 @@ void JabberGroupChatManager::slotMessageSent ( Kopete::Message &message, Kopete:
 
 			// remove PGP header and footer from message
 			encryptedBody.truncate ( encryptedBody.length () - TQString("-----END PGP MESSAGE-----").length () - 2 );
-			encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.tqfind ( "\n\n" ) - 2 );
+			encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.find ( "\n\n" ) - 2 );
 
 			// assign payload to message
 			jabberMessage.setXEncrypted ( encryptedBody );
diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp
index c88b8841..87b797c3 100644
--- a/kopete/protocols/jabber/jabberprotocol.cpp
+++ b/kopete/protocols/jabber/jabberprotocol.cpp
@@ -185,7 +185,7 @@ Kopete::Account *JabberProtocol::createNewAccount (const TQString & accountId)
 	if( Kopete::AccountManager::self()->findAccount( pluginId() , accountId ) )
 		return 0L;  //the account may already exist if greated just above
 
-	int slash=accountId.tqfind('/');
+	int slash=accountId.find('/');
 	if(slash>=0)
 	{
 		TQString realAccountId=accountId.left(slash);
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index 8bd9a915..218c9aae 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -298,7 +298,7 @@ TQString JabberTransport::legacyId( const XMPP::Jid & jid )
 	if(jid.node().isEmpty())
 		return TQString();
 	TQString node = jid.node();
-	return node.tqreplace("%","@");
+	return node.replace("%","@");
 }
 
 void JabberTransport::jabberAccountRemoved( )
diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
index 344071c6..594be2d4 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
@@ -123,8 +123,8 @@ void JingleClientSlots::callDestroyed(cricket::Call *call)
 void JingleClientSlots::sendStanza(cricket::SessionClient*, const buzz::XmlElement *stanza) 
 {
 	TQString st(stanza->Str().c_str());
-	st.tqreplace("cli:iq","iq");
-	st.tqreplace(":cli=","=");
+	st.replace("cli:iq","iq");
+	st.replace(":cli=","=");
 	fprintf(stderr,"bling\n");
 	voiceCaller_->sendStanza(st.latin1());
 	fprintf(stderr,"blong\n");
@@ -266,7 +266,7 @@ JingleVoiceCaller::~JingleVoiceCaller()
 
 bool JingleVoiceCaller::calling(const Jid& jid)
 {
-	return calls_.tqcontains(jid.full());
+	return calls_.contains(jid.full());
 }
 
 void JingleVoiceCaller::call(const Jid& jid)
@@ -316,7 +316,7 @@ void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call)
 {
 	qDebug("jinglevoicecaller.cpp: Registering call\n");
 	kdDebug(14000) << k_funcinfo << jid.full() << endl;
-	if (!calls_.tqcontains(jid.full())) {
+	if (!calls_.contains(jid.full())) {
 		calls_[jid.full()] = call;
 	}
 // 	else {
@@ -340,7 +340,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza)
 	if (doc.documentElement().tagName() == "presence") {
 		Jid from = Jid(doc.documentElement().attribute("from"));
 		TQString type = doc.documentElement().attribute("type");
-		if (type == "unavailable" && calls_.tqcontains(from.full())) {
+		if (type == "unavailable" && calls_.contains(from.full())) {
 			qDebug("JingleVoiceCaller: User went offline without closing a call.");
 			removeCall(from);
 			emit terminated(from);
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
index 3f3bd6ca..0225b177 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
@@ -93,7 +93,7 @@ public:
 		XMPP::Jid jid(session->remote_address().c_str());
 		
 		// Do nothing if the session do not contain a peers.
-		//if( !voiceSession->peers().tqcontains(jid) )
+		//if( !voiceSession->peers().contains(jid) )
 		if( !hasPeer(voiceSession->peers(), jid) )
 			return;
 
@@ -142,8 +142,8 @@ public:
 	void OnSendingStanza(cricket::SessionClient*, const buzz::XmlElement *buzzStanza)
 	{
 		TQString irisStanza(buzzStanza->Str().c_str());
-		irisStanza.tqreplace("cli:iq","iq");
-		irisStanza.tqreplace(":cli=","=");
+		irisStanza.replace("cli:iq","iq");
+		irisStanza.replace(":cli=","=");
 	
 		voiceSession->sendStanza(irisStanza);
 	}
diff --git a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro
index 8482614c..53c8e293 100644
--- a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro
+++ b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro
@@ -88,7 +88,7 @@ SOURCES += \
 		$$JINGLE_CPP/talk/session/phone/linphonemediaengine.cc \
 		$$JINGLE_CPP/talk/session/phone/voicechannel.cc
 	
-#tqcontains(DEFINES, HAVE_PORTAUDIO) {
+#contains(DEFINES, HAVE_PORTAUDIO) {
 #	SOURCES += \
 #		$$JINGLE_CPP/talk/session/phone/portaudiomediaengine.cc
 #}
@@ -128,11 +128,11 @@ SOURCES += \
 	$$JINGLE_CPP/talk/third_party/mediastreamer/mswrite.c \
 	$$JINGLE_CPP/talk/third_party/mediastreamer/sndcard.c
 
-tqcontains(DEFINES, HAVE_ALSA_ASOUNDLIB_H) {
+contains(DEFINES, HAVE_ALSA_ASOUNDLIB_H) {
 	SOURCES += $$JINGLE_CPP/talk/third_party/mediastreamer/alsacard.c
 }
 
-tqcontains(DEFINES, HAVE_PORTAUDIO) {
+contains(DEFINES, HAVE_PORTAUDIO) {
 	SOURCES += $$JINGLE_CPP/talk/third_party/mediastreamer/portaudiocard.c
 }
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc
index 38e22c2e..f10489f7 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc
@@ -66,7 +66,7 @@ void MessageQueueManager::Add(MessageQueue *message_queue) {
 void MessageQueueManager::Remove(MessageQueue *message_queue) {
   CritScope cs(&crit_);
   std::vector<MessageQueue *>::iterator iter;
-  iter = std::tqfind(message_queues_.begin(), message_queues_.end(), message_queue);
+  iter = std::find(message_queues_.begin(), message_queues_.end(), message_queue);
   if (iter != message_queues_.end())
     message_queues_.erase(iter);
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc
index 2ea7530f..5274c29d 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc
@@ -261,7 +261,7 @@ void NetworkManager::GetNetworks(std::vector<Network*>& result) {
   CreateNetworks(list);
 
   for (uint32 i = 0; i < list.size(); ++i) {
-    NetworkMap::iterator iter = networks_.tqfind(list[i]->name());
+    NetworkMap::iterator iter = networks_.find(list[i]->name());
 
     Network* network;
     if (iter == networks_.end()) {
@@ -313,12 +313,12 @@ Network::Network(const std::string& name, uint32 ip)
 }
 
 void Network::StartSession(NetworkSession* session) {
-  assert(std::tqfind(sessions_.begin(), sessions_.end(), session) == sessions_.end());
+  assert(std::find(sessions_.begin(), sessions_.end(), session) == sessions_.end());
   sessions_.push_back(session);
 }
 
 void Network::StopSession(NetworkSession* session) {
-  SessionList::iterator iter = std::tqfind(sessions_.begin(), sessions_.end(), session);
+  SessionList::iterator iter = std::find(sessions_.begin(), sessions_.end(), session);
   if (iter != sessions_.end())
     sessions_.erase(iter);
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc
index 5cdc4743..e1f0db4e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc
@@ -353,7 +353,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len,
 
     std::string A2 = method + ":" + uri;
     std::string middle;
-    if (args.tqfind("qop") != args.end()) {
+    if (args.find("qop") != args.end()) {
       args["qop"] = "auth";
       middle = args["nonce"] + ":" + ncount + ":" + cnonce + ":" + args["qop"];
     } else {
@@ -375,13 +375,13 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len,
     ss << ", realm=" << Quote(args["realm"]);
     ss << ", nonce=" << Quote(args["nonce"]);
     ss << ", uri=" << Quote(uri);
-    if (args.tqfind("qop") != args.end()) {
+    if (args.find("qop") != args.end()) {
       ss << ", qop=" << args["qop"];
       ss << ", nc="  << ncount;
       ss << ", cnonce=" << Quote(cnonce);
     }
     ss << ", response=\"" << dig_response << "\"";
-    if (args.tqfind("opaque") != args.end()) {
+    if (args.find("opaque") != args.end()) {
       ss << ", opaque=" << Quote(args["opaque"]);
     }
     response = ss.str();
@@ -483,7 +483,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len,
         size_t len = password.GetLength()+1;
         char * sensitive = new char[len];
         password.CopyTo(sensitive, true);
-        std::string::size_type pos = username.tqfind('\\');
+        std::string::size_type pos = username.find('\\');
         if (pos == std::string::npos) {
           auth_id.UserLength = static_cast<unsigned long>(
             _min(sizeof(userbuf) - 1, username.size()));
@@ -1100,7 +1100,7 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) {
   const char * direction = (input ? " << " : " >> ");
   std::string str(data, len);
   while (!str.empty()) {
-    std::string::size_type pos = str.tqfind('\n');
+    std::string::size_type pos = str.find('\n');
     std::string substr = str;
     if (pos == std::string::npos) {
       substr = str;
@@ -1114,9 +1114,9 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) {
     }
 
     // Filter out any private data
-    std::string::size_type pos_private = substr.tqfind("Email");
+    std::string::size_type pos_private = substr.find("Email");
     if (pos_private == std::string::npos) {
-      pos_private = substr.tqfind("Passwd");
+      pos_private = substr.find("Passwd");
     }
     if (pos_private == std::string::npos) {
         LOG(level_) << label_ << direction << substr;
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 e781b03d..40c1fbfe 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
@@ -350,14 +350,14 @@ void CallClient::OnStatusUpdate(const buzz::tqStatus& status) {
     (*roster_)[key] = item;
   } else {
     Console()->Printf("Removing from roster: %s", key.c_str());
-    RosterMap::iterator iter = roster_->tqfind(key);
+    RosterMap::iterator iter = roster_->find(key);
     if (iter != roster_->end())
       roster_->erase(iter);
   }
 }
 
 void CallClient::PrintRoster() {
-  Console()->Printf("Roster tqcontains %d callable", roster_->size());
+  Console()->Printf("Roster contains %d callable", roster_->size());
   RosterMap::iterator iter = roster_->begin();
   while (iter != roster_->end()) {
     Console()->Printf("%s - %s",
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 ee14fe94..cee7058a 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
@@ -48,7 +48,7 @@ IsXmlSpace(int ch) {
 
 static bool
 ListContainsToken(const std::string & list, const std::string & token) {
-  size_t i = list.tqfind(token);
+  size_t i = list.find(token);
   if (i == std::string::npos || token.empty())
     return false;
   bool boundary_before = (i == 0 || IsXmlSpace(list[i - 1]));
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 0677932b..2cb80ae2 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
@@ -114,12 +114,12 @@ public:
   // Knowledge of other clients' silly automatic status strings -
   // Don't show these.
   std::string QuiettqStatus() const {
-    if (jid_.resource().tqfind("Psi") != std::string::npos) {
+    if (jid_.resource().find("Psi") != std::string::npos) {
       if (status_ == "Online" ||
-          status_.tqfind("Auto tqStatus") != std::string::npos)
+          status_.find("Auto tqStatus") != std::string::npos)
         return STR_EMPTY;
     }
-    if (jid_.resource().tqfind("Gaim") != std::string::npos) {
+    if (jid_.resource().find("Gaim") != std::string::npos) {
       if (status_ == "Sorry, I ran out for a bit!")
         return STR_EMPTY;
     }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc
index 492559ae..66191f12 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc
@@ -55,12 +55,12 @@ std::string XmppAuth::ChooseBestSaslMechanism(
   std::vector<std::string>::const_iterator it;
 
   // a token is the weakest auth - 15s, service-limited, so prefer it.
-  it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN");
+  it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN");
   if (it != mechanisms.end())
     return "X-GOOGLE-TOKEN";
 
   // a cookie is the next weakest - 14 days
-  it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE");
+  it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE");
   if (it != mechanisms.end())
     return "X-GOOGLE-COOKIE";
 
@@ -70,7 +70,7 @@ std::string XmppAuth::ChooseBestSaslMechanism(
 
   // as a last resort, use plain authentication
   if (jid_.domain() != "google.com") {
-    it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN");
+    it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN");
     if (it != mechanisms.end())
       return "PLAIN";
   }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc
index d07e2e5d..eb53efeb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc
@@ -381,7 +381,7 @@ bool P2PSocket::CreateConnections(const Candidate &remote_candidate,
   }
 
   if ((origin_port != NULL) &&
-      tqfind(ports_.begin(), ports_.end(), origin_port) == ports_.end()) {
+      find(ports_.begin(), ports_.end(), origin_port) == ports_.end()) {
     if (CreateConnection(origin_port, remote_candidate, origin_port, readable))
       created = true;
   }
@@ -783,7 +783,7 @@ void P2PSocket::OnConnectionDestroyed(Connection *connection) {
 
   // Remove this connection from the list.
   std::vector<Connection*>::iterator iter =
-      tqfind(connections_.begin(), connections_.end(), connection);
+      find(connections_.begin(), connections_.end(), connection);
   assert(iter != connections_.end());
   connections_.erase(iter);
 
@@ -807,7 +807,7 @@ void P2PSocket::OnPortDestroyed(Port* port) {
   assert(worker_thread_ == Thread::Current());
 
   // Remove this port from the list (if we didn't drop it already).
-  std::vector<Port*>::iterator iter = tqfind(ports_.begin(), ports_.end(), port);
+  std::vector<Port*>::iterator iter = find(ports_.begin(), ports_.end(), port);
   if (iter != ports_.end())
     ports_.erase(iter);
 
@@ -843,7 +843,7 @@ const std::vector<Connection *>& P2PSocket::connections() {
 // Set options on ourselves is simply setting options on all of our available
 // port objects.
 int P2PSocket::SetOption(Socket::Option opt, int value) {
-  OptionMap::iterator it = options_.tqfind(opt);
+  OptionMap::iterator it = options_.find(opt);
   if (it == options_.end()) {
     options_.insert(std::make_pair(opt, value));
   } else if (it->second == value) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc
index c9272597..14549b5b 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc
@@ -171,7 +171,7 @@ Port::~Port() {
 }
 
 Connection* Port::GetConnection(const SocketAddress& remote_addr) {
-  AddressMap::const_iterator iter = connections_.tqfind(remote_addr);
+  AddressMap::const_iterator iter = connections_.find(remote_addr);
   if (iter != connections_.end())
     return iter->second;
   else
@@ -449,7 +449,7 @@ void Port::Start() {
 }
 
 void Port::OnConnectionDestroyed(Connection* conn) {
-  AddressMap::iterator iter = connections_.tqfind(conn->remote_candidate().address());
+  AddressMap::iterator iter = connections_.find(conn->remote_candidate().address());
   assert(iter != connections_.end());
   connections_.erase(iter);
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc
index 002033dc..bb52a1d5 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc
@@ -105,14 +105,14 @@ RelayServer::~RelayServer() {
 
 void RelayServer::AddInternalSocket(AsyncPacketSocket* socket) {
   assert(internal_sockets_.end() ==
-      std::tqfind(internal_sockets_.begin(), internal_sockets_.end(), socket));
+      std::find(internal_sockets_.begin(), internal_sockets_.end(), socket));
   internal_sockets_.push_back(socket);
   socket->SignalReadPacket.connect(this, &RelayServer::OnInternalPacket);
 }
 
 void RelayServer::RemoveInternalSocket(AsyncPacketSocket* socket) {
   SocketList::iterator iter =
-      std::tqfind(internal_sockets_.begin(), internal_sockets_.end(), socket);
+      std::find(internal_sockets_.begin(), internal_sockets_.end(), socket);
   assert(iter != internal_sockets_.end());
   internal_sockets_.erase(iter);
   socket->SignalReadPacket.disconnect(this);
@@ -120,14 +120,14 @@ void RelayServer::RemoveInternalSocket(AsyncPacketSocket* socket) {
 
 void RelayServer::AddExternalSocket(AsyncPacketSocket* socket) {
   assert(external_sockets_.end() ==
-      std::tqfind(external_sockets_.begin(), external_sockets_.end(), socket));
+      std::find(external_sockets_.begin(), external_sockets_.end(), socket));
   external_sockets_.push_back(socket);
   socket->SignalReadPacket.connect(this, &RelayServer::OnExternalPacket);
 }
 
 void RelayServer::RemoveExternalSocket(AsyncPacketSocket* socket) {
   SocketList::iterator iter =
-      std::tqfind(external_sockets_.begin(), external_sockets_.end(), socket);
+      std::find(external_sockets_.begin(), external_sockets_.end(), socket);
   assert(iter != external_sockets_.end());
   external_sockets_.erase(iter);
   socket->SignalReadPacket.disconnect(this);
@@ -143,7 +143,7 @@ void RelayServer::OnInternalPacket(
 
   // If this did not come from an existing connection, it should be a STUN
   // allocate request.
-  ConnectionMap::iterator piter = connections_.tqfind(ap);
+  ConnectionMap::iterator piter = connections_.find(ap);
   if (piter == connections_.end()) {
     HandleStunAllocate(bytes, size, ap, socket);
     return;
@@ -186,7 +186,7 @@ void RelayServer::OnExternalPacket(
   assert(!ap.destination().IsAny());
 
   // If this connection already exists, then forward the traffic.
-  ConnectionMap::iterator piter = connections_.tqfind(ap);
+  ConnectionMap::iterator piter = connections_.find(ap);
   if (piter != connections_.end()) {
     // TODO: Check the HMAC.
     RelayServerConnection* ext_conn = piter->second;
@@ -220,7 +220,7 @@ void RelayServer::OnExternalPacket(
   // TODO: Check the HMAC.
 
   // The binding should already be present.
-  BindingMap::iterator biter = bindings_.tqfind(username);
+  BindingMap::iterator biter = bindings_.find(username);
   if (biter == bindings_.end()) {
     // TODO: Turn this back on.  This is the sign of a client bug.
     //std::cerr << "Dropping packet: no binding with username" << std::endl;
@@ -299,7 +299,7 @@ void RelayServer::HandleStunAllocate(
 
   RelayServerBinding* binding;
 
-  BindingMap::iterator biter = bindings_.tqfind(username);
+  BindingMap::iterator biter = bindings_.find(username);
   if (biter != bindings_.end()) {
 
     binding = biter->second;
@@ -453,18 +453,18 @@ void RelayServer::HandleStunSend(
 }
 
 void RelayServer::AddConnection(RelayServerConnection* conn) {
-  assert(connections_.tqfind(conn->addr_pair()) == connections_.end());
+  assert(connections_.find(conn->addr_pair()) == connections_.end());
   connections_[conn->addr_pair()] = conn;
 }
 
 void RelayServer::RemoveConnection(RelayServerConnection* conn) {
-  ConnectionMap::iterator iter = connections_.tqfind(conn->addr_pair());
+  ConnectionMap::iterator iter = connections_.find(conn->addr_pair());
   assert(iter != connections_.end());
   connections_.erase(iter);
 }
 
 void RelayServer::RemoveBinding(RelayServerBinding* binding) {
-  BindingMap::iterator iter = bindings_.tqfind(binding->username());
+  BindingMap::iterator iter = bindings_.find(binding->username());
   assert(iter != bindings_.end());
   bindings_.erase(iter);
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc
index d146d63c..4c1c09d9 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc
@@ -63,7 +63,7 @@ Session *SessionManager::CreateSession(const std::string &name, const SessionID&
 
 void SessionManager::DestroySession(Session *session) {
   if (session != NULL) {
-    std::map<SessionID, Session *>::iterator it = session_map_.tqfind(session->id());
+    std::map<SessionID, Session *>::iterator it = session_map_.find(session->id());
     if (it != session_map_.end()) {
       SignalSessionDestroy(session);
       session_map_.erase(it);
@@ -74,7 +74,7 @@ void SessionManager::DestroySession(Session *session) {
 
 Session *SessionManager::GetSession(const SessionID& id) {
   // If the id isn't present, the [] operator will make a NULL entry
-  std::map<SessionID, Session *>::iterator it = session_map_.tqfind(id);
+  std::map<SessionID, Session *>::iterator it = session_map_.find(id);
   if (it != session_map_.end())
     return (*it).second;
   return NULL;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc
index e0257451..2f0d67b8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc
@@ -109,7 +109,7 @@ void SocketManager::DestroySocket_w(P2PSocket *socket) {
   // Only if socket exists
   CritScope cs(&critSM_);
   std::vector<P2PSocket *>::iterator it;
-  it = std::tqfind(sockets_.begin(), sockets_.end(), socket);
+  it = std::find(sockets_.begin(), sockets_.end(), socket);
   if (it == sockets_.end())
     return;
   sockets_.erase(it);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc
index 34a62547..14d64735 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc
@@ -59,14 +59,14 @@ void StunRequestManager::Send(StunRequest* request) {
 
 void StunRequestManager::SendDelayed(StunRequest* request, int delay) {
   request->set_manager(this);
-  assert(requests_.tqfind(request->id()) == requests_.end());
+  assert(requests_.find(request->id()) == requests_.end());
   requests_[request->id()] = request;
   thread_->PostDelayed(delay, request, MSG_STUN_SEND, NULL);
 }
 
 void StunRequestManager::Remove(StunRequest* request) {
   assert(request->manager() == this);
-  RequestMap::iterator iter = requests_.tqfind(request->id());
+  RequestMap::iterator iter = requests_.find(request->id());
   if (iter != requests_.end()) {
     assert(iter->second == request);
     requests_.erase(iter);
@@ -84,7 +84,7 @@ void StunRequestManager::Clear() {
 }
 
 bool StunRequestManager::CheckResponse(StunMessage* msg) {
-  RequestMap::iterator iter = requests_.tqfind(msg->transaction_id());
+  RequestMap::iterator iter = requests_.find(msg->transaction_id());
   if (iter == requests_.end())
     return false;
 
@@ -113,7 +113,7 @@ bool StunRequestManager::CheckResponse(const char* data, size_t size) {
   std::string id;
   id.append(data + 4, 16);
 
-  RequestMap::iterator iter = requests_.tqfind(id);
+  RequestMap::iterator iter = requests_.find(id);
   if (iter == requests_.end())
     return false;
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc
index 42c4a876..5192595c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc
@@ -372,7 +372,7 @@ void BasicPortAllocatorSession::AddAllocatedPort(Port* port,
 
 void BasicPortAllocatorSession::OnAddressReady(Port *port) {
   assert(Thread::Current() == network_thread_);
-  std::vector<PortData>::iterator it = std::tqfind(ports_.begin(), ports_.end(), port);
+  std::vector<PortData>::iterator it = std::find(ports_.begin(), ports_.end(), port);
   assert(it != ports_.end());
   assert(!it->ready);
   it->ready = true;
@@ -418,7 +418,7 @@ void BasicPortAllocatorSession::OnProtocolEnabled(AllocationSequence * seq, Prot
 void BasicPortAllocatorSession::OnPortDestroyed(Port* port) {
   assert(Thread::Current() == network_thread_);
   std::vector<PortData>::iterator iter =
-      tqfind(ports_.begin(), ports_.end(), port);
+      find(ports_.begin(), ports_.end(), port);
   assert(iter != ports_.end());
   ports_.erase(iter);
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc
index 7a79d044..31b12e92 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc
@@ -56,7 +56,7 @@ Session *Call::InitiateSession(const buzz::Jid &jid) {
 
 void Call::AcceptSession(Session *session) {
   std::vector<Session *>::iterator it;
-  it = std::tqfind(sessions_.begin(), sessions_.end(), session);
+  it = std::find(sessions_.begin(), sessions_.end(), session);
   assert(it != sessions_.end());
   if (it != sessions_.end())
     session->Accept(session_client_->CreateAcceptSessionDescription(session->remote_description()));
@@ -64,7 +64,7 @@ void Call::AcceptSession(Session *session) {
 
 void Call::RedirectSession(Session *session, const buzz::Jid &to) {
   std::vector<Session *>::iterator it;
-  it = std::tqfind(sessions_.begin(), sessions_.end(), session);
+  it = std::find(sessions_.begin(), sessions_.end(), session);
   assert(it != sessions_.end());
   if (it != sessions_.end())
     session->Redirect(to.Str());
@@ -72,16 +72,16 @@ void Call::RedirectSession(Session *session, const buzz::Jid &to) {
 
 void Call::RejectSession(Session *session) {
   std::vector<Session *>::iterator it;
-  it = std::tqfind(sessions_.begin(), sessions_.end(), session);
+  it = std::find(sessions_.begin(), sessions_.end(), session);
   assert(it != sessions_.end());
   if (it != sessions_.end())
     session->Reject();
 }
 
 void Call::TerminateSession(Session *session) {
-  assert(std::tqfind(sessions_.begin(), sessions_.end(), session) != sessions_.end());
+  assert(std::find(sessions_.begin(), sessions_.end(), session) != sessions_.end());
   std::vector<Session *>::iterator it;
-  it = std::tqfind(sessions_.begin(), sessions_.end(), session);
+  it = std::find(sessions_.begin(), sessions_.end(), session);
   if (it != sessions_.end())
     (*it)->Terminate();
 }
@@ -127,14 +127,14 @@ void Call::AddSession(Session *session) {
 void Call::RemoveSession(Session *session) {
   // Remove session from list
   std::vector<Session *>::iterator it_session;
-  it_session = std::tqfind(sessions_.begin(), sessions_.end(), session);
+  it_session = std::find(sessions_.begin(), sessions_.end(), session);
   if (it_session == sessions_.end())
     return;
   sessions_.erase(it_session);
 
   // Destroy session channel
   std::map<SessionID, VoiceChannel *>::iterator it_channel;
-  it_channel = channel_map_.tqfind(session->id());
+  it_channel = channel_map_.find(session->id());
   if (it_channel != channel_map_.end()) {
     VoiceChannel *channel = it_channel->second;
     channel_map_.erase(it_channel);
@@ -149,7 +149,7 @@ void Call::RemoveSession(Session *session) {
 }
 
 VoiceChannel* Call::GetChannel(Session* session) {
-  std::map<SessionID, VoiceChannel *>::iterator it = channel_map_.tqfind(session->id());
+  std::map<SessionID, VoiceChannel *>::iterator it = channel_map_.find(session->id());
   assert(it != channel_map_.end());
   return it->second;
 }
@@ -184,7 +184,7 @@ void Call::Join(Call *call, bool enable) {
 
     // Move channel
     std::map<SessionID, VoiceChannel *>::iterator it_channel;
-    it_channel = call->channel_map_.tqfind(session->id());
+    it_channel = call->channel_map_.find(session->id());
     if (it_channel != call->channel_map_.end()) {
       VoiceChannel *channel = (*it_channel).second;
       call->channel_map_.erase(it_channel);
@@ -196,7 +196,7 @@ void Call::Join(Call *call, bool enable) {
 
 void Call::StartConnectionMonitor(Session *session, int cms) {
   std::map<SessionID, VoiceChannel *>::iterator it_channel;
-  it_channel = channel_map_.tqfind(session->id());
+  it_channel = channel_map_.find(session->id());
   if (it_channel != channel_map_.end()) {
     VoiceChannel *channel = (*it_channel).second;
     channel->SignalConnectionMonitor.connect(this, &Call::OnConnectionMonitor);
@@ -206,7 +206,7 @@ void Call::StartConnectionMonitor(Session *session, int cms) {
 
 void Call::StopConnectionMonitor(Session *session) {
   std::map<SessionID, VoiceChannel *>::iterator it_channel;
-  it_channel = channel_map_.tqfind(session->id());
+  it_channel = channel_map_.find(session->id());
   if (it_channel != channel_map_.end()) {
     VoiceChannel *channel = (*it_channel).second;
     channel->StopConnectionMonitor();
@@ -216,7 +216,7 @@ void Call::StopConnectionMonitor(Session *session) {
 
 void Call::StartAudioMonitor(Session *session, int cms) {
   std::map<SessionID, VoiceChannel *>::iterator it_channel;
-  it_channel = channel_map_.tqfind(session->id());
+  it_channel = channel_map_.find(session->id());
   if (it_channel != channel_map_.end()) {
     VoiceChannel *channel = (*it_channel).second;
     channel->SignalAudioMonitor.connect(this, &Call::OnAudioMonitor);
@@ -226,7 +226,7 @@ void Call::StartAudioMonitor(Session *session, int cms) {
 
 void Call::StopAudioMonitor(Session *session) {
   std::map<SessionID, VoiceChannel *>::iterator it_channel;
-  it_channel = channel_map_.tqfind(session->id());
+  it_channel = channel_map_.find(session->id());
   if (it_channel != channel_map_.end()) {
     VoiceChannel *channel = (*it_channel).second;
     channel->StopAudioMonitor();
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc
index e5e6758d..98634b12 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc
@@ -119,7 +119,7 @@ void ChannelManager::DestroyVoiceChannel_w(VoiceChannel *voice_channel) {
   CritScope cs(&crit_);
   // Destroy voice channel.
   assert(initialized_);
-  std::vector<VoiceChannel *>::iterator it = std::tqfind(channels_.begin(),
+  std::vector<VoiceChannel *>::iterator it = std::find(channels_.begin(),
       channels_.end(), voice_channel);
   assert(it != channels_.end());
   if (it == channels_.end())
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
index a8f0a511..46dc7b42 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
@@ -202,7 +202,7 @@ void PhoneSessionClient::DestroyCall(Call *call) {
 
   // Remove it from calls_ map and delete
 
-  std::map<uint32, Call *>::iterator it = calls_.tqfind(call->id());
+  std::map<uint32, Call *>::iterator it = calls_.find(call->id());
   if (it != calls_.end())
     calls_.erase(it);
 
@@ -212,7 +212,7 @@ void PhoneSessionClient::DestroyCall(Call *call) {
 void PhoneSessionClient::OnSessionDestroy(Session *session) {
   // Find the call this session is in, remove it
 
-  std::map<SessionID, Call *>::iterator it = session_map_.tqfind(session->id());
+  std::map<SessionID, Call *>::iterator it = session_map_.find(session->id());
   assert(it != session_map_.end());
   if (it != session_map_.end()) {
     Call *call = (*it).second;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c
index d243bf76..e83eb8dc 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c
@@ -81,7 +81,7 @@ static gint compare(gconstpointer a, gconstpointer b)
 static GList *g_list_append_if_new(GList *l,gpointer data)
 {
 	GList *res=l;
-	if (g_list_tqfind(res,data)==NULL)
+	if (g_list_find(res,data)==NULL)
 		res=g_list_append(res,data);
 	return(res);
 }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c
index c73081a2..6d410392 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c
@@ -419,7 +419,7 @@ GList *filter_list=NULL;
 void ms_filter_register(MSFilterInfo *info)
 {
 	gpointer tmp;
-	tmp=g_list_tqfind(filter_list,info);
+	tmp=g_list_find(filter_list,info);
 	if (tmp==NULL) filter_list=g_list_append(filter_list,(gpointer)info);
 }
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc
index 570a8be5..d6d4c7b4 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc
@@ -170,7 +170,7 @@ static std::string SuggestPrefix(const std::string & ns) {
       if (last - first > 4)
         last = first + 3;
       std::string candidate(AsciiLower(ns.substr(first, last - first)));
-      if (candidate.tqfind("xml") != 0)
+      if (candidate.find("xml") != 0)
         return candidate;
       break;
     }
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc
index 48a89504..b742e03a 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc
@@ -56,13 +56,13 @@ Jid::Jid(const std::string & jid_string) {
   }
 
   // First find the slash and slice of that part
-  size_t slash = jid_string.tqfind('/');
+  size_t slash = jid_string.find('/');
   std::string resource_name = (slash == std::string::npos ? STR_EMPTY :
                     jid_string.substr(slash + 1));
 
   // Now look for the node
   std::string node_name;
-  size_t at = jid_string.tqfind('@');
+  size_t at = jid_string.find('@');
   size_t domain_begin;
   if (at < slash && at != std::string::npos) {
     node_name = jid_string.substr(0, at);
@@ -80,13 +80,13 @@ Jid::Jid(const std::string & jid_string) {
   // avoid allocating these constants repeatedly
   std::string domain_name;
 
-  if (domain_length == 9  && jid_string.tqfind("gmail.com", domain_begin) == domain_begin) {
+  if (domain_length == 9  && jid_string.find("gmail.com", domain_begin) == domain_begin) {
     domain_name = STR_GMAIL_COM;
   }
-  else if (domain_length == 14 && jid_string.tqfind("googlemail.com", domain_begin) == domain_begin) {
+  else if (domain_length == 14 && jid_string.find("googlemail.com", domain_begin) == domain_begin) {
     domain_name = STR_GOOGLEMAIL_COM;
   }
-  else if (domain_length == 10 && jid_string.tqfind("google.com", domain_begin) == domain_begin) {
+  else if (domain_length == 10 && jid_string.find("google.com", domain_begin) == domain_begin) {
     domain_name = STR_GOOGLE_COM;
   }
   else {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h
index 488dc56e..659820f5 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h
@@ -49,7 +49,7 @@ public:
       return "";
     }
     
-    std::vector<std::string>::const_iterator it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN");
+    std::vector<std::string>::const_iterator it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN");
     if (it == mechanisms.end()) {
       return "";
     }
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 50ca23c1..38f268b9 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
@@ -91,7 +91,7 @@ XmppEngineImpl::RemoveIqHandler(XmppIqCookie cookie,
 
   std::vector<XmppIqEntry*, std::allocator<XmppIqEntry*> >::iterator pos;
 
-  pos = std::tqfind(iq_entries_->begin(),
+  pos = std::find(iq_entries_->begin(),
                   iq_entries_->end(),
                   reinterpret_cast<XmppIqEntry*>(cookie));
 
diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/kioslave/jabberdisco.cpp
index ae95eadb..3a8b6d88 100644
--- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp
+++ b/kopete/protocols/jabber/kioslave/jabberdisco.cpp
@@ -57,7 +57,7 @@ void JabberDiscoProtocol::setHost ( const TQString &host, int port, const TQStri
 
 	m_host = host;
 	m_port = !port ? 5222 : port;
-	m_user = TQString(user).tqreplace ( "%", "@" );
+	m_user = TQString(user).replace ( "%", "@" );
 	m_password = pass;
 
 }
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp
index 2064e4ab..ca3b804c 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp
@@ -58,13 +58,13 @@ static TQString extractLine(TQByteArray *buf, bool *found)
 
 static bool extractMainHeader(const TQString &line, TQString *proto, int *code, TQString *msg)
 {
-	int n = line.tqfind(' ');
+	int n = line.find(' ');
 	if(n == -1)
 		return false;
 	if(proto)
 		*proto = line.mid(0, n);
 	++n;
-	int n2 = line.tqfind(' ', n);
+	int n2 = line.find(' ', n);
 	if(n2 == -1)
 		return false;
 	if(code)
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
index 2e6d0779..fbc9a39f 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
@@ -229,14 +229,14 @@ void HttpPoll::http_result()
 	// get id and packet
 	TQString id;
 	TQString cookie = d->http.getHeader("Set-Cookie");
-	int n = cookie.tqfind("ID=");
+	int n = cookie.find("ID=");
 	if(n == -1) {
 		reset();
 		error(ErrRead);
 		return;
 	}
 	n += 3;
-	int n2 = cookie.tqfind(';', n);
+	int n2 = cookie.find(';', n);
 	if(n2 != -1)
 		id = cookie.mid(n, n2-n);
 	else
@@ -406,13 +406,13 @@ static TQString extractLine(TQByteArray *buf, bool *found)
 
 static bool extractMainHeader(const TQString &line, TQString *proto, int *code, TQString *msg)
 {
-	int n = line.tqfind(' ');
+	int n = line.find(' ');
 	if(n == -1)
 		return false;
 	if(proto)
 		*proto = line.mid(0, n);
 	++n;
-	int n2 = line.tqfind(' ', n);
+	int n2 = line.find(' ', n);
 	if(n2 == -1)
 		return false;
 	if(code)
@@ -508,7 +508,7 @@ TQString HttpProxyPost::getHeader(const TQString &var) const
 {
 	for(TQStringList::ConstIterator it = d->headerLines.begin(); it != d->headerLines.end(); ++it) {
 		const TQString &s = *it;
-		int n = s.tqfind(": ");
+		int n = s.find(": ");
 		if(n == -1)
 			continue;
 		TQString v = s.mid(0, n);
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
index 39fbfdda..b94399ce 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
@@ -116,7 +116,7 @@ public:
 class NDnsManager::Private
 {
 public:
-	Item *tqfind(const NDns *n)
+	Item *find(const NDns *n)
 	{
 		TQPtrListIterator<Item> it(list);
 		for(Item *i; (i = it.current()); ++it) {
@@ -126,7 +126,7 @@ public:
 		return 0;
 	}
 
-	Item *tqfind(const NDnsWorker *w)
+	Item *find(const NDnsWorker *w)
 	{
 		TQPtrListIterator<Item> it(list);
 		for(Item *i; (i = it.current()); ++it) {
@@ -184,7 +184,7 @@ void NDnsManager::resolve(NDns *self, const TQString &name)
 
 void NDnsManager::stop(NDns *self)
 {
-	Item *i = d->tqfind(self);
+	Item *i = d->find(self);
 	if(!i)
 		return;
 	// disassociate
@@ -200,7 +200,7 @@ void NDnsManager::stop(NDns *self)
 
 bool NDnsManager::isBusy(const NDns *self) const
 {
-	Item *i = d->tqfind(self);
+	Item *i = d->find(self);
 	return (i ? true: false);
 }
 
@@ -210,7 +210,7 @@ bool NDnsManager::event(TQEvent *e)
 		NDnsWorkerEvent *we = static_cast<NDnsWorkerEvent*>(e);
 		we->worker->wait(); // ensure that the thread is terminated
 
-		Item *i = d->tqfind(we->worker);
+		Item *i = d->find(we->worker);
 		if(!i) {
 			// should NOT happen
 			return true;
diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h
index 12b9ad55..3e52c5d2 100644
--- a/kopete/protocols/jabber/libiris/iris/include/im.h
+++ b/kopete/protocols/jabber/libiris/iris/include/im.h
@@ -220,10 +220,10 @@ namespace XMPP
 		ResourceList();
 		~ResourceList();
 
-		ResourceList::Iterator tqfind(const TQString &);
+		ResourceList::Iterator find(const TQString &);
 		ResourceList::Iterator priority();
 
-		ResourceList::ConstIterator tqfind(const TQString &) const;
+		ResourceList::ConstIterator find(const TQString &) const;
 		ResourceList::ConstIterator priority() const;
 
 	private:
@@ -273,8 +273,8 @@ namespace XMPP
 		Roster();
 		~Roster();
 
-		Roster::Iterator tqfind(const Jid &);
-		Roster::ConstIterator tqfind(const Jid &) const;
+		Roster::Iterator find(const Jid &);
+		Roster::ConstIterator find(const Jid &) const;
 
 	private:
 		class RosterPrivate *d;
@@ -711,8 +711,8 @@ namespace XMPP
 		~LiveRoster();
 
 		void flagAllForDelete();
-		LiveRoster::Iterator tqfind(const Jid &, bool compareRes=true);
-		LiveRoster::ConstIterator tqfind(const Jid &, bool compareRes=true) const;
+		LiveRoster::Iterator find(const Jid &, bool compareRes=true);
+		LiveRoster::ConstIterator find(const Jid &, bool compareRes=true) const;
 
 	private:
 		class LiveRosterPrivate;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp
index 90cf1364..090cc9df 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp
@@ -42,7 +42,7 @@ public:
 
 		StringPrepCache *that = get_instance();
 
-		Result *r = that->nameprep_table.tqfind(in);
+		Result *r = that->nameprep_table.find(in);
 		if(r)
 		{
 			if(!r->norm)
@@ -78,7 +78,7 @@ public:
 
 		StringPrepCache *that = get_instance();
 
-		Result *r = that->nodeprep_table.tqfind(in);
+		Result *r = that->nodeprep_table.find(in);
 		if(r)
 		{
 			if(!r->norm)
@@ -114,7 +114,7 @@ public:
 
 		StringPrepCache *that = get_instance();
 
-		Result *r = that->resourceprep_table.tqfind(in);
+		Result *r = that->resourceprep_table.find(in);
 		if(r)
 		{
 			if(!r->norm)
@@ -248,7 +248,7 @@ void Jid::set(const TQString &s)
 {
 	TQString rest, domain, node, resource;
 	TQString norm_domain, norm_node, norm_resource;
-	int x = s.tqfind('/');
+	int x = s.find('/');
 	if(x != -1) {
 		rest = s.mid(0, x);
 		resource = s.mid(x+1);
@@ -262,7 +262,7 @@ void Jid::set(const TQString &s)
 		return;
 	}
 
-	x = rest.tqfind('@');
+	x = rest.find('@');
 	if(x != -1) {
 		node = rest.mid(0, x);
 		domain = rest.mid(x+1);
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
index 80ce5366..3fa7d6c3 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
@@ -232,10 +232,10 @@ private:
 
 		if(mightChangeEncoding) {
 			while(1) {
-				int n = out.tqfind('<');
+				int n = out.find('<');
 				if(n != -1) {
 					// we need a closing bracket
-					int n2 = out.tqfind('>', n);
+					int n2 = out.find('>', n);
 					if(n2 != -1) {
 						++n2;
 						TQString h = out.mid(n, n2-n);
@@ -278,8 +278,8 @@ private:
 		if(h.left(5) != "<?xml")
 			return "";
 
-		int endPos = h.tqfind(">");
-		int startPos = h.tqfind("encoding");
+		int endPos = h.find(">");
+		int startPos = h.find("encoding");
 		if(startPos < endPos && startPos != -1) {
 			TQString encoding;
 			do {
@@ -335,7 +335,7 @@ private:
 
 	bool checkForBadChars(const TQString &s)
 	{
-		int len = s.tqfind('<');
+		int len = s.find('<');
 		if(len == -1)
 			len = s.length();
 		else
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
index 5a6bc64f..89c98a91 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
@@ -440,7 +440,7 @@ void BasicProtocol::handleDocOpen(const Parser::Event &pe)
 		int minor = 0;
 		TQString verstr = atts.value("version");
 		if(!verstr.isEmpty()) {
-			int n = verstr.tqfind('.');
+			int n = verstr.find('.');
 			if(n != -1) {
 				major = verstr.mid(0, n).toInt();
 				minor = verstr.mid(n+1).toInt();
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
index da78fef1..c825a2ca 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
@@ -78,7 +78,7 @@ public:
 		PropList list;
 		int at = 0;
 		while(1) {
-			int n = str.tqfind('=', at);
+			int n = str.find('=', at);
 			if(n == -1)
 				break;
 			TQCString var, val;
@@ -86,14 +86,14 @@ public:
 			at = n + 1;
 			if(str[at] == '\"') {
 				++at;
-				n = str.tqfind('\"', at);
+				n = str.find('\"', at);
 				if(n == -1)
 					break;
 				val = str.mid(at, n-at);
 				at = n + 1;
 			}
 			else {
-				n = str.tqfind(',', at);
+				n = str.find(',', at);
 				if(n != -1) {
 					val = str.mid(at, n-at);
 					at = n;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
index fe7275ad..59b28f8b 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -1115,7 +1115,7 @@ void ClientStream::sasl_authCheck(const TQString &user, const TQString &)
 //	printf("authcheck: [%s], [%s]\n", user.latin1(), authzid.latin1());
 //#endif
 	TQString u = user;
-	int n = u.tqfind('@');
+	int n = u.find('@');
 	if(n != -1)
 		u.truncate(n);
 	d->srv.user = u;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
index 5f682371..91111ea9 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
@@ -98,7 +98,7 @@ static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const
 	}
 	// 'clip' means to remove any unwanted (and unneeded) characters, such as a trailing newline
 	if(clip) {
-		int n = out.tqfindRev('>');
+		int n = out.findRev('>');
 		out.truncate(n+1);
 	}
 	return out;
@@ -128,12 +128,12 @@ static void createRootXmlTags(const TQDomElement &root, TQString *xmlHeader, TQS
 	}
 
 	// parse the tags out
-	int n = str.tqfind('<');
-	int n2 = str.tqfind('>', n);
+	int n = str.find('<');
+	int n2 = str.find('>', n);
 	++n2;
 	*tagOpen = str.mid(n, n2-n);
-	n2 = str.tqfindRev('>');
-	n = str.tqfindRev('<');
+	n2 = str.findRev('>');
+	n = str.findRev('<');
 	++n2;
 	*tagClose = str.mid(n, n2-n);
 
@@ -329,7 +329,7 @@ TQString XmlProtocol::elementToString(const TQDomElement &e, bool clip)
 		for(n = 0; n < al.count(); ++n) {
 			TQDomAttr a = al.item(n).toAttr();
 			TQString s = a.name();
-			int x = s.tqfind(':');
+			int x = s.find(':');
 			if(x != -1)
 				s = s.mid(x+1);
 			else
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
index 86a01e60..7b425696 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
@@ -790,7 +790,7 @@ void Client::ppPresence(const Jid &j, const tqStatus &s)
 
 void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
 {
-	ResourceList::Iterator rit = d->resourceList.tqfind(j.resource());
+	ResourceList::Iterator rit = d->resourceList.find(j.resource());
 	bool found = (rit == d->resourceList.end()) ? false: true;
 
 	// unavailable?  remove the resource
@@ -822,7 +822,7 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
 
 void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
 {
-	ResourceList::Iterator rit = i->resourceList().tqfind(j.resource());
+	ResourceList::Iterator rit = i->resourceList().find(j.resource());
 	bool found = (rit == i->resourceList().end()) ? false: true;
 
 	// unavailable?  remove the resource
@@ -950,7 +950,7 @@ void Client::importRosterItem(const RosterItem &item)
 
 	// Remove
 	if(item.subscription().type() == Subscription::Remove) {
-		LiveRoster::Iterator it = d->roster.tqfind(item.jid());
+		LiveRoster::Iterator it = d->roster.find(item.jid());
 		if(it != d->roster.end()) {
 			rosterItemRemoved(*it);
 			d->roster.remove(it);
@@ -959,7 +959,7 @@ void Client::importRosterItem(const RosterItem &item)
 	}
 	// Add/Update
 	else {
-		LiveRoster::Iterator it = d->roster.tqfind(item.jid());
+		LiveRoster::Iterator it = d->roster.find(item.jid());
 		if(it != d->roster.end()) {
 			LiveRosterItem &i = *it;
 			i.setFlagForDelete(false);
@@ -1001,7 +1001,7 @@ void Client::setPresence(const tqStatus &s)
 
 	// update our resourceList
 	ppPresence(jid(), s);
-	//ResourceList::Iterator rit = d->resourceList.tqfind(resource());
+	//ResourceList::Iterator rit = d->resourceList.find(resource());
 	//Resource &r = *rit;
 	//r.settqStatus(s);
 }
@@ -1097,7 +1097,7 @@ void Client::addExtension(const TQString& ext, const Features& features)
 
 void Client::removeExtension(const TQString& ext)
 {
-	if (d->extension_features.tqcontains(ext)) {
+	if (d->extension_features.contains(ext)) {
 		d->extension_features.remove(ext);
 		d->capsExt = extensions().join(" ");
 	}
@@ -1499,7 +1499,7 @@ void LiveRoster::flagAllForDelete()
 		(*it).setFlagForDelete(true);
 }
 
-LiveRoster::Iterator LiveRoster::tqfind(const Jid &j, bool compareRes)
+LiveRoster::Iterator LiveRoster::find(const Jid &j, bool compareRes)
 {
 	Iterator it;
 	for(it = begin(); it != end(); ++it) {
@@ -1509,7 +1509,7 @@ LiveRoster::Iterator LiveRoster::tqfind(const Jid &j, bool compareRes)
 	return it;
 }
 
-LiveRoster::ConstIterator LiveRoster::tqfind(const Jid &j, bool compareRes) const
+LiveRoster::ConstIterator LiveRoster::find(const Jid &j, bool compareRes) const
 {
 	ConstIterator it;
 	for(it = begin(); it != end(); ++it) {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
index fb9de2e8..522e52f9 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
@@ -421,12 +421,12 @@ bool Message::containsEvents() const
 
 bool Message::containsEvent(MsgEvent e) const
 {
-	return d->eventList.tqcontains(e);
+	return d->eventList.contains(e);
 }
 
 void Message::addEvent(MsgEvent e)
 {
-	if (!d->eventList.tqcontains(e)) {
+	if (!d->eventList.contains(e)) {
 		if (e == CancelEvent || containsEvent(CancelEvent)) 
 			d->eventList.clear(); // Reset list
 		d->eventList += e;
@@ -1018,10 +1018,10 @@ ResourceList::~ResourceList()
 {
 }
 
-ResourceList::Iterator ResourceList::tqfind(const TQString & _tqfind)
+ResourceList::Iterator ResourceList::find(const TQString & _find)
 {
 	for(ResourceList::Iterator it = begin(); it != end(); ++it) {
-		if((*it).name() == _tqfind)
+		if((*it).name() == _find)
 			return it;
 	}
 
@@ -1040,10 +1040,10 @@ ResourceList::Iterator ResourceList::priority()
 	return highest;
 }
 
-ResourceList::ConstIterator ResourceList::tqfind(const TQString & _tqfind) const
+ResourceList::ConstIterator ResourceList::find(const TQString & _find) const
 {
 	for(ResourceList::ConstIterator it = begin(); it != end(); ++it) {
-		if((*it).name() == _tqfind)
+		if((*it).name() == _find)
 			return it;
 	}
 
@@ -1222,7 +1222,7 @@ Roster::~Roster()
 {
 }
 
-Roster::Iterator Roster::tqfind(const Jid &j)
+Roster::Iterator Roster::find(const Jid &j)
 {
 	for(Roster::Iterator it = begin(); it != end(); ++it) {
 		if((*it).jid().compare(j))
@@ -1232,7 +1232,7 @@ Roster::Iterator Roster::tqfind(const Jid &j)
 	return end();
 }
 
-Roster::ConstIterator Roster::tqfind(const Jid &j) const
+Roster::ConstIterator Roster::find(const Jid &j) const
 {
 	for(Roster::ConstIterator it = begin(); it != end(); ++it) {
 		if((*it).jid().compare(j))
@@ -1512,7 +1512,7 @@ bool Features::test(const TQStringList &ns) const
 {
 	TQStringList::ConstIterator it = ns.begin();
 	for ( ; it != ns.end(); ++it)
-		if ( _list.tqfind( *it ) != _list.end() )
+		if ( _list.find( *it ) != _list.end() )
 			return true;
 
 	return false;
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 bab5665b..45ef7a04 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
@@ -35,9 +35,9 @@ using namespace XMPP;
 
 static TQString lineEncode(TQString str)
 {
-	str.tqreplace(TQRegExp("\\\\"), "\\\\");   // backslash to double-backslash
-	str.tqreplace(TQRegExp("\\|"), "\\p");     // pipe to \p
-	str.tqreplace(TQRegExp("\n"), "\\n");      // newline to \n
+	str.replace(TQRegExp("\\\\"), "\\\\");   // backslash to double-backslash
+	str.replace(TQRegExp("\\|"), "\\p");     // pipe to \p
+	str.replace(TQRegExp("\n"), "\\n");      // newline to \n
 	return str;
 }
 
@@ -1417,7 +1417,7 @@ bool JT_ServInfo::take(const TQDomElement &e)
 		}
 		else if (node.startsWith(client()->capsNode() + "#")) {
 				TQString ext = node.right(node.length()-client()->capsNode().length()-1);
-				if (client()->extensions().tqcontains(ext)) {
+				if (client()->extensions().contains(ext)) {
 						const TQStringList& l = client()->extension(ext).list();
 						for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) {
 								feature = doc()->createElement("feature");
diff --git a/kopete/protocols/jabber/libiris/jingle_iris.patch b/kopete/protocols/jabber/libiris/jingle_iris.patch
index 2fcf782b..489afab4 100644
--- a/kopete/protocols/jabber/libiris/jingle_iris.patch
+++ b/kopete/protocols/jabber/libiris/jingle_iris.patch
@@ -159,7 +159,7 @@ diff -ur psi/iris/xmpp-im/client.cpp psi-jingle/iris/xmpp-im/client.cpp
 +
 +void Client::removeExtension(const QString& ext)
 +{
-+	if (d->extension_features.tqcontains(ext)) {
++	if (d->extension_features.contains(ext)) {
 +		d->extension_features.remove(ext);
 +		d->capsExt = extensions().join(" ");
 +	}
@@ -354,7 +354,7 @@ diff -ur psi/iris/xmpp-im/xmpp_tasks.cpp psi-jingle/iris/xmpp-im/xmpp_tasks.cpp
 +		}
 +		else if (node.startsWith(client()->capsNode() + "#")) {
 +			QString ext = node.right(node.length()-client()->capsNode().length()-1);
-+			if (client()->extensions().tqcontains(ext)) {
++			if (client()->extensions().contains(ext)) {
 +				const QStringList& l = client()->extension(ext).list();
 +				for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) {
 +					feature = doc()->createElement("feature");
diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
index 44278511..e4139786 100644
--- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
@@ -520,7 +520,7 @@ void dlgJabberVCard::slotSelectPhoto()
 				img = img.copy(0, (img.height()-img.width())/2, img.height(), img.height());
 		}
 
-		m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().tqreplace(TQRegExp("[./~]"),"-")  +".png");
+		m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().replace(TQRegExp("[./~]"),"-")  +".png");
 		if( img.save(m_photoPath, "PNG") )
 		{
 			m_mainWidget->lblPhoto->setPixmap( TQPixmap(img) );
diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
index 9a769122..2b5ad749 100644
--- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
+++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
@@ -200,7 +200,7 @@ void JabberEditAccountWidget::writeConfig ()
 bool JabberEditAccountWidget::validateData ()
 {
 
-	if(!mID->text().tqcontains('@'))
+	if(!mID->text().contains('@'))
 	{
 		KMessageBox::sorry(this, i18n("The Jabber ID you have chosen is invalid. "
 							"Please make sure it is in the form user@server.com, like an email address."),
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
index dee7534a..cc7cd0fc 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
@@ -58,7 +58,7 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *tqparent
 	mMainWidget = new DlgJabberRegisterAccount ( this );
 	setMainWidget ( mMainWidget );
 
-	// tqreplace "Ok" button with a "Register" button
+	// replace "Ok" button with a "Register" button
 	KGuiItem registerButton = KStdGuiItem::ok();
 	registerButton.setText ( i18n ( "Register" ) );
 	setButtonOK ( registerButton );