summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/private
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/libkopete/private')
-rw-r--r--kopete/libkopete/private/kopetecommand.cpp4
-rw-r--r--kopete/libkopete/private/kopeteemoticons.cpp6
-rw-r--r--kopete/libkopete/private/kopeteviewmanager.cpp8
3 files changed, 9 insertions, 9 deletions
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::Token> 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::Token> Emoticons::tokenize( const TQString& message, uint
// If this is an HTML, then search for the HTML form of the emoticon.
// For instance <o) => &gt;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::Token> Emoticons::tokenize( const TQString& message, uint
{
if( inHTMLEntity ){
// If we are in an HTML entitiy such as &gt;
- 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 );