From c245238b89a9ec7d979cedfee4b967a99ade80a1 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 20 Apr 2019 11:58:01 -0400
Subject: [PATCH] [license] Use standard algorithms, simplify code

 - Introduce isRequired() for readability later
 - Use std::any_of instead of rolling own loop
---
 src/modules/license/LicensePage.cpp | 12 +++---------
 src/modules/license/LicensePage.h   |  1 +
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp
index f21c222a2..1c1129513 100644
--- a/src/modules/license/LicensePage.cpp
+++ b/src/modules/license/LicensePage.cpp
@@ -41,6 +41,8 @@
 #include <QComboBox>
 #include <QMessageBox>
 
+#include <algorithm>
+
 const NamedEnumTable< LicenseEntry::Type >&
 LicenseEntry::typeNames()
 {
@@ -134,15 +136,7 @@ LicensePage::setEntries( const QList< LicenseEntry >& entriesList )
 {
     CalamaresUtils::clearLayout( ui->licenseEntriesLayout );
 
-    bool required = false;
-    for ( const LicenseEntry& entry : entriesList )
-    {
-        if ( entry.m_required )
-        {
-            required = true;
-            break;
-        }
-    }
+    const bool required = std::any_of( entriesList.cbegin(), entriesList.cend(), []( const LicenseEntry& e ){ return e.m_required; });
 
     m_isNextEnabled = !required;
     nextStatusChanged( m_isNextEnabled );
diff --git a/src/modules/license/LicensePage.h b/src/modules/license/LicensePage.h
index 4fbd163eb..b2e343602 100644
--- a/src/modules/license/LicensePage.h
+++ b/src/modules/license/LicensePage.h
@@ -51,6 +51,7 @@ struct LicenseEntry
     LicenseEntry( const LicenseEntry& ) = default;
 
     bool isValid() const { return !m_id.isEmpty(); }
+    bool isRequired() const { return m_required; }
 
     QString m_id;
     QString m_prettyName;