diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
commit | 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch) | |
tree | 073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h | |
parent | 3467e6464beac3a162839bf7078e22e3a74d73e7 (diff) | |
download | tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip |
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
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h')
-rw-r--r-- | kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h index 3b56a1c9..d84019a2 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h @@ -45,7 +45,7 @@ namespace buzz { // See Task and XmppClient first. // // XmppTask is a task that is designed to go underneath XmppClient and be -// useful there. It has a way of finding its XmppClient parent so you +// useful there. It has a way of finding its XmppClient tqparent so you // can have it nested arbitrarily deep under an XmppClient and it can // still find the XMPP services. // @@ -69,7 +69,7 @@ class XmppTask : public sigslot::has_slots<> { public: - XmppTask(Task * parent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE); + XmppTask(Task * tqparent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE); virtual ~XmppTask(); virtual XmppClient * GetClient() const { return client_; } @@ -78,9 +78,9 @@ public: protected: friend class XmppClient; - XmppReturnStatus SendStanza(const XmlElement * stanza); - XmppReturnStatus SetResult(const std::string & code); - XmppReturnStatus SendStanzaError(const XmlElement * element_original, + XmppReturntqStatus SendStanza(const XmlElement * stanza); + XmppReturntqStatus SetResult(const std::string & code); + XmppReturntqStatus SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text); @@ -93,7 +93,7 @@ protected: const XmlElement * NextStanza(); bool MatchResponseIq(const XmlElement * stanza, const Jid & to, const std::string & task_id); - bool MatchRequestIq(const XmlElement * stanza, const std::string & type, const QName & qn); + bool MatchRequestIq(const XmlElement * stanza, const std::string & type, const TQName & qn); XmlElement *MakeIqResult(const XmlElement * query); XmlElement *MakeIq(const std::string & type, const Jid & to, const std::string task_id); |