From 37548cc3e3449ee38f9227de92d5c76a1b59f10c Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 30 Nov 2018 08:59:25 +0100 Subject: [PATCH] Remove unused virtual keyword --- autotests/kselectionproxymodeltestsuite.h | 28 +++++++++---------- src/kbreadcrumbselectionmodel.h | 4 +-- src/kcheckableproxymodel.h | 8 +++--- tests/proxymodeltestapp/lessthanwidget.h | 2 +- .../recursivefilterpmwidget.h | 2 +- .../scriptablereparentingwidget.h | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/autotests/kselectionproxymodeltestsuite.h b/autotests/kselectionproxymodeltestsuite.h index bf13eca..bcf2681 100644 --- a/autotests/kselectionproxymodeltestsuite.h +++ b/autotests/kselectionproxymodeltestsuite.h @@ -44,7 +44,7 @@ public: } protected: - /* reimp */ QAbstractProxyModel *getProxy() override + QAbstractProxyModel *getProxy() override { Q_ASSERT(sourceModel()); m_selectionModel = new QItemSelectionModel(sourceModel()); @@ -94,58 +94,58 @@ public: SelectorStrategy::setProperty("filterBehaviour", QVariant(int(_filterBehaviour))); } - /* reimp */ void testInsertWhenEmptyData() override + void testInsertWhenEmptyData() override { SelectorStrategy::testInsertWhenEmptyData(); } - /* reimp */ void testInsertInRootData() override + void testInsertInRootData() override { SelectorStrategy::testInsertInRootData(); } - /* reimp */ void testInsertInTopLevelData() override + void testInsertInTopLevelData() override { SelectorStrategy::testInsertInTopLevelData(); } - /* reimp */ void testInsertInSecondLevelData() override + void testInsertInSecondLevelData() override { SelectorStrategy::testInsertInSecondLevelData(); } - /* reimp */ void testRemoveFromRootData() override + void testRemoveFromRootData() override { SelectorStrategy::testRemoveFromRootData(); } - /* reimp */ void testRemoveFromTopLevelData() override + void testRemoveFromTopLevelData() override { SelectorStrategy::testRemoveFromTopLevelData(); } - /* reimp */ void testRemoveFromSecondLevelData() override + void testRemoveFromSecondLevelData() override { SelectorStrategy::testRemoveFromSecondLevelData(); } - /* reimp */ void testMoveFromRootData() override + void testMoveFromRootData() override { SelectorStrategy::testMoveFromRootData(); } - /* reimp */ void testMoveFromTopLevelData() override + void testMoveFromTopLevelData() override { SelectorStrategy::testMoveFromTopLevelData(); } - /* reimp */ void testMoveFromSecondLevelData() override + void testMoveFromSecondLevelData() override { SelectorStrategy::testMoveFromSecondLevelData(); } - /* reimp */ void testModifyInRootData() override + void testModifyInRootData() override { SelectorStrategy::testModifyInRootData(); } - /* reimp */ void testModifyInTopLevelData() override + void testModifyInTopLevelData() override { SelectorStrategy::testModifyInTopLevelData(); } - /* reimp */ void testModifyInSecondLevelData() override + void testModifyInSecondLevelData() override { SelectorStrategy::testModifyInSecondLevelData(); } diff --git a/src/kbreadcrumbselectionmodel.h b/src/kbreadcrumbselectionmodel.h index 0880e4d..03dad88 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) override; + void select(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) override; - /* reimp */ void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command) override; + void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command) override; protected: KBreadcrumbSelectionModelPrivate *const d_ptr; diff --git a/src/kcheckableproxymodel.h b/src/kcheckableproxymodel.h index 4512d51..31ce1fe 100644 --- a/src/kcheckableproxymodel.h +++ b/src/kcheckableproxymodel.h @@ -73,13 +73,13 @@ public: void setSelectionModel(QItemSelectionModel *itemSelectionModel); QItemSelectionModel *selectionModel() const; - /* reimp */ Qt::ItemFlags flags(const QModelIndex &index) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; - /* reimp */ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - /* reimp */ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; - /* reimp */ void setSourceModel(QAbstractItemModel *sourceModel) override; + void setSourceModel(QAbstractItemModel *sourceModel) override; protected: virtual bool select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command); diff --git a/tests/proxymodeltestapp/lessthanwidget.h b/tests/proxymodeltestapp/lessthanwidget.h index a39b26d..77f3f51 100644 --- a/tests/proxymodeltestapp/lessthanwidget.h +++ b/tests/proxymodeltestapp/lessthanwidget.h @@ -33,7 +33,7 @@ class ColoredTreeModel : public DynamicTreeModel public: ColoredTreeModel(QObject *parent = nullptr); - /* reimp */ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; void setSelectionModel(QItemSelectionModel *selectionModel); diff --git a/tests/proxymodeltestapp/recursivefilterpmwidget.h b/tests/proxymodeltestapp/recursivefilterpmwidget.h index 2911f24..f77d7dd 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 override + bool acceptRow(int sourceRow, const QModelIndex &parent_index) const 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 73ad9f0..b58bd9d 100644 --- a/tests/proxymodeltestapp/scriptablereparentingwidget.h +++ b/tests/proxymodeltestapp/scriptablereparentingwidget.h @@ -36,7 +36,7 @@ class ScriptableReparentingProxyModel : public KReparentingProxyModel public: ScriptableReparentingProxyModel(QObject *parent = nullptr); - /* reimp */ bool isDescendantOf(const QModelIndex &ancestor, const QModelIndex &descendant) const override; + bool isDescendantOf(const QModelIndex &ancestor, const QModelIndex &descendant) const override; void setImplementation(const QString &implementation);