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

[libcalamares] Fix Qt 5.9 compatibility

Browse Source 
- not really sure why I went for the Qt 5.10 STL-style iterators

FIXES #1236
This commit is contained in:
Adriaan de Groot 2019-08-30 06:20:45 -04:00
parent 61482b38cc
commit 9053b9cecf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamares/locale/TranslatableConfiguration.cpp
View File

@ -40,9 +40,9 @@ TranslatedString::TranslatedString( const QVariantMap& map, const QString& key )
QString value = CalamaresUtils::getString( map, key ); QString value = CalamaresUtils::getString( map, key );
m_strings[ QString() ] = value; m_strings[ QString() ] = value;
for ( auto it = map.constKeyValueBegin(); it != map.constKeyValueEnd(); ++it ) for ( auto it = map.constBegin(); it != map.constEnd(); ++it )
{ {
QString subkey = ( *it ).first; QString subkey = it.key();
if ( subkey == key ) if ( subkey == key )
{ {
// Already obtained, above // Already obtained, above
@ -53,7 +53,7 @@ TranslatedString::TranslatedString( const QVariantMap& map, const QString& key )
if ( subkey.indexOf( QRegularExpression( "\\[([a-zA-Z_@]*)\\]" ), 0, &match ) > 0 ) if ( subkey.indexOf( QRegularExpression( "\\[([a-zA-Z_@]*)\\]" ), 0, &match ) > 0 )
{ {
QString language = match.captured( 1 ); QString language = match.captured( 1 );
m_strings[ language ] = ( *it ).second.toString(); m_strings[ language ] = it.value().toString();
} }
} }
} }