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

[netinstall] More coding-style

Browse Source 
The tools don't always pick up all the style changes in one go
(I think astyle has trouble parsing some Calamares code)
This commit is contained in:
Adriaan de Groot 2020-02-18 11:39:54 +01:00
parent 8286bff95f
commit d5675508fa
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,9 +258,13 @@ PackageModel::setupModelData( const YAML::Node& data, PackageTreeItem* parent )
itemData.description = description; itemData.description = description;
if ( itemDefinition[ "pre-install" ] ) if ( itemDefinition[ "pre-install" ] )
{
itemData.preScript = CalamaresUtils::yamlToVariant( itemDefinition[ "pre-install" ] ).toString(); itemData.preScript = CalamaresUtils::yamlToVariant( itemDefinition[ "pre-install" ] ).toString();
}
if ( itemDefinition[ "post-install" ] ) if ( itemDefinition[ "post-install" ] )
{
itemData.postScript = CalamaresUtils::yamlToVariant( itemDefinition[ "post-install" ] ).toString(); itemData.postScript = CalamaresUtils::yamlToVariant( itemDefinition[ "post-install" ] ).toString();
}
PackageTreeItem* item = new PackageTreeItem( itemData, parent ); PackageTreeItem* item = new PackageTreeItem( itemData, parent );
if ( itemDefinition[ "selected" ] ) if ( itemDefinition[ "selected" ] )
@ -272,10 +276,14 @@ PackageModel::setupModelData( const YAML::Node& data, PackageTreeItem* parent )
} }
if ( itemDefinition[ "hidden" ] ) if ( itemDefinition[ "hidden" ] )
{
item->setHidden( CalamaresUtils::yamlToVariant( itemDefinition[ "hidden" ] ).toBool() ); item->setHidden( CalamaresUtils::yamlToVariant( itemDefinition[ "hidden" ] ).toBool() );
}
if ( itemDefinition[ "critical" ] ) if ( itemDefinition[ "critical" ] )
{
item->setCritical( CalamaresUtils::yamlToVariant( itemDefinition[ "critical" ] ).toBool() ); item->setCritical( CalamaresUtils::yamlToVariant( itemDefinition[ "critical" ] ).toBool() );
}
if ( itemDefinition[ "packages" ] ) if ( itemDefinition[ "packages" ] )
for ( YAML::const_iterator packageIt = itemDefinition[ "packages" ].begin(); for ( YAML::const_iterator packageIt = itemDefinition[ "packages" ].begin();