diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-07-18 13:38:08 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-07-18 13:38:08 +0000 |
| commit | 23cfa0fd2068829204e0dcc25203873a5f408615 (patch) | |
| tree | 7b76f382780bf8fc307fa375405a53058ca17d1f /source | |
| parent | f4c8e3e8b31f5da7a221f11e685de8fdc03e04c0 (diff) | |
| download | qxmpp-23cfa0fd2068829204e0dcc25203873a5f408615.tar.gz | |
deprecate getXmppStreamError
Diffstat (limited to 'source')
| -rw-r--r-- | source/QXmppClient.h | 2 | ||||
| -rw-r--r-- | source/QXmppReconnectionManager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/QXmppClient.h b/source/QXmppClient.h index 6878eb5b..3752f6fa 100644 --- a/source/QXmppClient.h +++ b/source/QXmppClient.h @@ -152,7 +152,7 @@ public: QXmppRoster Q_DECL_DEPRECATED & getRoster(); QXmppVCardManager Q_DECL_DEPRECATED & getVCardManager(); QAbstractSocket::SocketError Q_DECL_DEPRECATED getSocketError(); - QXmppStanza::Error::Condition getXmppStreamError(); + QXmppStanza::Error::Condition Q_DECL_DEPRECATED getXmppStreamError(); /// \endcond signals: diff --git a/source/QXmppReconnectionManager.cpp b/source/QXmppReconnectionManager.cpp index fb53d7dd..4590e401 100644 --- a/source/QXmppReconnectionManager.cpp +++ b/source/QXmppReconnectionManager.cpp @@ -51,7 +51,7 @@ void QXmppReconnectionManager::error(QXmppClient::Error error) if(m_client && error == QXmppClient::XmppStreamError) { // if we receive a resource conflict, inhibit reconnection - if(m_client->getXmppStreamError() == QXmppStanza::Error::Conflict) + if(m_client->xmppStreamError() == QXmppStanza::Error::Conflict) m_receivedConflict = true; } else if(m_client && error == QXmppClient::SocketError && !m_receivedConflict) |