Update to latest settings library version

2018-11-03 13:00:07 +01:00
parent 9ced50e94e
commit ac4a496a06
36 changed files with 373 additions and 374 deletions
@@ -1,49 +1,45 @@
 #pragma once

 #include <QString>
-#include <pajlada/settings/serialize.hpp>
+#include <pajlada/serialize.hpp>

 namespace pajlada {
-namespace Settings {

-    template <>
-    struct Serialize<QString> {
-        static rapidjson::Value get(const QString &value,
-                                    rapidjson::Document::AllocatorType &a)
+template <>
+struct Serialize<QString> {
+    static rapidjson::Value get(const QString &value,
+                                rapidjson::Document::AllocatorType &a)
+    {
+        return rapidjson::Value(value.toUtf8(), a);
+    }
+};
+
+template <>
+struct Deserialize<QString> {
+    static QString get(const rapidjson::Value &value, bool *error = nullptr)
+    {
+        if (!value.IsString())
        {
-            return rapidjson::Value(value.toUtf8(), a);
-        }
-    };
-
-    template <>
-    struct Deserialize<QString> {
-        static QString get(const rapidjson::Value &value, bool *error = nullptr)
-        {
-            if (!value.IsString())
-            {
-                PAJLADA_REPORT_ERROR(error)
-                PAJLADA_THROW_EXCEPTION(
-                    "Deserialized rapidjson::Value is not a string");
-                return QString{};
-            }
-
-            try
-            {
-                return QString::fromUtf8(value.GetString(),
-                                         value.GetStringLength());
-            }
-            catch (const std::exception &)
-            {
-                //            int x = 5;
-            }
-            catch (...)
-            {
-                //            int y = 5;
-            }
-
+            PAJLADA_REPORT_ERROR(error)
            return QString{};
        }
-    };

-}  // namespace Settings
+        try
+        {
+            return QString::fromUtf8(value.GetString(),
+                                     value.GetStringLength());
+        }
+        catch (const std::exception &)
+        {
+            //            int x = 5;
+        }
+        catch (...)
+        {
+            //            int y = 5;
+        }
+
+        return QString{};
+    }
+};
+
 }  // namespace pajlada