1 files changed, 19 insertions, 19 deletions

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 03f6c6c1..ee14fe94 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.find(token);
+  size_t i = list.tqfind(token);
   if (i == std::string::npos || token.empty())
     return false;
   bool boundary_before = (i == 0 || IsXmlSpace(list[i - 1]));
@@ -59,9 +59,9 @@ ListContainsToken(const std::string & list, const std::string & token) {
 
 bool
 PresencePushTask::HandleStanza(const XmlElement * stanza) {
-  if (stanza->Name() != QN_PRESENCE)
+  if (stanza->Name() != TQN_PRESENCE)
     return false;
-  if (stanza->HasAttr(QN_TYPE) && stanza->Attr(QN_TYPE) != STR_UNAVAILABLE)
+  if (stanza->HasAttr(TQN_TYPE) && stanza->Attr(TQN_TYPE) != STR_UNAVAILABLE)
     return false;
   QueueStanza(stanza);
   return true;
@@ -77,17 +77,17 @@ PresencePushTask::ProcessStart() {
   const XmlElement * stanza = NextStanza();
   if (stanza == NULL)
     return STATE_BLOCKED;
-  Status s;
+  tqStatus s;
 
-  s.set_jid(Jid(stanza->Attr(QN_FROM)));
+  s.set_jid(Jid(stanza->Attr(TQN_FROM)));
 
-  if (stanza->Attr(QN_TYPE) == STR_UNAVAILABLE) {
+  if (stanza->Attr(TQN_TYPE) == STR_UNAVAILABLE) {
     s.set_available(false);
     SignalStatusUpdate(s);
   }
   else {
     s.set_available(true);
-    const XmlElement * status = stanza->FirstNamed(QN_STATUS);
+    const XmlElement * status = stanza->FirstNamed(TQN_STATUS);
     if (status != NULL) {
       s.set_status(status->BodyText());
 
@@ -104,7 +104,7 @@ PresencePushTask::ProcessStart() {
       }
     }
 
-    const XmlElement * priority = stanza->FirstNamed(QN_PRIORITY);
+    const XmlElement * priority = stanza->FirstNamed(TQN_PRIORITY);
     if (priority != NULL) {
       int pri;
       if (FromString(priority->BodyText(), &pri)) {
@@ -112,33 +112,33 @@ PresencePushTask::ProcessStart() {
       }
     }
 
-    const XmlElement * show = stanza->FirstNamed(QN_SHOW);
+    const XmlElement * show = stanza->FirstNamed(TQN_SHOW);
     if (show == NULL || show->FirstChild() == NULL) {
-      s.set_show(Status::SHOW_ONLINE);
+      s.set_show(tqStatus::SHOW_ONLINE);
     }
     else {
       if (show->BodyText() == "away") {
-        s.set_show(Status::SHOW_AWAY);
+        s.set_show(tqStatus::SHOW_AWAY);
       }
       else if (show->BodyText() == "xa") {
-        s.set_show(Status::SHOW_XA);
+        s.set_show(tqStatus::SHOW_XA);
       }
       else if (show->BodyText() == "dnd") {
-        s.set_show(Status::SHOW_DND);
+        s.set_show(tqStatus::SHOW_DND);
       }
       else if (show->BodyText() == "chat") {
-        s.set_show(Status::SHOW_CHAT);
+        s.set_show(tqStatus::SHOW_CHAT);
       }
       else {
-        s.set_show(Status::SHOW_ONLINE);
+        s.set_show(tqStatus::SHOW_ONLINE);
       }
     }
 
-    const XmlElement * caps = stanza->FirstNamed(QN_CAPS_C);
+    const XmlElement * caps = stanza->FirstNamed(TQN_CAPS_C);
     if (caps != NULL) {
-      std::string node = caps->Attr(QN_NODE);
-      std::string ver = caps->Attr(QN_VER);
-      std::string exts = caps->Attr(QN_EXT);
+      std::string node = caps->Attr(TQN_NODE);
+      std::string ver = caps->Attr(TQN_VER);
+      std::string exts = caps->Attr(TQN_EXT);
 
       s.set_know_capabilities(true);