From f5c0e57f177a011715e08e5ca356e224cb5caf78 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 28 Jan 2020 13:02:39 +0100
Subject: [PATCH] [welcome] Improve variable naming

 - these two are about whether all the checkEntries are satisfied
   (in general, and the mandatory ones) so make the names reflect that.
---
 src/modules/welcome/checker/ResultsListWidget.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp
index 612ba62ce..5cb58e6b5 100644
--- a/src/modules/welcome/checker/ResultsListWidget.cpp
+++ b/src/modules/welcome/checker/ResultsListWidget.cpp
@@ -157,8 +157,8 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
     spacerLayout->addSpacing( paddingSize );
     CalamaresUtils::unmarginLayout( spacerLayout );
 
-    bool allChecked = true;
-    bool requirementsSatisfied = true;
+    bool requirementsSatisfied = true;  // Give a warning
+    bool mandatorySatisfied = true;  // Give an error
 
     for ( const auto& entry : checkEntries )
     {
@@ -169,10 +169,10 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
             entriesLayout->addWidget( ciw );
             ciw->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
 
-            allChecked = false;
+            requirementsSatisfied = false;
             if ( entry.mandatory )
             {
-                requirementsSatisfied = false;
+                mandatorySatisfied = false;
             }
 
             ciw->setAutoFillBackground( true );
@@ -191,11 +191,11 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
     entriesLayout->insertWidget( 0, textLabel );
     textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
 
-    if ( !allChecked )
+    if ( !requirementsSatisfied )
     {
         entriesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 );
 
-        if ( !requirementsSatisfied )
+        if ( !mandatorySatisfied )
         {
             CALAMARES_RETRANSLATE( QString message = Calamares::Settings::instance()->isSetupMode()
                                        ? tr( "This computer does not satisfy the minimum "
@@ -230,7 +230,7 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
         }
     }
 
-    if ( allChecked && requirementsSatisfied )
+    if ( requirementsSatisfied && mandatorySatisfied )
     {
         if ( !Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductWelcome ).isEmpty() )
         {