rework manager ownership

9 files changed, 19 insertions, 16 deletions

diff --git a/source/QXmppArchiveManager.cpp b/source/QXmppArchiveManager.cpp
index 5281bf26..7ff0e5f6 100644
--- a/source/QXmppArchiveManager.cpp
+++ b/source/QXmppArchiveManager.cpp
@@ -27,8 +27,9 @@
 
 #include <QDebug>
 
-QXmppArchiveManager::QXmppArchiveManager(QXmppStream *stream) :
-        QObject(stream), m_stream(stream)
+QXmppArchiveManager::QXmppArchiveManager(QXmppStream *stream, QObject *parent)
+    : QObject(parent),
+    m_stream(stream)
 {
     bool check = QObject::connect(m_stream, SIGNAL(archiveChatIqReceived(const QXmppArchiveChatIq&)),
         this, SLOT(archiveChatIqReceived(const QXmppArchiveChatIq&)));
diff --git a/source/QXmppArchiveManager.h b/source/QXmppArchiveManager.h
index f9a544c2..c4ec0ada 100644
--- a/source/QXmppArchiveManager.h
+++ b/source/QXmppArchiveManager.h
@@ -39,7 +39,7 @@ class QXmppArchiveManager : public QObject
     Q_OBJECT
 
 public:
-    QXmppArchiveManager(QXmppStream* stream);
+    QXmppArchiveManager(QXmppStream* stream, QObject *parent = 0);
     void listCollections(const QString &jid, const QDateTime &start = QDateTime(), const QDateTime &end = QDateTime(), int max = 0);
     void retrieveCollection(const QString &jid, const QDateTime &start, int max = 0);
     void getPreferences();
diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp
index 73e9eb3f..8690e40c 100644
--- a/source/QXmppClient.cpp
+++ b/source/QXmppClient.cpp
@@ -88,10 +88,10 @@ QXmppClient::QXmppClient(QObject *parent)
     Q_ASSERT(check);
 
     // create managers
-    m_roster = new QXmppRoster(m_stream);
-    m_archiveManager = new QXmppArchiveManager(m_stream);
-    m_transferManager = new QXmppTransferManager(m_stream);
-    m_vCardManager = new QXmppVCardManager(m_stream);
+    m_roster = new QXmppRoster(m_stream, this);
+    m_archiveManager = new QXmppArchiveManager(m_stream, this);
+    m_transferManager = new QXmppTransferManager(m_stream, this);
+    m_vCardManager = new QXmppVCardManager(m_stream, this);
 }
 
 /// Destructor, destroys the QXmppClient object.
diff --git a/source/QXmppRoster.cpp b/source/QXmppRoster.cpp
index f595fde6..ffeea2a8 100644
--- a/source/QXmppRoster.cpp
+++ b/source/QXmppRoster.cpp
@@ -29,8 +29,8 @@
 #include "QXmppPresence.h"
 #include "QXmppStream.h"
 
-QXmppRoster::QXmppRoster(QXmppStream* stream)
-    : QObject(stream),
+QXmppRoster::QXmppRoster(QXmppStream* stream, QObject *parent)
+    : QObject(parent),
     m_stream(stream),
     m_isRosterReceived(false)
 {
diff --git a/source/QXmppRoster.h b/source/QXmppRoster.h
index 380a7e1e..a00b6309 100644
--- a/source/QXmppRoster.h
+++ b/source/QXmppRoster.h
@@ -67,7 +67,7 @@ public:
     // FIXME : is this class really necessary?
     typedef QXmppRosterIq::Item QXmppRosterEntry;
 
-    QXmppRoster(QXmppStream* stream);
+    QXmppRoster(QXmppStream* stream, QObject *parent = 0);
     ~QXmppRoster();
     
     bool isRosterReceived();
diff --git a/source/QXmppTransferManager.cpp b/source/QXmppTransferManager.cpp
index 71c7c0d1..f86fcf09 100644
--- a/source/QXmppTransferManager.cpp
+++ b/source/QXmppTransferManager.cpp
@@ -345,8 +345,8 @@ bool QXmppTransferJob::writeData(const QByteArray &data)
     return true;
 }
 
-QXmppTransferManager::QXmppTransferManager(QXmppStream *stream)
-    : QObject(m_stream),
+QXmppTransferManager::QXmppTransferManager(QXmppStream *stream, QObject *parent)
+    : QObject(parent),
     m_stream(stream),
     m_ibbBlockSize(4096),
     m_proxyOnly(false),
diff --git a/source/QXmppTransferManager.h b/source/QXmppTransferManager.h
index bb21a2d7..0c758ce8 100644
--- a/source/QXmppTransferManager.h
+++ b/source/QXmppTransferManager.h
@@ -205,7 +205,7 @@ class QXmppTransferManager : public QObject
     Q_OBJECT
 
 public:
-    QXmppTransferManager(QXmppStream *stream);
+    QXmppTransferManager(QXmppStream *stream, QObject *parent = 0);
     QXmppTransferJob *sendFile(const QString &jid, const QString &fileName, const QString &sid = QString());
     QXmppTransferJob *sendFile(const QString &jid, QIODevice *device, const QXmppTransferFileInfo &fileInfo, const QString &sid = QString());
 
diff --git a/source/QXmppVCardManager.cpp b/source/QXmppVCardManager.cpp
index 08917e3d..ed6b1f51 100644
--- a/source/QXmppVCardManager.cpp
+++ b/source/QXmppVCardManager.cpp
@@ -26,8 +26,10 @@
 #include "QXmppStream.h"
 #include "QXmppUtils.h"
 
-QXmppVCardManager::QXmppVCardManager(QXmppStream* stream) :
-        QObject(stream), m_stream(stream), m_isClientVCardReceived(false)
+QXmppVCardManager::QXmppVCardManager(QXmppStream* stream, QObject *parent)
+    : QObject(parent),
+    m_stream(stream),
+    m_isClientVCardReceived(false)
 {
     bool check = QObject::connect(m_stream, SIGNAL(vCardIqReceived(const QXmppVCard&)),
         this, SLOT(vCardIqReceived(const QXmppVCard&)));
diff --git a/source/QXmppVCardManager.h b/source/QXmppVCardManager.h
index ed68a2ac..8ec078ee 100644
--- a/source/QXmppVCardManager.h
+++ b/source/QXmppVCardManager.h
@@ -36,7 +36,7 @@ class QXmppVCardManager : public QObject
     Q_OBJECT
 
 public:
-    QXmppVCardManager(QXmppStream* stream);
+    QXmppVCardManager(QXmppStream* stream, QObject *parent = 0);
     void requestVCard(const QString& bareJid = "");
 
     const QXmppVCard& clientVCard() const;