From 54ba0aaf13b0bc2dc948ad88d86040daf08f4b73 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 26 Feb 2019 06:20:20 -0500 Subject: [PATCH] [welcome] Use convenience function - Introduce a hasDetails() for RequirementEntry, which is just a short-cut, but makes code more readable. --- src/libcalamaresui/modulesystem/Requirement.h | 7 +++++-- src/modules/welcome/checker/ResultsListWidget.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libcalamaresui/modulesystem/Requirement.h b/src/libcalamaresui/modulesystem/Requirement.h index bf2157f69..396fe852b 100644 --- a/src/libcalamaresui/modulesystem/Requirement.h +++ b/src/libcalamaresui/modulesystem/Requirement.h @@ -45,14 +45,17 @@ struct RequirementEntry /// @brief name of this requirement; not shown to user and used as ID QString name; - /// @brief Description of this requirement, for use in user-visible lists + /// @brief Detailed description of this requirement, for use in user-visible lists TextFunction enumerationText; - /// @brief User-visible string to show that the requirement is not met + /// @brief User-visible string to show that the requirement is not met, short form TextFunction negatedText; bool satisfied; bool mandatory; + + /// @brief Convenience to check if this entry should be shown in details dialog + bool hasDetails() const { return !enumerationText().isEmpty(); } }; using RequirementsList = QList< RequirementEntry >; diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp index 1c566026f..ca1a9459a 100644 --- a/src/modules/welcome/checker/ResultsListWidget.cpp +++ b/src/modules/welcome/checker/ResultsListWidget.cpp @@ -179,7 +179,7 @@ ResultsListWidget::showDetailsDialog( const Calamares::RequirementsList& checkEn for ( const auto& entry : checkEntries ) { - if ( entry.enumerationText().isEmpty() ) + if ( !entry.hasDetails() ) continue; ResultWidget* ciw = new ResultWidget( entry.satisfied, entry.mandatory );