From f5e82b8b460ea9e9c25bef7b0f9a9d3bd7e43523 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Sun, 10 Jul 2022 23:10:42 +0200
Subject: Rename Encryption::Omemo to Omemo0 to allow namespace Omemo

Allows it to create a namespace QXmpp::Omemo.
---
 src/base/QXmppGlobal.h  | 6 +++---
 src/base/QXmppMessage.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/base')

diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h
index e5296aec..fe57efc7 100644
--- a/src/base/QXmppGlobal.h
+++ b/src/base/QXmppGlobal.h
@@ -68,7 +68,7 @@ enum Encryption {
     /// \xep{0373, OpenPGP for XMPP}
     Ox,
     /// \xep{0384, OMEMO Encryption}
-    Omemo,
+    Omemo0,
     /// \xep{0384, OMEMO Encryption} since version 0.4
     Omemo1,
     /// \xep{0384, OMEMO Encryption} since version 0.8
@@ -91,8 +91,8 @@ enum Encryption {
     OX = Ox,
     /// \xep{0384, OMEMO Encryption}
     /// \deprecated This enum is deprecated since QXmpp 1.5. Use
-    /// \c QXmpp::Omemo instead.
-    OMEMO = Omemo,
+    /// \c QXmpp::Omemo0 instead.
+    OMEMO = Omemo0,
 #endif
 };
 
diff --git a/src/base/QXmppMessage.h b/src/base/QXmppMessage.h
index aa4d8611..e9d442c1 100644
--- a/src/base/QXmppMessage.h
+++ b/src/base/QXmppMessage.h
@@ -38,7 +38,7 @@ public:
     static const EncryptionMethod OTR = EncryptionMethod::Otr;
     static const EncryptionMethod LegacyOpenPGP = EncryptionMethod::LegacyOpenPgp;
     static const EncryptionMethod OX = EncryptionMethod::Ox;
-    static const EncryptionMethod OMEMO = EncryptionMethod::Omemo;
+    static const EncryptionMethod OMEMO = EncryptionMethod::Omemo0;
     /// \endcond
 #endif
 
-- 
cgit v1.2.3