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

[calamares] factor out variant-type-checking in debug window

Browse Source
This commit is contained in:
Adriaan de Groot 2024-02-29 00:32:35 +01:00
parent 5568d22549
commit 49afa16b1c
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/calamares/VariantModel.cpp
View File

@ -9,6 +9,18 @@
#include "VariantModel.h" #include "VariantModel.h"
static bool
isMapLike( const QVariant& item )
{
return item.canConvert< QVariantMap >();
}
static bool
isListLike( const QVariant& item )
{
return item.canConvert< QVariantList >();
}
static void static void
overallLength( const QVariant& item, quintptr& c, quintptr parent, VariantModel::IndexVector* skiplist ) overallLength( const QVariant& item, quintptr& c, quintptr parent, VariantModel::IndexVector* skiplist )
{ {
@ -18,16 +30,16 @@ overallLength( const QVariant& item, quintptr& c, quintptr parent, VariantModel:
} }
parent = c++; parent = c++;
if ( item.canConvert< QVariantList >() ) if ( isMapLike( item ) )
{ {
for ( const auto& subitem : item.toList() ) for ( const auto& subitem : item.toMap() )
{ {
overallLength( subitem, c, parent, skiplist ); overallLength( subitem, c, parent, skiplist );
} }
} }
else if ( item.canConvert< QVariantMap >() ) else if ( isListLike( item ) )
{ {
for ( const auto& subitem : item.toMap() ) for ( const auto& subitem : item.toList() )
{ {
overallLength( subitem, c, parent, skiplist ); overallLength( subitem, c, parent, skiplist );
} }
@ -179,7 +191,7 @@ VariantModel::data( const QModelIndex& index, int role ) const
return QVariant(); return QVariant();
} }
if ( thing.canConvert< QVariantMap >() ) if ( isMapLike( thing ) )
{ {
QVariantMap the_map = thing.toMap(); QVariantMap the_map = thing.toMap();
const auto key = the_map.keys().at( index.row() ); const auto key = the_map.keys().at( index.row() );
@ -192,7 +204,7 @@ VariantModel::data( const QModelIndex& index, int role ) const
return the_map[ key ]; return the_map[ key ];
} }
} }
else if ( thing.canConvert< QVariantList >() ) else if ( isListLike( thing ) )
{ {
if ( index.column() == 0 ) if ( index.column() == 0 )
{ {
@ -255,12 +267,12 @@ VariantModel::underlying( const QModelIndex& index ) const
} }
const auto& thing = underlying( parent( index ) ); const auto& thing = underlying( parent( index ) );
if ( thing.canConvert< QVariantMap >() ) if ( isMapLike( thing ) )
{ {
const auto& the_map = thing.toMap(); const auto& the_map = thing.toMap();
return the_map[ the_map.keys()[ index.row() ] ]; return the_map[ the_map.keys()[ index.row() ] ];
} }
else if ( thing.canConvert< QVariantList >() ) else if ( isListLike( thing ) )
{ {
return thing.toList()[ index.row() ]; return thing.toList()[ index.row() ];
} }