* replace QXmppClient::getRoster by QXmppClient::rosterManager

* replace QXmppClient::getVCardManager by QXmppClient::vCardManager

1 files changed, 14 insertions, 8 deletions

diff --git a/source/QXmppClient.h b/source/QXmppClient.h
index f660d437..ab6ef00e 100644
--- a/source/QXmppClient.h
+++ b/source/QXmppClient.h
@@ -38,19 +38,20 @@ class QXmppPresence;
 class QXmppMessage;
 class QXmppPacket;
 class QXmppIq;
-class QXmppMucManager;
-class QXmppRoster;
-class QXmppReconnectionManager;
-class QXmppVCardManager;
 class QXmppInvokable;
 class QXmppRpcInvokeIq;
 class QXmppRemoteMethod;
 struct QXmppRemoteMethodResult;
+
+// managers
 class QXmppArchiveManager;
+class QXmppCallManager;
 class QXmppDiscoveryIq;
-class QXmppVCardManager;
+class QXmppMucManager;
+class QXmppReconnectionManager;
+class QXmppRoster;
 class QXmppTransferManager;
-class QXmppCallManager;
+class QXmppVCardManager;
 
 /// \defgroup Core
 
@@ -112,17 +113,22 @@ public:
     QXmppArchiveManager& archiveManager();
     QXmppCallManager& callManager();
     QXmppMucManager& mucManager();
+    QXmppRoster& rosterManager();
     QXmppTransferManager& transferManager();
+    QXmppVCardManager& vCardManager();
 
     // FIXME : these accessors should be deprecated in favour of
     // versions without the "get".
-    QXmppRoster& getRoster();
     QXmppConfiguration& getConfiguration();
     const QXmppConfiguration& getConfiguration() const;
     QXmppReconnectionManager* getReconnectionManager();
     bool setReconnectionManager(QXmppReconnectionManager*);
     const QXmppPresence& getClientPresence() const;
-    QXmppVCardManager& getVCardManager();
+
+    /// \cond
+    QXmppRoster Q_DECL_DEPRECATED & getRoster();
+    QXmppVCardManager Q_DECL_DEPRECATED & getVCardManager();
+    /// \endcond
 
 signals: