From dfec49b06fc305cc55631e5473b9ba19c729cd03 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
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 +++++-------
 .../example_2_rosterHandling.h                     |  5 ++
 examples/example_9_vCard/example_9_vCard.cpp       | 64 +++++++++-------------
 examples/example_9_vCard/example_9_vCard.h         |  6 ++
 4 files changed, 50 insertions(+), 60 deletions(-)

(limited to 'examples')

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
diff --git a/examples/example_9_vCard/example_9_vCard.cpp b/examples/example_9_vCard/example_9_vCard.cpp
index f2f04e67..1fe9e76a 100644
--- a/examples/example_9_vCard/example_9_vCard.cpp
+++ b/examples/example_9_vCard/example_9_vCard.cpp
@@ -21,10 +21,9 @@
  *
  */
 
-#include <iostream>
-
 #include <QBuffer>
 #include <QCoreApplication>
+#include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QImage>
@@ -39,53 +38,43 @@
 #include "example_9_vCard.h"
 
 xmppClient::xmppClient(QObject *parent)
-    : QXmppClient(parent)
+    : QXmppClient(parent),
+      m_rosterManager(findExtension<QXmppRosterManager>()),
+      m_vCardManager(findExtension<QXmppVCardManager>())
 {
-    bool check;
-    Q_UNUSED(check);
-
-    check = connect(this, SIGNAL(connected()),
-                    SLOT(clientConnected()));
-    Q_ASSERT(check);
+    connect(this, &QXmppClient::connected, this, &xmppClient::clientConnected);
 
-    check = connect(&this->rosterManager(), SIGNAL(rosterReceived()),
-                    SLOT(rosterReceived()));
-    Q_ASSERT(check);
+    connect(m_rosterManager, &QXmppRosterManager::rosterReceived,
+            this, &xmppClient::rosterReceived);
 }
 
-xmppClient::~xmppClient()
-{
-
-}
+xmppClient::~xmppClient() = default;
 
 void xmppClient::clientConnected()
 {
-    std::cout<<"example_9_vCard:: CONNECTED"<<std::endl;
+    qDebug() << "example_9_vCard: CONNECTED";
 }
 
 void xmppClient::rosterReceived()
 {
-    std::cout<<"example_9_vCard:: Roster Received"<<std::endl;
-    bool check = connect(&this->vCardManager(), SIGNAL(vCardReceived(QXmppVCardIq)),
-        SLOT(vCardReceived(QXmppVCardIq)));
-    Q_ASSERT(check);
-    Q_UNUSED(check);
-
-    QStringList list = rosterManager().getRosterBareJids();
-    for(int i = 0; i < list.size(); ++i)
-    {
-        // request vCard of all the bareJids in roster
-        vCardManager().requestVCard(list.at(i));
-    }
+    qDebug() << "example_9_vCard: Roster Received";
+
+    connect(m_vCardManager, &QXmppVCardManager::vCardReceived,
+            this, &xmppClient::vCardReceived);
+
+    // request vCard of all the bareJids in roster
+    const QStringList jids = m_rosterManager->getRosterBareJids();
+    for (const auto &jid : jids)
+        m_vCardManager->requestVCard(jid);
 }
 
 void xmppClient::vCardReceived(const QXmppVCardIq& vCard)
 {
     QString bareJid = vCard.from();
-    std::cout<<"example_9_vCard:: vCard Received:: " << qPrintable(bareJid) <<std::endl;
+    qDebug() << "example_9_vCard: vCard Received:" << bareJid;
 
-    QString out("FullName: %1\nNickName: %2\n");
-    std::cout<<qPrintable(out.arg(vCard.fullName()).arg(vCard.nickName())) <<std::endl;
+    qDebug() << "FullName:" << vCard.fullName();
+    qDebug() << "Nickname:" << vCard.nickName();
 
     QString vCardsDir("vCards/");
 
@@ -94,12 +83,11 @@ void xmppClient::vCardReceived(const QXmppVCardIq& vCard)
         dir.mkdir(vCardsDir);
 
     QFile file("vCards/" + bareJid + ".xml");
-    if(file.open(QIODevice::ReadWrite))
-    {
+    if (file.open(QIODevice::ReadWrite)) {
         QXmlStreamWriter stream(&file);
         vCard.toXml(&stream);
         file.close();
-        std::cout<<"example_9_vCard:: vCard written to the file:: " << qPrintable(bareJid) <<std::endl;
+        qDebug() << "example_9_vCard: vCard written to the file:" << bareJid;
     }
 
     QString name("vCards/" + bareJid + ".png");
@@ -109,10 +97,8 @@ void xmppClient::vCardReceived(const QXmppVCardIq& vCard)
     buffer.open(QIODevice::ReadOnly);
     QImageReader imageReader(&buffer);
     QImage image = imageReader.read();
-    if(image.save(name))
-    {
-        std::cout<<"example_9_vCard:: Avatar saved to file" <<std::endl<<std::endl;
-    }
+    if (image.save(name))
+        qDebug() << "example_9_vCard: Avatar saved to file";
 }
 
 int main(int argc, char *argv[])
diff --git a/examples/example_9_vCard/example_9_vCard.h b/examples/example_9_vCard/example_9_vCard.h
index 24fc4b6c..09de39c8 100644
--- a/examples/example_9_vCard/example_9_vCard.h
+++ b/examples/example_9_vCard/example_9_vCard.h
@@ -27,7 +27,9 @@
 
 #include "QXmppClient.h"
 
+class QXmppRosterManager;
 class QXmppVCardIq;
+class QXmppVCardManager;
 
 class xmppClient : public QXmppClient
 {
@@ -41,6 +43,10 @@ public slots:
     void clientConnected();
     void rosterReceived();
     void vCardReceived(const QXmppVCardIq&);
+
+private:
+    QXmppRosterManager *m_rosterManager;
+    QXmppVCardManager *m_vCardManager;
 };
 
 #endif // XMPPCLIENT_H
-- 
cgit v1.2.3