From b6ca52ba7af7d633c4557adcdcbf00f5fca1e6d1 Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Tue, 25 Aug 2020 17:49:49 +0100
Subject: [PATCH] Issue #77 Move CExplicitLatin1String from json.h to
 metaclass.h

---
 src/blackmisc/json.h      | 21 ---------------------
 src/blackmisc/metaclass.h | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/blackmisc/json.h b/src/blackmisc/json.h
index 86df1caa3..4e6826fe1 100644
--- a/src/blackmisc/json.h
+++ b/src/blackmisc/json.h
@@ -32,27 +32,6 @@ class QDateTime;
 class QPixmap;
 class QStringList;
 
-namespace BlackMisc
-{
-    /*!
-     * Simple literal type containing a single QLatin1String.
-     *
-     * Just useful for encapsulating a QLatin1String in a way that inhibits implicit conversion to QString
-     * to avoid ambiguities in overload resolution.
-     */
-    struct CExplicitLatin1String
-    {
-        //! Embedded string.
-        const QLatin1String m_latin1;
-
-        //! Implicit constructor.
-        constexpr CExplicitLatin1String(QLatin1String s) : m_latin1(s) {}
-
-        //! Implicit conversion.
-        constexpr operator QLatin1String() const { return m_latin1; }
-    };
-}
-
 /*!
  * \defgroup JSON Streaming operators for JSON
  */
diff --git a/src/blackmisc/metaclass.h b/src/blackmisc/metaclass.h
index 6806af9c5..64a36e7d0 100644
--- a/src/blackmisc/metaclass.h
+++ b/src/blackmisc/metaclass.h
@@ -15,6 +15,7 @@
 #include "blackmisc/integersequence.h"
 #include <QHash>
 #include <QString>
+#include <QLatin1String>
 #include <type_traits>
 #include <functional>
 
@@ -102,6 +103,24 @@ namespace BlackMisc
 {
     class CVariant;
 
+    /*!
+     * Simple literal type containing a single QLatin1String.
+     *
+     * Just useful for encapsulating a QLatin1String in a way that inhibits implicit conversion to QString
+     * to avoid ambiguities in overload resolution.
+     */
+    struct CExplicitLatin1String
+    {
+        //! Embedded string.
+        const QLatin1String m_latin1;
+
+        //! Implicit constructor.
+        constexpr CExplicitLatin1String(QLatin1String s) : m_latin1(s) {}
+
+        //! Implicit conversion.
+        constexpr operator QLatin1String() const { return m_latin1; }
+    };
+
     // *INDENT-OFF*
     /*!
      * Type wrapper for passing MetaFlag to CMetaClassIntrospector::with and CMetaClassIntrospector::without.