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/QXmppMessage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp
index 2e53a223..7998598c 100644
--- a/src/base/QXmppMessage.cpp
+++ b/src/base/QXmppMessage.cpp
@@ -1012,7 +1012,7 @@ void QXmppMessage::setMixUserNick(const QString &mixUserNick)
 ///
 /// \since QXmpp 1.1
 ///
-QXmpp::Encryption QXmppMessage::encryptionMethod() const
+QXmpp::EncryptionMethod QXmppMessage::encryptionMethod() const
 {
     if (d->encryptionMethod.isEmpty()) {
         return QXmpp::NoEncryption;
@@ -1026,7 +1026,7 @@ QXmpp::Encryption QXmppMessage::encryptionMethod() const
 ///
 /// \since QXmpp 1.1
 ///
-void QXmppMessage::setEncryptionMethod(QXmpp::Encryption method)
+void QXmppMessage::setEncryptionMethod(QXmpp::EncryptionMethod method)
 {
     d->encryptionMethod = QXmpp::Private::encryptionToString(method);
 }
-- 
cgit v1.2.3