1 files changed, 17 insertions, 17 deletions

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 7f2ff11f..a8f0a511 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
@@ -30,16 +30,16 @@
 #include "talk/base/logging.h"
 #include "talk/session/receiver.h"
 #include "talk/session/phone/phonesessionclient.h"
-#include "talk/xmllite/qname.h"
+#include "talk/xmllite/tqname.h"
 namespace {
 
 const std::string NS_PHONE("http://www.google.com/session/phone");
 const std::string NS_EMPTY("");
 
-const buzz::QName QN_PHONE_DESCRIPTION(true, NS_PHONE, "description");
-const buzz::QName QN_PHONE_PAYLOADTYPE(true, NS_PHONE, "payload-type");
-const buzz::QName QN_PHONE_PAYLOADTYPE_ID(true, NS_EMPTY, "id");
-const buzz::QName QN_PHONE_PAYLOADTYPE_NAME(true, NS_EMPTY, "name");
+const buzz::TQName TQN_PHONE_DESCRIPTION(true, NS_PHONE, "description");
+const buzz::TQName TQN_PHONE_PAYLOADTYPE(true, NS_PHONE, "payload-type");
+const buzz::TQName TQN_PHONE_PAYLOADTYPE_ID(true, NS_EMPTY, "id");
+const buzz::TQName TQN_PHONE_PAYLOADTYPE_NAME(true, NS_EMPTY, "name");
 
 }
 
@@ -116,19 +116,19 @@ bool PhoneSessionClient::FindMediaCodec(MediaEngine* me,
 const SessionDescription *PhoneSessionClient::CreateSessionDescription(const buzz::XmlElement *element) {
   PhoneSessionDescription* desc = new PhoneSessionDescription();
 
-  const buzz::XmlElement* payload_type = element->FirstNamed(QN_PHONE_PAYLOADTYPE);
+  const buzz::XmlElement* payload_type = element->FirstNamed(TQN_PHONE_PAYLOADTYPE);
   int num_payload_types = 0;
 
   while (payload_type) {
-    if (payload_type->HasAttr(QN_PHONE_PAYLOADTYPE_ID) &&
-        payload_type->HasAttr(QN_PHONE_PAYLOADTYPE_NAME)) {
-      int id = atoi(payload_type->Attr(QN_PHONE_PAYLOADTYPE_ID).c_str());
+    if (payload_type->HasAttr(TQN_PHONE_PAYLOADTYPE_ID) &&
+        payload_type->HasAttr(TQN_PHONE_PAYLOADTYPE_NAME)) {
+      int id = atoi(payload_type->Attr(TQN_PHONE_PAYLOADTYPE_ID).c_str());
       int pref = 0;
-      std::string name = payload_type->Attr(QN_PHONE_PAYLOADTYPE_NAME);
+      std::string name = payload_type->Attr(TQN_PHONE_PAYLOADTYPE_NAME);
       desc->AddCodec(MediaEngine::Codec(id, name, 0));
     }
 
-    payload_type = payload_type->NextNamed(QN_PHONE_PAYLOADTYPE);
+    payload_type = payload_type->NextNamed(TQN_PHONE_PAYLOADTYPE);
     num_payload_types += 1;
   }
 
@@ -145,16 +145,16 @@ const SessionDescription *PhoneSessionClient::CreateSessionDescription(const buz
 buzz::XmlElement *PhoneSessionClient::TranslateSessionDescription(const SessionDescription *_session_desc) {
   const PhoneSessionDescription* session_desc =
       static_cast<const PhoneSessionDescription*>(_session_desc);
-  buzz::XmlElement* description = new buzz::XmlElement(QN_PHONE_DESCRIPTION, true);
+  buzz::XmlElement* description = new buzz::XmlElement(TQN_PHONE_DESCRIPTION, true);
 
   for (size_t i = 0; i < session_desc->codecs().size(); ++i) {
-    buzz::XmlElement* payload_type = new buzz::XmlElement(QN_PHONE_PAYLOADTYPE, true);
+    buzz::XmlElement* payload_type = new buzz::XmlElement(TQN_PHONE_PAYLOADTYPE, true);
 
     char buf[32];
     sprintf(buf, "%d", session_desc->codecs()[i].id);
-    payload_type->AddAttr(QN_PHONE_PAYLOADTYPE_ID, buf);
+    payload_type->AddAttr(TQN_PHONE_PAYLOADTYPE_ID, buf);
 
-    payload_type->AddAttr(QN_PHONE_PAYLOADTYPE_NAME,
+    payload_type->AddAttr(TQN_PHONE_PAYLOADTYPE_NAME,
                           session_desc->codecs()[i].name.c_str());
 
     description->AddElement(payload_type);
@@ -202,7 +202,7 @@ void PhoneSessionClient::DestroyCall(Call *call) {
 
   // Remove it from calls_ map and delete
 
-  std::map<uint32, Call *>::iterator it = calls_.find(call->id());
+  std::map<uint32, Call *>::iterator it = calls_.tqfind(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_.find(session->id());
+  std::map<SessionID, Call *>::iterator it = session_map_.tqfind(session->id());
   assert(it != session_map_.end());
   if (it != session_map_.end()) {
     Call *call = (*it).second;