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

[libcalamares] Add variant-map getStringList() convenience

Browse Source
This commit is contained in:
Adriaan de Groot 2020-06-17 15:02:01 +02:00
parent 98ab4330c4
commit e834ce532c
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libcalamares/utils/Variant.cpp
View File

@ -1,5 +1,5 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* SPDX-FileCopyrightText: 2013-2016 Teo Mrnjavac <teo@kde.org> * SPDX-FileCopyrightText: 2013-2016 Teo Mrnjavac <teo@kde.org>
* SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org> * SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
* *
@ -65,6 +65,20 @@ getString( const QVariantMap& map, const QString& key )
return QString(); return QString();
} }
QStringList
getStringList( const QVariantMap& map, const QString& key )
{
if ( map.contains( key ) )
{
auto v = map.value( key );
if ( v.type() == QVariant::StringList )
{
return v.toStringList();
}
}
return QStringList();
}
qint64 qint64
getInteger( const QVariantMap& map, const QString& key, qint64 d ) getInteger( const QVariantMap& map, const QString& key, qint64 d )
{ {

7
src/libcalamares/utils/Variant.h
View File

@ -1,5 +1,5 @@
/* === This file is part of Calamares - <https://github.com/calamares> === /* === This file is part of Calamares - <https://github.com/calamares> ===
* *
* SPDX-FileCopyrightText: 2013-2016 Teo Mrnjavac <teo@kde.org> * SPDX-FileCopyrightText: 2013-2016 Teo Mrnjavac <teo@kde.org>
* SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org> * SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
* *
@ -43,6 +43,11 @@ DLLEXPORT bool getBool( const QVariantMap& map, const QString& key, bool d );
*/ */
DLLEXPORT QString getString( const QVariantMap& map, const QString& key ); DLLEXPORT QString getString( const QVariantMap& map, const QString& key );
/**
* Get a string list from a mapping; returns empty list if no value.
*/
DLLEXPORT QStringList getStringList( const QVariantMap& map, const QString& key );
/** /**
* Get an integer value from a mapping; returns @p d if no value. * Get an integer value from a mapping; returns @p d if no value.
*/ */