summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commit937b2991d8e78166eea904c80ad04d34607017a4 (patch)
tree2accb8161eab09df5d7a5484ea9ea080ad123168 /kopete/protocols/oscar
parentdba26cb985af370c33d1767037851705cc561726 (diff)
downloadtdenetwork-937b2991d8e78166eea904c80ad04d34607017a4.tar.gz
tdenetwork-937b2991d8e78166eea904c80ad04d34607017a4.zip
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
Diffstat (limited to 'kopete/protocols/oscar')
-rw-r--r--kopete/protocols/oscar/aim/aimaccount.cpp34
-rw-r--r--kopete/protocols/oscar/aim/aimcontact.cpp40
-rw-r--r--kopete/protocols/oscar/aim/aimprotocol.cpp26
-rw-r--r--kopete/protocols/oscar/aim/aimuserinfo.cpp2
-rw-r--r--kopete/protocols/oscar/icq/icqcontact.cpp2
-rw-r--r--kopete/protocols/oscar/icq/icqcontact.h2
-rw-r--r--kopete/protocols/oscar/icq/icqprotocol.cpp12
-rw-r--r--kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqaddcontactpage.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqsearchdialog.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp2
-rw-r--r--kopete/protocols/oscar/icq/ui/icquserinfowidget.h2
-rw-r--r--kopete/protocols/oscar/liboscar/aimlogintask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/changevisibilitytask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/changevisibilitytask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/client.cpp6
-rw-r--r--kopete/protocols/oscar/liboscar/closeconnectiontask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/closeconnectiontask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/connection.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/connectionhandler.cpp6
-rw-r--r--kopete/protocols/oscar/liboscar/coreprotocol.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/icqtask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/icquserinfo.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/icquserinfo.h2
-rw-r--r--kopete/protocols/oscar/liboscar/icquserinfotask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/icquserinfotask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/oscarbytestream.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/oscarbytestream.h2
-rw-r--r--kopete/protocols/oscar/liboscar/oscarclientstream.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/oscarconnector.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/oscarconnector.h2
-rw-r--r--kopete/protocols/oscar/liboscar/rtf.cc16
-rw-r--r--kopete/protocols/oscar/liboscar/rtf.ll16
-rw-r--r--kopete/protocols/oscar/liboscar/ssimanager.cpp20
-rw-r--r--kopete/protocols/oscar/liboscar/typingnotifytask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/typingnotifytask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/userinfotask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/usersearchtask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/warningtask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/warningtask.h2
-rw-r--r--kopete/protocols/oscar/oscaraccount.cpp2
-rw-r--r--kopete/protocols/oscar/oscarencodingselectiondialog.cpp4
-rw-r--r--kopete/protocols/oscar/oscarvisibilitydialog.cpp4
46 files changed, 127 insertions, 127 deletions
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 -> <font ptsize=xx>
s=message.escapedBody();
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
TQString::tqfromLatin1("<style>\\1;\"\\2</style>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("\\2"));
//okay now change the <font ptsize="xx"> to <font size="xx">
//0-9 are size 1
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")),
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")),
TQString::tqfromLatin1("<font size=\"1\">"));
//10-11 are size 2
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")),
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")),
TQString::tqfromLatin1("<font size=\"2\">"));
//12-13 are size 3
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")),
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")),
TQString::tqfromLatin1("<font size=\"3\">"));
//14-16 are size 4
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")),
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")),
TQString::tqfromLatin1("<font size=\"4\">"));
//17-22 are size 5
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
TQString::tqfromLatin1("<font size=\"5\">"));
//23-29 are size 6
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">"));
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">"));
//30- (and any I missed) are size 7
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">"));
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">"));
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") );
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") );
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].*>(.*)</[hH][tT][mM][lL]>")),
TQString::tqfromLatin1("\\1"));
- filteredMessage.tqreplace(
+ filteredMessage.replace(
TQRegExp(TQString::tqfromLatin1("<[bB][oO][dD][yY].*>(.*)</[bB][oO][dD][yY]>")),
TQString::tqfromLatin1("\\1") );
TQRegExp fontRemover( TQString::tqfromLatin1("<[fF][oO][nN][tT].*>(.*)</[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 -> <font ptsize=xx>
s=message.escapedBody();
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
TQString::tqfromLatin1("<style>\\1;\"\\2</style>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
- s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
+ s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
TQString::tqfromLatin1("\\2"));
//okay now change the <font ptsize="xx"> to <font size="xx">
//0-9 are size 1
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")),
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")),
TQString::tqfromLatin1("<font size=\"1\">"));
//10-11 are size 2
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")),
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")),
TQString::tqfromLatin1("<font size=\"2\">"));
//12-13 are size 3
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")),
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")),
TQString::tqfromLatin1("<font size=\"3\">"));
//14-16 are size 4
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")),
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")),
TQString::tqfromLatin1("<font size=\"4\">"));
//17-22 are size 5
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
TQString::tqfromLatin1("<font size=\"5\">"));
//23-29 are size 6
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">"));
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">"));
//30- (and any I missed) are size 7
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">"));
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">"));
// strip left over line break
s.remove(TQRegExp(TQString::tqfromLatin1("<br\b[^>]*>$")));
- s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") );
+ s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") );
// strip left over line break
s.remove( TQRegExp( TQString::tqfromLatin1( "<br>$" ) ) );
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;
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index 9b13ab64..59979073 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -936,4 +936,4 @@ void ICQContact::slotVisibleTo()
}
#endif
#include "icqcontact.moc"
-//kate: indent-mode csands; tab-width 4; tqreplace-tabs off; space-indent off;
+//kate: indent-mode csands; tab-width 4; replace-tabs off; space-indent off;
diff --git a/kopete/protocols/oscar/icq/icqcontact.h b/kopete/protocols/oscar/icq/icqcontact.h
index 6184bf9b..59a87d4d 100644
--- a/kopete/protocols/oscar/icq/icqcontact.h
+++ b/kopete/protocols/oscar/icq/icqcontact.h
@@ -153,4 +153,4 @@ private slots:
};
#endif
-//kate: tab-width 4; indent-mode csands; space-indent off; tqreplace-tabs off;
+//kate: tab-width 4; indent-mode csands; space-indent off; replace-tabs off;
diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp
index e7a5dc6c..a6888cee 100644
--- a/kopete/protocols/oscar/icq/icqprotocol.cpp
+++ b/kopete/protocols/oscar/icq/icqprotocol.cpp
@@ -673,7 +673,7 @@ void ICQProtocol::setComboFromTable(TQComboBox *box, const TQMap<int, TQString>
{
// kdDebug(14153) << k_funcinfo << "Called." << endl;
TQMap<int, TQString>::ConstIterator it;
- it = map.tqfind(value);
+ it = map.find(value);
if (!(*it))
return;
@@ -770,21 +770,21 @@ Kopete::Contact *ICQProtocol::deserializeContact( Kopete::MetaContact *metaConta
uint ssiGid = 0, ssiBid = 0, ssiType = 0xFFFF;
TQString ssiName;
bool ssiWaitingAuth = false;
- if ( serializedData.tqcontains( "ssi_name" ) )
+ if ( serializedData.contains( "ssi_name" ) )
ssiName = serializedData["ssi_name"];
- if ( serializedData.tqcontains( "ssi_waitingAuth" ) )
+ if ( serializedData.contains( "ssi_waitingAuth" ) )
{
TQString authtqStatus = serializedData["ssi_waitingAuth"];
if ( authtqStatus == "true" )
ssiWaitingAuth = true;
}
- if ( serializedData.tqcontains( "ssi_gid" ) )
+ if ( serializedData.contains( "ssi_gid" ) )
ssiGid = serializedData["ssi_gid"].toUInt();
- if ( serializedData.tqcontains( "ssi_bid" ) )
+ if ( serializedData.contains( "ssi_bid" ) )
ssiBid = serializedData["ssi_bid"].toUInt();
- if ( serializedData.tqcontains( "ssi_type" ) )
+ if ( serializedData.contains( "ssi_type" ) )
ssiType = serializedData["ssi_type"].toUInt();
Oscar::SSI item( ssiName, ssiGid, ssiBid, ssiType, TQValueList<TLV>(), 0 );
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
index 05d9eb70..84ce12e7 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
@@ -123,4 +123,4 @@ void ICQAddContactPage::searchDialogDestroyed()
#include "icqaddcontactpage.moc"
// vim: set noet ts=4 sts=4 sw=4:
-// kate: indent-mode csands; space-indent off; tqreplace-tabs off;
+// kate: indent-mode csands; space-indent off; replace-tabs off;
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
index ba658f94..aebd4afa 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
@@ -58,4 +58,4 @@ private:
#endif
-//kate: space-indent off; tqreplace-tabs off; indent-mode csands;
+//kate: space-indent off; replace-tabs off; indent-mode csands;
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
index 874c2075..3feb48bf 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
@@ -187,4 +187,4 @@ void ICQEditAccountWidget::slotOpenRegister()
#include "icqeditaccountwidget.moc"
// vim: set noet ts=4 sts=4 sw=4:
-// kate: indent-mode csands; space-indent off; tqreplace-tabs off;
+// kate: indent-mode csands; space-indent off; replace-tabs off;
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h
index c9affe90..2ef9e703 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h
@@ -50,4 +50,4 @@ protected:
};
#endif
// vim: set noet ts=4 sts=4 sw=4:
-// kate: indent-mode csands; space-indent off; tqreplace-tabs off;
+// kate: indent-mode csands; space-indent off; replace-tabs off;
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
index 57c551aa..aabf046d 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
@@ -315,6 +315,6 @@ void ICQSearchDialog::newSearch()
clearFields();
}
-//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4;
+//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4;
#include "icqsearchdialog.moc"
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h
index 2dcdd502..f9bfa81e 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h
+++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h
@@ -67,4 +67,4 @@ private:
#endif
-//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4;
+//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4;
diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
index 3c327198..5c1d4500 100644
--- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
+++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
@@ -186,5 +186,5 @@ void ICQUserInfoWidget::fillMoreInfo( const ICQMoreUserInfo& ui )
#include "icquserinfowidget.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;
diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h
index 6fd5d84a..16d1d5d9 100644
--- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h
+++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h
@@ -56,4 +56,4 @@ private:
#endif
-//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;
diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp
index 56fa497f..74b6b5f9 100644
--- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp
+++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp
@@ -220,7 +220,7 @@ void AimLoginTask::handleLoginResponse()
{
TQString ip = TQString( server.data );
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(5) [SERVER] " << ip << endl;
- int index = ip.tqfind( ':' );
+ int index = ip.find( ':' );
m_bosHost = ip.left( index );
ip.remove( 0 , index+1 ); //get rid of the colon and everything before it
m_bosPort = ip.left(4); //we only need 4 bytes
diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp
index b4dfff4a..23231179 100644
--- a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp
+++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp
@@ -147,4 +147,4 @@ void ChangeVisibilityTask::sendEditEnd()
send( t5 );
}
-//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4;
+//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4;
diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.h b/kopete/protocols/oscar/liboscar/changevisibilitytask.h
index 9d8676b3..33d0c306 100644
--- a/kopete/protocols/oscar/liboscar/changevisibilitytask.h
+++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.h
@@ -55,4 +55,4 @@ private:
#endif
-//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4;
+//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4;
diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp
index 53e38ed1..41ee73bd 100644
--- a/kopete/protocols/oscar/liboscar/client.cpp
+++ b/kopete/protocols/oscar/liboscar/client.cpp
@@ -1099,7 +1099,7 @@ void Client::requestServerRedirect( WORD family, WORD exchange,
if ( !c )
return;
- if ( d->redirectionServices.tqfindIndex( family ) == -1 )
+ if ( d->redirectionServices.findIndex( family ) == -1 )
d->redirectionServices.append( family ); //don't add families twice
if ( d->currentRedirect != 0 )
@@ -1129,7 +1129,7 @@ void Client::haveServerForRedirect( const TQString& host, const TQByteArray& coo
ServerRedirectTask* srt = dynamic_cast<ServerRedirectTask*>( o );
//create a new connection and set it up
- int colonPos = host.tqfind(':');
+ int colonPos = host.find(':');
TQString realHost, realPort;
if ( colonPos != -1 )
{
@@ -1350,4 +1350,4 @@ bool Client::hasIconConnection( ) const
}
#include "client.moc"
-//kate: tab-width 4; indent-mode csands; space-indent off; tqreplace-tabs off;
+//kate: tab-width 4; indent-mode csands; space-indent off; replace-tabs off;
diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp
index d85ca4df..4a09f3f9 100644
--- a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp
+++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp
@@ -98,7 +98,7 @@ bool CloseConnectionTask::take( Transfer* transfer )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(5) [SERVER] " << TQString( server.data ) << endl;
TQString ip = server.data;
- int index = ip.tqfind( ':' );
+ int index = ip.find( ':' );
m_bosHost = ip.left( index );
ip.remove( 0 , index+1 ); //get rid of the colon and everything before it
m_bosPort = ip;
diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.h b/kopete/protocols/oscar/liboscar/closeconnectiontask.h
index 8bda062f..27830b31 100644
--- a/kopete/protocols/oscar/liboscar/closeconnectiontask.h
+++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.h
@@ -59,4 +59,4 @@ private:
#endif
-//kate: indent-mode csands; space-indent off; tab-width 4; tqreplace-tabs off;
+//kate: indent-mode csands; space-indent off; tab-width 4; replace-tabs off;
diff --git a/kopete/protocols/oscar/liboscar/connection.cpp b/kopete/protocols/oscar/liboscar/connection.cpp
index 03452153..b94a9082 100644
--- a/kopete/protocols/oscar/liboscar/connection.cpp
+++ b/kopete/protocols/oscar/liboscar/connection.cpp
@@ -96,7 +96,7 @@ void Connection::close()
bool Connection::isSupported( int family ) const
{
- return ( d->familyList.tqfindIndex( family ) != -1 );
+ return ( d->familyList.findIndex( family ) != -1 );
}
TQValueList<int> Connection::supportedFamilies() const
diff --git a/kopete/protocols/oscar/liboscar/connectionhandler.cpp b/kopete/protocols/oscar/liboscar/connectionhandler.cpp
index 3f2c1eff..1cac6611 100644
--- a/kopete/protocols/oscar/liboscar/connectionhandler.cpp
+++ b/kopete/protocols/oscar/liboscar/connectionhandler.cpp
@@ -112,7 +112,7 @@ Connection* ConnectionHandler::defaultConnection() const
void ConnectionHandler::addChatInfoForConnection( Connection* c, Oscar::WORD exchange, const TQString& room )
{
- if ( d->connections.tqfindIndex( c ) == -1 )
+ if ( d->connections.findIndex( c ) == -1 )
d->connections.append( c );
ConnectionRoomInfo info = tqMakePair( exchange, room );
@@ -137,7 +137,7 @@ Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, cons
TQString ConnectionHandler::chatRoomForConnection( Connection* c )
{
- if ( d->connections.tqfindIndex( c ) == -1 )
+ if ( d->connections.findIndex( c ) == -1 )
return TQString();
TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();
@@ -156,7 +156,7 @@ TQString ConnectionHandler::chatRoomForConnection( Connection* c )
Oscar::WORD ConnectionHandler::exchangeForConnection( Connection* c )
{
- if ( d->connections.tqfindIndex( c ) == -1 )
+ if ( d->connections.findIndex( c ) == -1 )
return 0xFFFF;
TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();
diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.cpp b/kopete/protocols/oscar/liboscar/coreprotocol.cpp
index 472618fe..638ed6c0 100644
--- a/kopete/protocols/oscar/liboscar/coreprotocol.cpp
+++ b/kopete/protocols/oscar/liboscar/coreprotocol.cpp
@@ -152,7 +152,7 @@ Transfer* CoreProtocol::incomingTransfer()
void cp_dump( const TQByteArray &bytes )
{
#ifdef OSCAR_COREPROTOCOL_DEBUG
- kdDebug(OSCAR_RAW_DEBUG) << "tqcontains: " << bytes.count() << " bytes" << endl;
+ kdDebug(OSCAR_RAW_DEBUG) << "contains: " << bytes.count() << " bytes" << endl;
for ( uint i = 0; i < bytes.count(); ++i )
{
printf( "%02x ", bytes[ i ] );
diff --git a/kopete/protocols/oscar/liboscar/icqtask.cpp b/kopete/protocols/oscar/liboscar/icqtask.cpp
index ccedd0d9..1c8d98ae 100644
--- a/kopete/protocols/oscar/liboscar/icqtask.cpp
+++ b/kopete/protocols/oscar/liboscar/icqtask.cpp
@@ -148,4 +148,4 @@ void ICQTask::setRequestSubType( WORD subType )
#include "icqtask.moc"
-//kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+//kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kopete/protocols/oscar/liboscar/icquserinfo.cpp b/kopete/protocols/oscar/liboscar/icquserinfo.cpp
index a4a5f78c..bc37d313 100644
--- a/kopete/protocols/oscar/liboscar/icquserinfo.cpp
+++ b/kopete/protocols/oscar/liboscar/icquserinfo.cpp
@@ -259,4 +259,4 @@ ICQWPSearchInfo::ICQWPSearchInfo()
-//kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+//kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kopete/protocols/oscar/liboscar/icquserinfo.h b/kopete/protocols/oscar/liboscar/icquserinfo.h
index 685859a6..ae51462d 100644
--- a/kopete/protocols/oscar/liboscar/icquserinfo.h
+++ b/kopete/protocols/oscar/liboscar/icquserinfo.h
@@ -210,4 +210,4 @@ typedef TQValueList<ICQInfoItem> ICQInfoItemList;
*/
#endif
-//kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
+//kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp
index 6a915ca8..6e8dd5d7 100644
--- a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp
+++ b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp
@@ -231,4 +231,4 @@ TQString ICQUserInfoRequestTask::notesInfoFor( const TQString& contact )
#include "icquserinfotask.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;
diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.h b/kopete/protocols/oscar/liboscar/icquserinfotask.h
index 27aa4a68..437ac4ca 100644
--- a/kopete/protocols/oscar/liboscar/icquserinfotask.h
+++ b/kopete/protocols/oscar/liboscar/icquserinfotask.h
@@ -75,4 +75,4 @@ private:
};
#endif
-//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;
diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp
index e2387368..9c12d473 100644
--- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp
@@ -138,4 +138,4 @@ void KNetworkByteStream::slotError( int code )
#include "oscarbytestream.moc"
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.h b/kopete/protocols/oscar/liboscar/oscarbytestream.h
index 3b310eab..bf11446b 100644
--- a/kopete/protocols/oscar/liboscar/oscarbytestream.h
+++ b/kopete/protocols/oscar/liboscar/oscarbytestream.h
@@ -69,5 +69,5 @@ private:
#endif
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp
index 085bac9e..3c2edeaf 100644
--- a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp
@@ -266,7 +266,7 @@ void ClientStream::write( Transfer *request )
void cs_dump( const TQByteArray &bytes )
{
#if 0
- qDebug( "tqcontains: %i bytes ", bytes.count() );
+ qDebug( "contains: %i bytes ", bytes.count() );
uint count = 0;
while ( count < bytes.count() )
{
diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.cpp b/kopete/protocols/oscar/liboscar/oscarconnector.cpp
index 03db367d..9f33eb76 100644
--- a/kopete/protocols/oscar/liboscar/oscarconnector.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarconnector.cpp
@@ -105,4 +105,4 @@ void KNetworkConnector::setOptHostPort( const TQString &host, TQ_UINT16 port )
#include "oscarconnector.moc"
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.h b/kopete/protocols/oscar/liboscar/oscarconnector.h
index 20a44123..9441c3c6 100644
--- a/kopete/protocols/oscar/liboscar/oscarconnector.h
+++ b/kopete/protocols/oscar/liboscar/oscarconnector.h
@@ -67,4 +67,4 @@ private:
#endif
-// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off;
+// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
diff --git a/kopete/protocols/oscar/liboscar/rtf.cc b/kopete/protocols/oscar/liboscar/rtf.cc
index 7559a253..e9048c21 100644
--- a/kopete/protocols/oscar/liboscar/rtf.cc
+++ b/kopete/protocols/oscar/liboscar/rtf.cc
@@ -1630,17 +1630,17 @@ void ParStyle::clearFormatting()
TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode)
{
TQString str = _str;
- str.tqreplace(TQRegExp("&"), "&amp;");
- str.tqreplace(TQRegExp("<"), "&lt;");
- str.tqreplace(TQRegExp(">"), "&gt;");
- str.tqreplace(TQRegExp("\""), "&quot;");
- str.tqreplace(TQRegExp("\r"), "");
+ str.replace(TQRegExp("&"), "&amp;");
+ str.replace(TQRegExp("<"), "&lt;");
+ str.replace(TQRegExp(">"), "&gt;");
+ str.replace(TQRegExp("\""), "&quot;");
+ str.replace(TQRegExp("\r"), "");
switch (mode){
case quoteHTML:
- str.tqreplace(TQRegExp("\n"), "<br>\n");
+ str.replace(TQRegExp("\n"), "<br>\n");
break;
case quoteXML:
- str.tqreplace(TQRegExp("\n"), "<br/>\n");
+ str.replace(TQRegExp("\n"), "<br/>\n");
break;
default:
break;
@@ -1657,7 +1657,7 @@ TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode)
TQString s = " ";
for (int i = 1; i < len; i++)
s += "&nbsp;";
- str.tqreplace(pos, len, s);
+ str.replace(pos, len, s);
}
return str;
}
diff --git a/kopete/protocols/oscar/liboscar/rtf.ll b/kopete/protocols/oscar/liboscar/rtf.ll
index 63c04c96..47d1bdf7 100644
--- a/kopete/protocols/oscar/liboscar/rtf.ll
+++ b/kopete/protocols/oscar/liboscar/rtf.ll
@@ -67,17 +67,17 @@ void ParStyle::clearFormatting()
QString RTF2HTML::quoteString(const QString &_str, quoteMode mode)
{
QString str = _str;
- str.tqreplace(QRegExp("&"), "&amp;");
- str.tqreplace(QRegExp("<"), "&lt;");
- str.tqreplace(QRegExp(">"), "&gt;");
- str.tqreplace(QRegExp("\""), "&quot;");
- str.tqreplace(QRegExp("\r"), "");
+ str.replace(QRegExp("&"), "&amp;");
+ str.replace(QRegExp("<"), "&lt;");
+ str.replace(QRegExp(">"), "&gt;");
+ str.replace(QRegExp("\""), "&quot;");
+ str.replace(QRegExp("\r"), "");
switch (mode){
case quoteHTML:
- str.tqreplace(QRegExp("\n"), "<br>\n");
+ str.replace(QRegExp("\n"), "<br>\n");
break;
case quoteXML:
- str.tqreplace(QRegExp("\n"), "<br/>\n");
+ str.replace(QRegExp("\n"), "<br/>\n");
break;
default:
break;
@@ -94,7 +94,7 @@ QString RTF2HTML::quoteString(const QString &_str, quoteMode mode)
QString s = " ";
for (int i = 1; i < len; i++)
s += "&nbsp;";
- str.tqreplace(pos, len, s);
+ str.replace(pos, len, s);
}
return str;
}
diff --git a/kopete/protocols/oscar/liboscar/ssimanager.cpp b/kopete/protocols/oscar/liboscar/ssimanager.cpp
index 630b8f6b..45f69340 100644
--- a/kopete/protocols/oscar/liboscar/ssimanager.cpp
+++ b/kopete/protocols/oscar/liboscar/ssimanager.cpp
@@ -97,7 +97,7 @@ WORD SSIManager::nextContactId()
return 0xFFFF;
}
- if ( d->itemIdList.tqcontains( d->nextContactId ) == 0 )
+ if ( d->itemIdList.contains( d->nextContactId ) == 0 )
d->itemIdList.append( d->nextContactId );
return d->nextContactId++;
@@ -116,7 +116,7 @@ WORD SSIManager::nextGroupId()
return 0xFFFF;
}
- if ( d->groupIdList.tqcontains( d->nextGroupId ) == 0 )
+ if ( d->groupIdList.contains( d->nextGroupId ) == 0 )
d->groupIdList.append( d->nextGroupId );
return d->nextGroupId++;
@@ -449,7 +449,7 @@ bool SSIManager::updateGroup( const Oscar::SSI& group )
d->SSIList.remove( oldGroup );
}
- if ( d->SSIList.tqfindIndex( group ) != -1 )
+ if ( d->SSIList.findIndex( group ) != -1 )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "New group is already in list." << endl;
return false;
@@ -496,7 +496,7 @@ bool SSIManager::removeGroup( const TQString &group )
bool SSIManager::newContact( const Oscar::SSI& contact )
{
- if ( d->SSIList.tqfindIndex( contact ) == -1 )
+ if ( d->SSIList.findIndex( contact ) == -1 )
{
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Adding contact '" << contact.name() << "' to SSI list" << endl;
addID( contact );
@@ -518,7 +518,7 @@ bool SSIManager::updateContact( const Oscar::SSI& contact )
d->SSIList.remove( oldContact );
}
- if ( d->SSIList.tqfindIndex( contact ) != -1 )
+ if ( d->SSIList.findIndex( contact ) != -1 )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "New contact is already in list." << endl;
return false;
@@ -562,7 +562,7 @@ bool SSIManager::removeContact( const TQString &contact )
bool SSIManager::newItem( const Oscar::SSI& item )
{
- if ( d->SSIList.tqfindIndex( item ) != -1 )
+ if ( d->SSIList.findIndex( item ) != -1 )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Item is already in list." << endl;
return false;
@@ -584,7 +584,7 @@ bool SSIManager::updateItem( const Oscar::SSI& item )
d->SSIList.remove( oldItem );
}
- if ( d->SSIList.tqfindIndex( item ) != -1 )
+ if ( d->SSIList.findIndex( item ) != -1 )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "New item is already in list." << endl;
return false;
@@ -614,12 +614,12 @@ void SSIManager::addID( const Oscar::SSI& item )
{
if ( item.type() == ROSTER_GROUP )
{
- if ( d->groupIdList.tqcontains( item.gid() ) == 0 )
+ if ( d->groupIdList.contains( item.gid() ) == 0 )
d->groupIdList.append( item.gid() );
}
else
{
- if ( d->itemIdList.tqcontains( item.bid() ) == 0 )
+ if ( d->itemIdList.contains( item.bid() ) == 0 )
d->itemIdList.append( item.bid() );
}
}
@@ -646,7 +646,7 @@ WORD SSIManager::findFreeId( const TQValueList<WORD>& idList, WORD fromId ) cons
{
for ( WORD id = fromId; id < 0x8000; id++ )
{
- if ( idList.tqcontains( id ) == 0 )
+ if ( idList.contains( id ) == 0 )
return id;
}
diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp
index 536f2f39..e69222c1 100644
--- a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp
+++ b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp
@@ -120,5 +120,5 @@ void TypingNotifyTask::setParams( const TQString& contact, int notifyType )
#include "typingnotifytask.moc"
-// kate: indent-mode csands; space-indent off; tqreplace-tabs off;
+// kate: indent-mode csands; space-indent off; replace-tabs off;
diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.h b/kopete/protocols/oscar/liboscar/typingnotifytask.h
index e99951fc..b815005a 100644
--- a/kopete/protocols/oscar/liboscar/typingnotifytask.h
+++ b/kopete/protocols/oscar/liboscar/typingnotifytask.h
@@ -60,4 +60,4 @@ private:
#endif
-//kate: indent-mode csands; space-indent off; tqreplace-tabs off;
+//kate: indent-mode csands; space-indent off; replace-tabs off;
diff --git a/kopete/protocols/oscar/liboscar/userinfotask.cpp b/kopete/protocols/oscar/liboscar/userinfotask.cpp
index 4cda87a0..c91dea47 100644
--- a/kopete/protocols/oscar/liboscar/userinfotask.cpp
+++ b/kopete/protocols/oscar/liboscar/userinfotask.cpp
@@ -44,7 +44,7 @@ bool UserInfoTask::forMe( const Transfer * transfer ) const
if ( st->snacService() == 0x0002 && st->snacSubtype() == 0x0006 )
{
- if ( m_contactSequenceMap.tqfind( st->snacRequest() ) == m_contactSequenceMap.end() )
+ if ( m_contactSequenceMap.find( st->snacRequest() ) == m_contactSequenceMap.end() )
return false;
else
{
diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.cpp b/kopete/protocols/oscar/liboscar/usersearchtask.cpp
index a386d8cf..48a5684f 100644
--- a/kopete/protocols/oscar/liboscar/usersearchtask.cpp
+++ b/kopete/protocols/oscar/liboscar/usersearchtask.cpp
@@ -312,4 +312,4 @@ void UserSearchTask::searchWhitePages( const ICQWPSearchInfo& info )
#include "usersearchtask.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;
diff --git a/kopete/protocols/oscar/liboscar/warningtask.cpp b/kopete/protocols/oscar/liboscar/warningtask.cpp
index 00a0294d..d2fb1f83 100644
--- a/kopete/protocols/oscar/liboscar/warningtask.cpp
+++ b/kopete/protocols/oscar/liboscar/warningtask.cpp
@@ -91,6 +91,6 @@ void WarningTask::onGo()
send( t );
}
-//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4;
+//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4;
#include "warningtask.moc"
diff --git a/kopete/protocols/oscar/liboscar/warningtask.h b/kopete/protocols/oscar/liboscar/warningtask.h
index d5e720be..0ce90cea 100644
--- a/kopete/protocols/oscar/liboscar/warningtask.h
+++ b/kopete/protocols/oscar/liboscar/warningtask.h
@@ -57,4 +57,4 @@ private:
#endif
-//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4;
+//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4;
diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp
index 38d01121..95fd6505 100644
--- a/kopete/protocols/oscar/oscaraccount.cpp
+++ b/kopete/protocols/oscar/oscaraccount.cpp
@@ -644,7 +644,7 @@ void OscarAccount::updateVersionUpdaterStamp()
void OscarAccount::ssiContactAdded( const Oscar::SSI& item )
{
- if ( d->addContactMap.tqcontains( Oscar::normalize( item.name() ) ) )
+ if ( d->addContactMap.contains( Oscar::normalize( item.name() ) ) )
{
kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Received confirmation from server. adding " << item.name()
<< " to the contact list" << endl;
diff --git a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp
index 10f6edb3..d5136a7e 100644
--- a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp
+++ b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp
@@ -81,7 +81,7 @@ OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* tqparent,
m_encodings.insert(1015, i18n("UTF-16 Unicode"));
m_encodingUI->encodingCombo->insertStringList( m_encodings.values() );
- if( (initialEncodingIndex = m_encodings.keys().tqfindIndex(initialEncoding)) == -1 )
+ if( (initialEncodingIndex = m_encodings.keys().findIndex(initialEncoding)) == -1 )
{
kdWarning() << k_funcinfo << "Requested encoding mib " << initialEncoding
<< " not in encoding list - defaulting to first encoding item"
@@ -100,7 +100,7 @@ OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* tqparent,
int OscarEncodingSelectionDialog::selectedEncoding() const
{
TQString encoding = m_encodingUI->encodingCombo->currentText();
- int mib = m_encodings.keys()[ m_encodings.values().tqfindIndex(encoding) ];
+ int mib = m_encodings.keys()[ m_encodings.values().findIndex(encoding) ];
if( mib == -1 )
return 0;
diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.cpp b/kopete/protocols/oscar/oscarvisibilitydialog.cpp
index c2fa021e..1c717e98 100644
--- a/kopete/protocols/oscar/oscarvisibilitydialog.cpp
+++ b/kopete/protocols/oscar/oscarvisibilitydialog.cpp
@@ -70,7 +70,7 @@ void OscarVisibilityDialog::slotAddToVisible()
TQString contactId = m_contactMap[itm->text()];
m_visibleListChangesMap[contactId] = Add;
- if ( !m_visibilityUI->visibleContacts->tqfindItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) )
+ if ( !m_visibilityUI->visibleContacts->findItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) )
m_visibilityUI->visibleContacts->insertItem( itm->text() );
}
@@ -94,7 +94,7 @@ void OscarVisibilityDialog::slotAddToInvisible()
TQString contactId = m_contactMap[itm->text()];
m_invisibleListChangesMap[contactId] = Add;
- if ( !m_visibilityUI->invisibleContacts->tqfindItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) )
+ if ( !m_visibilityUI->invisibleContacts->findItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) )
m_visibilityUI->invisibleContacts->insertItem( itm->text() );
}