diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-05-26 10:09:23 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-05-26 10:09:23 +0000 |
| commit | bcbd1b01744010c3f84c81e8d21cde6117afbe0b (patch) | |
| tree | 43734457a28739c75bb68ca696c389eb16513427 /source | |
| parent | fd70dcd1a7aea78ecf17ca16ae19ec1a5f5b6522 (diff) | |
| download | qxmpp-bcbd1b01744010c3f84c81e8d21cde6117afbe0b.tar.gz | |
don't use a dedicated signal to signal arrival of QXmppVersionIq
Diffstat (limited to 'source')
| -rw-r--r-- | source/QXmppClient.cpp | 4 | ||||
| -rw-r--r-- | source/QXmppClient.h | 4 | ||||
| -rw-r--r-- | source/QXmppStream.cpp | 3 | ||||
| -rw-r--r-- | source/QXmppStream.h | 1 |
4 files changed, 1 insertions, 11 deletions
diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp index 19d787da..9f361c14 100644 --- a/source/QXmppClient.cpp +++ b/source/QXmppClient.cpp @@ -60,10 +60,6 @@ QXmppClient::QXmppClient(QObject *parent) SIGNAL(discoveryIqReceived(const QXmppDiscoveryIq&))); Q_ASSERT(check); - check = connect(m_stream, SIGNAL(versionIqReceived(const QXmppVersionIq&)), this, - SIGNAL(versionIqReceived(const QXmppVersionIq&))); - Q_ASSERT(check); - check = connect(m_stream, SIGNAL(disconnected()), this, SIGNAL(disconnected())); Q_ASSERT(check); diff --git a/source/QXmppClient.h b/source/QXmppClient.h index 9275cbb8..2a2f831e 100644 --- a/source/QXmppClient.h +++ b/source/QXmppClient.h @@ -48,7 +48,6 @@ struct QXmppRemoteMethodResult; class QXmppArchiveManager; class QXmppDiscoveryIq; class QXmppTransferManager; -class QXmppVersionIq; /// \brief The QXmppClient class is the main class for using QXmpp. /// @@ -165,9 +164,6 @@ signals: /// Notifies that an XMPP service discovery iq stanza is received. void discoveryIqReceived(const QXmppDiscoveryIq&); - /// Notifies that an XMPP version iq stanza is received. - void versionIqReceived(const QXmppVersionIq&); - public: QAbstractSocket::SocketError getSocketError(); diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp index 53555c90..9c7f618d 100644 --- a/source/QXmppStream.cpp +++ b/source/QXmppStream.cpp @@ -686,10 +686,9 @@ void QXmppStream::parser(const QByteArray& data) responseIq.setVersion(qApp->applicationVersion()); sendPacket(responseIq); } else { - emit versionIqReceived(versionIq); + emit iqReceived(versionIq); } - emit iqReceived(versionIq); } // XEP-0095: Stream Initiation else if(QXmppStreamInitiationIq::isStreamInitiationIq(nodeRecv)) diff --git a/source/QXmppStream.h b/source/QXmppStream.h index f1bf6492..454c5bc7 100644 --- a/source/QXmppStream.h +++ b/source/QXmppStream.h @@ -106,7 +106,6 @@ signals: void archivePrefIqReceived(const QXmppArchivePrefIq&); void discoveryIqReceived(const QXmppDiscoveryIq&); - void versionIqReceived(const QXmppVersionIq&); void byteStreamIqReceived(const QXmppByteStreamIq&); void ibbCloseIqReceived(const QXmppIbbCloseIq&); |
