From f1ddd0c233c61a1f649de443a2ee6ad6a9e16673 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 2 May 2019 14:00:32 -0400 Subject: [PATCH] [welcome] Simplify configuration code --- src/modules/welcome/WelcomeViewStep.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp index 88b5f6324..d1c2cc840 100644 --- a/src/modules/welcome/WelcomeViewStep.cpp +++ b/src/modules/welcome/WelcomeViewStep.cpp @@ -24,6 +24,7 @@ #include "modulesystem/ModuleManager.h" #include "utils/Logger.h" +#include "utils/Variant.h" #include @@ -97,18 +98,9 @@ WelcomeViewStep::jobs() const void WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { - bool showSupportUrl = - configurationMap.contains( "showSupportUrl" ) && - configurationMap.value( "showSupportUrl" ).type() == QVariant::Bool && - configurationMap.value( "showSupportUrl" ).toBool(); - bool showKnownIssuesUrl = - configurationMap.contains( "showKnownIssuesUrl" ) && - configurationMap.value( "showKnownIssuesUrl" ).type() == QVariant::Bool && - configurationMap.value( "showKnownIssuesUrl" ).toBool(); - bool showReleaseNotesUrl = - configurationMap.contains( "showReleaseNotesUrl" ) && - configurationMap.value( "showReleaseNotesUrl" ).type() == QVariant::Bool && - configurationMap.value( "showReleaseNotesUrl" ).toBool(); + bool showSupportUrl = CalamaresUtils::getBool( configurationMap, "showSupportUrl", false ); + bool showKnownIssuesUrl = CalamaresUtils::getBool( configurationMap, "showKnownIssuesUrl", false ); + bool showReleaseNotesUrl = CalamaresUtils::getBool( configurationMap, "showReleaseNotesUrl", false ); m_widget->setUpLinks( showSupportUrl, showKnownIssuesUrl,