From 329367edf66fec19f8a9de843cf3319fbe187b99 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: [PATCH] rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kopete-otr@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/otrlchatinterface.cpp | 16 ++++++++-------- src/otrplugin.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/otrlchatinterface.cpp b/src/otrlchatinterface.cpp index f89ebec..3743b80 100644 --- a/src/otrlchatinterface.cpp +++ b/src/otrlchatinterface.cpp @@ -380,7 +380,7 @@ int OtrlChatInterface::decryptMessage( TQString *msg, TQString accountId, if( newMessage != NULL ){ *msg = TQString::fromUtf8(newMessage); otrl_message_free( newMessage ); - msg->tqreplace( TQString("\n"), TQString("
"), false ); + msg->replace( TQString("\n"), TQString("
"), false ); } } return ignoremessage; @@ -391,7 +391,7 @@ TQString OtrlChatInterface::encryptMessage( TQString msg, TQString accountId, int err; char * newMessage; if( otrl_proto_message_type( msg ) == OTRL_MSGTYPE_NOTOTR ){ - msg.tqreplace( TQString("<"), TQString("<"), false ); + msg.replace( TQString("<"), TQString("<"), false ); err = otrl_message_sending( userstate, &ui_ops, chatSession, accountId.latin1(), protocol.latin1(), contactId.latin1(), msg.utf8(), NULL, &newMessage, NULL, NULL ); if( err != 0 ){ @@ -405,7 +405,7 @@ TQString OtrlChatInterface::encryptMessage( TQString msg, TQString accountId, } OtrlMessageType type = otrl_proto_message_type( msg ); if( type == OTRL_MSGTYPE_NOTOTR | type == OTRL_MSGTYPE_TAGGEDPLAINTEXT ){ - msg.tqreplace( "<", "<", false ); + msg.replace( "<", "<", false ); } return msg; } @@ -562,9 +562,9 @@ void OtrlChatInterface::updateKeyfile( Kopete::Account *account ){ if( keyfile.open( IO_ReadWrite ) ){ kdDebug() << "file open" << endl; while( keyfile.readLine( line, 200 ) != -1){ - if( line.tqfind( "protocol" ) != -1 ){ - if( line.tqfind( account->accountLabel() ) != -1 ){ - line.tqreplace( account->accountLabel(), account->protocol()->displayName() ); + if( line.find( "protocol" ) != -1 ){ + if( line.find( account->accountLabel() ) != -1 ){ + line.replace( account->accountLabel(), account->protocol()->displayName() ); kdDebug() << "Successfully updated keyfile for account " << account->accountId() << endl; } } @@ -587,9 +587,9 @@ void OtrlChatInterface::updateKeyfile( Kopete::Account *account ){ if( fingerprintfile.open( IO_ReadWrite ) ){ kdDebug() << "file open" << endl; while( fingerprintfile.readLine( line, 200 ) != -1){ - int pos = line.tqfindRev( account->accountLabel() ); + int pos = line.findRev( account->accountLabel() ); if( pos != -1 ){ - line.tqreplace( pos, account->accountLabel().length(), account->protocol()->displayName() ); + line.replace( pos, account->accountLabel().length(), account->protocol()->displayName() ); kdDebug() << "Successfully updated fingerprint for account " << account->accountId() << endl; } file.append( line ); diff --git a/src/otrplugin.cpp b/src/otrplugin.cpp index 323ee44..b929b4c 100644 --- a/src/otrplugin.cpp +++ b/src/otrplugin.cpp @@ -281,7 +281,7 @@ kdDebug() << "Received Message: " << msg.parsedBody() << endl; return; } } else if( msg.direction() == Kopete::Message::Outbound ){ - if( messageCache.tqcontains( msg.plainBody() ) ){ + if( messageCache.contains( msg.plainBody() ) ){ msg.setBody( messageCache[msg.plainBody()] ); messageCache.remove( messageCache[msg.plainBody()] ); if(messageCache.count() > 5) messageCache.clear();