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

Merge pull request #1491 from asif-mahmud/calamares

Browse Source 
[libcalamares] retrieving string list fix
This commit is contained in:
Adriaan de Groot 2020-08-18 16:41:56 +02:00 committed by GitHub
commit a5555c3f94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/utils/Variant.cpp
View File

@ -67,7 +67,7 @@ getStringList( const QVariantMap& map, const QString& key, const QStringList& d
if ( map.contains( key ) ) if ( map.contains( key ) )
{ {
auto v = map.value( key ); auto v = map.value( key );
if ( v.type() == QVariant::StringList ) if ( v.canConvert( QMetaType::QStringList ) )
{ {
return v.toStringList(); return v.toStringList();
} }
@ -81,7 +81,7 @@ getInteger( const QVariantMap& map, const QString& key, qint64 d )
if ( map.contains( key ) ) if ( map.contains( key ) )
{ {
auto v = map.value( key ); auto v = map.value( key );
return v.toString().toLongLong(nullptr, 0); return v.toString().toLongLong( nullptr, 0 );
} }
return d; return d;
} }
@ -92,7 +92,7 @@ getUnsignedInteger( const QVariantMap& map, const QString& key, quint64 d )
if ( map.contains( key ) ) if ( map.contains( key ) )
{ {
auto v = map.value( key ); auto v = map.value( key );
return v.toString().toULongLong(nullptr, 0); return v.toString().toULongLong( nullptr, 0 );
} }
return d; return d;
} }