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

Merge pull request #1810 from dalto8/getlist

Browse Source 
[libcalamares] Add getList function to Variant
This commit is contained in:
Adriaan de Groot 2021-10-26 12:07:16 +02:00 committed by GitHub
commit 68ad34e421
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,20 @@ getStringList( const QVariantMap& map, const QString& key, const QStringList& d
return d; return d;
} }
QList< QVariant >
getList( const QVariantMap& map, const QString& key, const QList< QVariant >& d )
{
if ( map.contains( key ) )
{
auto v = map.value( key );
if ( v.canConvert( QVariant::List ) )
{
return v.toList();
}
}
return d;
}
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

@ -15,6 +15,7 @@
#include "DllMacro.h" #include "DllMacro.h"
#include <QList>
#include <QString> #include <QString>
#include <QVariantMap> #include <QVariantMap>
@ -39,6 +40,12 @@ DLLEXPORT QString getString( const QVariantMap& map, const QString& key, const Q
*/ */
DLLEXPORT QStringList getStringList( const QVariantMap& map, const QString& key, const QStringList& d = QStringList() ); DLLEXPORT QStringList getStringList( const QVariantMap& map, const QString& key, const QStringList& d = QStringList() );
/**
* Get a list from a mapping with a given key; returns @p d if no value.
*/
DLLEXPORT QList< QVariant >
getList( const QVariantMap& map, const QString& key, const QList< QVariant >& d = QList< QVariant >() );
/** /**
* Get an integer value from a mapping with a given key; returns @p d if no value. * Get an integer value from a mapping with a given key; returns @p d if no value.
*/ */