From 937b2991d8e78166eea904c80ad04d34607017a4 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: 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 --- kopete/protocols/oscar/aim/aimaccount.cpp | 34 ++++++++++++------------- kopete/protocols/oscar/aim/aimcontact.cpp | 40 +++++++++++++++--------------- kopete/protocols/oscar/aim/aimprotocol.cpp | 26 +++++++++---------- kopete/protocols/oscar/aim/aimuserinfo.cpp | 2 +- 4 files changed, 51 insertions(+), 51 deletions(-) (limited to 'kopete/protocols/oscar/aim') diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index 201d7d01..cc890add 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -127,53 +127,53 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio //font-size:xxpt -> s=message.escapedBody(); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("([^<]*)")), + s.replace ( TQRegExp( TQString::tqfromLatin1("([^<]*)")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("\\2")); //okay now change the to //0-9 are size 1 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); //10-11 are size 2 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); //12-13 are size 3 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); //14-16 are size 4 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); //17-22 are size 5 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); //23-29 are size 6 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); //30- (and any I missed) are size 7 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("
") ); + s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("
") ); kdDebug(14190) << k_funcinfo << "sending " << s << endl; @@ -280,7 +280,7 @@ TQString AIMAccount::sanitizedMessage( const TQString& message ) continue; if ( fontEl.hasAttribute( "back" ) ) { - kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "Found attribute to tqreplace. Doing replacement" << endl; + kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "Found attribute to replace. Doing replacement" << endl; TQString backgroundColor = fontEl.attribute( "back" ); backgroundColor.insert( 0, "background-color: " ); backgroundColor.append( ';' ); diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index 7f14d3ba..c71fed4d 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -127,16 +127,16 @@ void AIMContact::setAwayMessage(const TQString &message) kdDebug(14152) << k_funcinfo << "Called for '" << contactId() << "', away msg='" << message << "'" << endl; TQString filteredMessage = message; - filteredMessage.tqreplace( + filteredMessage.replace( TQRegExp(TQString::tqfromLatin1("<[hH][tT][mM][lL].*>(.*)")), TQString::tqfromLatin1("\\1")); - filteredMessage.tqreplace( + filteredMessage.replace( TQRegExp(TQString::tqfromLatin1("<[bB][oO][dD][yY].*>(.*)")), TQString::tqfromLatin1("\\1") ); TQRegExp fontRemover( TQString::tqfromLatin1("<[fF][oO][nN][tT].*>(.*)") ); fontRemover.setMinimal(true); - while ( filteredMessage.tqfind( fontRemover ) != -1 ) - filteredMessage.tqreplace( fontRemover, TQString::tqfromLatin1("\\1") ); + while ( filteredMessage.find( fontRemover ) != -1 ) + filteredMessage.replace( fontRemover, TQString::tqfromLatin1("\\1") ); setProperty(mProtocol->awayMessage, filteredMessage); } @@ -392,56 +392,56 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *) //font-size:xxpt -> s=message.escapedBody(); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("([^<]*)")), + s.replace ( TQRegExp( TQString::tqfromLatin1("([^<]*)")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + s.replace ( TQRegExp( TQString::tqfromLatin1("")), TQString::tqfromLatin1("\\2")); //okay now change the to //0-9 are size 1 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); //10-11 are size 2 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); //12-13 are size 3 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); //14-16 are size 4 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); //17-22 are size 5 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("")); //23-29 are size 6 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); //30- (and any I missed) are size 7 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); // strip left over line break s.remove(TQRegExp(TQString::tqfromLatin1("]*>$"))); - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("
") ); + s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("
") ); // strip left over line break s.remove( TQRegExp( TQString::tqfromLatin1( "
$" ) ) ); diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp index 0808fde9..b3d4205f 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.cpp +++ b/kopete/protocols/oscar/aim/aimprotocol.cpp @@ -81,54 +81,54 @@ void AIMProtocolHandler::handleURL(const KURL &url) const TQString command = url.path(); TQString realCommand, firstParam, secondParam; bool needContactAddition = false; - if ( command.tqfind( "goim", 0, false ) != -1 ) + if ( command.find( "goim", 0, false ) != -1 ) { realCommand = "goim"; kdDebug(14152) << k_funcinfo << "Handling send IM request" << endl; command.remove(0,4); - if ( command.tqfind( "?screenname=", 0, false ) == -1 ) + if ( command.find( "?screenname=", 0, false ) == -1 ) { kdWarning(14152) << k_funcinfo << "Unhandled AIM URI:" << url.url() << endl; return; } command.remove( 0, 12 ); - int andSign = command.tqfind( "&" ); + int andSign = command.find( "&" ); if ( andSign > 0 ) command = command.left( andSign ); firstParam = command; - firstParam.tqreplace( "+", " " ); + firstParam.replace( "+", " " ); needContactAddition = true; } else - if ( command.tqfind( "addbuddy", 0, false ) != -1 ) + if ( command.find( "addbuddy", 0, false ) != -1 ) { realCommand = "addbuddy"; kdDebug(14152) << k_funcinfo << "Handling AIM add buddy request" << endl; command.remove( 0, 8 ); - if ( command.tqfind( "?screenname=", 0, false ) == -1 ) + if ( command.find( "?screenname=", 0, false ) == -1 ) { kdWarning(14152) << k_funcinfo << "Unhandled AIM URI:" << url.url() << endl; return; } command.remove(0, 12); - int andSign = command.tqfind("&"); + int andSign = command.find("&"); if ( andSign > 0 ) command = command.left(andSign); - command.tqreplace("+", " "); + command.replace("+", " "); firstParam = command; needContactAddition = true; } else - if ( command.tqfind( "gochat", 0, false ) != -1 ) + if ( command.find( "gochat", 0, false ) != -1 ) { realCommand = "gochat"; kdDebug(14152) << k_funcinfo << "Handling AIM chat room request" << endl; command.remove( 0, 6 ); - if ( command.tqfind( "?RoomName=", 0, false ) == -1 ) + if ( command.find( "?RoomName=", 0, false ) == -1 ) { kdWarning(14152) << "Unhandled AIM URI: " << url.url() << endl; return; @@ -136,7 +136,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const command.remove( 0, 10 ); - int andSign = command.tqfind("&"); + int andSign = command.find("&"); if (andSign > 0) // strip off anything else for now { firstParam = command.left(andSign); @@ -146,7 +146,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const command.remove( 0, 10 ); //remove "&Exchange=" secondParam = command; kdDebug(14152) << k_funcinfo << firstParam << " " << secondParam << endl; - firstParam.tqreplace("+", " "); + firstParam.replace("+", " "); } Kopete::Account *account = 0; @@ -283,7 +283,7 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac uint ssiGid = 0, ssiBid = 0, ssiType = 0xFFFF; TQString ssiName; bool ssiWaitingAuth = false; - if ( serializedData.tqcontains( "ssi_type" ) ) + if ( serializedData.contains( "ssi_type" ) ) { ssiName = serializedData["ssi_name"]; TQString authtqStatus = serializedData["ssi_waitingAuth"]; diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp index cc016684..767c519d 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.cpp +++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp @@ -221,4 +221,4 @@ void AIMUserInfoDialog::slotMailClicked(const TQString&, const TQString &address #include "aimuserinfo.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; -- cgit v1.2.1