From b465121e265eb55dbbdadecdab13881254b926ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Tue, 8 Jul 2014 15:30:02 +0200 Subject: [PATCH] Remove RowType enum and associated role --- src/calamares/progresstree/ProgressTreeItem.cpp | 2 -- src/calamares/progresstree/ProgressTreeModel.h | 10 +--------- src/calamares/progresstree/TextTreeItem.cpp | 2 -- src/calamares/progresstree/ViewStepItem.cpp | 2 -- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/calamares/progresstree/ProgressTreeItem.cpp b/src/calamares/progresstree/ProgressTreeItem.cpp index 5d0dd9789..9ab84d1e5 100644 --- a/src/calamares/progresstree/ProgressTreeItem.cpp +++ b/src/calamares/progresstree/ProgressTreeItem.cpp @@ -86,8 +86,6 @@ ProgressTreeRoot::ProgressTreeRoot() QVariant ProgressTreeRoot::data( int role ) const { - if ( role == ProgressTreeModel::ProgressTreeItemTypeRole ) - return ProgressTreeModel::Invalid; if ( role == ProgressTreeModel::ProgressTreeItemRole ) return this; return QVariant(); diff --git a/src/calamares/progresstree/ProgressTreeModel.h b/src/calamares/progresstree/ProgressTreeModel.h index fade29de3..e37242220 100644 --- a/src/calamares/progresstree/ProgressTreeModel.h +++ b/src/calamares/progresstree/ProgressTreeModel.h @@ -28,18 +28,10 @@ class ProgressTreeModel : public QAbstractItemModel { Q_OBJECT public: - enum RowType - { - Invalid = -1, - Category = 0, - ViewStep = 1 - }; - enum Role { ProgressTreeItemRole = Qt::UserRole + 10, - ProgressTreeItemTypeRole = Qt::UserRole + 11, - ProgressTreeItemCurrentRole = Qt::UserRole + 12 + ProgressTreeItemCurrentRole = Qt::UserRole + 11 }; explicit ProgressTreeModel( QObject* parent = nullptr ); diff --git a/src/calamares/progresstree/TextTreeItem.cpp b/src/calamares/progresstree/TextTreeItem.cpp index 8c6f8d692..16a7a41eb 100644 --- a/src/calamares/progresstree/TextTreeItem.cpp +++ b/src/calamares/progresstree/TextTreeItem.cpp @@ -29,8 +29,6 @@ TextTreeItem::TextTreeItem( const QString& text, ProgressTreeItem* parent ) QVariant TextTreeItem::data( int role ) const { - if ( role == ProgressTreeModel::ProgressTreeItemTypeRole ) - return ProgressTreeModel::Category; if ( role == ProgressTreeModel::ProgressTreeItemRole ) return this; if ( role == Qt::DisplayRole ) diff --git a/src/calamares/progresstree/ViewStepItem.cpp b/src/calamares/progresstree/ViewStepItem.cpp index 6310e8589..b056cdaa5 100644 --- a/src/calamares/progresstree/ViewStepItem.cpp +++ b/src/calamares/progresstree/ViewStepItem.cpp @@ -40,8 +40,6 @@ ViewStepItem::appendChild( ProgressTreeItem* item ) QVariant ViewStepItem::data( int role ) const { - if ( role == ProgressTreeModel::ProgressTreeItemTypeRole ) - return ProgressTreeModel::ViewStep; if ( role == ProgressTreeModel::ProgressTreeItemRole ) return this; if ( role == Qt::DisplayRole )