From 85d9f14aa8bac16ab341662c770b64a15c21628b Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Wed, 3 Jan 2018 16:39:32 +0100
Subject: Changed from qbs to cmake

---
 lib/settings/CMakeLists.txt    | 10 ++++++++++
 lib/settings/configuration.cpp |  4 ++++
 lib/settings/settings.qbs      | 38 --------------------------------------
 3 files changed, 14 insertions(+), 38 deletions(-)
 create mode 100644 lib/settings/CMakeLists.txt
 delete mode 100644 lib/settings/settings.qbs

(limited to 'lib/settings')

diff --git a/lib/settings/CMakeLists.txt b/lib/settings/CMakeLists.txt
new file mode 100644
index 0000000..704c40f
--- /dev/null
+++ b/lib/settings/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.1.0)
+
+add_library(configuration
+        configuration.cpp
+        configuration.h
+        settingsdialog.cpp
+        settingsdialog.h
+        settingsdialog.ui)
+
+target_link_libraries(configuration Qt5::Widgets)
\ No newline at end of file
diff --git a/lib/settings/configuration.cpp b/lib/settings/configuration.cpp
index 34d50db..4603779 100644
--- a/lib/settings/configuration.cpp
+++ b/lib/settings/configuration.cpp
@@ -214,6 +214,8 @@ void Configuration::setValue(std::string path, const T &val)
         // compiler complained about operator= not taking unsinged ints, longs and long longs
         if constexpr(std::is_unsigned_v<T> && !std::is_same_v<T, bool>) {
             setting = static_cast<typename std::make_signed_t<T>>(val);
+        } else if constexpr(std::is_same_v<T, std::string>) {
+            setting = static_cast<std::string>(val).c_str();
         } else {
             setting = val;
         }
@@ -240,6 +242,8 @@ void Configuration::setValue(std::string path, const T &val)
 
     if constexpr(std::is_unsigned_v<T> && !std::is_same_v<T, bool>) {
         *userSetting = static_cast<typename std::make_signed_t<T>>(val);
+    } else if constexpr(std::is_same_v<T, std::string>) {
+        *userSetting = static_cast<std::string>(val).c_str();
     } else {
         *userSetting = val;
     }
diff --git a/lib/settings/settings.qbs b/lib/settings/settings.qbs
deleted file mode 100644
index 0559daa..0000000
--- a/lib/settings/settings.qbs
+++ /dev/null
@@ -1,38 +0,0 @@
-import qbs
-
-Project {
-    name: "Settings"
-
-    StaticLibrary {
-        name: "settings"
-
-        Depends { name: "cpp" }
-
-        cpp.defines: "C_LIKE_CONFIG"
-        cpp.cxxLanguageVersion: "c++17"
-
-        files: [
-            "configuration.cpp",
-            "configuration.h"
-        ]
-    }
-
-    StaticLibrary {
-        name: "settingsDialog"
-
-        Depends { name: "cpp" }
-
-        Depends {
-            name: "Qt"
-            submodules: ["core", "widgets"]
-        }
-
-        cpp.cxxLanguageVersion: "c++17"
-
-        files: [
-            "settingsdialog.cpp",
-            "settingsdialog.h",
-            "settingsdialog.ui",
-        ]
-    }
-}
-- 
cgit v1.2.1