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

[netinstall] isCritical is const after construction

Browse Source
This commit is contained in:
Adriaan de Groot 2020-03-10 12:38:11 -05:00
parent 09006a936d
commit b074696ac1
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,6 +234,10 @@ PackageModel::setupModelData( const YAML::Node& data, PackageTreeItem* parent )
{ {
itemData.postScript = CalamaresUtils::yamlToVariant( itemDefinition[ "post-install" ] ).toString(); itemData.postScript = CalamaresUtils::yamlToVariant( itemDefinition[ "post-install" ] ).toString();
} }
if ( itemDefinition[ "critical" ] )
{
itemData.isCritical = CalamaresUtils::yamlToVariant( itemDefinition[ "critical" ] ).toBool();
}
PackageTreeItem* item = new PackageTreeItem( itemData, parent ); PackageTreeItem* item = new PackageTreeItem( itemData, parent );
if ( itemDefinition[ "selected" ] ) if ( itemDefinition[ "selected" ] )
@ -249,10 +253,6 @@ PackageModel::setupModelData( const YAML::Node& data, PackageTreeItem* parent )
item->setHidden( CalamaresUtils::yamlToVariant( itemDefinition[ "hidden" ] ).toBool() ); item->setHidden( CalamaresUtils::yamlToVariant( itemDefinition[ "hidden" ] ).toBool() );
} }
if ( itemDefinition[ "critical" ] )
{
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();

6
src/modules/netinstall/PackageTreeItem.cpp
View File

@ -217,12 +217,6 @@ PackageTreeItem::isCritical() const
return m_data.isCritical; return m_data.isCritical;
} }
void
PackageTreeItem::setCritical( bool isCritical )
{
m_data.isCritical = isCritical;
}
Qt::CheckState Qt::CheckState
PackageTreeItem::isSelected() const PackageTreeItem::isSelected() const
{ {

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

@ -79,7 +79,6 @@ public:
bool hiddenSelected() const; bool hiddenSelected() const;
bool isCritical() const; bool isCritical() const;
void setCritical( bool isCritical );
Qt::CheckState isSelected() const; Qt::CheckState isSelected() const;
void setSelected( Qt::CheckState isSelected ); void setSelected( Qt::CheckState isSelected );