From 57567b062c4028033d4cb21842d69bff4ea47df2 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 3 Jan 2017 08:21:04 +0100 Subject: [PATCH] Add missing Q_DECL_OVERRIDE --- autotests/krecursivefilterproxymodeltest.cpp | 2 +- autotests/kselectionproxymodeltestsuite.h | 28 +++++++++---------- src/kbreadcrumbselectionmodel.h | 4 +-- src/kcheckableproxymodel.h | 8 +++--- src/krecursivefilterproxymodel.h | 8 +++--- .../breadcrumbdirectionwidget.h | 2 +- .../breadcrumbnavigationwidget.h | 10 +++---- tests/proxymodeltestapp/breadcrumbswidget.h | 4 +-- .../kreparentingproxymodel.h | 20 ++++++------- tests/proxymodeltestapp/lessthanwidget.h | 2 +- .../recursivefilterpmwidget.h | 2 +- .../scriptablereparentingwidget.h | 2 +- 12 files changed, 46 insertions(+), 46 deletions(-) diff --git a/autotests/krecursivefilterproxymodeltest.cpp b/autotests/krecursivefilterproxymodeltest.cpp index 69edac5..e730143 100644 --- a/autotests/krecursivefilterproxymodeltest.cpp +++ b/autotests/krecursivefilterproxymodeltest.cpp @@ -90,7 +90,7 @@ public: setSourceModel(sourceModel); } - virtual bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const + bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE { // qDebug() << sourceModel()->index(sourceRow, 0, sourceParent).data().toString() << sourceModel()->index(sourceRow, 0, sourceParent).data(Qt::UserRole+1).toBool(); return sourceModel()->index(sourceRow, 0, sourceParent).data(Qt::UserRole+1).toBool(); diff --git a/autotests/kselectionproxymodeltestsuite.h b/autotests/kselectionproxymodeltestsuite.h index 215d242..72ae4d5 100644 --- a/autotests/kselectionproxymodeltestsuite.h +++ b/autotests/kselectionproxymodeltestsuite.h @@ -44,7 +44,7 @@ public: } protected: - /* reimp */ QAbstractProxyModel *getProxy() + /* reimp */ QAbstractProxyModel *getProxy() Q_DECL_OVERRIDE { Q_ASSERT(sourceModel()); m_selectionModel = new QItemSelectionModel(sourceModel()); @@ -94,58 +94,58 @@ public: SelectorStrategy::setProperty("filterBehaviour", QVariant(int(_filterBehaviour))); } - /* reimp */ void testInsertWhenEmptyData() + /* reimp */ void testInsertWhenEmptyData() Q_DECL_OVERRIDE { SelectorStrategy::testInsertWhenEmptyData(); } - /* reimp */ void testInsertInRootData() + /* reimp */ void testInsertInRootData() Q_DECL_OVERRIDE { SelectorStrategy::testInsertInRootData(); } - /* reimp */ void testInsertInTopLevelData() + /* reimp */ void testInsertInTopLevelData() Q_DECL_OVERRIDE { SelectorStrategy::testInsertInTopLevelData(); } - /* reimp */ void testInsertInSecondLevelData() + /* reimp */ void testInsertInSecondLevelData() Q_DECL_OVERRIDE { SelectorStrategy::testInsertInSecondLevelData(); } - /* reimp */ void testRemoveFromRootData() + /* reimp */ void testRemoveFromRootData() Q_DECL_OVERRIDE { SelectorStrategy::testRemoveFromRootData(); } - /* reimp */ void testRemoveFromTopLevelData() + /* reimp */ void testRemoveFromTopLevelData() Q_DECL_OVERRIDE { SelectorStrategy::testRemoveFromTopLevelData(); } - /* reimp */ void testRemoveFromSecondLevelData() + /* reimp */ void testRemoveFromSecondLevelData() Q_DECL_OVERRIDE { SelectorStrategy::testRemoveFromSecondLevelData(); } - /* reimp */ void testMoveFromRootData() + /* reimp */ void testMoveFromRootData() Q_DECL_OVERRIDE { SelectorStrategy::testMoveFromRootData(); } - /* reimp */ void testMoveFromTopLevelData() + /* reimp */ void testMoveFromTopLevelData() Q_DECL_OVERRIDE { SelectorStrategy::testMoveFromTopLevelData(); } - /* reimp */ void testMoveFromSecondLevelData() + /* reimp */ void testMoveFromSecondLevelData() Q_DECL_OVERRIDE { SelectorStrategy::testMoveFromSecondLevelData(); } - /* reimp */ void testModifyInRootData() + /* reimp */ void testModifyInRootData() Q_DECL_OVERRIDE { SelectorStrategy::testModifyInRootData(); } - /* reimp */ void testModifyInTopLevelData() + /* reimp */ void testModifyInTopLevelData() Q_DECL_OVERRIDE { SelectorStrategy::testModifyInTopLevelData(); } - /* reimp */ void testModifyInSecondLevelData() + /* reimp */ void testModifyInSecondLevelData() Q_DECL_OVERRIDE { SelectorStrategy::testModifyInSecondLevelData(); } diff --git a/src/kbreadcrumbselectionmodel.h b/src/kbreadcrumbselectionmodel.h index 7ad9583..8230283 100644 --- a/src/kbreadcrumbselectionmodel.h +++ b/src/kbreadcrumbselectionmodel.h @@ -144,9 +144,9 @@ public: */ void setBreadcrumbLength(int breadcrumbLength); - /* reimp */ void select(const QModelIndex &index, QItemSelectionModel::SelectionFlags command); + /* reimp */ void select(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; - /* reimp */ void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command); + /* reimp */ void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; protected: KBreadcrumbSelectionModelPrivate *const d_ptr; diff --git a/src/kcheckableproxymodel.h b/src/kcheckableproxymodel.h index d193646..7ed1951 100644 --- a/src/kcheckableproxymodel.h +++ b/src/kcheckableproxymodel.h @@ -71,13 +71,13 @@ public: void setSelectionModel(QItemSelectionModel *itemSelectionModel); QItemSelectionModel *selectionModel() const; - /* reimp */ Qt::ItemFlags flags(const QModelIndex &index) const; + /* reimp */ Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; - /* reimp */ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + /* reimp */ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - /* reimp */ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + /* reimp */ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; - /* reimp */ void setSourceModel(QAbstractItemModel *sourceModel); + /* reimp */ void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE; protected: virtual bool select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command); diff --git a/src/krecursivefilterproxymodel.h b/src/krecursivefilterproxymodel.h index 306ef76..3f6b236 100644 --- a/src/krecursivefilterproxymodel.h +++ b/src/krecursivefilterproxymodel.h @@ -98,13 +98,13 @@ public: virtual ~KRecursiveFilterProxyModel(); /** @reimp */ - void setSourceModel(QAbstractItemModel *model); + void setSourceModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; /** * @reimplemented */ - virtual QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, int hits = 1, - Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const; + QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, int hits = 1, + Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const Q_DECL_OVERRIDE; protected: /** @@ -113,7 +113,7 @@ protected: virtual bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const; /** @reimp */ - virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; + bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE; KRecursiveFilterProxyModelPrivate *const d_ptr; diff --git a/tests/proxymodeltestapp/breadcrumbdirectionwidget.h b/tests/proxymodeltestapp/breadcrumbdirectionwidget.h index 26a66c1..e26a60b 100644 --- a/tests/proxymodeltestapp/breadcrumbdirectionwidget.h +++ b/tests/proxymodeltestapp/breadcrumbdirectionwidget.h @@ -31,7 +31,7 @@ public: BreadcrumbDirectionWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); protected: - virtual bool eventFilter(QObject *, QEvent *); + bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; }; diff --git a/tests/proxymodeltestapp/breadcrumbnavigationwidget.h b/tests/proxymodeltestapp/breadcrumbnavigationwidget.h index 0b2c6a3..3d78111 100644 --- a/tests/proxymodeltestapp/breadcrumbnavigationwidget.h +++ b/tests/proxymodeltestapp/breadcrumbnavigationwidget.h @@ -55,7 +55,7 @@ public: void setShowHiddenAscendantData(bool showHiddenAscendantData); bool showHiddenAscendantData() const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; private: bool m_showHiddenAscendantData; @@ -68,9 +68,9 @@ class KNavigatingProxyModel : public KSelectionProxyModel public: KNavigatingProxyModel(QItemSelectionModel *selectionModel, QObject *parent = 0); - virtual void setSourceModel(QAbstractItemModel *sourceModel); + void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; private Q_SLOTS: void modelReset(); @@ -97,8 +97,8 @@ public: KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, QObject *parent = 0); KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, Direction direction, QObject *parent = 0); - virtual void select(const QModelIndex &index, SelectionFlags command); - virtual void select(const QItemSelection &selection, SelectionFlags command); + void select(const QModelIndex &index, SelectionFlags command) Q_DECL_OVERRIDE; + void select(const QItemSelection &selection, SelectionFlags command) Q_DECL_OVERRIDE; private Q_SLOTS: void navigationSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected); diff --git a/tests/proxymodeltestapp/breadcrumbswidget.h b/tests/proxymodeltestapp/breadcrumbswidget.h index 07d46f6..67bc76e 100644 --- a/tests/proxymodeltestapp/breadcrumbswidget.h +++ b/tests/proxymodeltestapp/breadcrumbswidget.h @@ -37,8 +37,8 @@ public: MultiSelectionModel(QAbstractItemModel *model, QList selectionModels, QObject *parent = 0); public: - virtual void select(const QModelIndex &index, SelectionFlags command); - virtual void select(const QItemSelection &selection, SelectionFlags command); + void select(const QModelIndex &index, SelectionFlags command) Q_DECL_OVERRIDE; + void select(const QItemSelection &selection, SelectionFlags command) Q_DECL_OVERRIDE; private: QList m_selectionModels; diff --git a/tests/proxymodeltestapp/kreparentingproxymodel.h b/tests/proxymodeltestapp/kreparentingproxymodel.h index eca815a..9076810 100644 --- a/tests/proxymodeltestapp/kreparentingproxymodel.h +++ b/tests/proxymodeltestapp/kreparentingproxymodel.h @@ -104,30 +104,30 @@ public: virtual ~KReparentingProxyModel(); - virtual QModelIndex mapFromSource(const QModelIndex &sourceIndex) const; + QModelIndex mapFromSource(const QModelIndex &sourceIndex) const Q_DECL_OVERRIDE; - virtual QModelIndex mapToSource(const QModelIndex &proxyIndex) const; + QModelIndex mapToSource(const QModelIndex &proxyIndex) const Q_DECL_OVERRIDE; - virtual void setSourceModel(QAbstractItemModel *sourceModel); + void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE; /** Reimplement this to return whether @p descendant is a descendant of @p ancestor. */ virtual bool isDescendantOf(const QModelIndex &ancestor, const QModelIndex &descendant) const; - virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - virtual QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const; + QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - virtual QModelIndex parent(const QModelIndex &child) const; + QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - virtual bool hasChildren(const QModelIndex &parent = QModelIndex()) const; + bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - virtual Qt::DropActions supportedDropActions() const; + Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; protected: void beginChangeRule(); diff --git a/tests/proxymodeltestapp/lessthanwidget.h b/tests/proxymodeltestapp/lessthanwidget.h index 4ff424c..4384897 100644 --- a/tests/proxymodeltestapp/lessthanwidget.h +++ b/tests/proxymodeltestapp/lessthanwidget.h @@ -33,7 +33,7 @@ class ColoredTreeModel : public DynamicTreeModel public: ColoredTreeModel(QObject *parent = 0); - /* reimp */ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + /* reimp */ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; void setSelectionModel(QItemSelectionModel *selectionModel); diff --git a/tests/proxymodeltestapp/recursivefilterpmwidget.h b/tests/proxymodeltestapp/recursivefilterpmwidget.h index 0188f82..fc5a171 100644 --- a/tests/proxymodeltestapp/recursivefilterpmwidget.h +++ b/tests/proxymodeltestapp/recursivefilterpmwidget.h @@ -44,7 +44,7 @@ public: } - /* reimp */ bool acceptRow(int sourceRow, const QModelIndex &parent_index) const + /* reimp */ bool acceptRow(int sourceRow, const QModelIndex &parent_index) const Q_DECL_OVERRIDE { static const int column = 0; QModelIndex srcIndex = sourceModel()->index(sourceRow, column, parent_index); diff --git a/tests/proxymodeltestapp/scriptablereparentingwidget.h b/tests/proxymodeltestapp/scriptablereparentingwidget.h index aaa068d..9c0086e 100644 --- a/tests/proxymodeltestapp/scriptablereparentingwidget.h +++ b/tests/proxymodeltestapp/scriptablereparentingwidget.h @@ -36,7 +36,7 @@ class ScriptableReparentingProxyModel : public KReparentingProxyModel public: ScriptableReparentingProxyModel(QObject *parent = 0); - /* reimp */ bool isDescendantOf(const QModelIndex &ancestor, const QModelIndex &descendant) const; + /* reimp */ bool isDescendantOf(const QModelIndex &ancestor, const QModelIndex &descendant) const Q_DECL_OVERRIDE; void setImplementation(const QString &implementation);