[license] Tidy up setting-of-entries
- we loop over all the entries anyway, so calculate allLicensesOptional along the way (debatable whether std::none_of is clearer) - always un-check the accept-box when resetting entries.
This commit is contained in:
parent
5ed8ec9990
commit
d8020e3574
@ -130,21 +130,21 @@ void
|
||||
LicensePage::setEntries( const QList< LicenseEntry >& entriesList )
|
||||
{
|
||||
CalamaresUtils::clearLayout( ui->licenseEntriesLayout );
|
||||
|
||||
m_allLicensesOptional = true;
|
||||
|
||||
m_entries.clear();
|
||||
m_entries.reserve( entriesList.count() );
|
||||
|
||||
auto isRequired = []( const LicenseEntry& e ) { return e.m_required; };
|
||||
m_allLicensesOptional = std::none_of( entriesList.cbegin(), entriesList.cend(), isRequired );
|
||||
|
||||
checkAcceptance( false );
|
||||
|
||||
for ( const LicenseEntry& entry : entriesList )
|
||||
{
|
||||
LicenseWidget* w = new LicenseWidget( entry );
|
||||
ui->licenseEntriesLayout->addWidget( w );
|
||||
m_entries.append( w );
|
||||
m_allLicensesOptional &= !entry.isRequired();
|
||||
}
|
||||
ui->licenseEntriesLayout->addStretch();
|
||||
|
||||
ui->acceptCheckBox->setChecked(false);
|
||||
checkAcceptance( false );
|
||||
}
|
||||
|
||||
void
|
||||
|
Loading…
Reference in New Issue
Block a user