summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/itemmodels
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-09-10 20:39:49 +0200
committerLars Knoll <lars.knoll@qt.io>2020-09-11 00:20:47 +0200
commit6ae7a02104631a2234c475575ae15ca79bef14f9 (patch)
tree5ca2db0e3aa3c7851c6d19117147c581bebeeee3 /tests/auto/corelib/itemmodels
parent459e8dfdfb8ac164383c14332b2b0919f59f8b3c (diff)
Remove most compiler warnings about missing overrides
Remove around 1000 compiler warnings about missing overrides in our auto tests. This significantly reduce the compiler warning noise in our auto tests, so that one can actually better see the real problems inbetween. Change-Id: Id0c04dba43fcaf55d8cd2b5c6697358857c31bf9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/corelib/itemmodels')
-rw-r--r--tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp32
-rw-r--r--tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp30
-rw-r--r--tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp8
-rw-r--r--tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp26
4 files changed, 48 insertions, 48 deletions
diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
index df3104eddf..5d384de2b2 100644
--- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -134,26 +134,26 @@ class QtTestModel: public QAbstractItemModel
public:
QtTestModel(int rows, int columns, QObject *parent = 0);
QtTestModel(const QList<QList<QString> > tbl, QObject *parent = 0);
- QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
- QModelIndex parent(const QModelIndex &) const;
- int rowCount(const QModelIndex &parent) const;
- int columnCount(const QModelIndex &parent) const;
- bool hasChildren(const QModelIndex &) const;
- QVariant data(const QModelIndex &idx, int) const;
- bool setData(const QModelIndex &idx, const QVariant &value, int);
- bool insertRows(int row, int count, const QModelIndex &parent= QModelIndex());
- bool insertColumns(int column, int count, const QModelIndex &parent= QModelIndex());
+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex &) const override;
+ int rowCount(const QModelIndex &parent) const override;
+ int columnCount(const QModelIndex &parent) const override;
+ bool hasChildren(const QModelIndex &) const override;
+ QVariant data(const QModelIndex &idx, int) const override;
+ bool setData(const QModelIndex &idx, const QVariant &value, int) override;
+ bool insertRows(int row, int count, const QModelIndex &parent= QModelIndex()) override;
+ bool insertColumns(int column, int count, const QModelIndex &parent= QModelIndex()) override;
void setPersistent(const QModelIndex &from, const QModelIndex &to);
- bool removeRows ( int row, int count, const QModelIndex & parent = QModelIndex() );
- bool removeColumns( int column, int count, const QModelIndex & parent = QModelIndex());
+ bool removeRows ( int row, int count, const QModelIndex & parent = QModelIndex()) override;
+ bool removeColumns( int column, int count, const QModelIndex & parent = QModelIndex()) override;
bool moveRows (const QModelIndex &sourceParent, int sourceRow, int count,
- const QModelIndex &destinationParent, int destinationChild);
+ const QModelIndex &destinationParent, int destinationChild) override;
bool moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count,
- const QModelIndex &destinationParent, int destinationChild);
+ const QModelIndex &destinationParent, int destinationChild) override;
void reset();
bool canDropMimeData(const QMimeData *data, Qt::DropAction action,
- int row, int column, const QModelIndex &parent) const;
+ int row, int column, const QModelIndex &parent) const override;
int cCount, rCount;
mutable bool wrongIndex;
@@ -2171,14 +2171,14 @@ public:
}
- QHash<int, QByteArray> roleNames() const
+ QHash<int, QByteArray> roleNames() const override
{
QHash<int, QByteArray> roles = QStringListModel::roleNames();
roles.insert(Qt::UserRole + 2, "custom");
return roles;
}
- Qt::DropActions supportedDragActions() const
+ Qt::DropActions supportedDragActions() const override
{
return QStringListModel::supportedDragActions() | Qt::MoveAction;
}
diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
index 4406d40986..92700b251e 100644
--- a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
@@ -67,29 +67,29 @@ class SubQAbstractProxyModel : public QAbstractProxyModel
{
public:
// QAbstractProxyModel::mapFromSource is a pure virtual function.
- QModelIndex mapFromSource(QModelIndex const& sourceIndex) const
+ QModelIndex mapFromSource(QModelIndex const& sourceIndex) const override
{ Q_UNUSED(sourceIndex); return QModelIndex(); }
// QAbstractProxyModel::mapToSource is a pure virtual function.
- QModelIndex mapToSource(QModelIndex const& proxyIndex) const
+ QModelIndex mapToSource(QModelIndex const& proxyIndex) const override
{ Q_UNUSED(proxyIndex); return QModelIndex(); }
- QModelIndex index(int, int, const QModelIndex&) const
+ QModelIndex index(int, int, const QModelIndex&) const override
{
return QModelIndex();
}
- QModelIndex parent(const QModelIndex&) const
+ QModelIndex parent(const QModelIndex&) const override
{
return QModelIndex();
}
- int rowCount(const QModelIndex&) const
+ int rowCount(const QModelIndex&) const override
{
return 0;
}
- int columnCount(const QModelIndex&) const
+ int columnCount(const QModelIndex&) const override
{
return 0;
}
@@ -399,7 +399,7 @@ class SwappingProxy : public QAbstractProxyModel
}
}
public:
- virtual QModelIndex index(int row, int column, const QModelIndex &parentIdx) const
+ virtual QModelIndex index(int row, int column, const QModelIndex &parentIdx) const override
{
if (!sourceModel())
return QModelIndex();
@@ -412,28 +412,28 @@ public:
return createIndex(row, column, parentIdx.internalPointer());
}
- virtual QModelIndex parent(const QModelIndex &parentIdx) const
+ virtual QModelIndex parent(const QModelIndex &parentIdx) const override
{
// well, we're a 2D model
Q_UNUSED(parentIdx);
return QModelIndex();
}
- virtual int rowCount(const QModelIndex &parentIdx) const
+ virtual int rowCount(const QModelIndex &parentIdx) const override
{
if (parentIdx.isValid() || !sourceModel())
return 0;
return sourceModel()->rowCount();
}
- virtual int columnCount(const QModelIndex &parentIdx) const
+ virtual int columnCount(const QModelIndex &parentIdx) const override
{
if (parentIdx.isValid() || !sourceModel())
return 0;
return sourceModel()->rowCount();
}
- virtual QModelIndex mapToSource(const QModelIndex &proxyIndex) const
+ virtual QModelIndex mapToSource(const QModelIndex &proxyIndex) const override
{
if (!proxyIndex.isValid())
return QModelIndex();
@@ -443,7 +443,7 @@ public:
return sourceModel()->index(swapRow(proxyIndex.row()), proxyIndex.column(), QModelIndex());
}
- virtual QModelIndex mapFromSource(const QModelIndex &sourceIndex) const
+ virtual QModelIndex mapFromSource(const QModelIndex &sourceIndex) const override
{
if (!sourceIndex.isValid())
return QModelIndex();
@@ -485,9 +485,9 @@ void tst_QAbstractProxyModel::testSwappingRowsProxy()
class StandardItemModelWithCustomDragAndDrop : public QStandardItemModel
{
public:
- QStringList mimeTypes() const { return QStringList() << QStringLiteral("foo/mimetype"); }
- Qt::DropActions supportedDragActions() const { return Qt::CopyAction | Qt::LinkAction; }
- Qt::DropActions supportedDropActions() const { return Qt::MoveAction; }
+ QStringList mimeTypes() const override { return QStringList() << QStringLiteral("foo/mimetype"); }
+ Qt::DropActions supportedDragActions() const override { return Qt::CopyAction | Qt::LinkAction; }
+ Qt::DropActions supportedDropActions() const override { return Qt::MoveAction; }
};
void tst_QAbstractProxyModel::testDragAndDrop()
diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
index 95743ddb9e..4828df8b94 100644
--- a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
@@ -43,9 +43,9 @@ Q_LOGGING_CATEGORY(lcItemModels, "qt.corelib.tests.itemmodels")
class DataChangedModel : public QAbstractListModel
{
public:
- int rowCount(const QModelIndex &parent) const { return parent.isValid() ? 0 : 1; }
- QVariant data(const QModelIndex&, int) const { return QVariant(); }
- QModelIndex index(int row, int column, const QModelIndex &) const { return createIndex(row, column); }
+ int rowCount(const QModelIndex &parent) const override { return parent.isValid() ? 0 : 1; }
+ QVariant data(const QModelIndex&, int) const override { return QVariant(); }
+ QModelIndex index(int row, int column, const QModelIndex &) const override { return createIndex(row, column); }
void changeData()
{
@@ -399,7 +399,7 @@ void tst_QIdentityProxyModel::dataChanged()
class AppendStringProxy : public QIdentityProxyModel
{
public:
- QVariant data(const QModelIndex &index, int role) const
+ QVariant data(const QModelIndex &index, int role) const override
{
const QVariant result = QIdentityProxyModel::data(index, role);
if (role != Qt::DisplayRole)
diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
index 3185dbcaf4..313facac81 100644
--- a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -127,17 +127,17 @@ public:
return helper.QAbstractItemModel::createIndex(row, column, data);
}
- QModelIndex index(int, int, const QModelIndex&) const
+ QModelIndex index(int, int, const QModelIndex&) const override
{ return QModelIndex(); }
- QModelIndex parent(const QModelIndex&) const
+ QModelIndex parent(const QModelIndex&) const override
{ return QModelIndex(); }
- int rowCount(const QModelIndex & = QModelIndex()) const
+ int rowCount(const QModelIndex & = QModelIndex()) const override
{ return 0; }
- int columnCount(const QModelIndex & = QModelIndex()) const
+ int columnCount(const QModelIndex & = QModelIndex()) const override
{ return 0; }
- QVariant data(const QModelIndex &, int = Qt::DisplayRole) const
+ QVariant data(const QModelIndex &, int = Qt::DisplayRole) const override
{ return QVariant(); }
- bool hasChildren(const QModelIndex &) const
+ bool hasChildren(const QModelIndex &) const override
{ return false; }
};
@@ -2099,11 +2099,11 @@ public:
{
}
- int rowCount(const QModelIndex& = QModelIndex()) const { return row_count; }
- int columnCount(const QModelIndex& = QModelIndex()) const { return column_count; }
+ int rowCount(const QModelIndex& = QModelIndex()) const override { return row_count; }
+ int columnCount(const QModelIndex& = QModelIndex()) const override { return column_count; }
bool isEditable(const QModelIndex &) const { return true; }
- QVariant data(const QModelIndex &idx, int role) const
+ QVariant data(const QModelIndex &idx, int role) const override
{
if (role == Qt::DisplayRole || role == Qt::EditRole)
return QLatin1Char('[') + QString::number(idx.row()) + QLatin1Char(',')
@@ -2305,7 +2305,7 @@ void tst_QItemSelectionModel::layoutChangedWithAllSelected2()
struct MyFilterModel : public QSortFilterProxyModel
{ // Override sort filter proxy to remove even numbered rows.
bool filtering;
- virtual bool filterAcceptsRow( int source_row, const QModelIndex& /* source_parent */) const
+ virtual bool filterAcceptsRow( int source_row, const QModelIndex& /* source_parent */) const override
{
return !filtering || !( source_row & 1 );
}
@@ -2693,7 +2693,7 @@ public:
{
}
- void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command)
+ void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command) override
{
QItemSelectionModel::select(selection, command);
m_target->select(selection, command);
@@ -2701,13 +2701,13 @@ public:
using QItemSelectionModel::select;
- void setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command)
+ void setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) override
{
QItemSelectionModel::setCurrentIndex(index, command);
m_target->setCurrentIndex(index, command);
}
- void clearCurrentIndex()
+ void clearCurrentIndex() override
{
QItemSelectionModel::clearCurrentIndex();
m_target->clearCurrentIndex();