diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-06-04 13:52:47 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-06-04 13:52:47 +0000 |
| commit | 452d70b95168e5f36a6cdb972278d656141feb3f (patch) | |
| tree | 3740ca69a09069310ec19b6407627ce24dceb3bf /source/QXmppStream.cpp | |
| parent | a64de45ea1daec3a791c1e07f6b3381c0f6d5a97 (diff) | |
| download | qxmpp-452d70b95168e5f36a6cdb972278d656141feb3f.tar.gz | |
move transfer manager from QXmppStream to QXmppClient
Diffstat (limited to 'source/QXmppStream.cpp')
| -rw-r--r-- | source/QXmppStream.cpp | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp index 31735fc9..36e9e87f 100644 --- a/source/QXmppStream.cpp +++ b/source/QXmppStream.cpp @@ -35,7 +35,6 @@ #include "QXmppVCard.h" #include "QXmppNonSASLAuth.h" #include "QXmppInformationRequestResult.h" -#include "QXmppTransferManager.h" // IQ types #include "QXmppArchiveIq.h" @@ -63,7 +62,6 @@ static const QByteArray streamRootElementEnd = "</stream:stream>"; QXmppStream::QXmppStream(QXmppClient* client) : QObject(client), m_client(client), m_sessionAvaliable(false), - m_transferManager(m_client), m_authStep(0) { // Make sure the random number generator is seeded @@ -96,33 +94,6 @@ QXmppStream::QXmppStream(QXmppClient* client) SLOT(socketError(QAbstractSocket::SocketError))); Q_ASSERT(check); - // XEP-0047: In-Band Bytestreams - check = QObject::connect(this, SIGNAL(iqReceived(const QXmppIq&)), - &m_transferManager, SLOT(iqReceived(const QXmppIq&))); - Q_ASSERT(check); - - check = QObject::connect(this, SIGNAL(ibbCloseIqReceived(const QXmppIbbCloseIq&)), - &m_transferManager, SLOT(ibbCloseIqReceived(const QXmppIbbCloseIq&))); - Q_ASSERT(check); - - check = QObject::connect(this, SIGNAL(ibbDataIqReceived(const QXmppIbbDataIq&)), - &m_transferManager, SLOT(ibbDataIqReceived(const QXmppIbbDataIq&))); - Q_ASSERT(check); - - check = QObject::connect(this, SIGNAL(ibbOpenIqReceived(const QXmppIbbOpenIq&)), - &m_transferManager, SLOT(ibbOpenIqReceived(const QXmppIbbOpenIq&))); - Q_ASSERT(check); - - // XEP-0065: SOCKS5 Bytestreams - check = QObject::connect(this, SIGNAL(byteStreamIqReceived(const QXmppByteStreamIq&)), - &m_transferManager, SLOT(byteStreamIqReceived(const QXmppByteStreamIq&))); - Q_ASSERT(check); - - // XEP-0095: Stream Initiation - check = QObject::connect(this, SIGNAL(streamInitiationIqReceived(const QXmppStreamInitiationIq&)), - &m_transferManager, SLOT(streamInitiationIqReceived(const QXmppStreamInitiationIq&))); - Q_ASSERT(check); - // XEP-0199: XMPP Ping m_pingTimer = new QTimer(); check = QObject::connect(m_pingTimer, SIGNAL(timeout()), this, SLOT(pingSend())); @@ -1108,7 +1079,3 @@ void QXmppStream::flushDataBuffer() m_dataBuffer.clear(); } -QXmppTransferManager& QXmppStream::getTransferManager() -{ - return m_transferManager; -} |
