From dfec49b06fc305cc55631e5473b9ba19c729cd03 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Mon, 21 Oct 2019 17:01:03 +0200 Subject: Port away from deprecated client extension getters of the QXmppClient This replaces the deprecated getters in the examples and in the documentation. --- .../example_2_rosterHandling.cpp | 35 +++++++++------------- 1 file changed, 14 insertions(+), 21 deletions(-) (limited to 'examples/example_2_rosterHandling/example_2_rosterHandling.cpp') diff --git a/examples/example_2_rosterHandling/example_2_rosterHandling.cpp b/examples/example_2_rosterHandling/example_2_rosterHandling.cpp index ec063ab5..86ca555b 100644 --- a/examples/example_2_rosterHandling/example_2_rosterHandling.cpp +++ b/examples/example_2_rosterHandling/example_2_rosterHandling.cpp @@ -29,30 +29,22 @@ #include "example_2_rosterHandling.h" xmppClient::xmppClient(QObject *parent) - : QXmppClient(parent) + : QXmppClient(parent), + m_rosterManager(findExtension()) { - bool check; - Q_UNUSED(check); + connect(this, &QXmppClient::connected, + this, &xmppClient::clientConnected); - check = connect(this, SIGNAL(connected()), - SLOT(clientConnected())); - Q_ASSERT(check); + connect(m_rosterManager, &QXmppRosterManager::rosterReceived, + this, &xmppClient::rosterReceived); - check = connect(&this->rosterManager(), SIGNAL(rosterReceived()), - SLOT(rosterReceived())); - Q_ASSERT(check); - - /// Then QXmppRoster::presenceChanged() is emitted whenever presence of someone - /// in roster changes - check = connect(&this->rosterManager(), SIGNAL(presenceChanged(QString,QString)), - SLOT(presenceChanged(QString,QString))); - Q_ASSERT(check); + /// Then QXmppRoster::presenceChanged() is emitted whenever presence of + /// someone in roster changes + connect(m_rosterManager, &QXmppRosterManager::presenceChanged, + this, &xmppClient::presenceChanged); } -xmppClient::~xmppClient() -{ - -} +xmppClient::~xmppClient() = default; void xmppClient::clientConnected() { @@ -62,8 +54,9 @@ void xmppClient::clientConnected() void xmppClient::rosterReceived() { qDebug("example_2_rosterHandling:: Roster received"); - foreach (const QString &bareJid, rosterManager().getRosterBareJids()) { - QString name = rosterManager().getRosterEntry(bareJid).name(); + const QStringList jids = m_rosterManager->getRosterBareJids(); + for (const QString &bareJid : jids) { + QString name = m_rosterManager->getRosterEntry(bareJid).name(); if(name.isEmpty()) name = "-"; qDebug("example_2_rosterHandling:: Roster received: %s [%s]", qPrintable(bareJid), qPrintable(name)); -- cgit v1.2.3