From 7ef84728ab3744192583eb587a4585c576f5a176 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sat, 18 Jun 2022 21:39:42 +0200
Subject: Move C++-only macros to util.h

This pertains to QUO_IMPLICIT and DECL_DEPRECATED_ENUMERATOR - both can
be used with no connection to Qt meta-type system (which is what
quotient_common.h is for).
---
 lib/e2ee/e2ee.h                | 3 +--
 lib/events/encryptionevent.cpp | 2 --
 lib/events/encryptionevent.h   | 1 -
 lib/quotient_common.h          | 9 ---------
 lib/util.h                     | 9 +++++++++
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/lib/e2ee/e2ee.h b/lib/e2ee/e2ee.h
index 1efd0f16..9501b263 100644
--- a/lib/e2ee/e2ee.h
+++ b/lib/e2ee/e2ee.h
@@ -8,7 +8,6 @@
 #include "converters.h"
 #include "expected.h"
 #include "qolmerrors.h"
-#include "quotient_common.h"
 
 #include <QtCore/QMetaType>
 #include <variant>
@@ -71,7 +70,7 @@ struct IdentityKeys
 };
 
 //! Struct representing the one-time keys.
-struct QUOTIENT_API UnsignedOneTimeKeys
+struct UnsignedOneTimeKeys
 {
     QHash<QString, QHash<QString, QString>> keys;
 
diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
index eb15f38e..1654d6f3 100644
--- a/lib/events/encryptionevent.cpp
+++ b/lib/events/encryptionevent.cpp
@@ -6,8 +6,6 @@
 
 #include "e2ee/e2ee.h"
 
-#include <array>
-
 namespace Quotient {
 static constexpr std::array encryptionStrings { MegolmV1AesSha2AlgoKey };
 
diff --git a/lib/events/encryptionevent.h b/lib/events/encryptionevent.h
index 5b5420ec..c73e5598 100644
--- a/lib/events/encryptionevent.h
+++ b/lib/events/encryptionevent.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "stateevent.h"
-#include "quotient_common.h"
 
 namespace Quotient {
 class QUOTIENT_API EncryptionEventContent {
diff --git a/lib/quotient_common.h b/lib/quotient_common.h
index 136e9f79..e087e7d3 100644
--- a/lib/quotient_common.h
+++ b/lib/quotient_common.h
@@ -41,15 +41,6 @@
     Q_ENUM_NS_IMPL(Enum)                  \
     Q_FLAG_NS(Flags)
 
-#if __cpp_conditional_explicit >= 201806L
-#define QUO_IMPLICIT explicit(false)
-#else
-#define QUO_IMPLICIT
-#endif
-
-#define DECL_DEPRECATED_ENUMERATOR(Deprecated, Recommended) \
-    Deprecated Q_DECL_ENUMERATOR_DEPRECATED_X("Use " #Recommended) = Recommended
-
 namespace Quotient {
 Q_NAMESPACE_EXPORT(QUOTIENT_API)
 
diff --git a/lib/util.h b/lib/util.h
index 5dd69d74..d1623881 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -37,6 +37,15 @@ static_assert(false, "Use Q_DISABLE_MOVE instead; Quotient enables it across all
         QT_WARNING_POP
 #endif
 
+#if __cpp_conditional_explicit >= 201806L
+#define QUO_IMPLICIT explicit(false)
+#else
+#define QUO_IMPLICIT
+#endif
+
+#define DECL_DEPRECATED_ENUMERATOR(Deprecated, Recommended) \
+    Deprecated Q_DECL_ENUMERATOR_DEPRECATED_X("Use " #Recommended) = Recommended
+
 /// \brief Copy an object with slicing
 ///
 /// Unintended slicing is bad, which why there's a C++ Core Guideline that
-- 
cgit v1.2.3