wilderjds
/
kitemmodels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing Q_DECL_OVERRIDE

Browse Source
wilder
Montel Laurent 9 years ago
parent 1fff8ac1b9
commit 57567b062c
12 changed files with 46 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      autotests/krecursivefilterproxymodeltest.cpp
  2. 28
      autotests/kselectionproxymodeltestsuite.h
  3. 4
      src/kbreadcrumbselectionmodel.h
  4. 8
      src/kcheckableproxymodel.h
  5. 8
      src/krecursivefilterproxymodel.h
  6. 2
      tests/proxymodeltestapp/breadcrumbdirectionwidget.h
  7. 10
      tests/proxymodeltestapp/breadcrumbnavigationwidget.h
  8. 4
      tests/proxymodeltestapp/breadcrumbswidget.h
  9. 20
      tests/proxymodeltestapp/kreparentingproxymodel.h
  10. 2
      tests/proxymodeltestapp/lessthanwidget.h
  11. 2
      tests/proxymodeltestapp/recursivefilterpmwidget.h
  12. 2
      tests/proxymodeltestapp/scriptablereparentingwidget.h

2
autotests/krecursivefilterproxymodeltest.cpp
Unescape View File

@ -90,7 +90,7 @@ public:
setSourceModel(sourceModel); 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(); // 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(); return sourceModel()->index(sourceRow, 0, sourceParent).data(Qt::UserRole+1).toBool();

28
autotests/kselectionproxymodeltestsuite.h
Unescape View File

@ -44,7 +44,7 @@ public:
} }
protected: protected:
/* reimp */ QAbstractProxyModel *getProxy() /* reimp */ QAbstractProxyModel *getProxy() Q_DECL_OVERRIDE
{ {
Q_ASSERT(sourceModel()); Q_ASSERT(sourceModel());
m_selectionModel = new QItemSelectionModel(sourceModel()); m_selectionModel = new QItemSelectionModel(sourceModel());
@ -94,58 +94,58 @@ public:
SelectorStrategy::setProperty("filterBehaviour", QVariant(int(_filterBehaviour))); SelectorStrategy::setProperty("filterBehaviour", QVariant(int(_filterBehaviour)));
} }
/* reimp */ void testInsertWhenEmptyData() /* reimp */ void testInsertWhenEmptyData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testInsertWhenEmptyData(); SelectorStrategy::testInsertWhenEmptyData();
} }
/* reimp */ void testInsertInRootData() /* reimp */ void testInsertInRootData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testInsertInRootData(); SelectorStrategy::testInsertInRootData();
} }
/* reimp */ void testInsertInTopLevelData() /* reimp */ void testInsertInTopLevelData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testInsertInTopLevelData(); SelectorStrategy::testInsertInTopLevelData();
} }
/* reimp */ void testInsertInSecondLevelData() /* reimp */ void testInsertInSecondLevelData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testInsertInSecondLevelData(); SelectorStrategy::testInsertInSecondLevelData();
} }
/* reimp */ void testRemoveFromRootData() /* reimp */ void testRemoveFromRootData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testRemoveFromRootData(); SelectorStrategy::testRemoveFromRootData();
} }
/* reimp */ void testRemoveFromTopLevelData() /* reimp */ void testRemoveFromTopLevelData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testRemoveFromTopLevelData(); SelectorStrategy::testRemoveFromTopLevelData();
} }
/* reimp */ void testRemoveFromSecondLevelData() /* reimp */ void testRemoveFromSecondLevelData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testRemoveFromSecondLevelData(); SelectorStrategy::testRemoveFromSecondLevelData();
} }
/* reimp */ void testMoveFromRootData() /* reimp */ void testMoveFromRootData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testMoveFromRootData(); SelectorStrategy::testMoveFromRootData();
} }
/* reimp */ void testMoveFromTopLevelData() /* reimp */ void testMoveFromTopLevelData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testMoveFromTopLevelData(); SelectorStrategy::testMoveFromTopLevelData();
} }
/* reimp */ void testMoveFromSecondLevelData() /* reimp */ void testMoveFromSecondLevelData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testMoveFromSecondLevelData(); SelectorStrategy::testMoveFromSecondLevelData();
} }
/* reimp */ void testModifyInRootData() /* reimp */ void testModifyInRootData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testModifyInRootData(); SelectorStrategy::testModifyInRootData();
} }
/* reimp */ void testModifyInTopLevelData() /* reimp */ void testModifyInTopLevelData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testModifyInTopLevelData(); SelectorStrategy::testModifyInTopLevelData();
} }
/* reimp */ void testModifyInSecondLevelData() /* reimp */ void testModifyInSecondLevelData() Q_DECL_OVERRIDE
{ {
SelectorStrategy::testModifyInSecondLevelData(); SelectorStrategy::testModifyInSecondLevelData();
} }

4
src/kbreadcrumbselectionmodel.h
Unescape View File

@ -144,9 +144,9 @@ public:
*/ */
void setBreadcrumbLength(int breadcrumbLength); 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: protected:
KBreadcrumbSelectionModelPrivate *const d_ptr; KBreadcrumbSelectionModelPrivate *const d_ptr;

8
src/kcheckableproxymodel.h
Unescape View File

@ -71,13 +71,13 @@ public:
void setSelectionModel(QItemSelectionModel *itemSelectionModel); void setSelectionModel(QItemSelectionModel *itemSelectionModel);
QItemSelectionModel *selectionModel() const; 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: protected:
virtual bool select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command); virtual bool select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command);

8
src/krecursivefilterproxymodel.h
Unescape View File

@ -98,13 +98,13 @@ public:
virtual ~KRecursiveFilterProxyModel(); virtual ~KRecursiveFilterProxyModel();
/** @reimp */ /** @reimp */
void setSourceModel(QAbstractItemModel *model); void setSourceModel(QAbstractItemModel *model) Q_DECL_OVERRIDE;
/** /**
* @reimplemented * @reimplemented
*/ */
virtual QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, int hits = 1, QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, int hits = 1,
Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const; Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const Q_DECL_OVERRIDE;
protected: protected:
/** /**
@ -113,7 +113,7 @@ protected:
virtual bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const; virtual bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const;
/** @reimp */ /** @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; KRecursiveFilterProxyModelPrivate *const d_ptr;

2
tests/proxymodeltestapp/breadcrumbdirectionwidget.h
Unescape View File

@ -31,7 +31,7 @@ public:
BreadcrumbDirectionWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); BreadcrumbDirectionWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
protected: protected:
virtual bool eventFilter(QObject *, QEvent *); bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE;
}; };

10
tests/proxymodeltestapp/breadcrumbnavigationwidget.h
Unescape View File

@ -55,7 +55,7 @@ public:
void setShowHiddenAscendantData(bool showHiddenAscendantData); void setShowHiddenAscendantData(bool showHiddenAscendantData);
bool showHiddenAscendantData() const; 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: private:
bool m_showHiddenAscendantData; bool m_showHiddenAscendantData;
@ -68,9 +68,9 @@ class KNavigatingProxyModel : public KSelectionProxyModel
public: public:
KNavigatingProxyModel(QItemSelectionModel *selectionModel, QObject *parent = 0); 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: private Q_SLOTS:
void modelReset(); void modelReset();
@ -97,8 +97,8 @@ public:
KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, QObject *parent = 0); KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, QObject *parent = 0);
KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, Direction direction, QObject *parent = 0); KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, Direction direction, QObject *parent = 0);
virtual void select(const QModelIndex &index, SelectionFlags command); void select(const QModelIndex &index, SelectionFlags command) Q_DECL_OVERRIDE;
virtual void select(const QItemSelection &selection, SelectionFlags command); void select(const QItemSelection &selection, SelectionFlags command) Q_DECL_OVERRIDE;
private Q_SLOTS: private Q_SLOTS:
void navigationSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected); void navigationSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);

4
tests/proxymodeltestapp/breadcrumbswidget.h
Unescape View File

@ -37,8 +37,8 @@ public:
MultiSelectionModel(QAbstractItemModel *model, QList<QItemSelectionModel *> selectionModels, QObject *parent = 0); MultiSelectionModel(QAbstractItemModel *model, QList<QItemSelectionModel *> selectionModels, QObject *parent = 0);
public: public:
virtual void select(const QModelIndex &index, SelectionFlags command); void select(const QModelIndex &index, SelectionFlags command) Q_DECL_OVERRIDE;
virtual void select(const QItemSelection &selection, SelectionFlags command); void select(const QItemSelection &selection, SelectionFlags command) Q_DECL_OVERRIDE;
private: private:
QList<QItemSelectionModel *> m_selectionModels; QList<QItemSelectionModel *> m_selectionModels;

20
tests/proxymodeltestapp/kreparentingproxymodel.h
Unescape View File

@ -104,30 +104,30 @@ public:
virtual ~KReparentingProxyModel(); 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. Reimplement this to return whether @p descendant is a descendant of @p ancestor.
*/ */
virtual bool isDescendantOf(const QModelIndex &ancestor, const QModelIndex &descendant) const; 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: protected:
void beginChangeRule(); void beginChangeRule();

2
tests/proxymodeltestapp/lessthanwidget.h
Unescape View File

@ -33,7 +33,7 @@ class ColoredTreeModel : public DynamicTreeModel
public: public:
ColoredTreeModel(QObject *parent = 0); 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); void setSelectionModel(QItemSelectionModel *selectionModel);

2
tests/proxymodeltestapp/recursivefilterpmwidget.h
Unescape View File

@ -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; static const int column = 0;
QModelIndex srcIndex = sourceModel()->index(sourceRow, column, parent_index); QModelIndex srcIndex = sourceModel()->index(sourceRow, column, parent_index);

2
tests/proxymodeltestapp/scriptablereparentingwidget.h
Unescape View File

@ -36,7 +36,7 @@ class ScriptableReparentingProxyModel : public KReparentingProxyModel
public: public:
ScriptableReparentingProxyModel(QObject *parent = 0); 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); void setImplementation(const QString &implementation);

Write Preview
Loading…
Cancel
Save