From 4d459f7fc06dc832ed7f639914262e7f18e3e64a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 5 Apr 2018 04:31:13 -0400
Subject: [PATCH] [libcalamares] Move non-UI stuff from libcalamaresui

 - Settings is just a settings class, no UI involved, so
   move to libcalamares where it can be used also from
   system helpers.
 - YAML utilities are useful at a lower level of the stack, too.
---
 src/libcalamares/CMakeLists.txt                          | 9 +++++++--
 src/{libcalamaresui => libcalamares}/Settings.cpp        | 0
 src/{libcalamaresui => libcalamares}/Settings.h          | 0
 src/{libcalamaresui => libcalamares}/utils/YamlUtils.cpp | 0
 src/{libcalamaresui => libcalamares}/utils/YamlUtils.h   | 0
 src/libcalamaresui/CMakeLists.txt                        | 3 ---
 6 files changed, 7 insertions(+), 5 deletions(-)
 rename src/{libcalamaresui => libcalamares}/Settings.cpp (100%)
 rename src/{libcalamaresui => libcalamares}/Settings.h (100%)
 rename src/{libcalamaresui => libcalamares}/utils/YamlUtils.cpp (100%)
 rename src/{libcalamaresui => libcalamares}/utils/YamlUtils.h (100%)

diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 2a1cfeb20..cbc049ac6 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -18,6 +18,7 @@ set( libSources
     Job.cpp
     JobQueue.cpp
     ProcessJob.cpp
+    Settings.cpp
 )
 set( utilsSources
     utils/CalamaresUtils.cpp
@@ -26,6 +27,7 @@ set( utilsSources
     utils/Logger.cpp
     utils/PluginFactory.cpp
     utils/Retranslator.cpp
+    utils/YamlUtils.cpp
 )
 set( kdsagSources
     kdsingleapplicationguard/kdsingleapplicationguard.cpp
@@ -88,8 +90,11 @@ set_target_properties( calamares
 )
 
 target_link_libraries( calamares
-    LINK_PRIVATE ${OPTIONAL_PRIVATE_LIBRARIES}
-    LINK_PUBLIC Qt5::Core
+    LINK_PRIVATE
+        ${OPTIONAL_PRIVATE_LIBRARIES}
+    LINK_PUBLIC
+        ${YAMLCPP_LIBRARY}
+        Qt5::Core
 )
 
 install( TARGETS calamares
diff --git a/src/libcalamaresui/Settings.cpp b/src/libcalamares/Settings.cpp
similarity index 100%
rename from src/libcalamaresui/Settings.cpp
rename to src/libcalamares/Settings.cpp
diff --git a/src/libcalamaresui/Settings.h b/src/libcalamares/Settings.h
similarity index 100%
rename from src/libcalamaresui/Settings.h
rename to src/libcalamares/Settings.h
diff --git a/src/libcalamaresui/utils/YamlUtils.cpp b/src/libcalamares/utils/YamlUtils.cpp
similarity index 100%
rename from src/libcalamaresui/utils/YamlUtils.cpp
rename to src/libcalamares/utils/YamlUtils.cpp
diff --git a/src/libcalamaresui/utils/YamlUtils.h b/src/libcalamares/utils/YamlUtils.h
similarity index 100%
rename from src/libcalamaresui/utils/YamlUtils.h
rename to src/libcalamares/utils/YamlUtils.h
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index 7c3e8fca2..6bbb285bb 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -10,7 +10,6 @@ set( calamaresui_SOURCES
     utils/CalamaresUtilsGui.cpp
     utils/DebugWindow.cpp
     utils/ImageRegistry.cpp
-    utils/YamlUtils.cpp
 
     utils/qjsonmodel.cpp
     utils/qjsonitem.cpp
@@ -25,7 +24,6 @@ set( calamaresui_SOURCES
 
     ExecutionViewStep.cpp
     Branding.cpp
-    Settings.cpp
     ViewManager.cpp
 )
 
@@ -71,7 +69,6 @@ calamares_add_library( calamaresui
     UI ${calamaresui_UI}
     EXPORT_MACRO UIDLLEXPORT_PRO
     LINK_PRIVATE_LIBRARIES
-        ${YAMLCPP_LIBRARY}
         ${OPTIONAL_PRIVATE_LIBRARIES}
     LINK_LIBRARIES
         Qt5::Svg