napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[welcome] Make resultWidgets less error-prone

Browse Source 
- instead of counting and needing to keep track of the predicate
   applied while creating the widgets, push nullptrs to the widget
   list instead reflecting "this entry did not satisfy the predicate
   for widget creation".
This commit is contained in:
Adriaan de Groot 2020-01-28 13:50:23 +01:00
parent 39534325e6
commit 28d91979c3
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/modules/welcome/checker/ResultsListWidget.cpp
View File

@ -34,16 +34,29 @@
#include <QLabel>
#include <QVBoxLayout>
/** @brief Add widgets to @p layout for the list @p checkEntries
*
* The @p resultWidgets is filled with pointers to the widgets;
* for each entry in @p checkEntries that satisfies @p predicate,
* a widget is created, otherwise a nullptr is added instead.
*
* Adds all the widgets to the given @p layout.
*
* Afterwards, @p resultWidgets has a length equal to @p checkEntries.
*/
static void
createResultWidgets( QLayout* layout,
QList< ResultWidget* >& resultWidgets,
const Calamares::RequirementsList& checkEntries,
std::function< bool( const Calamares::RequirementEntry& ) > predicate )
{
resultWidgets.clear();
resultWidgets.reserve( checkEntries.count() );
for ( const auto& entry : checkEntries )
{
if ( !predicate( entry ) )
{
resultWidgets.append( nullptr );
continue;
}
@ -127,11 +140,10 @@ ResultsListDialog::retranslate()
int i = 0;
for ( const auto& entry : m_entries )
{
if ( !entry.hasDetails() )
if ( m_resultWidgets[ i ] )
{
continue;
m_resultWidgets[ i ]->setText( entry.enumerationText() );
}
m_resultWidgets[ i ]->setText( entry.enumerationText() );
i++;
}
}
@ -241,7 +253,7 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
{
mainLayout->addStretch();
}
CALAMARES_RETRANSLATE_SLOT( &ResultsListWidget::retranslate )
retranslate();
}
@ -264,11 +276,10 @@ ResultsListWidget::retranslate()
int i = 0;
for ( const auto& entry : m_entries )
{
if ( entry.satisfied )
if ( m_resultWidgets[ i ] )
{
continue;
m_resultWidgets[ i ]->setText( entry.negatedText() );
}
m_resultWidgets[ i ]->setText( entry.negatedText() );
i++;
}
}