diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-05-14 14:30:08 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-05-14 14:30:08 +0200 |
| commit | d7bcaa9c2e633f1a12a624d69196cfa1890d84c5 (patch) | |
| tree | 5b7067a20c349a0f98bbf5dd32a8198a4bb4b8dd /src/client | |
| parent | f95297e8ecd7baa3211004b472888aa0af91409b (diff) | |
| download | qxmpp-d7bcaa9c2e633f1a12a624d69196cfa1890d84c5.tar.gz | |
deprecate QXmppReconnectionManager
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/QXmppClient.cpp | 15 | ||||
| -rw-r--r-- | src/client/QXmppClient.h | 16 |
2 files changed, 10 insertions, 21 deletions
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp index 9403d67a..5e4d73aa 100644 --- a/src/client/QXmppClient.cpp +++ b/src/client/QXmppClient.cpp @@ -437,25 +437,12 @@ void QXmppClient::setClientPresence(const QXmppPresence& presence) connectToServer(d->stream->configuration(), presence); } -/// Function to get reconnection manager. By default there exists a reconnection -/// manager. See QXmppReconnectionManager for more details of the reconnection -/// mechanism. -/// -/// \return Pointer to QXmppReconnectionManager -/// - QXmppReconnectionManager* QXmppClient::reconnectionManager() { return d->reconnectionManager; } -/// Sets the user defined reconnection manager. -/// -/// \return true if all the signal-slot connections are made correctly. -/// - -bool QXmppClient::setReconnectionManager(QXmppReconnectionManager* - reconnectionManager) +bool QXmppClient::setReconnectionManager(QXmppReconnectionManager* reconnectionManager) { if(!reconnectionManager) return false; diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h index c4696911..37f64c32 100644 --- a/src/client/QXmppClient.h +++ b/src/client/QXmppClient.h @@ -51,12 +51,12 @@ class QXmppVersionManager; /// \brief The QXmppClient class is the main class for using QXmpp. /// -/// It provides the user all the required functionality to connect to the server -/// and perform operations afterwards. +/// It provides the user all the required functionality to connect to the +/// server and perform operations afterwards. /// -/// This class will provide the handle/reference to QXmppRosterManager (roster management), -/// QXmppVCardManager (vCard manager), QXmppReconnectionManager (reconnection -/// mechanism) and QXmppVersionManager (software version information). +/// This class will provide the handle/reference to QXmppRosterManager +/// (roster management), QXmppVCardManager (vCard manager), and +/// QXmppVersionManager (software version information). /// /// By default, a reconnection mechanism exists, which makes sure of reconnecting /// to the server on disconnections due to an error. User can have a custom @@ -155,8 +155,10 @@ public: QXmppVCardManager& vCardManager(); QXmppVersionManager& versionManager(); - QXmppReconnectionManager* reconnectionManager(); - bool setReconnectionManager(QXmppReconnectionManager*); + /// cond + QXmppReconnectionManager* Q_DECL_DEPRECATED reconnectionManager(); + bool Q_DECL_DEPRECATED setReconnectionManager(QXmppReconnectionManager*); + /// \endcond signals: |
