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

[libcalamaresui] Don't clear the map when inserting strings

Browse Source 
- the documentation doesn't say the map is cleared, and the one
  place this function is used doesn't need that either.
- make type of config explicit
This commit is contained in:
Adriaan de Groot 2020-07-09 08:45:41 +02:00
parent a91edfef89
commit da1cc7c3a5
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcalamaresui/Branding.cpp
View File

@ -132,9 +132,7 @@ loadStrings( QMap< QString, QString >& map,
throw YAML::Exception( YAML::Mark(), std::string( "Branding configuration is not a map: " ) + key ); throw YAML::Exception( YAML::Mark(), std::string( "Branding configuration is not a map: " ) + key );
} }
const auto& config = CalamaresUtils::yamlMapToVariant( doc[ key ] ); const QVariantMap config = CalamaresUtils::yamlMapToVariant( doc[ key ] );
map.clear();
for ( auto it = config.constBegin(); it != config.constEnd(); ++it ) for ( auto it = config.constBegin(); it != config.constEnd(); ++it )
{ {
map.insert( it.key(), transform( it.value().toString() ) ); map.insert( it.key(), transform( it.value().toString() ) );