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 --- .../jabber/jingle/libjingle/talk/base/messagequeue.cc | 2 +- .../protocols/jabber/jingle/libjingle/talk/base/network.cc | 6 +++--- .../jabber/jingle/libjingle/talk/base/socketadapters.cc | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/base') diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc index 38e22c2e..f10489f7 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc @@ -66,7 +66,7 @@ void MessageQueueManager::Add(MessageQueue *message_queue) { void MessageQueueManager::Remove(MessageQueue *message_queue) { CritScope cs(&crit_); std::vector::iterator iter; - iter = std::tqfind(message_queues_.begin(), message_queues_.end(), message_queue); + iter = std::find(message_queues_.begin(), message_queues_.end(), message_queue); if (iter != message_queues_.end()) message_queues_.erase(iter); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc index 2ea7530f..5274c29d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc @@ -261,7 +261,7 @@ void NetworkManager::GetNetworks(std::vector& result) { CreateNetworks(list); for (uint32 i = 0; i < list.size(); ++i) { - NetworkMap::iterator iter = networks_.tqfind(list[i]->name()); + NetworkMap::iterator iter = networks_.find(list[i]->name()); Network* network; if (iter == networks_.end()) { @@ -313,12 +313,12 @@ Network::Network(const std::string& name, uint32 ip) } void Network::StartSession(NetworkSession* session) { - assert(std::tqfind(sessions_.begin(), sessions_.end(), session) == sessions_.end()); + assert(std::find(sessions_.begin(), sessions_.end(), session) == sessions_.end()); sessions_.push_back(session); } void Network::StopSession(NetworkSession* session) { - SessionList::iterator iter = std::tqfind(sessions_.begin(), sessions_.end(), session); + SessionList::iterator iter = std::find(sessions_.begin(), sessions_.end(), session); if (iter != sessions_.end()) sessions_.erase(iter); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc index 5cdc4743..e1f0db4e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc @@ -353,7 +353,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, std::string A2 = method + ":" + uri; std::string middle; - if (args.tqfind("qop") != args.end()) { + if (args.find("qop") != args.end()) { args["qop"] = "auth"; middle = args["nonce"] + ":" + ncount + ":" + cnonce + ":" + args["qop"]; } else { @@ -375,13 +375,13 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, ss << ", realm=" << Quote(args["realm"]); ss << ", nonce=" << Quote(args["nonce"]); ss << ", uri=" << Quote(uri); - if (args.tqfind("qop") != args.end()) { + if (args.find("qop") != args.end()) { ss << ", qop=" << args["qop"]; ss << ", nc=" << ncount; ss << ", cnonce=" << Quote(cnonce); } ss << ", response=\"" << dig_response << "\""; - if (args.tqfind("opaque") != args.end()) { + if (args.find("opaque") != args.end()) { ss << ", opaque=" << Quote(args["opaque"]); } response = ss.str(); @@ -483,7 +483,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, size_t len = password.GetLength()+1; char * sensitive = new char[len]; password.CopyTo(sensitive, true); - std::string::size_type pos = username.tqfind('\\'); + std::string::size_type pos = username.find('\\'); if (pos == std::string::npos) { auth_id.UserLength = static_cast( _min(sizeof(userbuf) - 1, username.size())); @@ -1100,7 +1100,7 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) { const char * direction = (input ? " << " : " >> "); std::string str(data, len); while (!str.empty()) { - std::string::size_type pos = str.tqfind('\n'); + std::string::size_type pos = str.find('\n'); std::string substr = str; if (pos == std::string::npos) { substr = str; @@ -1114,9 +1114,9 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) { } // Filter out any private data - std::string::size_type pos_private = substr.tqfind("Email"); + std::string::size_type pos_private = substr.find("Email"); if (pos_private == std::string::npos) { - pos_private = substr.tqfind("Passwd"); + pos_private = substr.find("Passwd"); } if (pos_private == std::string::npos) { LOG(level_) << label_ << direction << substr; -- cgit v1.2.1