aiden
/
calamares
mirror of https://github.com/cutefishos/calamares
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[netinstall] Apply coding style

Browse Source
main
Adriaan de Groot 5 years ago
parent 7c2a196568
commit 17eb3f5e33
6 changed files with 167 additions and 90 deletions
Show Stats Download Patch File Download Diff File

19
src/modules/netinstall/NetInstallViewStep.cpp
Unescape Escape View File

@ -20,15 +20,15 @@
#include "NetInstallViewStep.h" #include "NetInstallViewStep.h"
#include "JobQueue.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Variant.h" #include "utils/Variant.h"
#include "NetInstallPage.h" #include "NetInstallPage.h"
CALAMARES_PLUGIN_FACTORY_DEFINITION( NetInstallViewStepFactory, registerPlugin<NetInstallViewStep>(); ) CALAMARES_PLUGIN_FACTORY_DEFINITION( NetInstallViewStepFactory, registerPlugin< NetInstallViewStep >(); )
NetInstallViewStep::NetInstallViewStep( QObject* parent ) NetInstallViewStep::NetInstallViewStep( QObject* parent )
: Calamares::ViewStep( parent ) : Calamares::ViewStep( parent )
@ -36,15 +36,16 @@ NetInstallViewStep::NetInstallViewStep( QObject* parent )
, m_nextEnabled( false ) , m_nextEnabled( false )
{ {
emit nextStatusChanged( true ); emit nextStatusChanged( true );
connect( m_widget, &NetInstallPage::checkReady, connect( m_widget, &NetInstallPage::checkReady, this, &NetInstallViewStep::nextIsReady );
this, &NetInstallViewStep::nextIsReady );
} }
NetInstallViewStep::~NetInstallViewStep() NetInstallViewStep::~NetInstallViewStep()
{ {
if ( m_widget && m_widget->parent() == nullptr ) if ( m_widget && m_widget->parent() == nullptr )
{
m_widget->deleteLater(); m_widget->deleteLater();
}
} }
@ -131,28 +132,32 @@ NetInstallViewStep::onLeave()
// with the more complicated datastructure. // with the more complicated datastructure.
if ( !package.preScript.isEmpty() || !package.postScript.isEmpty() ) if ( !package.preScript.isEmpty() || !package.postScript.isEmpty() )
{ {
QMap<QString, QVariant> sdetails; QMap< QString, QVariant > sdetails;
sdetails.insert( "pre-script", package.preScript ); sdetails.insert( "pre-script", package.preScript );
sdetails.insert( "package", package.packageName ); sdetails.insert( "package", package.packageName );
sdetails.insert( "post-script", package.postScript ); sdetails.insert( "post-script", package.postScript );
details = sdetails; details = sdetails;
} }
if ( package.isCritical ) if ( package.isCritical )
{
installPackages.append( details ); installPackages.append( details );
}
else else
{
tryInstallPackages.append( details ); tryInstallPackages.append( details );
} }
}
if ( !installPackages.empty() ) if ( !installPackages.empty() )
{ {
QMap<QString, QVariant> op; QMap< QString, QVariant > op;
op.insert( "install", QVariant( installPackages ) ); op.insert( "install", QVariant( installPackages ) );
packageOperations.append( op ); packageOperations.append( op );
cDebug() << Logger::SubEntry << installPackages.length() << "critical packages."; cDebug() << Logger::SubEntry << installPackages.length() << "critical packages.";
} }
if ( !tryInstallPackages.empty() ) if ( !tryInstallPackages.empty() )
{ {
QMap<QString, QVariant> op; QMap< QString, QVariant > op;
op.insert( "try_install", QVariant( tryInstallPackages ) ); op.insert( "try_install", QVariant( tryInstallPackages ) );
packageOperations.append( op ); packageOperations.append( op );
cDebug() << Logger::SubEntry << tryInstallPackages.length() << "non-critical packages."; cDebug() << Logger::SubEntry << tryInstallPackages.length() << "non-critical packages.";

137
src/modules/netinstall/PackageModel.cpp
Unescape Escape View File

@ -21,9 +21,9 @@
#include "utils/Yaml.h" #include "utils/Yaml.h"
PackageModel::PackageModel( const YAML::Node& data, QObject* parent ) : PackageModel::PackageModel( const YAML::Node& data, QObject* parent )
QAbstractItemModel( parent ), : QAbstractItemModel( parent )
m_columnHeadings() , m_columnHeadings()
{ {
m_rootItem = new PackageTreeItem(); m_rootItem = new PackageTreeItem();
setupModelData( data, m_rootItem ); setupModelData( data, m_rootItem );
@ -38,33 +38,47 @@ QModelIndex
PackageModel::index( int row, int column, const QModelIndex& parent ) const PackageModel::index( int row, int column, const QModelIndex& parent ) const
{ {
if ( !hasIndex( row, column, parent ) ) if ( !hasIndex( row, column, parent ) )
{
return QModelIndex(); return QModelIndex();
}
PackageTreeItem* parentItem; PackageTreeItem* parentItem;
if ( !parent.isValid() ) if ( !parent.isValid() )
{
parentItem = m_rootItem; parentItem = m_rootItem;
}
else else
parentItem = static_cast<PackageTreeItem*>( parent.internalPointer() ); {
parentItem = static_cast< PackageTreeItem* >( parent.internalPointer() );
}
PackageTreeItem* childItem = parentItem->child( row ); PackageTreeItem* childItem = parentItem->child( row );
if ( childItem ) if ( childItem )
{
return createIndex( row, column, childItem ); return createIndex( row, column, childItem );
}
else else
{
return QModelIndex(); return QModelIndex();
}
} }
QModelIndex QModelIndex
PackageModel::parent( const QModelIndex& index ) const PackageModel::parent( const QModelIndex& index ) const
{ {
if ( !index.isValid() ) if ( !index.isValid() )
{
return QModelIndex(); return QModelIndex();
}
PackageTreeItem* child = static_cast<PackageTreeItem*>( index.internalPointer() ); PackageTreeItem* child = static_cast< PackageTreeItem* >( index.internalPointer() );
PackageTreeItem* parent = child->parentItem(); PackageTreeItem* parent = child->parentItem();
if ( parent == m_rootItem ) if ( parent == m_rootItem )
{
return QModelIndex(); return QModelIndex();
}
return createIndex( parent->row(), 0, parent ); return createIndex( parent->row(), 0, parent );
} }
@ -72,13 +86,19 @@ int
PackageModel::rowCount( const QModelIndex& parent ) const PackageModel::rowCount( const QModelIndex& parent ) const
{ {
if ( parent.column() > 0 ) if ( parent.column() > 0 )
{
return 0; return 0;
}
PackageTreeItem* parentItem; PackageTreeItem* parentItem;
if ( !parent.isValid() ) if ( !parent.isValid() )
{
parentItem = m_rootItem; parentItem = m_rootItem;
}
else else
parentItem = static_cast<PackageTreeItem*>( parent.internalPointer() ); {
parentItem = static_cast< PackageTreeItem* >( parent.internalPointer() );
}
return parentItem->childCount(); return parentItem->childCount();
} }
@ -87,7 +107,9 @@ int
PackageModel::columnCount( const QModelIndex& parent ) const PackageModel::columnCount( const QModelIndex& parent ) const
{ {
if ( parent.isValid() ) if ( parent.isValid() )
return static_cast<PackageTreeItem*>( parent.internalPointer() )->columnCount(); {
return static_cast< PackageTreeItem* >( parent.internalPointer() )->columnCount();
}
return m_rootItem->columnCount(); return m_rootItem->columnCount();
} }
@ -95,17 +117,25 @@ QVariant
PackageModel::data( const QModelIndex& index, int role ) const PackageModel::data( const QModelIndex& index, int role ) const
{ {
if ( !index.isValid() ) if ( !index.isValid() )
{
return QVariant(); return QVariant();
}
PackageTreeItem* item = static_cast<PackageTreeItem*>( index.internalPointer() ); PackageTreeItem* item = static_cast< PackageTreeItem* >( index.internalPointer() );
if ( index.column() == 0 && role == Qt::CheckStateRole ) if ( index.column() == 0 && role == Qt::CheckStateRole )
{
return item->isSelected(); return item->isSelected();
}
if ( item->isHidden() && role == Qt::DisplayRole ) // Hidden group if ( item->isHidden() && role == Qt::DisplayRole ) // Hidden group
{
return QVariant(); return QVariant();
}
if ( role == Qt::DisplayRole ) if ( role == Qt::DisplayRole )
{
return item->data( index.column() ); return item->data( index.column() );
}
return QVariant(); return QVariant();
} }
@ -114,27 +144,31 @@ PackageModel::setData( const QModelIndex& index, const QVariant& value, int role
{ {
if ( role == Qt::CheckStateRole && index.isValid() ) if ( role == Qt::CheckStateRole && index.isValid() )
{ {
PackageTreeItem* item = static_cast<PackageTreeItem*>( index.internalPointer() ); PackageTreeItem* item = static_cast< PackageTreeItem* >( index.internalPointer() );
item->setSelected( static_cast<Qt::CheckState>( value.toInt() ) ); item->setSelected( static_cast< Qt::CheckState >( value.toInt() ) );
emit dataChanged( this->index( 0, 0 ), index.sibling( index.column(), index.row() + 1 ), emit dataChanged( this->index( 0, 0 ),
QVector<int>( Qt::CheckStateRole ) ); index.sibling( index.column(), index.row() + 1 ),
QVector< int >( Qt::CheckStateRole ) );
} }
return true; return true;
} }
bool bool
PackageModel::setHeaderData( int section, Qt::Orientation orientation, PackageModel::setHeaderData( int section, Qt::Orientation orientation, const QVariant& value, int role )
const QVariant& value, int role )
{ {
Q_UNUSED( role ) Q_UNUSED( role )
if ( orientation == Qt::Horizontal ) if ( orientation == Qt::Horizontal )
{ {
if ( m_columnHeadings.value( section ) != QVariant() ) if ( m_columnHeadings.value( section ) != QVariant() )
{
m_columnHeadings.replace( section, value ); m_columnHeadings.replace( section, value );
}
else else
{
m_columnHeadings.insert( section, value ); m_columnHeadings.insert( section, value );
}
emit headerDataChanged( orientation, section, section ); emit headerDataChanged( orientation, section, section );
} }
return true; return true;
@ -144,9 +178,13 @@ Qt::ItemFlags
PackageModel::flags( const QModelIndex& index ) const PackageModel::flags( const QModelIndex& index ) const
{ {
if ( !index.isValid() ) if ( !index.isValid() )
{
return Qt::ItemFlags(); return Qt::ItemFlags();
}
if ( index.column() == 0 ) if ( index.column() == 0 )
{
return Qt::ItemIsUserCheckable | QAbstractItemModel::flags( index ); return Qt::ItemIsUserCheckable | QAbstractItemModel::flags( index );
}
return QAbstractItemModel::flags( index ); return QAbstractItemModel::flags( index );
} }
@ -154,18 +192,22 @@ QVariant
PackageModel::headerData( int section, Qt::Orientation orientation, int role ) const PackageModel::headerData( int section, Qt::Orientation orientation, int role ) const
{ {
if ( orientation == Qt::Horizontal && role == Qt::DisplayRole ) if ( orientation == Qt::Horizontal && role == Qt::DisplayRole )
{
return m_columnHeadings.value( section ); return m_columnHeadings.value( section );
}
return QVariant(); return QVariant();
} }
QList<PackageTreeItem::ItemData> QList< PackageTreeItem::ItemData >
PackageModel::getPackages() const PackageModel::getPackages() const
{ {
QList<PackageTreeItem*> items = getItemPackages( m_rootItem ); QList< PackageTreeItem* > items = getItemPackages( m_rootItem );
for ( auto package : m_hiddenItems ) for ( auto package : m_hiddenItems )
if ( package->hiddenSelected() ) if ( package->hiddenSelected() )
{
items.append( getItemPackages( package ) ); items.append( getItemPackages( package ) );
QList<PackageTreeItem::ItemData> packages; }
QList< PackageTreeItem::ItemData > packages;
for ( auto item : items ) for ( auto item : items )
{ {
PackageTreeItem::ItemData itemData; PackageTreeItem::ItemData itemData;
@ -178,22 +220,27 @@ PackageModel::getPackages() const
return packages; return packages;
} }
QList<PackageTreeItem*> QList< PackageTreeItem* >
PackageModel::getItemPackages( PackageTreeItem* item ) const PackageModel::getItemPackages( PackageTreeItem* item ) const
{ {
QList<PackageTreeItem*> selectedPackages; QList< PackageTreeItem* > selectedPackages;
for ( int i = 0; i < item->childCount(); i++ ) for ( int i = 0; i < item->childCount(); i++ )
{ {
if ( item->child( i )->isSelected() == Qt::Unchecked ) if ( item->child( i )->isSelected() == Qt::Unchecked )
{
continue; continue;
}
if ( !item->child( i )->childCount() ) // package if ( !item->child( i )->childCount() ) // package
{
selectedPackages.append( item->child( i ) ); selectedPackages.append( item->child( i ) );
}
else else
{
selectedPackages.append( getItemPackages( item->child( i ) ) ); selectedPackages.append( getItemPackages( item->child( i ) ) );
} }
}
return selectedPackages; return selectedPackages;
} }
void void
@ -203,49 +250,49 @@ PackageModel::setupModelData( const YAML::Node& data, PackageTreeItem* parent )
{ {
const YAML::Node itemDefinition = *it; const YAML::Node itemDefinition = *it;
QString name( QString name( tr( CalamaresUtils::yamlToVariant( itemDefinition[ "name" ] ).toByteArray() ) );
tr( CalamaresUtils::yamlToVariant( itemDefinition["name"] ).toByteArray() ) ); QString description( tr( CalamaresUtils::yamlToVariant( itemDefinition[ "description" ] ).toByteArray() ) );
QString description(
tr( CalamaresUtils::yamlToVariant( itemDefinition["description"] ).toByteArray() ) );
PackageTreeItem::ItemData itemData; PackageTreeItem::ItemData itemData;
itemData.name = name; itemData.name = name;
itemData.description = description; itemData.description = description;
if ( itemDefinition["pre-install"] ) if ( itemDefinition[ "pre-install" ] )
itemData.preScript = itemData.preScript = CalamaresUtils::yamlToVariant( itemDefinition[ "pre-install" ] ).toString();
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" ] )
item->setSelected( item->setSelected( CalamaresUtils::yamlToVariant( itemDefinition[ "selected" ] ).toBool() ? Qt::Checked
CalamaresUtils::yamlToVariant( itemDefinition["selected"] ).toBool() ? : Qt::Unchecked );
Qt::Checked : Qt::Unchecked );
else else
{
item->setSelected( parent->isSelected() ); // Inherit from it's parent item->setSelected( parent->isSelected() ); // Inherit from it's parent
}
if ( itemDefinition["hidden"] ) if ( itemDefinition[ "hidden" ] )
item->setHidden( item->setHidden( CalamaresUtils::yamlToVariant( itemDefinition[ "hidden" ] ).toBool() );
CalamaresUtils::yamlToVariant( itemDefinition["hidden"] ).toBool() );
if ( itemDefinition["critical"] ) if ( itemDefinition[ "critical" ] )
item->setCritical( item->setCritical( CalamaresUtils::yamlToVariant( itemDefinition[ "critical" ] ).toBool() );
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();
packageIt != itemDefinition["packages"].end(); ++packageIt ) packageIt != itemDefinition[ "packages" ].end();
++packageIt )
item->appendChild( item->appendChild(
new PackageTreeItem( CalamaresUtils::yamlToVariant( *packageIt ).toString(), item ) ); new PackageTreeItem( CalamaresUtils::yamlToVariant( *packageIt ).toString(), item ) );
if ( itemDefinition["subgroups"] ) if ( itemDefinition[ "subgroups" ] )
setupModelData( itemDefinition["subgroups"], item ); {
setupModelData( itemDefinition[ "subgroups" ], item );
}
if ( item->isHidden() ) if ( item->isHidden() )
{
m_hiddenItems.append( item ); m_hiddenItems.append( item );
}
else else
{ {
item->setCheckable( true ); item->setCheckable( true );

19
src/modules/netinstall/PackageModel.h
Unescape Escape View File

@ -29,7 +29,7 @@
namespace YAML namespace YAML
{ {
class Node; class Node;
} }
class PackageModel : public QAbstractItemModel class PackageModel : public QAbstractItemModel
@ -43,26 +43,23 @@ public:
~PackageModel() override; ~PackageModel() override;
QVariant data( const QModelIndex& index, int role ) const override; QVariant data( const QModelIndex& index, int role ) const override;
bool setData( const QModelIndex& index, const QVariant& value, bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole ) override;
int role = Qt::EditRole ) override; bool
bool setHeaderData( int section, Qt::Orientation orientation, setHeaderData( int section, Qt::Orientation orientation, const QVariant& value, int role = Qt::EditRole ) override;
const QVariant& value, int role = Qt::EditRole ) override;
Qt::ItemFlags flags( const QModelIndex& index ) const override; Qt::ItemFlags flags( const QModelIndex& index ) const override;
QVariant headerData( int section, Qt::Orientation orientation, QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
int role = Qt::DisplayRole ) const override; QModelIndex index( int row, int column, const QModelIndex& parent = QModelIndex() ) const override;
QModelIndex index( int row, int column,
const QModelIndex& parent = QModelIndex() ) const override;
QModelIndex parent( const QModelIndex& index ) const override; QModelIndex parent( const QModelIndex& index ) const override;
int rowCount( const QModelIndex& parent = QModelIndex() ) const override; int rowCount( const QModelIndex& parent = QModelIndex() ) const override;
int columnCount( const QModelIndex& parent = QModelIndex() ) const override; int columnCount( const QModelIndex& parent = QModelIndex() ) const override;
PackageItemDataList getPackages() const; PackageItemDataList getPackages() const;
QList<PackageTreeItem*> getItemPackages( PackageTreeItem* item ) const; QList< PackageTreeItem* > getItemPackages( PackageTreeItem* item ) const;
private: private:
void setupModelData( const YAML::Node& data, PackageTreeItem* parent ); void setupModelData( const YAML::Node& data, PackageTreeItem* parent );
PackageTreeItem* m_rootItem; PackageTreeItem* m_rootItem;
QList<PackageTreeItem*> m_hiddenItems; QList< PackageTreeItem* > m_hiddenItems;
QVariantList m_columnHeadings; QVariantList m_columnHeadings;
}; };

47
src/modules/netinstall/PackageTreeItem.cpp
Unescape Escape View File

@ -24,25 +24,30 @@
PackageTreeItem::PackageTreeItem( const ItemData& data, PackageTreeItem* parent ) PackageTreeItem::PackageTreeItem( const ItemData& data, PackageTreeItem* parent )
: m_parentItem( parent ) : m_parentItem( parent )
, m_data( data ) , m_data( data )
{ } {
}
PackageTreeItem::PackageTreeItem( const QString packageName, PackageTreeItem* parent ) : PackageTreeItem::PackageTreeItem( const QString packageName, PackageTreeItem* parent )
m_parentItem( parent ) : m_parentItem( parent )
{ {
m_data.packageName = packageName; m_data.packageName = packageName;
if ( parent != nullptr ) if ( parent != nullptr )
{
m_data.selected = parent->isSelected(); m_data.selected = parent->isSelected();
}
else else
{
m_data.selected = Qt::Unchecked; m_data.selected = Qt::Unchecked;
}
} }
PackageTreeItem::PackageTreeItem( PackageTreeItem* parent ) : PackageTreeItem::PackageTreeItem( PackageTreeItem* parent )
m_parentItem( parent ) : m_parentItem( parent )
{ {
} }
PackageTreeItem::PackageTreeItem::PackageTreeItem() : PackageTreeItem::PackageTreeItem::PackageTreeItem()
PackageTreeItem( QString(), nullptr ) : PackageTreeItem( QString(), nullptr )
{ {
m_data.selected = Qt::Checked; m_data.selected = Qt::Checked;
m_data.name = QLatin1String( "<root>" ); m_data.name = QLatin1String( "<root>" );
@ -75,7 +80,9 @@ int
PackageTreeItem::row() const PackageTreeItem::row() const
{ {
if ( m_parentItem ) if ( m_parentItem )
return m_parentItem->m_childItems.indexOf( const_cast<PackageTreeItem*>( this ) ); {
return m_parentItem->m_childItems.indexOf( const_cast< PackageTreeItem* >( this ) );
}
return 0; return 0;
} }
@ -91,7 +98,9 @@ PackageTreeItem::data( int column ) const
if ( packageName() != nullptr ) // package if ( packageName() != nullptr ) // package
{ {
if ( !column ) if ( !column )
{
return QVariant( packageName() ); return QVariant( packageName() );
}
return QVariant(); return QVariant();
} }
switch ( column ) // group switch ( column ) // group
@ -164,14 +173,18 @@ bool
PackageTreeItem::hiddenSelected() const PackageTreeItem::hiddenSelected() const
{ {
Q_ASSERT( m_data.isHidden ); Q_ASSERT( m_data.isHidden );
if (! m_data.selected ) if ( !m_data.selected )
{
return false; return false;
}
const PackageTreeItem* currentItem = parentItem(); const PackageTreeItem* currentItem = parentItem();
while ( currentItem != nullptr ) while ( currentItem != nullptr )
{ {
if ( !currentItem->isHidden() ) if ( !currentItem->isHidden() )
{
return currentItem->isSelected() != Qt::Unchecked; return currentItem->isSelected() != Qt::Unchecked;
}
currentItem = currentItem->parentItem(); currentItem = currentItem->parentItem();
} }
@ -203,7 +216,9 @@ PackageTreeItem::setSelected( Qt::CheckState isSelected )
{ {
if ( parentItem() == nullptr ) if ( parentItem() == nullptr )
// This is the root, it is always checked so don't change state // This is the root, it is always checked so don't change state
{
return; return;
}
m_data.selected = isSelected; m_data.selected = isSelected;
setChildrenSelected( isSelected ); setChildrenSelected( isSelected );
@ -217,7 +232,9 @@ PackageTreeItem::setSelected( Qt::CheckState isSelected )
} }
if ( currentItem == nullptr ) if ( currentItem == nullptr )
// Reached the root .. don't bother // Reached the root .. don't bother
{
return; return;
}
// Figure out checked-state based on the children // Figure out checked-state based on the children
int childrenSelected = 0; int childrenSelected = 0;
@ -225,16 +242,26 @@ PackageTreeItem::setSelected( Qt::CheckState isSelected )
for ( int i = 0; i < currentItem->childCount(); i++ ) for ( int i = 0; i < currentItem->childCount(); i++ )
{ {
if ( currentItem->child( i )->isSelected() == Qt::Checked ) if ( currentItem->child( i )->isSelected() == Qt::Checked )
{
childrenSelected++; childrenSelected++;
}
if ( currentItem->child( i )->isSelected() == Qt::PartiallyChecked ) if ( currentItem->child( i )->isSelected() == Qt::PartiallyChecked )
{
childrenPartiallySelected++; childrenPartiallySelected++;
} }
if ( !childrenSelected && !childrenPartiallySelected) }
if ( !childrenSelected && !childrenPartiallySelected )
{
currentItem->setSelected( Qt::Unchecked ); currentItem->setSelected( Qt::Unchecked );
}
else if ( childrenSelected == currentItem->childCount() ) else if ( childrenSelected == currentItem->childCount() )
{
currentItem->setSelected( Qt::Checked ); currentItem->setSelected( Qt::Checked );
}
else else
{
currentItem->setSelected( Qt::PartiallyChecked ); currentItem->setSelected( Qt::PartiallyChecked );
}
} }
void void

5
src/modules/netinstall/PackageTreeItem.h
Unescape Escape View File

@ -21,8 +21,8 @@
#define PACKAGETREEITEM_H #define PACKAGETREEITEM_H
#include <QList> #include <QList>
#include <QVariant>
#include <QStandardItem> #include <QStandardItem>
#include <QVariant>
class PackageTreeItem : public QStandardItem class PackageTreeItem : public QStandardItem
{ {
@ -78,9 +78,10 @@ public:
void setSelected( Qt::CheckState isSelected ); void setSelected( Qt::CheckState isSelected );
void setChildrenSelected( Qt::CheckState isSelected ); void setChildrenSelected( Qt::CheckState isSelected );
int type() const override; int type() const override;
private: private:
PackageTreeItem* m_parentItem; PackageTreeItem* m_parentItem;
QList<PackageTreeItem*> m_childItems; QList< PackageTreeItem* > m_childItems;
ItemData m_data; ItemData m_data;
const int m_columns = 2; // Name, description const int m_columns = 2; // Name, description
}; };

Write Preview
Loading…
Cancel
Save