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

[netinstall] It should be easier to get the number 2

Browse Source
This commit is contained in:
Adriaan de Groot 2020-02-19 01:24:24 +01:00
parent 497ecda14d
commit 5b67ca315a
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,11 +106,7 @@ PackageModel::rowCount( const QModelIndex& parent ) const
int int
PackageModel::columnCount( const QModelIndex& parent ) const PackageModel::columnCount( const QModelIndex& parent ) const
{ {
if ( parent.isValid() ) return 2;
{
return static_cast< PackageTreeItem* >( parent.internalPointer() )->columnCount();
}
return m_rootItem->columnCount();
} }
QVariant QVariant

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

@ -105,12 +105,6 @@ PackageTreeItem::row() const
return 0; return 0;
} }
int
PackageTreeItem::columnCount() const
{
return m_columns;
}
QVariant QVariant
PackageTreeItem::data( int column ) const PackageTreeItem::data( int column ) const
{ {

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

@ -54,7 +54,6 @@ public:
void appendChild( PackageTreeItem* child ); void appendChild( PackageTreeItem* child );
PackageTreeItem* child( int row ); PackageTreeItem* child( int row );
int childCount() const; int childCount() const;
int columnCount() const;
QVariant data( int column ) const override; QVariant data( int column ) const override;
int row() const; int row() const;
@ -90,7 +89,6 @@ 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
}; };
#endif // PACKAGETREEITEM_H #endif // PACKAGETREEITEM_H