diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:34 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:34 -0600 |
commit | 83677e35509b4dafac63b76995652bdf3b49f209 (patch) | |
tree | 591f1dc22278addb439726c42896376b17bb42bd /kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc | |
parent | 808e453c56036211f57482ed847d54aca01bba68 (diff) | |
download | tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.tar.gz tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc')
-rw-r--r-- | kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc index 3d363a78..c9569524 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc @@ -85,7 +85,7 @@ XmppEngineImpl::~XmppEngineImpl() { DeleteIqCookies(); } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -95,7 +95,7 @@ XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -105,7 +105,7 @@ XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::HandleInput(const char * bytes, size_t len) { if (state_ < STATE_OPENING || state_ > STATE_OPEN) return XMPP_RETURN_BADSTATE; @@ -117,7 +117,7 @@ XmppEngineImpl::HandleInput(const char * bytes, size_t len) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::ConnectionClosed() { if (state_ != STATE_CLOSED) { EnterExit ee(this); @@ -128,7 +128,7 @@ XmppEngineImpl::ConnectionClosed() { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetUseTls(bool useTls) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -138,7 +138,7 @@ XmppEngineImpl::SetUseTls(bool useTls) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetTlsServerDomain(const std::string & tls_server_domain) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -153,7 +153,7 @@ XmppEngineImpl::GetUseTls() { return tls_needed_; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetUser(const Jid & jid) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -168,7 +168,7 @@ XmppEngineImpl::GetUser() { return user_jid_; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -177,7 +177,7 @@ XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetRequestedResource(const std::string & resource) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -192,7 +192,7 @@ XmppEngineImpl::GetRequestedResource() { return requested_resource_; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler, XmppEngine::HandlerLevel level) { if (state_ == STATE_CLOSED) @@ -203,7 +203,7 @@ XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler, return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) { bool found = false; @@ -227,7 +227,7 @@ XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::Connect() { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -245,7 +245,7 @@ XmppEngineImpl::Connect() { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SendStanza(const XmlElement * element) { if (state_ == STATE_CLOSED) return XMPP_RETURN_BADSTATE; @@ -263,7 +263,7 @@ XmppEngineImpl::SendStanza(const XmlElement * element) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SendRaw(const std::string & text) { if (state_ == STATE_CLOSED || login_task_.get()) return XMPP_RETURN_BADSTATE; @@ -282,7 +282,7 @@ XmppEngineImpl::NextId() { return ss.str(); } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::Disconnect() { if (state_ != STATE_CLOSED) { |