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/irc/ircchannelcontact.cpp | 2 +- kopete/protocols/irc/irccontact.cpp | 6 +++--- kopete/protocols/irc/irccontactmanager.cpp | 4 ++-- kopete/protocols/irc/ircprotocol.cpp | 20 +++++++++--------- kopete/protocols/irc/ircservercontact.cpp | 2 +- kopete/protocols/irc/ircusercontact.cpp | 2 +- kopete/protocols/irc/kcodecaction.cpp | 2 +- kopete/protocols/irc/ksparser.cpp | 8 ++++---- kopete/protocols/irc/libkirc/kircengine.cpp | 2 +- kopete/protocols/irc/libkirc/kircengine.h | 2 +- kopete/protocols/irc/libkirc/kircengine_ctcp.cpp | 8 ++++---- kopete/protocols/irc/libkirc/kircmessage.cpp | 26 ++++++++++++------------ kopete/protocols/irc/libkirc/kircmessage.h | 2 +- kopete/protocols/irc/libkirc/ksslsocket.cpp | 4 ++-- kopete/protocols/irc/ui/channellist.cpp | 2 +- 15 files changed, 46 insertions(+), 46 deletions(-) (limited to 'kopete/protocols/irc') diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index 1835bb4b..45121c34 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -329,7 +329,7 @@ void IRCChannelContact::slotIncomingUserIsAway( const TQString &nick, const TQSt if( nick.lower() == account->mySelf()->nickName().lower() ) { IRCUserContact *c = account->mySelf(); - if (manager() && manager()->members().tqcontains(c)) + if (manager() && manager()->members().contains(c)) { Kopete::OnlineStatus status = manager()->contactOnlineStatus(c); if (status == m_protocol->m_UserStatusOp) diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp index 93888b55..7df5894c 100644 --- a/kopete/protocols/irc/irccontact.cpp +++ b/kopete/protocols/irc/irccontact.cpp @@ -229,7 +229,7 @@ void IRCContact::slotSendMsg(Kopete::Message &message, Kopete::ChatSession *) // Two-liner in color: // Hello
World - if (htmlString.tqfind(TQString::tqfromLatin1(" -1) + if (htmlString.find(TQString::tqfromLatin1(" -1) { TQRegExp findTags( TQString::tqfromLatin1("(.*)") ); findTags.setMinimal( true ); @@ -363,7 +363,7 @@ bool IRCContact::isChatting(const Kopete::ChatSession *avoid) const for (TQValueList::Iterator it= sessions.begin(); it!=sessions.end() ; ++it) { if( (*it) != avoid && (*it)->account() == account && - (*it)->members().tqcontains(this) ) + (*it)->members().contains(this) ) { return true; } @@ -413,7 +413,7 @@ void IRCContact::receivedMessage( KIRC::Engine::ServerMessageType type, const KIRC::EntityPtrList &to, const TQString &msg) { - if (to.tqcontains(m_entity)) + if (to.contains(m_entity)) { IRCContact *fromContact = ircAccount()->getContact(from); Kopete::Message message(fromContact, manager()->members(), msg, Kopete::Message::Inbound, diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp index f304a2ed..fb49e08e 100644 --- a/kopete/protocols/irc/irccontactmanager.cpp +++ b/kopete/protocols/irc/irccontactmanager.cpp @@ -260,7 +260,7 @@ void IRCContactManager::slotContactAdded( Kopete::MetaContact *contact ) void IRCContactManager::addToNotifyList(const TQString &nick) { - if (!m_NotifyList.tqcontains(nick.lower())) + if (!m_NotifyList.contains(nick.lower())) { m_NotifyList.append(nick); checkOnlineNotifyList(); @@ -269,7 +269,7 @@ void IRCContactManager::addToNotifyList(const TQString &nick) void IRCContactManager::removeFromNotifyList(const TQString &nick) { - if (m_NotifyList.tqcontains(nick.lower())) + if (m_NotifyList.contains(nick.lower())) m_NotifyList.remove(nick.lower()); } diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index a3182a14..e30bfa90 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -376,7 +376,7 @@ void IRCProtocol::slotMessageFilter( Kopete::Message &msg ) TQString messageText = msg.escapedBody(); //Add right click for channels, only replace text not in HTML tags - messageText.tqreplace( TQRegExp( TQString::tqfromLatin1("(?![^<]+>)(#[^#\\s]+)(?![^<]+>)") ), TQString::tqfromLatin1("\\1") ); + messageText.replace( TQRegExp( TQString::tqfromLatin1("(?![^<]+>)(#[^#\\s]+)(?![^<]+>)") ), TQString::tqfromLatin1("\\1") ); msg.setBody( messageText, Kopete::Message::RichText ); } @@ -807,7 +807,7 @@ void IRCProtocol::editNetworks( const TQString &networkName ) connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); if( !networkName.isEmpty() ) - netConf->networkList->setSelected( netConf->networkList->tqfindItem( networkName ), true ); + netConf->networkList->setSelected( netConf->networkList->findItem( networkName ), true ); //slotUpdateNetworkConfig(); // unnecessary, setSelected emits selectionChanged @@ -952,7 +952,7 @@ void IRCProtocol::slotDeleteHost() { disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); TQString entryText = host->host + TQString::tqfromLatin1(":") + TQString::number(host->port); - TQListBoxItem * justAdded = netConf->hostList->tqfindItem( entryText ); + TQListBoxItem * justAdded = netConf->hostList->findItem( entryText ); netConf->hostList->removeItem( netConf->hostList->index( justAdded ) ); connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); @@ -972,13 +972,13 @@ void IRCProtocol::slotNewNetwork() IRCNetwork *net = new IRCNetwork; // give it the name of 'New Network' (incrementing number if needed) TQString netName = TQString::tqfromLatin1( "New Network" ); - if ( m_networks.tqfind( netName ) ) + if ( m_networks.find( netName ) ) { int newIdx = 1; do { netName = TQString::tqfromLatin1( "New Network #%1" ).tqarg( newIdx++ ); } - while ( m_networks.tqfind( netName ) && newIdx < 100 ); + while ( m_networks.find( netName ) && newIdx < 100 ); if ( newIdx == 100 ) // pathological case return; } @@ -986,7 +986,7 @@ void IRCProtocol::slotNewNetwork() // and add it to the networks dict and list m_networks.insert( net->name, net ); netConf->networkList->insertItem( net->name ); - TQListBoxItem * justAdded = netConf->networkList->tqfindItem( net->name ); + TQListBoxItem * justAdded = netConf->networkList->findItem( net->name ); netConf->networkList->setSelected( justAdded, true ); netConf->networkList->setBottomItem( netConf->networkList->index( justAdded ) ); } @@ -1022,7 +1022,7 @@ void IRCProtocol::slotNewHost() TQString entryText = host->host + TQString::tqfromLatin1(":") + TQString::number(host->port); netConf->hostList->insertItem( entryText ); // select it in the gui - TQListBoxItem * justAdded = netConf->hostList->tqfindItem( entryText ); + TQListBoxItem * justAdded = netConf->hostList->findItem( entryText ); netConf->hostList->setSelected( justAdded, true ); //netConf->hostList->setBottomItem( netConf->hostList->index( justAdded ) ); } @@ -1056,7 +1056,7 @@ void IRCProtocol::slotRenameNetwork() m_networks.remove( m_uiCurrentNetworkSelection ); m_networks.insert( net->name, net ); // ui - int idx = netConf->networkList->index( netConf->networkList->tqfindItem( m_uiCurrentNetworkSelection ) ); + int idx = netConf->networkList->index( netConf->networkList->findItem( m_uiCurrentNetworkSelection ) ); m_uiCurrentNetworkSelection = net->name; netConf->networkList->changeItem( net->name, idx ); // changes the selection!!! netConf->networkList->sort(); @@ -1190,7 +1190,7 @@ void IRCProtocol::slotMoveServerUp() if( !selectedNetwork || !selectedHost ) return; - TQValueList::iterator pos = selectedNetwork->hosts.tqfind( selectedHost ); + TQValueList::iterator pos = selectedNetwork->hosts.find( selectedHost ); if( pos != selectedNetwork->hosts.begin() ) { TQValueList::iterator lastPos = pos; @@ -1217,7 +1217,7 @@ void IRCProtocol::slotMoveServerDown() if( !selectedNetwork || !selectedHost ) return; - TQValueList::iterator pos = selectedNetwork->hosts.tqfind( selectedHost ); + TQValueList::iterator pos = selectedNetwork->hosts.find( selectedHost ); if( *pos != selectedNetwork->hosts.back() ) { TQValueList::iterator nextPos = selectedNetwork->hosts.remove( pos ); diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp index 3200d72d..9188963f 100644 --- a/kopete/protocols/irc/ircservercontact.cpp +++ b/kopete/protocols/irc/ircservercontact.cpp @@ -154,7 +154,7 @@ void IRCServerContact::slotIncomingNotice( const TQString &orig, const TQString // :Global!service@rizon.net NOTICE foobar :[Logon News - Oct 12 2005] Due to growing problems ... // :somenick!~fooobar@somehostname.fi NOTICE foobar :hello - if (orig.tqcontains('!')) { + if (orig.contains('!')) { ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").tqarg( orig.section('!', 0, 0), orig.section('!', 1, 1), diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index 2c039e94..bec7c4b7 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -504,7 +504,7 @@ void IRCUserContact::updateInfo() void IRCUserContact::newWhoReply( const TQString &channel, const TQString &user, const TQString &host, const TQString &server, bool away, const TQString &flags, uint hops, const TQString &realName ) { - if( !mInfo.channels.tqcontains( channel ) ) + if( !mInfo.channels.contains( channel ) ) mInfo.channels.append( channel ); mInfo.userName = user; diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index 7bd9bfe8..88306027 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -70,7 +70,7 @@ TQStringList KCodecAction::supportedEncodings(bool usAscii) { TQTextCodec *codec = KGlobal::charsets()->codecForName(*it); TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it); - if (mimeNames.tqfind(mimeName) == mimeNames.end()) + if (mimeNames.find(mimeName) == mimeNames.end()) { encodings.append(KGlobal::charsets()->languageForEncoding(*it) + " ( " + mimeName + " )"); diff --git a/kopete/protocols/irc/ksparser.cpp b/kopete/protocols/irc/ksparser.cpp index ea7e72cd..79ff605e 100644 --- a/kopete/protocols/irc/ksparser.cpp +++ b/kopete/protocols/irc/ksparser.cpp @@ -178,10 +178,10 @@ TQString KSParser::pushTag(const TQString &tag, const TQString &attributes) { TQString res; m_tags.push(tag); - if(!m_attributes.tqcontains(tag)) + if(!m_attributes.contains(tag)) m_attributes.insert(tag, attributes); else if(!attributes.isEmpty()) - m_attributes.tqreplace(tag, attributes); + m_attributes.replace(tag, attributes); res.append("<" + tag); if(!m_attributes[tag].isEmpty()) res.append(" " + m_attributes[tag]); @@ -205,7 +205,7 @@ TQString KSParser::pushColorTag(const TQColor &fgColor, const TQColor &bgColor) TQString KSParser::popTag(const TQString &tag) { - if (!m_tags.tqcontains(tag)) + if (!m_tags.contains(tag)) return TQString(); TQString res; @@ -224,7 +224,7 @@ TQString KSParser::popTag(const TQString &tag) TQString KSParser::toggleTag(const TQString &tag) { - return m_attributes.tqcontains(tag)?popTag(tag):pushTag(tag); + return m_attributes.contains(tag)?popTag(tag):pushTag(tag); } TQString KSParser::popAll() diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index 167d7a22..786b4594 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -277,7 +277,7 @@ bool Engine::_bind(TQDict &dict, if (!mr) { mr = new MessageRedirector(this, minArgs, maxArgs, helpMessage); - dict.tqreplace(command, mr); + dict.replace(command, mr); } return mr->connect(object, member); diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h index e086afc1..ac3fb00c 100644 --- a/kopete/protocols/irc/libkirc/kircengine.h +++ b/kopete/protocols/irc/libkirc/kircengine.h @@ -175,7 +175,7 @@ public: { return m_status == Connected; } inline void setCodec( const TQString &nick, const TQTextCodec *codec ) - { codecs.tqreplace( nick, codec ); } + { codecs.replace( nick, codec ); } /* Custom CTCP replies handling */ inline TQString &customCtcp( const TQString &s ) diff --git a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp index 83a4257c..05477710 100644 --- a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp @@ -143,8 +143,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName, { TQFileInfo file(fileName); TQString noWhiteSpace = file.fileName(); - if (noWhiteSpace.tqcontains(' ') > 0) - noWhiteSpace.tqreplace(TQRegExp("\\s+"), "_"); + if (noWhiteSpace.contains(' ') > 0) + noWhiteSpace.replace(TQRegExp("\\s+"), "_"); TransferServer *server = TransferHandler::self()->createServer(this, nickname, type, fileName, file.size()); @@ -284,7 +284,7 @@ void Engine::CtcpReply_ping(Message &msg) if (difference < 1) { diffString = TQString::number(difference); - diffString.remove((diffString.tqfind('.') -1), 2); + diffString.remove((diffString.find('.') -1), 2); diffString.truncate(3); diffString.append("milliseconds"); } @@ -293,7 +293,7 @@ void Engine::CtcpReply_ping(Message &msg) diffString = TQString::number(difference); TQString seconds = diffString.section('.', 0, 0); TQString millSec = diffString.section('.', 1, 1); - millSec.remove(millSec.tqfind('.'), 1); + millSec.remove(millSec.find('.'), 1); millSec.truncate(3); diffString = TQString::tqfromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec); } diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp index 0c1d3ef0..6f45b0c1 100644 --- a/kopete/protocols/irc/libkirc/kircmessage.cpp +++ b/kopete/protocols/irc/libkirc/kircmessage.cpp @@ -201,10 +201,10 @@ TQString Message::quote(const TQString &str) { TQString tmp = str; TQChar q('\020'); - tmp.tqreplace(q, q+TQString(q)); - tmp.tqreplace(TQChar('\r'), q+TQString::tqfromLatin1("r")); - tmp.tqreplace(TQChar('\n'), q+TQString::tqfromLatin1("n")); - tmp.tqreplace(TQChar('\0'), q+TQString::tqfromLatin1("0")); + tmp.replace(q, q+TQString(q)); + tmp.replace(TQChar('\r'), q+TQString::tqfromLatin1("r")); + tmp.replace(TQChar('\n'), q+TQString::tqfromLatin1("n")); + tmp.replace(TQChar('\0'), q+TQString::tqfromLatin1("0")); return tmp; } @@ -216,13 +216,13 @@ TQString Message::unquote(const TQString &str) char b[3] = { 020, 020, '\0' }; const char b2[2] = { 020, '\0' }; - tmp.tqreplace( b, b2 ); + tmp.replace( b, b2 ); b[1] = 'r'; - tmp.tqreplace( b, "\r"); + tmp.replace( b, "\r"); b[1] = 'n'; - tmp.tqreplace( b, "\n"); + tmp.replace( b, "\n"); b[1] = '0'; - tmp.tqreplace( b, "\0"); + tmp.replace( b, "\0"); return tmp; } @@ -230,16 +230,16 @@ TQString Message::unquote(const TQString &str) TQString Message::ctcpQuote(const TQString &str) { TQString tmp = str; - tmp.tqreplace( TQChar('\\'), TQString::tqfromLatin1("\\\\")); - tmp.tqreplace( (char)1, TQString::tqfromLatin1("\\1")); + tmp.replace( TQChar('\\'), TQString::tqfromLatin1("\\\\")); + tmp.replace( (char)1, TQString::tqfromLatin1("\\1")); return tmp; } TQString Message::ctcpUnquote(const TQString &str) { TQString tmp = str; - tmp.tqreplace("\\\\", "\\"); - tmp.tqreplace("\\1", "\1" ); + tmp.replace("\\\\", "\\"); + tmp.replace("\\1", "\1" ); return tmp; } @@ -276,7 +276,7 @@ bool Message::matchForIRCRegExp(TQRegExp ®exp, const TQTextCodec *codec, cons msg.m_ctcpMessage = new Message(); msg.m_ctcpMessage->m_raw = codec->fromUnicode(ctcpUnquote(msg.m_ctcpRaw)); - int space = ctcpRaw.tqfind(' '); + int space = ctcpRaw.find(' '); if (!matchForIRCRegExp(msg.m_ctcpMessage->m_raw, codec, *msg.m_ctcpMessage)) { TQCString command; diff --git a/kopete/protocols/irc/libkirc/kircmessage.h b/kopete/protocols/irc/libkirc/kircmessage.h index 80dcfa79..fb38a476 100644 --- a/kopete/protocols/irc/libkirc/kircmessage.h +++ b/kopete/protocols/irc/libkirc/kircmessage.h @@ -112,7 +112,7 @@ public: inline const TQString &command() const { return m_command; } - /** \brief The number of command arguments this message tqcontains. + /** \brief The number of command arguments this message contains. */ inline size_t argsSize() const { return m_args.size(); } diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index f14f1a3e..4dcf9ce8 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -206,12 +206,12 @@ void KSSLSocket::setMetaData( const TQString &key, const TQVariant &data ) bool KSSLSocket::hasMetaData( const TQString &key ) { - return d->metaData.tqcontains(key); + return d->metaData.contains(key); } TQString KSSLSocket::metaData( const TQString &key ) { - if( d->metaData.tqcontains(key) ) + if( d->metaData.contains(key) ) return d->metaData[key]; return TQString(); } diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index e4e574bc..2d5e0b13 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -315,7 +315,7 @@ void ChannelList::slotChannelListed( const TQString &channel, uint users, const void ChannelList::checkSearchResult( const TQString &channel, uint users, const TQString &topic ) { if( ( mUsers == 0 || mUsers <= users ) && - ( mSearch.isEmpty() || channel.tqcontains( mSearch, false ) || topic.tqcontains( mSearch, false ) ) + ( mSearch.isEmpty() || channel.contains( mSearch, false ) || topic.contains( mSearch, false ) ) ) { new ChannelListItem( mChannelList, channel, TQString::number(users), topic ); -- cgit v1.2.1