Port away from deprecated client extension getters of the QXmppClient

This replaces the deprecated getters in the examples and in the
documentation.

2 files changed, 19 insertions, 21 deletions

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<QXmppRosterManager>())
 {
-    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));
diff --git a/examples/example_2_rosterHandling/example_2_rosterHandling.h b/examples/example_2_rosterHandling/example_2_rosterHandling.h
index 06bcc6d1..8eefae48 100644
--- a/examples/example_2_rosterHandling/example_2_rosterHandling.h
+++ b/examples/example_2_rosterHandling/example_2_rosterHandling.h
@@ -27,6 +27,8 @@
 
 #include "QXmppClient.h"
 
+class QXmppRosterManager;
+
 class xmppClient : public QXmppClient
 {
     Q_OBJECT
@@ -39,6 +41,9 @@ public slots:
     void clientConnected();
     void rosterReceived();
     void presenceChanged(const QString& bareJid, const QString& resource);
+
+private:
+    QXmppRosterManager *m_rosterManager;
 };
 
 #endif // XMPPCLIENT_H