From 76555840228eb2005e4cd5e28727d710db6bac43 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 31 Mar 2020 22:56:42 +0200
Subject: [PATCH] [libcalamaresui] Move Module to libcalamares

- The Module class has no UI-specific code in it; it's all about
  loading and data-management. Move it out of the UI library.
---
 src/libcalamares/CMakeLists.txt                      |  1 +
 .../modulesystem/Module.cpp                          | 12 ------------
 .../modulesystem/Module.h                            |  2 +-
 src/libcalamaresui/CMakeLists.txt                    |  1 -
 src/libcalamaresui/modulesystem/CppJobModule.h       |  2 +-
 src/libcalamaresui/modulesystem/ModuleManager.cpp    |  2 +-
 src/libcalamaresui/modulesystem/ProcessJobModule.h   |  3 +--
 src/libcalamaresui/modulesystem/PythonJobModule.h    |  3 +--
 .../modulesystem/RequirementsChecker.cpp             |  3 +--
 src/libcalamaresui/modulesystem/ViewModule.h         |  2 +-
 10 files changed, 8 insertions(+), 23 deletions(-)
 rename src/{libcalamaresui => libcalamares}/modulesystem/Module.cpp (96%)
 rename src/{libcalamaresui => libcalamares}/modulesystem/Module.h (99%)

diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index a663552f0..90f9f9046 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -39,6 +39,7 @@ set( libSources
 
     # Modules
     modulesystem/InstanceKey.cpp
+    modulesystem/Module.cpp
     modulesystem/Requirement.cpp
 
     # Network service
diff --git a/src/libcalamaresui/modulesystem/Module.cpp b/src/libcalamares/modulesystem/Module.cpp
similarity index 96%
rename from src/libcalamaresui/modulesystem/Module.cpp
rename to src/libcalamares/modulesystem/Module.cpp
index 08a46e546..9620299ec 100644
--- a/src/libcalamaresui/modulesystem/Module.cpp
+++ b/src/libcalamares/modulesystem/Module.cpp
@@ -20,30 +20,18 @@
 #include "Module.h"
 
 #include "CalamaresConfig.h"
-#include "CppJobModule.h"
-#include "ProcessJobModule.h"
 #include "Settings.h"
-#include "ViewModule.h"
 
 #include "utils/Dirs.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Yaml.h"
 
-#ifdef WITH_PYTHON
-#include "PythonJobModule.h"
-#endif
-
-#ifdef WITH_PYTHONQT
-#include "PythonQtViewModule.h"
-#endif
-
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
 #include <QString>
 
-
 static const char EMERGENCY[] = "emergency";
 
 namespace Calamares
diff --git a/src/libcalamaresui/modulesystem/Module.h b/src/libcalamares/modulesystem/Module.h
similarity index 99%
rename from src/libcalamaresui/modulesystem/Module.h
rename to src/libcalamares/modulesystem/Module.h
index 67b76601a..ba4533fae 100644
--- a/src/libcalamaresui/modulesystem/Module.h
+++ b/src/libcalamares/modulesystem/Module.h
@@ -46,7 +46,7 @@ Module* moduleFromDescriptor( const ModuleSystem::Descriptor& moduleDescriptor,
  * takes care of creating an object of the correct type starting from a module
  * descriptor structure.
  */
-class UIDLLEXPORT Module
+class DLLEXPORT Module
 {
 public:
     /**
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index da4e4b42b..1f554fceb 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/libcalamares ${CMAKE_BINARY_DIR}/sr
 
 set( calamaresui_SOURCES
     modulesystem/CppJobModule.cpp
-    modulesystem/Module.cpp
     modulesystem/ModuleFactory.cpp
     modulesystem/ModuleManager.cpp
     modulesystem/ProcessJobModule.cpp
diff --git a/src/libcalamaresui/modulesystem/CppJobModule.h b/src/libcalamaresui/modulesystem/CppJobModule.h
index 8f7cfb03a..2fd82433c 100644
--- a/src/libcalamaresui/modulesystem/CppJobModule.h
+++ b/src/libcalamaresui/modulesystem/CppJobModule.h
@@ -22,7 +22,7 @@
 #define CALAMARES_CPPJOBMODULE_H
 
 #include "DllMacro.h"
-#include "Module.h"
+#include "modulesystem/Module.h"
 
 class QPluginLoader;
 
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp
index cd79afad4..aa05c6843 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp
@@ -19,11 +19,11 @@
 
 #include "ModuleManager.h"
 
-#include "Module.h"
 #include "RequirementsChecker.h"
 #include "Settings.h"
 #include "ViewManager.h"
 
+#include "modulesystem/Module.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 #include "viewpages/ExecutionViewStep.h"
diff --git a/src/libcalamaresui/modulesystem/ProcessJobModule.h b/src/libcalamaresui/modulesystem/ProcessJobModule.h
index 5be5de837..87c6e2da8 100644
--- a/src/libcalamaresui/modulesystem/ProcessJobModule.h
+++ b/src/libcalamaresui/modulesystem/ProcessJobModule.h
@@ -20,9 +20,8 @@
 #ifndef CALAMARES_PROCESSJOBMODULE_H
 #define CALAMARES_PROCESSJOBMODULE_H
 
-#include "Module.h"
-
 #include "DllMacro.h"
+#include "modulesystem/Module.h"
 
 #include <chrono>
 
diff --git a/src/libcalamaresui/modulesystem/PythonJobModule.h b/src/libcalamaresui/modulesystem/PythonJobModule.h
index 8f65daa48..85f25ab74 100644
--- a/src/libcalamaresui/modulesystem/PythonJobModule.h
+++ b/src/libcalamaresui/modulesystem/PythonJobModule.h
@@ -19,9 +19,8 @@
 #ifndef CALAMARES_PYTHONJOBMODULE_H
 #define CALAMARES_PYTHONJOBMODULE_H
 
-#include "Module.h"
-
 #include "DllMacro.h"
+#include "modulesystem/Module.h"
 
 namespace Calamares
 {
diff --git a/src/libcalamaresui/modulesystem/RequirementsChecker.cpp b/src/libcalamaresui/modulesystem/RequirementsChecker.cpp
index b941adee1..97a4c912f 100644
--- a/src/libcalamaresui/modulesystem/RequirementsChecker.cpp
+++ b/src/libcalamaresui/modulesystem/RequirementsChecker.cpp
@@ -18,8 +18,7 @@
 
 #include "RequirementsChecker.h"
 
-#include "Module.h"
-
+#include "modulesystem/Module.h"
 #include "modulesystem/Requirement.h"
 #include "utils/Logger.h"
 
diff --git a/src/libcalamaresui/modulesystem/ViewModule.h b/src/libcalamaresui/modulesystem/ViewModule.h
index 958b99c1c..1d24ca811 100644
--- a/src/libcalamaresui/modulesystem/ViewModule.h
+++ b/src/libcalamaresui/modulesystem/ViewModule.h
@@ -21,7 +21,7 @@
 #define CALAMARES_VIEWMODULE_H
 
 #include "DllMacro.h"
-#include "Module.h"
+#include "modulesystem/Module.h"
 
 class QPluginLoader;