Rename Encryption to EncryptionMethod to avoid conflicts with namespace

There's QXmpp::Private::Encryption. This renames QXmpp::Encryption to
QXmpp::EncryptionMethod to avoid conflicts.

7 files changed, 18 insertions, 18 deletions

diff --git a/src/base/QXmppE2eeMetadata.h b/src/base/QXmppE2eeMetadata.h
index e435ef13..cc6a3b9f 100644
--- a/src/base/QXmppE2eeMetadata.h
+++ b/src/base/QXmppE2eeMetadata.h
@@ -26,8 +26,8 @@ public:
     QXmppE2eeMetadata &operator=(const QXmppE2eeMetadata &other);
     QXmppE2eeMetadata &operator=(QXmppE2eeMetadata &&);
 
-    QXmpp::Encryption encryption() const;
-    void setEncryption(QXmpp::Encryption encryption);
+    QXmpp::EncryptionMethod encryption() const;
+    void setEncryption(QXmpp::EncryptionMethod encryption);
 
     QByteArray senderKey() const;
     void setSenderKey(const QByteArray &keyId);
diff --git a/src/base/QXmppGlobal.cpp b/src/base/QXmppGlobal.cpp
index ac5abea8..31a65ffa 100644
--- a/src/base/QXmppGlobal.cpp
+++ b/src/base/QXmppGlobal.cpp
@@ -30,21 +30,21 @@ static const QStringList ENCRYPTION_NAMES = {
     QStringLiteral("OMEMO 2")
 };
 
-std::optional<QXmpp::Encryption> QXmpp::Private::encryptionFromString(const QString &str)
+std::optional<QXmpp::EncryptionMethod> QXmpp::Private::encryptionFromString(const QString &str)
 {
     int index = ENCRYPTION_NAMESPACES.indexOf(str);
     if (index < 0) {
         return {};
     }
-    return QXmpp::Encryption(index);
+    return QXmpp::EncryptionMethod(index);
 }
 
-QString QXmpp::Private::encryptionToString(Encryption encryption)
+QString QXmpp::Private::encryptionToString(EncryptionMethod encryption)
 {
     return ENCRYPTION_NAMESPACES.at(int(encryption));
 }
 
-QString QXmpp::Private::encryptionToName(Encryption encryption)
+QString QXmpp::Private::encryptionToName(EncryptionMethod encryption)
 {
     return ENCRYPTION_NAMES.at(int(encryption));
 }
diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h
index f2389306..95867a2c 100644
--- a/src/base/QXmppGlobal.h
+++ b/src/base/QXmppGlobal.h
@@ -74,7 +74,7 @@ namespace QXmpp {
 ///
 /// \since QXmpp 1.5
 ///
-enum Encryption {
+enum EncryptionMethod {
     /// No encryption
     NoEncryption,
     /// Unknown encryption
diff --git a/src/base/QXmppGlobal_p.h b/src/base/QXmppGlobal_p.h
index 906d1dce..2cd78bea 100644
--- a/src/base/QXmppGlobal_p.h
+++ b/src/base/QXmppGlobal_p.h
@@ -11,9 +11,9 @@
 
 namespace QXmpp::Private {
 
-std::optional<Encryption> encryptionFromString(const QString &str);
-QString encryptionToString(Encryption);
-QString encryptionToName(Encryption);
+std::optional<EncryptionMethod> encryptionFromString(const QString &str);
+QString encryptionToString(EncryptionMethod);
+QString encryptionToName(EncryptionMethod);
 
 }  // namespace QXmpp::Private
 
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);
 }
diff --git a/src/base/QXmppMessage.h b/src/base/QXmppMessage.h
index 51547f0a..899f477e 100644
--- a/src/base/QXmppMessage.h
+++ b/src/base/QXmppMessage.h
@@ -35,7 +35,7 @@ class QXMPP_EXPORT QXmppMessage : public QXmppStanza
 public:
 #if QXMPP_DEPRECATED_SINCE(1, 5)
     /// \cond
-    using EncryptionMethod = QXmpp::Encryption;
+    using EncryptionMethod = QXmpp::EncryptionMethod;
 
     static const EncryptionMethod NoEncryption = EncryptionMethod::NoEncryption;
     static const EncryptionMethod UnknownEncryption = EncryptionMethod::UnknownEncryption;
@@ -226,8 +226,8 @@ public:
     void setMixUserNick(const QString &);
 
     // XEP-0380: Explicit Message Encryption
-    QXmpp::Encryption encryptionMethod() const;
-    void setEncryptionMethod(QXmpp::Encryption);
+    QXmpp::EncryptionMethod encryptionMethod() const;
+    void setEncryptionMethod(QXmpp::EncryptionMethod);
     QString encryptionMethodNs() const;
     void setEncryptionMethodNs(const QString &);
 
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;
 }