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/libkopete/private/kopetecommand.cpp | 4 ++-- kopete/libkopete/private/kopeteemoticons.cpp | 6 +++--- kopete/libkopete/private/kopeteviewmanager.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'kopete/libkopete/private') diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp index f9fef1b6..e80788bf 100644 --- a/kopete/libkopete/private/kopetecommand.cpp +++ b/kopete/libkopete/private/kopetecommand.cpp @@ -102,8 +102,8 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession // Translate %s to the whole string and %n to current nickname - formatString.tqreplace( TQString::tqfromLatin1("%n"), manager->myself()->nickName() ); - formatString.tqreplace( TQString::tqfromLatin1("%s"), args ); + formatString.replace( TQString::tqfromLatin1("%n"), manager->myself()->nickName() ); + formatString.replace( TQString::tqfromLatin1("%s"), args ); // Translate %1..%N to word1..wordN diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index 9c41d44d..26375517 100644 --- a/kopete/libkopete/private/kopeteemoticons.cpp +++ b/kopete/libkopete/private/kopeteemoticons.cpp @@ -183,7 +183,7 @@ TQValueList Emoticons::tokenize( const TQString& message, uint p = c; continue; } /* strict requires space before the emoticon */ - if ( d->emoticonMap.tqcontains( c ) ) + if ( d->emoticonMap.contains( c ) ) { emoticonList = d->emoticonMap[ c ]; bool found = false; @@ -192,7 +192,7 @@ TQValueList Emoticons::tokenize( const TQString& message, uint // If this is an HTML, then search for the HTML form of the emoticon. // For instance >o) needle = ( mode & SkipHTML ) ? (*it).matchTextEscaped : (*it).matchText; - if ( ( pos == (size_t)message.tqfind( needle, pos ) ) ) + if ( ( pos == (size_t)message.find( needle, pos ) ) ) { if( mode & StrictParse ) { @@ -214,7 +214,7 @@ TQValueList Emoticons::tokenize( const TQString& message, uint { if( inHTMLEntity ){ // If we are in an HTML entitiy such as > - int htmlEnd = message.tqfind( ';', pos ); + int htmlEnd = message.find( ';', pos ); // Search for where it ends if( htmlEnd == -1 ) { diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 4650ffb9..1d6feced 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -110,7 +110,7 @@ KopeteView *KopeteViewManager::view( Kopete::ChatSession* session, const TQStrin { // kdDebug(14000) << k_funcinfo << endl; - if( d->managerMap.tqcontains( session ) && d->managerMap[ session ] ) + if( d->managerMap.contains( session ) && d->managerMap[ session ] ) { return d->managerMap[ session ]; } @@ -161,7 +161,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi bool outgoingMessage = ( msg.direction() == Kopete::Message::Outbound ); - if( !outgoingMessage || d->managerMap.tqcontains( manager ) ) + if( !outgoingMessage || d->managerMap.contains( manager ) ) { d->foreignMessage=!outgoingMessage; //let know for the view we are about to create manager->view(true,msg.requestedPlugin())->appendMessage( msg ); @@ -329,7 +329,7 @@ void KopeteViewManager::slotViewDestroyed( KopeteView *closingView ) { // kdDebug( 14000 ) << k_funcinfo << endl; - if( d->managerMap.tqcontains( closingView->msgManager() ) ) + if( d->managerMap.contains( closingView->msgManager() ) ) { d->managerMap.remove( closingView->msgManager() ); // closingView->msgManager()->setCanBeDeleted( true ); @@ -343,7 +343,7 @@ void KopeteViewManager::slotChatSessionDestroyed( Kopete::ChatSession *manager ) { // kdDebug( 14000 ) << k_funcinfo << endl; - if( d->managerMap.tqcontains( manager ) ) + if( d->managerMap.contains( manager ) ) { KopeteView *v=d->managerMap[ manager ]; v->closeView( true ); -- cgit v1.2.1