From b6fed964ce6072ee34211a915cd3198755c22529 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 2 Dec 2017 11:20:45 -0500
Subject: [PATCH] [libcalamaresui] Defer requirements checking of ViewModules
 to their ViewSteps

---
 src/libcalamaresui/modulesystem/ViewModule.cpp | 6 ++++++
 src/libcalamaresui/modulesystem/ViewModule.h   | 2 ++
 src/libcalamaresui/viewpages/ViewStep.cpp      | 6 ++++++
 src/libcalamaresui/viewpages/ViewStep.h        | 3 +++
 4 files changed, 17 insertions(+)

diff --git a/src/libcalamaresui/modulesystem/ViewModule.cpp b/src/libcalamaresui/modulesystem/ViewModule.cpp
index 419cad611..b6270f397 100644
--- a/src/libcalamaresui/modulesystem/ViewModule.cpp
+++ b/src/libcalamaresui/modulesystem/ViewModule.cpp
@@ -126,4 +126,10 @@ ViewModule::~ViewModule()
     delete m_loader;
 }
 
+RequirementsList
+ViewModule::checkRequirements()
+{
+    return m_viewStep->checkRequirements();
+}
+
 } // namespace Calamares
diff --git a/src/libcalamaresui/modulesystem/ViewModule.h b/src/libcalamaresui/modulesystem/ViewModule.h
index 323315947..50a374e56 100644
--- a/src/libcalamaresui/modulesystem/ViewModule.h
+++ b/src/libcalamaresui/modulesystem/ViewModule.h
@@ -39,6 +39,8 @@ public:
     void loadSelf() override;
     JobList jobs() const override;
 
+    RequirementsList checkRequirements() override;
+
 protected:
     void initFrom( const QVariantMap& moduleDescriptor ) override;
 
diff --git a/src/libcalamaresui/viewpages/ViewStep.cpp b/src/libcalamaresui/viewpages/ViewStep.cpp
index 96d80cb5f..1694d5bad 100644
--- a/src/libcalamaresui/viewpages/ViewStep.cpp
+++ b/src/libcalamaresui/viewpages/ViewStep.cpp
@@ -66,4 +66,10 @@ ViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     Q_UNUSED( configurationMap );
 }
 
+
+RequirementsList ViewStep::checkRequirements()
+{
+    return RequirementsList();
+}
+
 }
diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h
index f69f872e2..0cfbec84a 100644
--- a/src/libcalamaresui/viewpages/ViewStep.h
+++ b/src/libcalamaresui/viewpages/ViewStep.h
@@ -22,6 +22,7 @@
 
 #include <QObject>
 
+#include "modulesystem/Requirement.h"
 #include "../UiDllMacro.h"
 #include "Typedefs.h"
 
@@ -101,6 +102,8 @@ public:
 
     virtual void setConfigurationMap( const QVariantMap& configurationMap );
 
+    virtual RequirementsList checkRequirements();
+
 signals:
     void nextStatusChanged( bool status );
     void done();