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

13 files changed, 29 insertions, 29 deletions

diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp
index c9c5828b..573c5ccf 100644
--- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp
@@ -115,7 +115,7 @@ Transfer* CoreProtocol::incomingTransfer()
 void cp_dump( const TQByteArray &bytes )
 {
 #ifdef YAHOO_COREPROTOCOL_DEBUG
-	kdDebug(YAHOO_RAW_DEBUG) << " tqcontains " << bytes.count() << " bytes" << endl;
+	kdDebug(YAHOO_RAW_DEBUG) << " contains " << bytes.count() << " bytes" << endl;
 	for ( uint i = 0; i < bytes.count(); ++i )
 	{
 		printf( "%02x ", bytes[ i ] );
@@ -196,7 +196,7 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire )
 			kdDebug(YAHOO_RAW_DEBUG) << " - not a valid YMSG packet. Trying to recover." << endl;
 			TQTextStream s( wire, IO_ReadOnly );
 			TQString remaining = s.read();
-			int pos = remaining.tqfind( "YMSG", bytesParsed );
+			int pos = remaining.find( "YMSG", bytesParsed );
 			if( pos >= 0 )
 			{
 				kdDebug(YAHOO_RAW_DEBUG) << "Recover successful." << endl;
diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp
index 10056a61..f48bd52d 100644
--- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp
@@ -104,8 +104,8 @@ void FileTransferNotifierTask::parseFileTransfer( YMSGTransfer *t )
 		return;
 
 
-	unsigned int left = url.tqfindRev( '/' ) + 1;
-        unsigned int right = url.tqfindRev( '?' );
+	unsigned int left = url.findRev( '/' ) + 1;
+        unsigned int right = url.findRev( '?' );
 	filename = url.mid( left, right - left );
 
 	emit incomingFileTransfer( from, url, expires, msg, filename, size, TQPixmap() );
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
index 439b39f7..7c46229b 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
@@ -359,9 +359,9 @@ void LoginTask::sendAuthSixteenStage3(const TQString& cryptString)
 
 	TQString cryptStringHash = KMD5( cryptString.ascii() ).base64Digest();
 
-	cryptStringHash = cryptStringHash.tqreplace('+', '.');
-	cryptStringHash = cryptStringHash.tqreplace('/', '_');
-	cryptStringHash = cryptStringHash.tqreplace('=', '-');
+	cryptStringHash = cryptStringHash.replace('+', '.');
+	cryptStringHash = cryptStringHash.replace('/', '_');
+	cryptStringHash = cryptStringHash.replace('=', '-');
 
 	YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceAuthResp, m_stateOnConnect);
 	t->setId( m_sessionID );
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
index b456746a..a9916851 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
@@ -132,9 +132,9 @@ void ModifyYABTask::slotRead()
 	TQByteArray ar( socket->bytesAvailable() );
 	socket->readBlock( ar.data (), ar.size () );
 	TQString data( ar );
-	data = data.right( data.length() - data.tqfind("<?xml") );
+	data = data.right( data.length() - data.find("<?xml") );
 
-	if( m_data.tqfind("</ab>") < 0 )
+	if( m_data.find("</ab>") < 0 )
 		return;						// Need more data
 
 	m_socket->close();
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
index 1b24b860..f4e8dcf9 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
@@ -163,7 +163,7 @@ void SendPictureTask::readResult()
         TQString buf( ar );
 
         m_socket->close();
-        if( buf.tqfind( "error", 0, false ) >= 0 )
+        if( buf.find( "error", 0, false ) >= 0 )
         {
                 kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Picture upload failed" << endl;
                 setSuccess( false );
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
index 41d5019d..d50d68b2 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
@@ -425,9 +425,9 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket )
 		case UserRequest:
 			{
 			who.append( info->buffer->buffer() );
-			who = who.mid( 2, who.tqfind('\n') - 3);
-			kdDebug(YAHOO_RAW_DEBUG) << "User wants to view webcam: " << who << " len: " << who.length() << " Index: " << accessGranted.tqfindIndex( who ) << endl;
-			if( accessGranted.tqfindIndex( who ) >= 0 )
+			who = who.mid( 2, who.find('\n') - 3);
+			kdDebug(YAHOO_RAW_DEBUG) << "User wants to view webcam: " << who << " len: " << who.length() << " Index: " << accessGranted.findIndex( who ) << endl;
+			if( accessGranted.findIndex( who ) >= 0 )
 			{
 				grantAccess( who );
 			}
diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
index cee71da6..65c48f54 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
@@ -36,13 +36,13 @@ void YABEntry::fromTQDomElement( const TQDomElement &e )
 	privateURL = e.attribute("pu");
 	title = e.attribute("ti");
 	corporation = e.attribute("co");
-	workAdress = e.attribute("wa").tqreplace( "&#xd;&#xa;", "\n" );
+	workAdress = e.attribute("wa").replace( "&#xd;&#xa;", "\n" );
 	workCity = e.attribute("wc");
 	workState = e.attribute("ws");
 	workZIP = e.attribute("wz");
 	workCountry = e.attribute("wn");
 	workURL = e.attribute("wu");
-	privateAdress = e.attribute("ha").tqreplace( "&#xd;&#xa;", "\n" );
+	privateAdress = e.attribute("ha").replace( "&#xd;&#xa;", "\n" );
 	privateCity = e.attribute("hc");
 	privateState = e.attribute("hs");
 	privateZIP = e.attribute("hz");
@@ -55,7 +55,7 @@ void YABEntry::fromTQDomElement( const TQDomElement &e )
 	additional2 = e.attribute("c2");
 	additional3 = e.attribute("c3");
 	additional4 = e.attribute("c4");
-	notes = e.attribute("cm").tqreplace( "&#xd;&#xa;", "\n" );
+	notes = e.attribute("cm").replace( "&#xd;&#xa;", "\n" );
 	imAIM = e.attribute("ima");
 	imGoogleTalk = e.attribute("img");
 	imICQ = e.attribute("imq");
@@ -86,13 +86,13 @@ void YABEntry::fromTQDomDocument( const TQDomDocument &d )
 	privateURL = d.elementsByTagName("pu").item(0).toElement().text();
 	title = d.elementsByTagName("ti").item(0).toElement().text();
 	corporation = d.elementsByTagName("co").item(0).toElement().text();
-	workAdress = d.elementsByTagName("wa").item(0).toElement().text().tqreplace( "&#xd;&#xa;", "\n" );
+	workAdress = d.elementsByTagName("wa").item(0).toElement().text().replace( "&#xd;&#xa;", "\n" );
 	workCity = d.elementsByTagName("wc").item(0).toElement().text();
 	workState = d.elementsByTagName("ws").item(0).toElement().text();
 	workZIP = d.elementsByTagName("wz").item(0).toElement().text();
 	workCountry = d.elementsByTagName("wn").item(0).toElement().text();
 	workURL = d.elementsByTagName("wu").item(0).toElement().text();
-	privateAdress = d.elementsByTagName("ha").item(0).toElement().text().tqreplace( "&#xd;&#xa;", "\n" );
+	privateAdress = d.elementsByTagName("ha").item(0).toElement().text().replace( "&#xd;&#xa;", "\n" );
 	privateCity = d.elementsByTagName("hc").item(0).toElement().text();
 	privateState = d.elementsByTagName("hs").item(0).toElement().text();
 	privateZIP = d.elementsByTagName("hz").item(0).toElement().text();
@@ -105,7 +105,7 @@ void YABEntry::fromTQDomDocument( const TQDomDocument &d )
 	additional2 = d.elementsByTagName("c2").item(0).toElement().text();
 	additional3 = d.elementsByTagName("c3").item(0).toElement().text();
 	additional4 = d.elementsByTagName("c4").item(0).toElement().text();
-	notes = d.elementsByTagName("cm").item(0).toElement().text().tqreplace( "&#xd;&#xa;", "\n" );
+	notes = d.elementsByTagName("cm").item(0).toElement().text().replace( "&#xd;&#xa;", "\n" );
 	imAIM = d.elementsByTagName("ima").item(0).toElement().text();
 	imGoogleTalk = d.elementsByTagName("img").item(0).toElement().text();
 	imICQ = d.elementsByTagName("imq").item(0).toElement().text();
@@ -135,13 +135,13 @@ void YABEntry::fillTQDomElement( TQDomElement &e ) const
 	e.setAttribute( "pu", privateURL );
 	e.setAttribute( "ti", title );
 	e.setAttribute( "co", corporation );
-	e.setAttribute( "wa", TQString( workAdress ).tqreplace( '\n', "&#xd;&#xa;" ) );
+	e.setAttribute( "wa", TQString( workAdress ).replace( '\n', "&#xd;&#xa;" ) );
 	e.setAttribute( "wc", workCity );
 	e.setAttribute( "ws", workState );
 	e.setAttribute( "wz", workZIP );
 	e.setAttribute( "wn", workCountry );
 	e.setAttribute( "wu", workURL );
-	e.setAttribute( "ha", TQString( privateAdress ).tqreplace( '\n', "&#xd;&#xa;" ) );
+	e.setAttribute( "ha", TQString( privateAdress ).replace( '\n', "&#xd;&#xa;" ) );
 	e.setAttribute( "hc", privateCity );
 	e.setAttribute( "hs", privateState );
 	e.setAttribute( "hz", privateZIP );
@@ -152,7 +152,7 @@ void YABEntry::fillTQDomElement( TQDomElement &e ) const
 	e.setAttribute( "c2", additional2 );
 	e.setAttribute( "c3", additional3 );
 	e.setAttribute( "c4", additional4 );
-	e.setAttribute( "cm", TQString( notes ).tqreplace( '\n', "&#xd;&#xa;" ) );
+	e.setAttribute( "cm", TQString( notes ).replace( '\n', "&#xd;&#xa;" ) );
 	e.setAttribute( "ima", imAIM );
 	e.setAttribute( "img", imGoogleTalk );
 	e.setAttribute( "imq", imICQ );
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
index 81b2f53e..a317cb12 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
@@ -45,8 +45,8 @@ void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int ch
 	kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << url << endl;
 	KIO::TransferJob *transfer;
 	TQString Url = url.url();
-	TQString ext = Url.left( Url.tqfindRev( "?" ) );
-	ext = ext.right( ext.length() - ext.tqfindRev( "." ) );
+	TQString ext = Url.left( Url.findRev( "?" ) );
+	ext = ext.right( ext.length() - ext.findRev( "." ) );
 
 	transfer = KIO::get( url, false, false );
 	connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) );
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
index ed673c2f..6b69bc70 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
@@ -138,4 +138,4 @@ void KNetworkByteStream::slotError( int code )
 
 #include "yahoobytestream.moc"
 
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
index 4ed96d3a..e84f70b0 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
@@ -66,4 +66,4 @@ private:
 
 #endif // YAHOOBYTESTREAM_H
 
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
index 45716e35..3a15b03c 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
@@ -256,7 +256,7 @@ void ClientStream::write( Transfer *request )
 void cs_dump( const TQByteArray &bytes )
 {
 #if 0
-	qDebug( "tqcontains: %i bytes ", bytes.count() );
+	qDebug( "contains: %i bytes ", bytes.count() );
 	uint count = 0;
 	while ( count < bytes.count() )
 	{
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
index 0e0f8436..dc54bf82 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
@@ -108,4 +108,4 @@ void KNetworkConnector::setOptHostPort( const TQString &host, TQ_UINT16 port )
 
 #include "yahooconnector.moc"
 
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h
index 9a33a2e7..667138ed 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h
@@ -64,4 +64,4 @@ private:
 
 #endif
 
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;