From e4759d35ca5fa956650235b680b3c3b3ac13ffcf Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Thu, 26 Aug 2021 19:28:14 +0200
Subject: Make it possible to send QXmppNonzas over streams

---
 src/base/QXmppPacket.cpp | 8 ++++----
 src/base/QXmppPacket_p.h | 4 ++--
 src/base/QXmppStream.cpp | 4 ++--
 src/base/QXmppStream.h   | 5 +++--
 4 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'src/base')

diff --git a/src/base/QXmppPacket.cpp b/src/base/QXmppPacket.cpp
index 86b28ed2..bd29106f 100644
--- a/src/base/QXmppPacket.cpp
+++ b/src/base/QXmppPacket.cpp
@@ -22,18 +22,18 @@
  */
 
 #include "QXmppPacket_p.h"
-#include "QXmppStanza.h"
+#include "QXmppNonza.h"
 
 #include <QFuture>
 #include <QXmlStreamWriter>
 
 /// \cond
-QXmppPacket::QXmppPacket(const QXmppStanza &stanza)
+QXmppPacket::QXmppPacket(const QXmppNonza &nonza)
     : m_interface(new QFutureInterface<QXmpp::PacketState>(QFutureInterfaceBase::Started)),
-      m_isXmppStanza(stanza.isXmppStanza())
+      m_isXmppStanza(nonza.isXmppStanza())
 {
     QXmlStreamWriter xmlStream(&m_data);
-    stanza.toXml(&xmlStream);
+    nonza.toXml(&xmlStream);
 }
 
 QByteArray QXmppPacket::data() const
diff --git a/src/base/QXmppPacket_p.h b/src/base/QXmppPacket_p.h
index 1ec2f592..ea5baca3 100644
--- a/src/base/QXmppPacket_p.h
+++ b/src/base/QXmppPacket_p.h
@@ -29,12 +29,12 @@
 #include <QFutureInterface>
 #include <QSharedPointer>
 
-class QXmppStanza;
+class QXmppNonza;
 
 class QXmppPacket
 {
 public:
-    QXmppPacket(const QXmppStanza &stanza);
+    QXmppPacket(const QXmppNonza &);
 
     QByteArray data() const;
     bool isXmppStanza() const;
diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp
index af4280fc..704fc2fb 100644
--- a/src/base/QXmppStream.cpp
+++ b/src/base/QXmppStream.cpp
@@ -208,7 +208,7 @@ bool QXmppStream::sendData(const QByteArray &data)
 ///
 /// \param stanza
 ///
-bool QXmppStream::sendPacket(const QXmppStanza &stanza)
+bool QXmppStream::sendPacket(const QXmppNonza &stanza)
 {
     // the first result is always reported immediately
     return send(stanza).resultAt(0) != QXmpp::NotSent;
@@ -219,7 +219,7 @@ bool QXmppStream::sendPacket(const QXmppStanza &stanza)
 ///
 /// \since QXmpp 1.5
 ///
-QFuture<QXmpp::PacketState> QXmppStream::send(const QXmppStanza &stanza)
+QFuture<QXmpp::PacketState> QXmppStream::send(const QXmppNonza &stanza)
 {
     QXmppPacket packet(stanza);
     sendPacket(packet);
diff --git a/src/base/QXmppStream.h b/src/base/QXmppStream.h
index 3299b096..62558aa0 100644
--- a/src/base/QXmppStream.h
+++ b/src/base/QXmppStream.h
@@ -37,6 +37,7 @@ template<typename T>
 class QFuture;
 class QSslSocket;
 class QXmppIq;
+class QXmppNonza;
 class QXmppPacket;
 class QXmppStanza;
 class QXmppStreamPrivate;
@@ -54,8 +55,8 @@ public:
 
     virtual bool isConnected() const;
 
-    bool sendPacket(const QXmppStanza &);
-    QFuture<QXmpp::PacketState> send(const QXmppStanza &);
+    bool sendPacket(const QXmppNonza &);
+    QFuture<QXmpp::PacketState> send(const QXmppNonza &);
 
     using IqResult = std::variant<QDomElement, QXmpp::PacketState>;
     QFuture<IqResult> sendIq(const QXmppIq &);
-- 
cgit v1.2.3