Merge branch 'dev' into kitsune-fix-read-receipts-and-markers

1 files changed, 21 insertions, 4 deletions

diff --git a/lib/quotient_common.h b/lib/quotient_common.h
index 13bf7246..3d8ace67 100644
--- a/lib/quotient_common.h
+++ b/lib/quotient_common.h
@@ -7,6 +7,25 @@
 
 #include <array>
 
+// See https://bugreports.qt.io/browse/QTBUG-82295 - despite the comment that
+// Q_FLAG[_NS] "should" be applied to the enum only, Qt doesn't allow to wrap
+// a flag type into a QVariant then. The macros below define Q_FLAG_NS and on
+// top of that add a part of Q_ENUM() that enables the metatype data but goes
+// under the moc radar to avoid double registration of the same data in the map
+// defined in moc_*.cpp
+#define QUO_DECLARE_FLAGS(Flags, Enum) \
+    Q_DECLARE_FLAGS(Flags, Enum)       \
+    Q_ENUM_IMPL(Enum)                  \
+    Q_FLAG(Flags)
+
+#define QUO_DECLARE_FLAGS_NS(Flags, Enum) \
+    Q_DECLARE_FLAGS(Flags, Enum)          \
+    Q_ENUM_NS_IMPL(Enum)                  \
+    Q_FLAG_NS(Flags)
+
+#define DECL_DEPRECATED_ENUMERATOR(Deprecated, Recommended) \
+    Deprecated Q_DECL_ENUMERATOR_DEPRECATED_X("Use " #Recommended) = Recommended
+
 namespace Quotient {
 Q_NAMESPACE
 
@@ -41,8 +60,7 @@ enum class Membership : unsigned int {
     Ban = 0x10,
     Undefined = Invalid
 };
-Q_DECLARE_FLAGS(MembershipMask, Membership)
-Q_FLAG_NS(MembershipMask)
+QUO_DECLARE_FLAGS_NS(MembershipMask, Membership)
 
 constexpr inline auto MembershipStrings = make_array(
     // The order MUST be the same as the order in the original enum
@@ -60,8 +78,7 @@ enum class JoinState : std::underlying_type_t<Membership> {
     Invite = std::underlying_type_t<Membership>(Membership::Invite),
     Knock = std::underlying_type_t<Membership>(Membership::Knock),
 };
-Q_DECLARE_FLAGS(JoinStates, JoinState)
-Q_FLAG_NS(JoinStates)
+QUO_DECLARE_FLAGS_NS(JoinStates, JoinState)
 
 constexpr inline auto JoinStateStrings = make_array(
     MembershipStrings[0], MembershipStrings[1], MembershipStrings[2],