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

Remove RowType enum and associated role

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-07-08 15:30:02 +02:00
parent a84b551ab0
commit b465121e26
4 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calamares/progresstree/ProgressTreeItem.cpp
View File

@ -86,8 +86,6 @@ ProgressTreeRoot::ProgressTreeRoot()
QVariant QVariant
ProgressTreeRoot::data( int role ) const ProgressTreeRoot::data( int role ) const
{ {
if ( role == ProgressTreeModel::ProgressTreeItemTypeRole )
return ProgressTreeModel::Invalid;
if ( role == ProgressTreeModel::ProgressTreeItemRole ) if ( role == ProgressTreeModel::ProgressTreeItemRole )
return this; return this;
return QVariant(); return QVariant();

10
src/calamares/progresstree/ProgressTreeModel.h
View File

@ -28,18 +28,10 @@ class ProgressTreeModel : public QAbstractItemModel
{ {
Q_OBJECT Q_OBJECT
public: public:
enum RowType
{
Invalid = -1,
Category = 0,
ViewStep = 1
};
enum Role enum Role
{ {
ProgressTreeItemRole = Qt::UserRole + 10, ProgressTreeItemRole = Qt::UserRole + 10,
ProgressTreeItemTypeRole = Qt::UserRole + 11, ProgressTreeItemCurrentRole = Qt::UserRole + 11
ProgressTreeItemCurrentRole = Qt::UserRole + 12
}; };
explicit ProgressTreeModel( QObject* parent = nullptr ); explicit ProgressTreeModel( QObject* parent = nullptr );

2
src/calamares/progresstree/TextTreeItem.cpp
View File

@ -29,8 +29,6 @@ TextTreeItem::TextTreeItem( const QString& text, ProgressTreeItem* parent )
QVariant QVariant
TextTreeItem::data( int role ) const TextTreeItem::data( int role ) const
{ {
if ( role == ProgressTreeModel::ProgressTreeItemTypeRole )
return ProgressTreeModel::Category;
if ( role == ProgressTreeModel::ProgressTreeItemRole ) if ( role == ProgressTreeModel::ProgressTreeItemRole )
return this; return this;
if ( role == Qt::DisplayRole ) if ( role == Qt::DisplayRole )

2
src/calamares/progresstree/ViewStepItem.cpp
View File

@ -40,8 +40,6 @@ ViewStepItem::appendChild( ProgressTreeItem* item )
QVariant QVariant
ViewStepItem::data( int role ) const ViewStepItem::data( int role ) const
{ {
if ( role == ProgressTreeModel::ProgressTreeItemTypeRole )
return ProgressTreeModel::ViewStep;
if ( role == ProgressTreeModel::ProgressTreeItemRole ) if ( role == ProgressTreeModel::ProgressTreeItemRole )
return this; return this;
if ( role == Qt::DisplayRole ) if ( role == Qt::DisplayRole )