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

6 files changed, 15 insertions, 15 deletions

diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp
index e1eb5487..e100af2e 100644
--- a/kopete/protocols/gadu/gaduaway.cpp
+++ b/kopete/protocols/gadu/gaduaway.cpp
@@ -51,7 +51,7 @@ GaduAway::GaduAway( GaduAccount* account, TQWidget* tqparent, const char* name )
 	s  = GaduProtocol::protocol()->statusToWithDescription( ks );
 
 	if ( s == GG_STATUS_NOT_AVAIL_DESCR ) {
-		ui_->statusGroup_->tqfind( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( TRUE );
+		ui_->statusGroup_->find( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( TRUE );
 		ui_->statusGroup_->setButton( GG_STATUS_AVAIL_DESCR );
 	}
 	else {
diff --git a/kopete/protocols/gadu/gaducontactlist.cpp b/kopete/protocols/gadu/gaducontactlist.cpp
index 9c003751..67050bce 100644
--- a/kopete/protocols/gadu/gaducontactlist.cpp
+++ b/kopete/protocols/gadu/gaducontactlist.cpp
@@ -45,7 +45,7 @@ GaduContactsList::GaduContactsList( TQString sList )
 		return;
 	}
 
-	if ( ( !sList.tqcontains( '\n' ) && sList.tqcontains( ';' ) )  || !sList.tqcontains( ';' ) ) {
+	if ( ( !sList.contains( '\n' ) && sList.contains( ';' ) )  || !sList.contains( ';' ) ) {
 		return;
 	}
 
diff --git a/kopete/protocols/gadu/gadudcc.cpp b/kopete/protocols/gadu/gadudcc.cpp
index 6e5b416a..b44ba883 100644
--- a/kopete/protocols/gadu/gadudcc.cpp
+++ b/kopete/protocols/gadu/gadudcc.cpp
@@ -78,7 +78,7 @@ GaduDCC::unregisterAccount( unsigned int id )
 		return false;
 	}
 
-	if ( !accounts.tqcontains( id ) ) {
+	if ( !accounts.contains( id ) ) {
 		kdDebug(14100) << "attempt to unregister not registered account" << endl;
 		initmutex.unlock();
 		return false;
@@ -118,7 +118,7 @@ GaduDCC::registerAccount( GaduAccount* account )
 
 	aid = account->accountId().toInt();
 
-	if ( accounts.tqcontains( aid ) ) {
+	if ( accounts.contains( aid ) ) {
 		kdDebug(14100) << "attempt to register already registered account" << endl;
 		initmutex.unlock();
 		return false;
@@ -168,7 +168,7 @@ GaduDCC::slotIncoming( gg_dcc* incoming, bool& handled )
 
 GaduDCC::~GaduDCC()
 {
-	if ( accounts.tqcontains( accountId ) ) {
+	if ( accounts.contains( accountId ) ) {
 		kdDebug( 14100 ) << "unregister account " << accountId << "  in destructor " << endl;
 		unregisterAccount( accountId );
 	}
diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp
index f152b942..e95f80d1 100644
--- a/kopete/protocols/gadu/gadudcctransaction.cpp
+++ b/kopete/protocols/gadu/gadudcctransaction.cpp
@@ -384,7 +384,7 @@ GaduDCCTransaction::watcher() {
 			return;
 			break;
 		case GG_EVENT_DCC_NEED_FILE_INFO:
-			if (gaduDCC_->requests.tqcontains(dccSock_->peer_uin)) {
+			if (gaduDCC_->requests.contains(dccSock_->peer_uin)) {
 			    TQString filePath = gaduDCC_->requests[dccSock_->peer_uin];
 			    kdDebug() << "Callback request found. Sending " << filePath << endl;
 			    gaduDCC_->requests.remove(dccSock_->peer_uin);
diff --git a/kopete/protocols/gadu/gadurichtextformat.cpp b/kopete/protocols/gadu/gadurichtextformat.cpp
index 9e46b967..9dcdbc21 100644
--- a/kopete/protocols/gadu/gadurichtextformat.cpp
+++ b/kopete/protocols/gadu/gadurichtextformat.cpp
@@ -150,7 +150,7 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message )
 	output->rtf.resize(0);
 
 	// test first if there is any HTML formating in it
-	if( htmlString.tqfind( TQString::tqfromLatin1("</span") ) > -1 ) {
+	if( htmlString.find( TQString::tqfromLatin1("</span") ) > -1 ) {
 		TQRegExp findTags( TQString::tqfromLatin1("<span style=\"(.*)\">(.*)</span>") );
 		findTags.setMinimal( true );
 		int pos = 0;
@@ -199,7 +199,7 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message )
 				}
 
 				TQString rep = TQString("<span style=\"%1\">%2</span>" ).tqarg( styleHTML ).tqarg( replacement );
-				htmlString.tqreplace( findTags.pos( 0 ), rep.length(), replacement );
+				htmlString.replace( findTags.pos( 0 ), rep.length(), replacement );
 
 				replacement = unescapeGaduMessage( replacement );
 				output->message += replacement;
@@ -245,7 +245,7 @@ GaduRichTextFormat::unescapeGaduMessage( TQString& ns )
 {
 	TQString s;
 	s = Kopete::Message::unescape( ns );
-	s.tqreplace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) );
+	s.replace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) );
 	return s;
 }
 
@@ -282,10 +282,10 @@ GaduRichTextFormat::insertRtf( uint position)
 TQString
 GaduRichTextFormat::escapeBody( TQString& input )
 {
-	input.tqreplace( '<', TQString::tqfromLatin1("&lt;") );
-	input.tqreplace( '>', TQString::tqfromLatin1("&gt;") );
-	input.tqreplace( '\n', TQString::tqfromLatin1( "<br />" ) );
-	input.tqreplace( '\t', TQString::tqfromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) );
-	input.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " &nbsp;" ) );
+	input.replace( '<', TQString::tqfromLatin1("&lt;") );
+	input.replace( '>', TQString::tqfromLatin1("&gt;") );
+	input.replace( '\n', TQString::tqfromLatin1( "<br />" ) );
+	input.replace( '\t', TQString::tqfromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) );
+	input.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " &nbsp;" ) );
 	return input;
 }
diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp
index f7fe5970..6490a1e3 100644
--- a/kopete/protocols/gadu/gadusession.cpp
+++ b/kopete/protocols/gadu/gadusession.cpp
@@ -265,7 +265,7 @@ GaduSession::sendMessage( uin_t recipient, const Kopete::Message& msg, int msgCl
 		}
 		else {
 			sendMsg = msg.plainBody();
-			sendMsg.tqreplace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) );
+			sendMsg.replace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) );
 			cpMsg = textcodec->fromUnicode( sendMsg );
 
 			return gg_send_message( session_, msgClass, recipient, (const unsigned char *)cpMsg.data() );