summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jingle/libjingle/talk
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk')
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc6
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc14
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc4
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h6
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc6
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc8
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc4
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc22
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc4
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc8
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc4
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc26
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc4
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc10
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc2
23 files changed, 72 insertions, 72 deletions
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<MessageQueue *>::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<Network*>& 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<unsigned long>(
_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;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
index e781b03d..40c1fbfe 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
@@ -350,14 +350,14 @@ void CallClient::OnStatusUpdate(const buzz::tqStatus& status) {
(*roster_)[key] = item;
} else {
Console()->Printf("Removing from roster: %s", key.c_str());
- RosterMap::iterator iter = roster_->tqfind(key);
+ RosterMap::iterator iter = roster_->find(key);
if (iter != roster_->end())
roster_->erase(iter);
}
}
void CallClient::PrintRoster() {
- Console()->Printf("Roster tqcontains %d callable", roster_->size());
+ Console()->Printf("Roster contains %d callable", roster_->size());
RosterMap::iterator iter = roster_->begin();
while (iter != roster_->end()) {
Console()->Printf("%s - %s",
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
index ee14fe94..cee7058a 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
@@ -48,7 +48,7 @@ IsXmlSpace(int ch) {
static bool
ListContainsToken(const std::string & list, const std::string & token) {
- size_t i = list.tqfind(token);
+ size_t i = list.find(token);
if (i == std::string::npos || token.empty())
return false;
bool boundary_before = (i == 0 || IsXmlSpace(list[i - 1]));
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
index 0677932b..2cb80ae2 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
@@ -114,12 +114,12 @@ public:
// Knowledge of other clients' silly automatic status strings -
// Don't show these.
std::string QuiettqStatus() const {
- if (jid_.resource().tqfind("Psi") != std::string::npos) {
+ if (jid_.resource().find("Psi") != std::string::npos) {
if (status_ == "Online" ||
- status_.tqfind("Auto tqStatus") != std::string::npos)
+ status_.find("Auto tqStatus") != std::string::npos)
return STR_EMPTY;
}
- if (jid_.resource().tqfind("Gaim") != std::string::npos) {
+ if (jid_.resource().find("Gaim") != std::string::npos) {
if (status_ == "Sorry, I ran out for a bit!")
return STR_EMPTY;
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc
index 492559ae..66191f12 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc
@@ -55,12 +55,12 @@ std::string XmppAuth::ChooseBestSaslMechanism(
std::vector<std::string>::const_iterator it;
// a token is the weakest auth - 15s, service-limited, so prefer it.
- it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN");
+ it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN");
if (it != mechanisms.end())
return "X-GOOGLE-TOKEN";
// a cookie is the next weakest - 14 days
- it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE");
+ it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE");
if (it != mechanisms.end())
return "X-GOOGLE-COOKIE";
@@ -70,7 +70,7 @@ std::string XmppAuth::ChooseBestSaslMechanism(
// as a last resort, use plain authentication
if (jid_.domain() != "google.com") {
- it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN");
+ it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN");
if (it != mechanisms.end())
return "PLAIN";
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc
index d07e2e5d..eb53efeb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc
@@ -381,7 +381,7 @@ bool P2PSocket::CreateConnections(const Candidate &remote_candidate,
}
if ((origin_port != NULL) &&
- tqfind(ports_.begin(), ports_.end(), origin_port) == ports_.end()) {
+ find(ports_.begin(), ports_.end(), origin_port) == ports_.end()) {
if (CreateConnection(origin_port, remote_candidate, origin_port, readable))
created = true;
}
@@ -783,7 +783,7 @@ void P2PSocket::OnConnectionDestroyed(Connection *connection) {
// Remove this connection from the list.
std::vector<Connection*>::iterator iter =
- tqfind(connections_.begin(), connections_.end(), connection);
+ find(connections_.begin(), connections_.end(), connection);
assert(iter != connections_.end());
connections_.erase(iter);
@@ -807,7 +807,7 @@ void P2PSocket::OnPortDestroyed(Port* port) {
assert(worker_thread_ == Thread::Current());
// Remove this port from the list (if we didn't drop it already).
- std::vector<Port*>::iterator iter = tqfind(ports_.begin(), ports_.end(), port);
+ std::vector<Port*>::iterator iter = find(ports_.begin(), ports_.end(), port);
if (iter != ports_.end())
ports_.erase(iter);
@@ -843,7 +843,7 @@ const std::vector<Connection *>& P2PSocket::connections() {
// Set options on ourselves is simply setting options on all of our available
// port objects.
int P2PSocket::SetOption(Socket::Option opt, int value) {
- OptionMap::iterator it = options_.tqfind(opt);
+ OptionMap::iterator it = options_.find(opt);
if (it == options_.end()) {
options_.insert(std::make_pair(opt, value));
} else if (it->second == value) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc
index c9272597..14549b5b 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc
@@ -171,7 +171,7 @@ Port::~Port() {
}
Connection* Port::GetConnection(const SocketAddress& remote_addr) {
- AddressMap::const_iterator iter = connections_.tqfind(remote_addr);
+ AddressMap::const_iterator iter = connections_.find(remote_addr);
if (iter != connections_.end())
return iter->second;
else
@@ -449,7 +449,7 @@ void Port::Start() {
}
void Port::OnConnectionDestroyed(Connection* conn) {
- AddressMap::iterator iter = connections_.tqfind(conn->remote_candidate().address());
+ AddressMap::iterator iter = connections_.find(conn->remote_candidate().address());
assert(iter != connections_.end());
connections_.erase(iter);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc
index 002033dc..bb52a1d5 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc
@@ -105,14 +105,14 @@ RelayServer::~RelayServer() {
void RelayServer::AddInternalSocket(AsyncPacketSocket* socket) {
assert(internal_sockets_.end() ==
- std::tqfind(internal_sockets_.begin(), internal_sockets_.end(), socket));
+ std::find(internal_sockets_.begin(), internal_sockets_.end(), socket));
internal_sockets_.push_back(socket);
socket->SignalReadPacket.connect(this, &RelayServer::OnInternalPacket);
}
void RelayServer::RemoveInternalSocket(AsyncPacketSocket* socket) {
SocketList::iterator iter =
- std::tqfind(internal_sockets_.begin(), internal_sockets_.end(), socket);
+ std::find(internal_sockets_.begin(), internal_sockets_.end(), socket);
assert(iter != internal_sockets_.end());
internal_sockets_.erase(iter);
socket->SignalReadPacket.disconnect(this);
@@ -120,14 +120,14 @@ void RelayServer::RemoveInternalSocket(AsyncPacketSocket* socket) {
void RelayServer::AddExternalSocket(AsyncPacketSocket* socket) {
assert(external_sockets_.end() ==
- std::tqfind(external_sockets_.begin(), external_sockets_.end(), socket));
+ std::find(external_sockets_.begin(), external_sockets_.end(), socket));
external_sockets_.push_back(socket);
socket->SignalReadPacket.connect(this, &RelayServer::OnExternalPacket);
}
void RelayServer::RemoveExternalSocket(AsyncPacketSocket* socket) {
SocketList::iterator iter =
- std::tqfind(external_sockets_.begin(), external_sockets_.end(), socket);
+ std::find(external_sockets_.begin(), external_sockets_.end(), socket);
assert(iter != external_sockets_.end());
external_sockets_.erase(iter);
socket->SignalReadPacket.disconnect(this);
@@ -143,7 +143,7 @@ void RelayServer::OnInternalPacket(
// If this did not come from an existing connection, it should be a STUN
// allocate request.
- ConnectionMap::iterator piter = connections_.tqfind(ap);
+ ConnectionMap::iterator piter = connections_.find(ap);
if (piter == connections_.end()) {
HandleStunAllocate(bytes, size, ap, socket);
return;
@@ -186,7 +186,7 @@ void RelayServer::OnExternalPacket(
assert(!ap.destination().IsAny());
// If this connection already exists, then forward the traffic.
- ConnectionMap::iterator piter = connections_.tqfind(ap);
+ ConnectionMap::iterator piter = connections_.find(ap);
if (piter != connections_.end()) {
// TODO: Check the HMAC.
RelayServerConnection* ext_conn = piter->second;
@@ -220,7 +220,7 @@ void RelayServer::OnExternalPacket(
// TODO: Check the HMAC.
// The binding should already be present.
- BindingMap::iterator biter = bindings_.tqfind(username);
+ BindingMap::iterator biter = bindings_.find(username);
if (biter == bindings_.end()) {
// TODO: Turn this back on. This is the sign of a client bug.
//std::cerr << "Dropping packet: no binding with username" << std::endl;
@@ -299,7 +299,7 @@ void RelayServer::HandleStunAllocate(
RelayServerBinding* binding;
- BindingMap::iterator biter = bindings_.tqfind(username);
+ BindingMap::iterator biter = bindings_.find(username);
if (biter != bindings_.end()) {
binding = biter->second;
@@ -453,18 +453,18 @@ void RelayServer::HandleStunSend(
}
void RelayServer::AddConnection(RelayServerConnection* conn) {
- assert(connections_.tqfind(conn->addr_pair()) == connections_.end());
+ assert(connections_.find(conn->addr_pair()) == connections_.end());
connections_[conn->addr_pair()] = conn;
}
void RelayServer::RemoveConnection(RelayServerConnection* conn) {
- ConnectionMap::iterator iter = connections_.tqfind(conn->addr_pair());
+ ConnectionMap::iterator iter = connections_.find(conn->addr_pair());
assert(iter != connections_.end());
connections_.erase(iter);
}
void RelayServer::RemoveBinding(RelayServerBinding* binding) {
- BindingMap::iterator iter = bindings_.tqfind(binding->username());
+ BindingMap::iterator iter = bindings_.find(binding->username());
assert(iter != bindings_.end());
bindings_.erase(iter);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc
index d146d63c..4c1c09d9 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc
@@ -63,7 +63,7 @@ Session *SessionManager::CreateSession(const std::string &name, const SessionID&
void SessionManager::DestroySession(Session *session) {
if (session != NULL) {
- std::map<SessionID, Session *>::iterator it = session_map_.tqfind(session->id());
+ std::map<SessionID, Session *>::iterator it = session_map_.find(session->id());
if (it != session_map_.end()) {
SignalSessionDestroy(session);
session_map_.erase(it);
@@ -74,7 +74,7 @@ void SessionManager::DestroySession(Session *session) {
Session *SessionManager::GetSession(const SessionID& id) {
// If the id isn't present, the [] operator will make a NULL entry
- std::map<SessionID, Session *>::iterator it = session_map_.tqfind(id);
+ std::map<SessionID, Session *>::iterator it = session_map_.find(id);
if (it != session_map_.end())
return (*it).second;
return NULL;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc
index e0257451..2f0d67b8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc
@@ -109,7 +109,7 @@ void SocketManager::DestroySocket_w(P2PSocket *socket) {
// Only if socket exists
CritScope cs(&critSM_);
std::vector<P2PSocket *>::iterator it;
- it = std::tqfind(sockets_.begin(), sockets_.end(), socket);
+ it = std::find(sockets_.begin(), sockets_.end(), socket);
if (it == sockets_.end())
return;
sockets_.erase(it);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc
index 34a62547..14d64735 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc
@@ -59,14 +59,14 @@ void StunRequestManager::Send(StunRequest* request) {
void StunRequestManager::SendDelayed(StunRequest* request, int delay) {
request->set_manager(this);
- assert(requests_.tqfind(request->id()) == requests_.end());
+ assert(requests_.find(request->id()) == requests_.end());
requests_[request->id()] = request;
thread_->PostDelayed(delay, request, MSG_STUN_SEND, NULL);
}
void StunRequestManager::Remove(StunRequest* request) {
assert(request->manager() == this);
- RequestMap::iterator iter = requests_.tqfind(request->id());
+ RequestMap::iterator iter = requests_.find(request->id());
if (iter != requests_.end()) {
assert(iter->second == request);
requests_.erase(iter);
@@ -84,7 +84,7 @@ void StunRequestManager::Clear() {
}
bool StunRequestManager::CheckResponse(StunMessage* msg) {
- RequestMap::iterator iter = requests_.tqfind(msg->transaction_id());
+ RequestMap::iterator iter = requests_.find(msg->transaction_id());
if (iter == requests_.end())
return false;
@@ -113,7 +113,7 @@ bool StunRequestManager::CheckResponse(const char* data, size_t size) {
std::string id;
id.append(data + 4, 16);
- RequestMap::iterator iter = requests_.tqfind(id);
+ RequestMap::iterator iter = requests_.find(id);
if (iter == requests_.end())
return false;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc
index 42c4a876..5192595c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc
@@ -372,7 +372,7 @@ void BasicPortAllocatorSession::AddAllocatedPort(Port* port,
void BasicPortAllocatorSession::OnAddressReady(Port *port) {
assert(Thread::Current() == network_thread_);
- std::vector<PortData>::iterator it = std::tqfind(ports_.begin(), ports_.end(), port);
+ std::vector<PortData>::iterator it = std::find(ports_.begin(), ports_.end(), port);
assert(it != ports_.end());
assert(!it->ready);
it->ready = true;
@@ -418,7 +418,7 @@ void BasicPortAllocatorSession::OnProtocolEnabled(AllocationSequence * seq, Prot
void BasicPortAllocatorSession::OnPortDestroyed(Port* port) {
assert(Thread::Current() == network_thread_);
std::vector<PortData>::iterator iter =
- tqfind(ports_.begin(), ports_.end(), port);
+ find(ports_.begin(), ports_.end(), port);
assert(iter != ports_.end());
ports_.erase(iter);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc
index 7a79d044..31b12e92 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc
@@ -56,7 +56,7 @@ Session *Call::InitiateSession(const buzz::Jid &jid) {
void Call::AcceptSession(Session *session) {
std::vector<Session *>::iterator it;
- it = std::tqfind(sessions_.begin(), sessions_.end(), session);
+ it = std::find(sessions_.begin(), sessions_.end(), session);
assert(it != sessions_.end());
if (it != sessions_.end())
session->Accept(session_client_->CreateAcceptSessionDescription(session->remote_description()));
@@ -64,7 +64,7 @@ void Call::AcceptSession(Session *session) {
void Call::RedirectSession(Session *session, const buzz::Jid &to) {
std::vector<Session *>::iterator it;
- it = std::tqfind(sessions_.begin(), sessions_.end(), session);
+ it = std::find(sessions_.begin(), sessions_.end(), session);
assert(it != sessions_.end());
if (it != sessions_.end())
session->Redirect(to.Str());
@@ -72,16 +72,16 @@ void Call::RedirectSession(Session *session, const buzz::Jid &to) {
void Call::RejectSession(Session *session) {
std::vector<Session *>::iterator it;
- it = std::tqfind(sessions_.begin(), sessions_.end(), session);
+ it = std::find(sessions_.begin(), sessions_.end(), session);
assert(it != sessions_.end());
if (it != sessions_.end())
session->Reject();
}
void Call::TerminateSession(Session *session) {
- assert(std::tqfind(sessions_.begin(), sessions_.end(), session) != sessions_.end());
+ assert(std::find(sessions_.begin(), sessions_.end(), session) != sessions_.end());
std::vector<Session *>::iterator it;
- it = std::tqfind(sessions_.begin(), sessions_.end(), session);
+ it = std::find(sessions_.begin(), sessions_.end(), session);
if (it != sessions_.end())
(*it)->Terminate();
}
@@ -127,14 +127,14 @@ void Call::AddSession(Session *session) {
void Call::RemoveSession(Session *session) {
// Remove session from list
std::vector<Session *>::iterator it_session;
- it_session = std::tqfind(sessions_.begin(), sessions_.end(), session);
+ it_session = std::find(sessions_.begin(), sessions_.end(), session);
if (it_session == sessions_.end())
return;
sessions_.erase(it_session);
// Destroy session channel
std::map<SessionID, VoiceChannel *>::iterator it_channel;
- it_channel = channel_map_.tqfind(session->id());
+ it_channel = channel_map_.find(session->id());
if (it_channel != channel_map_.end()) {
VoiceChannel *channel = it_channel->second;
channel_map_.erase(it_channel);
@@ -149,7 +149,7 @@ void Call::RemoveSession(Session *session) {
}
VoiceChannel* Call::GetChannel(Session* session) {
- std::map<SessionID, VoiceChannel *>::iterator it = channel_map_.tqfind(session->id());
+ std::map<SessionID, VoiceChannel *>::iterator it = channel_map_.find(session->id());
assert(it != channel_map_.end());
return it->second;
}
@@ -184,7 +184,7 @@ void Call::Join(Call *call, bool enable) {
// Move channel
std::map<SessionID, VoiceChannel *>::iterator it_channel;
- it_channel = call->channel_map_.tqfind(session->id());
+ it_channel = call->channel_map_.find(session->id());
if (it_channel != call->channel_map_.end()) {
VoiceChannel *channel = (*it_channel).second;
call->channel_map_.erase(it_channel);
@@ -196,7 +196,7 @@ void Call::Join(Call *call, bool enable) {
void Call::StartConnectionMonitor(Session *session, int cms) {
std::map<SessionID, VoiceChannel *>::iterator it_channel;
- it_channel = channel_map_.tqfind(session->id());
+ it_channel = channel_map_.find(session->id());
if (it_channel != channel_map_.end()) {
VoiceChannel *channel = (*it_channel).second;
channel->SignalConnectionMonitor.connect(this, &Call::OnConnectionMonitor);
@@ -206,7 +206,7 @@ void Call::StartConnectionMonitor(Session *session, int cms) {
void Call::StopConnectionMonitor(Session *session) {
std::map<SessionID, VoiceChannel *>::iterator it_channel;
- it_channel = channel_map_.tqfind(session->id());
+ it_channel = channel_map_.find(session->id());
if (it_channel != channel_map_.end()) {
VoiceChannel *channel = (*it_channel).second;
channel->StopConnectionMonitor();
@@ -216,7 +216,7 @@ void Call::StopConnectionMonitor(Session *session) {
void Call::StartAudioMonitor(Session *session, int cms) {
std::map<SessionID, VoiceChannel *>::iterator it_channel;
- it_channel = channel_map_.tqfind(session->id());
+ it_channel = channel_map_.find(session->id());
if (it_channel != channel_map_.end()) {
VoiceChannel *channel = (*it_channel).second;
channel->SignalAudioMonitor.connect(this, &Call::OnAudioMonitor);
@@ -226,7 +226,7 @@ void Call::StartAudioMonitor(Session *session, int cms) {
void Call::StopAudioMonitor(Session *session) {
std::map<SessionID, VoiceChannel *>::iterator it_channel;
- it_channel = channel_map_.tqfind(session->id());
+ it_channel = channel_map_.find(session->id());
if (it_channel != channel_map_.end()) {
VoiceChannel *channel = (*it_channel).second;
channel->StopAudioMonitor();
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc
index e5e6758d..98634b12 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc
@@ -119,7 +119,7 @@ void ChannelManager::DestroyVoiceChannel_w(VoiceChannel *voice_channel) {
CritScope cs(&crit_);
// Destroy voice channel.
assert(initialized_);
- std::vector<VoiceChannel *>::iterator it = std::tqfind(channels_.begin(),
+ std::vector<VoiceChannel *>::iterator it = std::find(channels_.begin(),
channels_.end(), voice_channel);
assert(it != channels_.end());
if (it == channels_.end())
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
index a8f0a511..46dc7b42 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
@@ -202,7 +202,7 @@ void PhoneSessionClient::DestroyCall(Call *call) {
// Remove it from calls_ map and delete
- std::map<uint32, Call *>::iterator it = calls_.tqfind(call->id());
+ std::map<uint32, Call *>::iterator it = calls_.find(call->id());
if (it != calls_.end())
calls_.erase(it);
@@ -212,7 +212,7 @@ void PhoneSessionClient::DestroyCall(Call *call) {
void PhoneSessionClient::OnSessionDestroy(Session *session) {
// Find the call this session is in, remove it
- std::map<SessionID, Call *>::iterator it = session_map_.tqfind(session->id());
+ std::map<SessionID, Call *>::iterator it = session_map_.find(session->id());
assert(it != session_map_.end());
if (it != session_map_.end()) {
Call *call = (*it).second;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c
index d243bf76..e83eb8dc 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c
@@ -81,7 +81,7 @@ static gint compare(gconstpointer a, gconstpointer b)
static GList *g_list_append_if_new(GList *l,gpointer data)
{
GList *res=l;
- if (g_list_tqfind(res,data)==NULL)
+ if (g_list_find(res,data)==NULL)
res=g_list_append(res,data);
return(res);
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c
index c73081a2..6d410392 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c
@@ -419,7 +419,7 @@ GList *filter_list=NULL;
void ms_filter_register(MSFilterInfo *info)
{
gpointer tmp;
- tmp=g_list_tqfind(filter_list,info);
+ tmp=g_list_find(filter_list,info);
if (tmp==NULL) filter_list=g_list_append(filter_list,(gpointer)info);
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc
index 570a8be5..d6d4c7b4 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc
@@ -170,7 +170,7 @@ static std::string SuggestPrefix(const std::string & ns) {
if (last - first > 4)
last = first + 3;
std::string candidate(AsciiLower(ns.substr(first, last - first)));
- if (candidate.tqfind("xml") != 0)
+ if (candidate.find("xml") != 0)
return candidate;
break;
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc
index 48a89504..b742e03a 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc
@@ -56,13 +56,13 @@ Jid::Jid(const std::string & jid_string) {
}
// First find the slash and slice of that part
- size_t slash = jid_string.tqfind('/');
+ size_t slash = jid_string.find('/');
std::string resource_name = (slash == std::string::npos ? STR_EMPTY :
jid_string.substr(slash + 1));
// Now look for the node
std::string node_name;
- size_t at = jid_string.tqfind('@');
+ size_t at = jid_string.find('@');
size_t domain_begin;
if (at < slash && at != std::string::npos) {
node_name = jid_string.substr(0, at);
@@ -80,13 +80,13 @@ Jid::Jid(const std::string & jid_string) {
// avoid allocating these constants repeatedly
std::string domain_name;
- if (domain_length == 9 && jid_string.tqfind("gmail.com", domain_begin) == domain_begin) {
+ if (domain_length == 9 && jid_string.find("gmail.com", domain_begin) == domain_begin) {
domain_name = STR_GMAIL_COM;
}
- else if (domain_length == 14 && jid_string.tqfind("googlemail.com", domain_begin) == domain_begin) {
+ else if (domain_length == 14 && jid_string.find("googlemail.com", domain_begin) == domain_begin) {
domain_name = STR_GOOGLEMAIL_COM;
}
- else if (domain_length == 10 && jid_string.tqfind("google.com", domain_begin) == domain_begin) {
+ else if (domain_length == 10 && jid_string.find("google.com", domain_begin) == domain_begin) {
domain_name = STR_GOOGLE_COM;
}
else {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h
index 488dc56e..659820f5 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h
@@ -49,7 +49,7 @@ public:
return "";
}
- std::vector<std::string>::const_iterator it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN");
+ std::vector<std::string>::const_iterator it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN");
if (it == mechanisms.end()) {
return "";
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
index 50ca23c1..38f268b9 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
@@ -91,7 +91,7 @@ XmppEngineImpl::RemoveIqHandler(XmppIqCookie cookie,
std::vector<XmppIqEntry*, std::allocator<XmppIqEntry*> >::iterator pos;
- pos = std::tqfind(iq_entries_->begin(),
+ pos = std::find(iq_entries_->begin(),
iq_entries_->end(),
reinterpret_cast<XmppIqEntry*>(cookie));