[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

@@ -39,6 +39,7 @@ set( libSources
 
     # Modules
     modulesystem/InstanceKey.cpp
+    modulesystem/Requirement.cpp
 
     # Network service
     network/Manager.cpp

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>

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
 

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>

src/libcalamaresui/modulesystem/ModuleManager.h

@@ -22,8 +22,7 @@
 
 #include "modulesystem/Descriptor.h"
 #include "modulesystem/InstanceKey.h"
-
+#include "modulesystem/Requirement.h"
-#include "Requirement.h"
 
 #include <QObject>
 #include <QStringList>

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
 {

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>