From 0f7f5216ee9e48039fcc713eccc33ef5284f29ec Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 10 Mar 2020 12:39:35 -0500 Subject: [PATCH] [netinstall] isHidden is const after construction --- src/modules/netinstall/PackageModel.cpp | 9 +++++---- src/modules/netinstall/PackageTreeItem.cpp | 6 ------ src/modules/netinstall/PackageTreeItem.h | 1 - 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp index f51203944..9b197b876 100644 --- a/src/modules/netinstall/PackageModel.cpp +++ b/src/modules/netinstall/PackageModel.cpp @@ -238,6 +238,11 @@ PackageModel::setupModelData( const YAML::Node& data, PackageTreeItem* parent ) { itemData.isCritical = CalamaresUtils::yamlToVariant( itemDefinition[ "critical" ] ).toBool(); } + if ( itemDefinition[ "hidden" ] ) + { + itemData.isHidden = CalamaresUtils::yamlToVariant( itemDefinition[ "hidden" ] ).toBool(); + } + PackageTreeItem* item = new PackageTreeItem( itemData, parent ); if ( itemDefinition[ "selected" ] ) @@ -248,10 +253,6 @@ PackageModel::setupModelData( const YAML::Node& data, PackageTreeItem* parent ) item->setSelected( parent->isSelected() ); // Inherit from it's parent } - if ( itemDefinition[ "hidden" ] ) - { - item->setHidden( CalamaresUtils::yamlToVariant( itemDefinition[ "hidden" ] ).toBool() ); - } if ( itemDefinition[ "packages" ] ) diff --git a/src/modules/netinstall/PackageTreeItem.cpp b/src/modules/netinstall/PackageTreeItem.cpp index 3a67a2682..7e20d63e1 100644 --- a/src/modules/netinstall/PackageTreeItem.cpp +++ b/src/modules/netinstall/PackageTreeItem.cpp @@ -181,12 +181,6 @@ PackageTreeItem::isHidden() const return m_data.isHidden; } -void -PackageTreeItem::setHidden( bool isHidden ) -{ - m_data.isHidden = isHidden; -} - bool PackageTreeItem::hiddenSelected() const { diff --git a/src/modules/netinstall/PackageTreeItem.h b/src/modules/netinstall/PackageTreeItem.h index cee89727d..5077694c9 100644 --- a/src/modules/netinstall/PackageTreeItem.h +++ b/src/modules/netinstall/PackageTreeItem.h @@ -68,7 +68,6 @@ public: QString postScript() const; bool isHidden() const; - void setHidden( bool isHidden ); /** * @brief Is this hidden item, considered "selected"? *