diff options
| author | Linus Jahn <lnj@kaidan.im> | 2019-09-28 00:22:30 +0200 |
|---|---|---|
| committer | LNJ <lnj@kaidan.im> | 2019-10-14 21:33:09 +0200 |
| commit | f95db9d35fe8ef0ed025552043f1582db9c0834d (patch) | |
| tree | 4518f1baf54f5793b9fdf36d4462ac395f719f8e /src | |
| parent | a6c90186b4f95183a8b40e1c44dc4b4bdb48cbc4 (diff) | |
| download | qxmpp-f95db9d35fe8ef0ed025552043f1582db9c0834d.tar.gz | |
Deprecate QXmppClient::{rosterManager,vCardManager,versionManager}()
QXmppClient::findExtension() should be used instead.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/QXmppClient.cpp | 7 | ||||
| -rw-r--r-- | src/client/QXmppClient.h | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp index 9ce3d854..e5bd5473 100644 --- a/src/client/QXmppClient.cpp +++ b/src/client/QXmppClient.cpp @@ -344,9 +344,12 @@ void QXmppClient::setActive(bool active) } /// Returns the reference to QXmppRosterManager object of the client. +/// /// \return Reference to the roster object of the connected client. Use this to /// get the list of friends in the roster and their presence information. /// +/// \deprecated This method is deprecated since QXmpp 1.1. Use +/// \c QXmppClient::findExtension<QXmppRosterManager>() instead. QXmppRosterManager& QXmppClient::rosterManager() { @@ -461,6 +464,8 @@ QXmppStanza::Error::Condition QXmppClient::xmppStreamError() /// Returns the reference to QXmppVCardManager, implementation of XEP-0054. /// http://xmpp.org/extensions/xep-0054.html /// +/// \deprecated This method is deprecated since QXmpp 1.1. Use +/// \c QXmppClient::findExtension<QXmppVCardManager>() instead. QXmppVCardManager& QXmppClient::vCardManager() { @@ -470,6 +475,8 @@ QXmppVCardManager& QXmppClient::vCardManager() /// Returns the reference to QXmppVersionManager, implementation of XEP-0092. /// http://xmpp.org/extensions/xep-0092.html /// +/// \deprecated This method is deprecated since QXmpp 1.1. Use +/// \c QXmppClient::findExtension<QXmppVersionManager>() instead. QXmppVersionManager& QXmppClient::versionManager() { diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h index 2d41eebf..de4bb3d5 100644 --- a/src/client/QXmppClient.h +++ b/src/client/QXmppClient.h @@ -155,9 +155,16 @@ public: State state() const; QXmppStanza::Error::Condition xmppStreamError(); +#if QXMPP_DEPRECATED_SINCE(1, 1) + QT_DEPRECATED_X("Use QXmppClient::findExtension<QXmppRosterManager>() instead") QXmppRosterManager& rosterManager(); + + QT_DEPRECATED_X("Use QXmppClient::findExtension<QXmppVCardManager>() instead") QXmppVCardManager& vCardManager(); + + QT_DEPRECATED_X("Use QXmppClient::findExtension<QXmppVersionManager>() instead") QXmppVersionManager& versionManager(); +#endif signals: |