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

[netinstall] Build the model from QVariantList always

Browse Source
This commit is contained in:
Adriaan de Groot 2020-03-23 14:21:41 +01:00
parent ebc1db6a7b
commit fa28788f78
2 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/modules/netinstall/PackageModel.cpp
View File

@ -26,7 +26,7 @@ PackageModel::PackageModel( const YAML::Node& data, QObject* parent )
: QAbstractItemModel( parent ) : QAbstractItemModel( parent )
{ {
m_rootItem = new PackageTreeItem(); m_rootItem = new PackageTreeItem();
setupModelData( data, m_rootItem ); setupModelData( CalamaresUtils::yamlSequenceToVariant( data ), m_rootItem );
} }
PackageModel::PackageModel( const QVariantList& data, QObject* parent ) PackageModel::PackageModel( const QVariantList& data, QObject* parent )
@ -262,43 +262,3 @@ PackageModel::setupModelData( const QVariantList& groupList, PackageTreeItem* pa
} }
} }
} }
void
PackageModel::setupModelData( const YAML::Node& data, PackageTreeItem* parent )
{
for ( YAML::const_iterator it = data.begin(); it != data.end(); ++it )
{
const YAML::Node itemDefinition = *it;
PackageTreeItem* item = new PackageTreeItem( CalamaresUtils::yamlMapToVariant( itemDefinition ), parent );
if ( itemDefinition[ "selected" ] )
{
item->setSelected( getBool( itemDefinition, "selected" ) ? Qt::Checked : Qt::Unchecked );
}
if ( itemDefinition[ "packages" ] )
{
for ( YAML::const_iterator packageIt = itemDefinition[ "packages" ].begin();
packageIt != itemDefinition[ "packages" ].end();
++packageIt )
{
item->appendChild(
new PackageTreeItem( CalamaresUtils::yamlToVariant( *packageIt ).toString(), item ) );
}
}
if ( itemDefinition[ "subgroups" ] )
{
setupModelData( itemDefinition[ "subgroups" ], item );
}
if ( item->isHidden() )
{
m_hiddenItems.append( item );
}
else
{
item->setCheckable( true );
parent->appendChild( item );
}
}
}

1
src/modules/netinstall/PackageModel.h
View File

@ -68,7 +68,6 @@ public:
private: private:
friend class ItemTests; friend class ItemTests;
void setupModelData( const YAML::Node& data, PackageTreeItem* parent );
void setupModelData( const QVariantList& l, PackageTreeItem* parent ); void setupModelData( const QVariantList& l, PackageTreeItem* parent );
PackageTreeItem* m_rootItem; PackageTreeItem* m_rootItem;