aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-07-18 07:40:15 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2012-07-18 07:40:15 +0200
commit7e72b2d00b61cf05187ebe011c34426bf8594a20 (patch)
treef3bb6d4bb94d396f3cbeac0299292a80c35aea8c /src/client
parentdabc85508fffc83dc86492ad56cec3e30816c107 (diff)
downloadqxmpp-7e72b2d00b61cf05187ebe011c34426bf8594a20.tar.gz
Remove deprecated QXmppClient::discoveryIqReceived() signal.
Diffstat (limited to 'src/client')
-rw-r--r--src/client/QXmppClient.cpp13
-rw-r--r--src/client/QXmppClient.h7
2 files changed, 1 insertions, 19 deletions
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);