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

[locale] Factor out a simple lambda

Browse Source 
- If this was handed to an algorithm it would make more sense
   as a lambda
This commit is contained in:
Adriaan de Groot 2019-09-07 15:58:56 +02:00
parent 3093f635e2
commit 5a24e45e3b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/locale/LocalePage.cpp
View File

@ -127,6 +127,18 @@ LocalePage::updateLocaleLabels()
m_formatsLabel->setText( labels.second ); m_formatsLabel->setText( labels.second );
} }
static inline bool
containsLocation( const QList< LocaleGlobal::Location >& locations, const QString& zone )
{
for ( const LocaleGlobal::Location& location : locations )
{
if ( location.zone == zone )
{
return true;
}
}
return false;
}
void void
LocalePage::init( const QString& initialRegion, const QString& initialZone, const QString& localeGenPath ) LocalePage::init( const QString& initialRegion, const QString& initialZone, const QString& localeGenPath )
@ -150,18 +162,6 @@ LocalePage::init( const QString& initialRegion, const QString& initialZone, cons
m_regionCombo->currentIndexChanged( m_regionCombo->currentIndex() ); m_regionCombo->currentIndexChanged( m_regionCombo->currentIndex() );
// Default location
auto containsLocation = []( const QList< LocaleGlobal::Location >& locations, const QString& zone ) -> bool {
for ( const LocaleGlobal::Location& location : locations )
{
if ( location.zone == zone )
{
return true;
}
}
return false;
};
if ( keys.contains( initialRegion ) && containsLocation( regions.value( initialRegion ), initialZone ) ) if ( keys.contains( initialRegion ) && containsLocation( regions.value( initialRegion ), initialZone ) )
{ {
m_tzWidget->setCurrentLocation( initialRegion, initialZone ); m_tzWidget->setCurrentLocation( initialRegion, initialZone );