From c8e42e690967adda741b0aaa89a8919ba02915c0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 2 Dec 2017 11:25:26 -0500 Subject: [PATCH] [welcome] Implement requirements checking at module level. - Hook up the requirements checker (which only checks) to the module-and-viewstep method called to do the checking. --- src/modules/welcome/WelcomeViewStep.cpp | 5 +++++ src/modules/welcome/WelcomeViewStep.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp index 4571141d6..d8aed9f37 100644 --- a/src/modules/welcome/WelcomeViewStep.cpp +++ b/src/modules/welcome/WelcomeViewStep.cpp @@ -131,3 +131,8 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap ) cDebug() << "WARNING: no valid requirements map found in welcome " "module configuration."; } + +Calamares::RequirementsList WelcomeViewStep::checkRequirements() +{ + return m_requirementsChecker->checkRequirements( m_widget ); +} diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h index 9d1b5d97f..bdcf30eaf 100644 --- a/src/modules/welcome/WelcomeViewStep.h +++ b/src/modules/welcome/WelcomeViewStep.h @@ -57,6 +57,8 @@ public: void setConfigurationMap( const QVariantMap& configurationMap ) override; + Calamares::RequirementsList checkRequirements() override; + private: WelcomePage* m_widget; RequirementsChecker* m_requirementsChecker;