From 4ddd1ecceb83b760fb5d680ce17cb8c0dbe1e485 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 31 Mar 2020 22:13:30 +0200
Subject: [PATCH] [libcalamares] Move Requirement to libcalamares

- This isn't a UI component: a requirement can be checked and
  reported-on without a UI entirely.
---
 src/libcalamares/CMakeLists.txt                              | 1 +
 .../modulesystem/Requirement.cpp                             | 0
 .../modulesystem/Requirement.h                               | 2 ++
 src/libcalamaresui/CMakeLists.txt                            | 1 -
 src/libcalamaresui/modulesystem/Module.h                     | 4 ++--
 src/libcalamaresui/modulesystem/ModuleManager.h              | 3 +--
 src/libcalamaresui/modulesystem/RequirementsChecker.cpp      | 5 ++---
 src/libcalamaresui/modulesystem/RequirementsChecker.h        | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename src/{libcalamaresui => libcalamares}/modulesystem/Requirement.cpp (100%)
 rename src/{libcalamaresui => libcalamares}/modulesystem/Requirement.h (98%)

diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 608768a97..a663552f0 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -39,6 +39,7 @@ set( libSources
 
     # Modules
     modulesystem/InstanceKey.cpp
+    modulesystem/Requirement.cpp
 
     # Network service
     network/Manager.cpp
diff --git a/src/libcalamaresui/modulesystem/Requirement.cpp b/src/libcalamares/modulesystem/Requirement.cpp
similarity index 100%
rename from src/libcalamaresui/modulesystem/Requirement.cpp
rename to src/libcalamares/modulesystem/Requirement.cpp
diff --git a/src/libcalamaresui/modulesystem/Requirement.h b/src/libcalamares/modulesystem/Requirement.h
similarity index 98%
rename from src/libcalamaresui/modulesystem/Requirement.h
rename to src/libcalamares/modulesystem/Requirement.h
index 3f8d1a54b..da3cf29dd 100644
--- a/src/libcalamaresui/modulesystem/Requirement.h
+++ b/src/libcalamares/modulesystem/Requirement.h
@@ -18,6 +18,8 @@
 #ifndef CALAMARES_REQUIREMENT_H
 #define CALAMARES_REQUIREMENT_H
 
+#include "DllMacro.h"
+
 #include <QList>
 #include <QMetaType>
 #include <QString>
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index c603ca22d..ed50d777b 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -9,7 +9,6 @@ set( calamaresui_SOURCES
     modulesystem/Module.cpp
     modulesystem/ModuleManager.cpp
     modulesystem/ProcessJobModule.cpp
-    modulesystem/Requirement.cpp
     modulesystem/RequirementsChecker.cpp
     modulesystem/ViewModule.cpp
 
diff --git a/src/libcalamaresui/modulesystem/Module.h b/src/libcalamaresui/modulesystem/Module.h
index 0891f8a25..5455916e4 100644
--- a/src/libcalamaresui/modulesystem/Module.h
+++ b/src/libcalamaresui/modulesystem/Module.h
@@ -20,12 +20,12 @@
 #ifndef CALAMARES_MODULE_H
 #define CALAMARES_MODULE_H
 
-#include "Job.h"
-#include "Requirement.h"
 #include "DllMacro.h"
+#include "Job.h"
 
 #include "modulesystem/Descriptor.h"
 #include "modulesystem/InstanceKey.h"
+#include "modulesystem/Requirement.h"
 
 #include <QStringList>
 #include <QVariant>
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.h b/src/libcalamaresui/modulesystem/ModuleManager.h
index be485c01d..fdb63cd87 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.h
+++ b/src/libcalamaresui/modulesystem/ModuleManager.h
@@ -22,8 +22,7 @@
 
 #include "modulesystem/Descriptor.h"
 #include "modulesystem/InstanceKey.h"
-
-#include "Requirement.h"
+#include "modulesystem/Requirement.h"
 
 #include <QObject>
 #include <QStringList>
diff --git a/src/libcalamaresui/modulesystem/RequirementsChecker.cpp b/src/libcalamaresui/modulesystem/RequirementsChecker.cpp
index 41281c9b9..b941adee1 100644
--- a/src/libcalamaresui/modulesystem/RequirementsChecker.cpp
+++ b/src/libcalamaresui/modulesystem/RequirementsChecker.cpp
@@ -19,17 +19,16 @@
 #include "RequirementsChecker.h"
 
 #include "Module.h"
-#include "Requirement.h"
 
+#include "modulesystem/Requirement.h"
 #include "utils/Logger.h"
 
-#include <algorithm>
-
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QTimer>
 #include <QtConcurrent/QtConcurrent>
 
+#include <algorithm>
 
 namespace Calamares
 {
diff --git a/src/libcalamaresui/modulesystem/RequirementsChecker.h b/src/libcalamaresui/modulesystem/RequirementsChecker.h
index 2e1708016..7cda10fbc 100644
--- a/src/libcalamaresui/modulesystem/RequirementsChecker.h
+++ b/src/libcalamaresui/modulesystem/RequirementsChecker.h
@@ -18,7 +18,7 @@
 #ifndef CALAMARES_REQUIREMENTSCHECKER_H
 #define CALAMARES_REQUIREMENTSCHECKER_H
 
-#include "Requirement.h"
+#include "modulesystem/Requirement.h"
 
 #include <QFutureWatcher>
 #include <QObject>