From 423fa97d3699b133926aeaab01c216c69555ce6f Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Thu, 29 Sep 2022 15:16:45 +0200
Subject: Rename Encryption to EncryptionMethod to avoid conflicts with
 namespace

There's QXmpp::Private::Encryption. This renames QXmpp::Encryption to
QXmpp::EncryptionMethod to avoid conflicts.
---
 src/base/QXmppStanza.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/base/QXmppStanza.cpp')

diff --git a/src/base/QXmppStanza.cpp b/src/base/QXmppStanza.cpp
index db969327..e7cb0208 100644
--- a/src/base/QXmppStanza.cpp
+++ b/src/base/QXmppStanza.cpp
@@ -716,7 +716,7 @@ void QXmppStanza::Error::toXml(QXmlStreamWriter *writer) const
 class QXmppE2eeMetadataPrivate : public QSharedData
 {
 public:
-    QXmpp::Encryption encryption;
+    QXmpp::EncryptionMethod encryption;
     QByteArray senderKey;
 
     // XEP-0420: Stanza Content Encryption
@@ -753,7 +753,7 @@ QXmppE2eeMetadata &QXmppE2eeMetadata::operator=(QXmppE2eeMetadata &&) = default;
 ///
 /// \return the encryption protocol
 ///
-QXmpp::Encryption QXmppE2eeMetadata::encryption() const
+QXmpp::EncryptionMethod QXmppE2eeMetadata::encryption() const
 {
     return d->encryption;
 }
@@ -763,7 +763,7 @@ QXmpp::Encryption QXmppE2eeMetadata::encryption() const
 ///
 /// \param encryption encryption protocol
 ///
-void QXmppE2eeMetadata::setEncryption(QXmpp::Encryption encryption)
+void QXmppE2eeMetadata::setEncryption(QXmpp::EncryptionMethod encryption)
 {
     d->encryption = encryption;
 }
-- 
cgit v1.2.3