From e834ce532c35931386eb3e50bf3ff9cce2e84d81 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 17 Jun 2020 15:02:01 +0200 Subject: [PATCH] [libcalamares] Add variant-map getStringList() convenience --- src/libcalamares/utils/Variant.cpp | 16 +++++++++++++++- src/libcalamares/utils/Variant.h | 7 ++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/utils/Variant.cpp b/src/libcalamares/utils/Variant.cpp index cf6ff91fe..dc20e73b2 100644 --- a/src/libcalamares/utils/Variant.cpp +++ b/src/libcalamares/utils/Variant.cpp @@ -1,5 +1,5 @@ /* === This file is part of Calamares - === - * + * * SPDX-FileCopyrightText: 2013-2016 Teo Mrnjavac * SPDX-FileCopyrightText: 2018 Adriaan de Groot * @@ -65,6 +65,20 @@ getString( const QVariantMap& map, const QString& key ) 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 getInteger( const QVariantMap& map, const QString& key, qint64 d ) { diff --git a/src/libcalamares/utils/Variant.h b/src/libcalamares/utils/Variant.h index a05d281c3..643d8ae98 100644 --- a/src/libcalamares/utils/Variant.h +++ b/src/libcalamares/utils/Variant.h @@ -1,5 +1,5 @@ /* === This file is part of Calamares - === - * + * * SPDX-FileCopyrightText: 2013-2016 Teo Mrnjavac * SPDX-FileCopyrightText: 2018 Adriaan de Groot * @@ -43,6 +43,11 @@ DLLEXPORT bool getBool( const QVariantMap& map, const QString& key, bool d ); */ 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. */