1 files changed, 26 insertions, 26 deletions

diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
index a55af89e..7fd68120 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
@@ -42,33 +42,33 @@ bool ToString(const T &t,
   return !oss.fail();
 }
 
-XmppReturnStatus
-PresenceOutTask::Send(const Status & s) {
+XmppReturntqStatus
+PresenceOutTask::Send(const tqStatus & s) {
   if (GetState() != STATE_INIT)
     return XMPP_RETURN_BADSTATE;
 
-  stanza_.reset(TranslateStatus(s));
+  stanza_.reset(TranslatetqStatus(s));
   return XMPP_RETURN_OK;
 }
 
-XmppReturnStatus
-PresenceOutTask::SendDirected(const Jid & j, const Status & s) {
+XmppReturntqStatus
+PresenceOutTask::SendDirected(const Jid & j, const tqStatus & s) {
   if (GetState() != STATE_INIT)
     return XMPP_RETURN_BADSTATE;
 
-  XmlElement * presence = TranslateStatus(s);
-  presence->AddAttr(QN_TO, j.Str());
+  XmlElement * presence = TranslatetqStatus(s);
+  presence->AddAttr(TQN_TO, j.Str());
   stanza_.reset(presence);
   return XMPP_RETURN_OK;
 }
 
-XmppReturnStatus PresenceOutTask::SendProbe(const Jid & jid) {
+XmppReturntqStatus PresenceOutTask::SendProbe(const Jid & jid) {
   if (GetState() != STATE_INIT)
     return XMPP_RETURN_BADSTATE;
 
-  XmlElement * presence = new XmlElement(QN_PRESENCE);
-  presence->AddAttr(QN_TO, jid.Str());
-  presence->AddAttr(QN_TYPE, "probe");
+  XmlElement * presence = new XmlElement(TQN_PRESENCE);
+  presence->AddAttr(TQN_TO, jid.Str());
+  presence->AddAttr(TQN_TYPE, "probe");
 
   stanza_.reset(presence);
   return XMPP_RETURN_OK;
@@ -82,48 +82,48 @@ PresenceOutTask::ProcessStart() {
 }
 
 XmlElement *
-PresenceOutTask::TranslateStatus(const Status & s) {
-  XmlElement * result = new XmlElement(QN_PRESENCE);
+PresenceOutTask::TranslatetqStatus(const tqStatus & s) {
+  XmlElement * result = new XmlElement(TQN_PRESENCE);
   if (!s.available()) {
-    result->AddAttr(QN_TYPE, STR_UNAVAILABLE);
+    result->AddAttr(TQN_TYPE, STR_UNAVAILABLE);
   }
   else {
     if (s.invisible()) {
-      result->AddAttr(QN_TYPE, STR_INVISIBLE);
+      result->AddAttr(TQN_TYPE, STR_INVISIBLE);
     }
 
-    if (s.show() != Status::SHOW_ONLINE && s.show() != Status::SHOW_OFFLINE) {
-      result->AddElement(new XmlElement(QN_SHOW));
+    if (s.show() != tqStatus::SHOW_ONLINE && s.show() != tqStatus::SHOW_OFFLINE) {
+      result->AddElement(new XmlElement(TQN_SHOW));
       switch (s.show()) {
         default:
           result->AddText(STR_SHOW_AWAY, 1);
           break;
-        case Status::SHOW_XA:
+        case tqStatus::SHOW_XA:
           result->AddText(STR_SHOW_XA, 1);
           break;
-        case Status::SHOW_DND:
+        case tqStatus::SHOW_DND:
           result->AddText(STR_SHOW_DND, 1);
           break;
-        case Status::SHOW_CHAT:
+        case tqStatus::SHOW_CHAT:
           result->AddText(STR_SHOW_CHAT, 1);
           break;
       }
     }
 
-    result->AddElement(new XmlElement(QN_STATUS));
+    result->AddElement(new XmlElement(TQN_STATUS));
     result->AddText(s.status(), 1);
 
     std::string pri;
     ToString(s.priority(), &pri);
 
-    result->AddElement(new XmlElement(QN_PRIORITY));
+    result->AddElement(new XmlElement(TQN_PRIORITY));
     result->AddText(pri, 1);
 
     if (s.know_capabilities() && s.is_google_client()) {
-      result->AddElement(new XmlElement(QN_CAPS_C, true));
-      result->AddAttr(QN_NODE, GOOGLE_CLIENT_NODE, 1);
-      result->AddAttr(QN_VER, s.version(), 1);
-      result->AddAttr(QN_EXT, s.phone_capability() ? "voice-v1" : "", 1);
+      result->AddElement(new XmlElement(TQN_CAPS_C, true));
+      result->AddAttr(TQN_NODE, GOOGLE_CLIENT_NODE, 1);
+      result->AddAttr(TQN_VER, s.version(), 1);
+      result->AddAttr(TQN_EXT, s.phone_capability() ? "voice-v1" : "", 1);
     }
 
     // Put the delay mark on the presence according to JEP-0091