From ca5065c2c9b10250d8728517cc2b48e638831eaf Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Fri, 13 May 2022 19:34:42 +0200
Subject: E2eeExtension: Rename EncryptMessageResult to MessageEncryptResult

---
 src/client/QXmppClient.cpp        | 6 +++---
 src/client/QXmppE2eeExtension.cpp | 4 +---
 src/client/QXmppE2eeExtension.h   | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/client')

diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index 104d94e4..650e9991 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -29,7 +29,7 @@
 #include <QTimer>
 
 using namespace QXmpp::Private;
-using EncryptMessageResult = QXmppE2eeExtension::EncryptMessageResult;
+using MessageEncryptResult = QXmppE2eeExtension::MessageEncryptResult;
 using IqEncryptResult = QXmppE2eeExtension::IqEncryptResult;
 using IqDecryptResult = QXmppE2eeExtension::IqDecryptResult;
 
@@ -408,10 +408,10 @@ bool QXmppClient::sendPacket(const QXmppNonza &packet)
 ///
 QFuture<QXmpp::SendResult> QXmppClient::send(QXmppStanza &&stanza)
 {
-    const auto sendEncrypted = [this](QFuture<EncryptMessageResult> &&future) {
+    const auto sendEncrypted = [this](QFuture<MessageEncryptResult> &&future) {
         QFutureInterface<QXmpp::SendResult> interface(QFutureInterfaceBase::Started);
 
-        await(future, this, [this, interface](EncryptMessageResult &&result) mutable {
+        await(future, this, [this, interface](MessageEncryptResult &&result) mutable {
             if (const auto *xml = std::get_if<QByteArray>(&result)) {
                 auto future = d->stream->send(QXmppPacket(*xml, true, interface));
                 await(future, this, [interface](QXmpp::SendResult &&result) mutable {
diff --git a/src/client/QXmppE2eeExtension.cpp b/src/client/QXmppE2eeExtension.cpp
index f439e85d..1a6d5e5c 100644
--- a/src/client/QXmppE2eeExtension.cpp
+++ b/src/client/QXmppE2eeExtension.cpp
@@ -19,11 +19,9 @@
 ///
 /// Indicates that the input was not encrypted and so nothing could be decrypted.
 ///
-/// \since QXmpp 1.5
-///
 
 ///
-/// \typedef QXmppE2eeExtension::EncryptMessageResult
+/// \typedef QXmppE2eeExtension::MessageEncryptResult
 ///
 /// Contains the XML serialized message stanza with encrypted contents or a
 /// QXmpp::SendError in case the message couldn't be encrypted.
diff --git a/src/client/QXmppE2eeExtension.h b/src/client/QXmppE2eeExtension.h
index 39d74d23..442d94ba 100644
--- a/src/client/QXmppE2eeExtension.h
+++ b/src/client/QXmppE2eeExtension.h
@@ -21,11 +21,11 @@ public:
     {
     };
 
-    using EncryptMessageResult = std::variant<QByteArray, QXmpp::SendError>;
+    using MessageEncryptResult = std::variant<QByteArray, QXmpp::SendError>;
     using IqEncryptResult = std::variant<QByteArray, QXmpp::SendError>;
     using IqDecryptResult = std::variant<QDomElement, NotEncrypted, QXmpp::SendError>;
 
-    virtual QFuture<EncryptMessageResult> encryptMessage(QXmppMessage &&) = 0;
+    virtual QFuture<MessageEncryptResult> encryptMessage(QXmppMessage &&) = 0;
 
     virtual QFuture<IqEncryptResult> encryptIq(QXmppIq &&) = 0;
     virtual QFuture<IqDecryptResult> decryptIq(const QDomElement &) = 0;
-- 
cgit v1.2.3