Remove managers from QXmppClientPrivate, use the extensions list instead

1 files changed, 6 insertions, 22 deletions

diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index 59ee65ee..3fc3d35b 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -54,11 +54,6 @@ public:
     int reconnectionTries;
     QTimer *reconnectionTimer;
 
-    // managers
-    QXmppRosterManager *rosterManager;
-    QXmppVCardManager *vCardManager;
-    QXmppVersionManager *versionManager;
-
     void addProperCapability(QXmppPresence& presence);
     int getNextReconnectTime() const;
 
@@ -73,9 +68,6 @@ QXmppClientPrivate::QXmppClientPrivate(QXmppClient *qq)
     , receivedConflict(false)
     , reconnectionTries(0)
     , reconnectionTimer(0)
-    , rosterManager(0)
-    , vCardManager(0)
-    , versionManager(0)
     , q(qq)
 {
 }
@@ -199,17 +191,9 @@ QXmppClient::QXmppClient(QObject *parent)
     // logging
     setLogger(QXmppLogger::getLogger());
 
-    // create managers
-    // TODO move manager references to d->extensions
-    d->rosterManager = new QXmppRosterManager(this);
-    addExtension(d->rosterManager);
-
-    d->vCardManager = new QXmppVCardManager;
-    addExtension(d->vCardManager);
-
-    d->versionManager = new QXmppVersionManager;
-    addExtension(d->versionManager);
-
+    addExtension(new QXmppRosterManager(this));
+    addExtension(new QXmppVCardManager);
+    addExtension(new QXmppVersionManager);
     addExtension(new QXmppEntityTimeManager());
     addExtension(new QXmppDiscoveryManager());
 }
@@ -370,7 +354,7 @@ bool QXmppClient::isConnected() const
 
 QXmppRosterManager& QXmppClient::rosterManager()
 {
-    return *d->rosterManager;
+    return *findExtension<QXmppRosterManager>();
 }
 
 /// Utility function to send message to all the resources associated with the
@@ -476,7 +460,7 @@ QXmppStanza::Error::Condition QXmppClient::xmppStreamError()
 
 QXmppVCardManager& QXmppClient::vCardManager()
 {
-    return *d->vCardManager;
+    return *findExtension<QXmppVCardManager>();
 }
 
 /// Returns the reference to QXmppVersionManager, implementation of XEP-0092.
@@ -485,7 +469,7 @@ QXmppVCardManager& QXmppClient::vCardManager()
 
 QXmppVersionManager& QXmppClient::versionManager()
 {
-    return *d->versionManager;
+    return *findExtension<QXmppVersionManager>();
 }
 
 /// Give extensions a chance to handle incoming stanzas.