From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../libjingle/talk/examples/call/callclient.cc | 24 +++++----- .../libjingle/talk/examples/call/callclient.h | 6 +-- .../talk/examples/call/presenceouttask.cc | 52 +++++++++++----------- .../libjingle/talk/examples/call/presenceouttask.h | 10 ++--- .../talk/examples/call/presencepushtask.cc | 38 ++++++++-------- .../talk/examples/call/presencepushtask.h | 4 +- .../jingle/libjingle/talk/examples/call/status.h | 32 ++++++------- 7 files changed, 83 insertions(+), 83 deletions(-) (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/examples/call') 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 6d818932..e781b03d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc @@ -188,13 +188,13 @@ private: CallClient* call_client_; }; -const char* DescribeStatus(buzz::Status::Show show, const std::string& desc) { +const char* DescribetqStatus(buzz::tqStatus::Show show, const std::string& desc) { switch (show) { - case buzz::Status::SHOW_XA: return desc.c_str(); - case buzz::Status::SHOW_ONLINE: return "online"; - case buzz::Status::SHOW_AWAY: return "away"; - case buzz::Status::SHOW_DND: return "do not disturb"; - case buzz::Status::SHOW_CHAT: return "ready to chat"; + case buzz::tqStatus::SHOW_XA: return desc.c_str(); + case buzz::tqStatus::SHOW_ONLINE: return "online"; + case buzz::tqStatus::SHOW_AWAY: return "away"; + case buzz::tqStatus::SHOW_DND: return "do not disturb"; + case buzz::tqStatus::SHOW_CHAT: return "ready to chat"; delault: return "offline"; } } @@ -320,11 +320,11 @@ void CallClient::InitPresence() { this, &CallClient::OnStatusUpdate); presence_push_->Start(); - buzz::Status my_status; + buzz::tqStatus my_status; my_status.set_jid(xmpp_client_->jid()); my_status.set_available(true); my_status.set_invisible(false); - my_status.set_show(buzz::Status::SHOW_ONLINE); + my_status.set_show(buzz::tqStatus::SHOW_ONLINE); my_status.set_priority(0); my_status.set_know_capabilities(true); my_status.set_phone_capability(true); @@ -337,7 +337,7 @@ void CallClient::InitPresence() { presence_out_->Start(); } -void CallClient::OnStatusUpdate(const buzz::Status& status) { +void CallClient::OnStatusUpdate(const buzz::tqStatus& status) { RosterItem item; item.jid = status.jid(); item.show = status.show(); @@ -350,19 +350,19 @@ void CallClient::OnStatusUpdate(const buzz::Status& status) { (*roster_)[key] = item; } else { Console()->Printf("Removing from roster: %s", key.c_str()); - RosterMap::iterator iter = roster_->find(key); + RosterMap::iterator iter = roster_->tqfind(key); if (iter != roster_->end()) roster_->erase(iter); } } void CallClient::PrintRoster() { - Console()->Printf("Roster contains %d callable", roster_->size()); + Console()->Printf("Roster tqcontains %d callable", roster_->size()); RosterMap::iterator iter = roster_->begin(); while (iter != roster_->end()) { Console()->Printf("%s - %s", iter->second.jid.BareJid().Str().c_str(), - DescribeStatus(iter->second.show, iter->second.status)); + DescribetqStatus(iter->second.show, iter->second.status)); iter++; } } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h index d35a6114..24ce1545 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h @@ -29,7 +29,7 @@ namespace buzz { class PresencePushTask; -class Status; +class tqStatus; } namespace cricket { @@ -43,7 +43,7 @@ class Call; struct RosterItem { buzz::Jid jid; - buzz::Status::Show show; + buzz::tqStatus::Show show; std::string status; }; @@ -82,7 +82,7 @@ private: void OnSendStanza(cricket::SessionClient *client, const buzz::XmlElement* stanza); void InitPresence(); - void OnStatusUpdate(const buzz::Status& status); + void OnStatusUpdate(const buzz::tqStatus& status); }; #endif // CRICKET_EXAMPLES_CALL_CALLCLIENT_H__ 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 diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h index 2b65a553..7307a522 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h @@ -28,16 +28,16 @@ namespace buzz { class PresenceOutTask : public XmppTask { public: - PresenceOutTask(Task * parent) : XmppTask(parent) {} + PresenceOutTask(Task * tqparent) : XmppTask(tqparent) {} virtual ~PresenceOutTask() {} - XmppReturnStatus Send(const Status & s); - XmppReturnStatus SendDirected(const Jid & j, const Status & s); - XmppReturnStatus SendProbe(const Jid& jid); + XmppReturntqStatus Send(const tqStatus & s); + XmppReturntqStatus SendDirected(const Jid & j, const tqStatus & s); + XmppReturntqStatus SendProbe(const Jid& jid); virtual int ProcessStart(); private: - XmlElement * TranslateStatus(const Status & s); + XmlElement * TranslatetqStatus(const tqStatus & s); scoped_ptr stanza_; }; 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); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h index 77459647..2ed5ac46 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h @@ -30,9 +30,9 @@ namespace buzz { class PresencePushTask : public XmppTask { public: - PresencePushTask(Task * parent) : XmppTask(parent, XmppEngine::HL_TYPE) {} + PresencePushTask(Task * tqparent) : XmppTask(tqparent, XmppEngine::HL_TYPE) {} virtual int ProcessStart(); - sigslot::signal1SignalStatusUpdate; + sigslot::signal1SignalStatusUpdate; protected: virtual bool HandleStanza(const XmlElement * stanza); 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 cab9312f..0677932b 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h @@ -26,9 +26,9 @@ namespace buzz { -class Status { +class tqStatus { public: - Status() : + tqStatus() : pri_(0), show_(SHOW_NONE), available_(false), @@ -39,7 +39,7 @@ public: is_google_client_(false), feedback_probation_(false) {}; - ~Status() {} + ~tqStatus() {} // These are arranged in "priority order", i.e., if we see // two statuses at the same priority but with different Shows, @@ -86,7 +86,7 @@ public: void set_feedback_probation(bool f) { feedback_probation_ = f; } void set_sent_time(const std::string& time) { sent_time_ = time; } - void UpdateWith(const Status & new_value) { + void UpdateWith(const tqStatus & new_value) { if (!new_value.know_capabilities()) { bool k = know_capabilities(); bool i = is_google_client(); @@ -105,36 +105,36 @@ public: } } - bool HasQuietStatus() const { + bool HasQuiettqStatus() const { if (status_.empty()) return false; - return !(QuietStatus().empty()); + return !(QuiettqStatus().empty()); } // Knowledge of other clients' silly automatic status strings - // Don't show these. - std::string QuietStatus() const { - if (jid_.resource().find("Psi") != std::string::npos) { + std::string QuiettqStatus() const { + if (jid_.resource().tqfind("Psi") != std::string::npos) { if (status_ == "Online" || - status_.find("Auto Status") != std::string::npos) + status_.tqfind("Auto tqStatus") != std::string::npos) return STR_EMPTY; } - if (jid_.resource().find("Gaim") != std::string::npos) { + if (jid_.resource().tqfind("Gaim") != std::string::npos) { if (status_ == "Sorry, I ran out for a bit!") return STR_EMPTY; } - return TrimStatus(status_); + return TrimtqStatus(status_); } - std::string ExplicitStatus() const { - std::string result = QuietStatus(); + std::string ExplicittqStatus() const { + std::string result = QuiettqStatus(); if (result.empty()) { - result = ShowStatus(); + result = ShowtqStatus(); } return result; } - std::string ShowStatus() const { + std::string ShowtqStatus() const { std::string result; if (!available()) { result = "Offline"; @@ -159,7 +159,7 @@ public: return result; } - static std::string TrimStatus(const std::string & st) { + static std::string TrimtqStatus(const std::string & st) { std::string s(st); int j = 0; bool collapsing = true; -- cgit v1.2.1