From 599b12db8656e41c1dcc589a674e8ed286fcbabb Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 13 Dec 2010 14:25:19 +0000
Subject: remove "client" argument from QXmppTransferManager constructor

---
 src/QXmppTransferManager.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'src/QXmppTransferManager.cpp')

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
-- 
cgit v1.2.3