remove "client" argument from QXmppTransferManager constructor

3 files changed, 22 insertions, 11 deletions

diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index 8a02f4bb..fddd3236 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -175,7 +175,7 @@ QXmppClient::QXmppClient(QObject *parent)
     d->rosterManager = new QXmppRosterManager(this);
     addExtension(d->rosterManager);
 
-    d->transferManager = new QXmppTransferManager(this);
+    d->transferManager = new QXmppTransferManager;
     addExtension(d->transferManager);
 
     d->vCardManager = new QXmppVCardManager;
diff --git a/src/QXmppTransferManager.cpp b/src/QXmppTransferManager.cpp
index e36bcc7a..ca443390 100644
--- a/src/QXmppTransferManager.cpp
+++ b/src/QXmppTransferManager.cpp
@@ -424,31 +424,37 @@ bool QXmppTransferJob::writeData(const QByteArray &data)
 
 /// Constructs a QXmppTransferManager to handle incoming and outgoing
 /// file transfers.
-///
-/// \param client
-QXmppTransferManager::QXmppTransferManager(QXmppClient *client)
+
+QXmppTransferManager::QXmppTransferManager()
     : m_ibbBlockSize(4096),
     m_proxyOnly(false),
     m_socksServer(0),
     m_supportedMethods(QXmppTransferJob::AnyMethod)
 {
-    // XEP-0047: In-Band Bytestreams
-    bool check = QObject::connect(client, SIGNAL(iqReceived(const QXmppIq&)),
-        this, SLOT(iqReceived(const QXmppIq&)));
-    Q_ASSERT(check);
-
     // start SOCKS server
     m_socksServer = new QXmppSocksServer(this);
     if (m_socksServer->listen())
     {
-        check = connect(m_socksServer, SIGNAL(newConnection(QTcpSocket*, const QString&, quint16)),
+        bool check = connect(m_socksServer, SIGNAL(newConnection(QTcpSocket*, const QString&, quint16)),
                         this, SLOT(socksServerConnected(QTcpSocket*, const QString&, quint16)));
         Q_ASSERT(check);
+        Q_UNUSED(check);
     } else {
         qWarning("QXmppSocksServer could not start listening");
     }
 }
 
+void QXmppTransferManager::setClient(QXmppClient *client)
+{
+    QXmppClientExtension::setClient(client);
+
+    // XEP-0047: In-Band Bytestreams
+    bool check = QObject::connect(client, SIGNAL(iqReceived(const QXmppIq&)),
+        this, SLOT(iqReceived(const QXmppIq&)));
+    Q_ASSERT(check);
+    Q_UNUSED(check);
+}
+
 void QXmppTransferManager::byteStreamIqReceived(const QXmppByteStreamIq &iq)
 {
     // handle IQ from proxy
diff --git a/src/QXmppTransferManager.h b/src/QXmppTransferManager.h
index b08e22c2..45a72db6 100644
--- a/src/QXmppTransferManager.h
+++ b/src/QXmppTransferManager.h
@@ -190,7 +190,7 @@ class QXmppTransferManager : public QXmppClientExtension
     Q_OBJECT
 
 public:
-    QXmppTransferManager(QXmppClient *client);
+    QXmppTransferManager();
     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());
 
@@ -220,6 +220,11 @@ signals:
     /// \sa QXmppTransferJob::finished()
     void finished(QXmppTransferJob *job);
 
+protected:
+    /// \cond
+    void setClient(QXmppClient* client);
+    /// \endcond
+
 private slots:
     void iqReceived(const QXmppIq&);
     void jobDestroyed(QObject *object);