Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

1 files changed, 12 insertions, 12 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 a15a6c83..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,27 +42,27 @@ 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);
+  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;
 
@@ -82,7 +82,7 @@ PresenceOutTask::ProcessStart() {
 }
 
 XmlElement *
-PresenceOutTask::TranslateStatus(const Status & s) {
+PresenceOutTask::TranslatetqStatus(const tqStatus & s) {
   XmlElement * result = new XmlElement(TQN_PRESENCE);
   if (!s.available()) {
     result->AddAttr(TQN_TYPE, STR_UNAVAILABLE);
@@ -92,19 +92,19 @@ PresenceOutTask::TranslateStatus(const Status & s) {
       result->AddAttr(TQN_TYPE, STR_INVISIBLE);
     }
 
-    if (s.show() != Status::SHOW_ONLINE && s.show() != Status::SHOW_OFFLINE) {
+    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;
       }