Make legacy QXmppClient::discoveryIqReceived() signal actually work

by relaying QXmppDiscoveryManager's signals. The old code in
QXmppOutgoingClient is no longer reached.

3 files changed, 12 insertions, 31 deletions

diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index e0e2386f..ab845a08 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -164,10 +164,6 @@ QXmppClient::QXmppClient(QObject *parent)
         SIGNAL(iqReceived(const QXmppIq&)));
     Q_ASSERT(check);
 
-    check = connect(d->stream, SIGNAL(discoveryIqReceived(const QXmppDiscoveryIq&)), this,
-        SIGNAL(discoveryIqReceived(const QXmppDiscoveryIq&)));
-    Q_ASSERT(check);
-
     check = connect(d->stream, SIGNAL(disconnected()), this,
         SIGNAL(disconnected()));
     Q_ASSERT(check);
@@ -220,7 +216,18 @@ QXmppClient::QXmppClient(QObject *parent)
     addExtension(d->versionManager);
 
     addExtension(new QXmppEntityTimeManager());
-    addExtension(new QXmppDiscoveryManager());
+
+    QXmppDiscoveryManager *discoveryManager = new QXmppDiscoveryManager;
+    addExtension(discoveryManager);
+
+    // obsolete signal
+    check = connect(discoveryManager, SIGNAL(infoReceived(QXmppDiscoveryIq)),
+                    this, SIGNAL(discoveryIqReceived(QXmppDiscoveryIq)));
+    Q_ASSERT(check);
+
+    check = connect(discoveryManager, SIGNAL(itemsReceived(QXmppDiscoveryIq)),
+                    this, SIGNAL(discoveryIqReceived(QXmppDiscoveryIq)));
+    Q_ASSERT(check);
 }
 
 /// Destructor, destroys the QXmppClient object.
diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp
index a0ed4247..b4ea2f2a 100644
--- a/src/QXmppOutgoingClient.cpp
+++ b/src/QXmppOutgoingClient.cpp
@@ -40,7 +40,6 @@
 
 // IQ types
 #include "QXmppBindIq.h"
-#include "QXmppDiscoveryIq.h"
 #include "QXmppPingIq.h"
 #include "QXmppRpcIq.h"
 #include "QXmppRosterIq.h"
@@ -472,27 +471,6 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
                 rpcErrorIq.parse(nodeRecv);
                 emit rpcCallError(rpcErrorIq);
             }
-
-            // XEP-0030: Service Discovery
-            else if(QXmppDiscoveryIq::isDiscoveryIq(nodeRecv))
-            {
-                QXmppDiscoveryIq discoIq;
-                discoIq.parse(nodeRecv);
-
-                if (discoIq.type() == QXmppIq::Get &&
-                    discoIq.queryType() == QXmppDiscoveryIq::InfoQuery &&
-                    (discoIq.queryNode().isEmpty() || discoIq.queryNode().startsWith(QString(capabilities_node))))
-                {
-                    // respond to info query
-//                    QXmppDiscoveryIq qxmppFeatures = capabilities();
-//                    qxmppFeatures.setId(discoIq.id());
-//                    qxmppFeatures.setTo(discoIq.from());
-//                    qxmppFeatures.setQueryNode(discoIq.queryNode());
-//                    sendPacket(qxmppFeatures);
-                } else {
-                    emit discoveryIqReceived(discoIq);
-                }
-            }
             // XEP-0078: Non-SASL Authentication
             else if(id == d->nonSASLAuthId && type == "result")
             {
diff --git a/src/QXmppOutgoingClient.h b/src/QXmppOutgoingClient.h
index 335448af..3f09b312 100644
--- a/src/QXmppOutgoingClient.h
+++ b/src/QXmppOutgoingClient.h
@@ -43,7 +43,6 @@ class QXmppRosterIq;
 class QXmppMessage;
 class QXmppRpcResponseIq;
 class QXmppRpcErrorIq;
-class QXmppDiscoveryIq;
 
 class QXmppOutgoingClientPrivate;
 
@@ -84,9 +83,6 @@ signals:
     void rpcCallResponse(const QXmppRpcResponseIq& result);
     void rpcCallError(const QXmppRpcErrorIq &err);
 
-    // XEP-0030: Service Discovery
-    void discoveryIqReceived(const QXmppDiscoveryIq&);
-
 protected:
     /// \cond
     // Overridable methods