From 7e72b2d00b61cf05187ebe011c34426bf8594a20 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Wed, 18 Jul 2012 07:40:15 +0200
Subject: Remove deprecated QXmppClient::discoveryIqReceived() signal.

---
 src/client/QXmppClient.cpp | 13 +------------
 src/client/QXmppClient.h   |  7 -------
 2 files changed, 1 insertion(+), 19 deletions(-)

(limited to 'src/client')

diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index 1c7d9342..d42b4966 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -211,18 +211,7 @@ QXmppClient::QXmppClient(QObject *parent)
     addExtension(d->versionManager);
 
     addExtension(new QXmppEntityTimeManager());
-
-    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);
+    addExtension(new QXmppDiscoveryManager());
 }
 
 /// Destructor, destroys the QXmppClient object.
diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h
index 20b9912f..b6661f96 100644
--- a/src/client/QXmppClient.h
+++ b/src/client/QXmppClient.h
@@ -212,13 +212,6 @@ signals:
     /// This signal is emitted when the client state changes.
     void stateChanged(QXmppClient::State state);
 
-    /// \cond
-    // Deprecated in release 0.3.0
-    // Use QXmppDiscoveryManager::informationReceived(const QXmppDiscoveryIq&)
-    // Notifies that an XMPP service discovery iq stanza is received.
-    void discoveryIqReceived(const QXmppDiscoveryIq&);
-    /// \endcond
-
 public slots:
     void connectToServer(const QString &jid,
                          const QString &password);
-- 
cgit v1.2.3