summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/itemviews
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/widgets/itemviews
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/widgets/itemviews')
-rw-r--r--tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp4
-rw-r--r--tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp22
2 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index 2517d3bd5a..5f98902abd 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -196,13 +196,13 @@ class DialogItemDelegate : public QStyledItemDelegate
{
public:
using QStyledItemDelegate::QStyledItemDelegate;
- QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, const QModelIndex &) const
+ QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, const QModelIndex &) const override
{
openedEditor = new QDialog(parent);
return openedEditor;
}
- void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
+ void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override
{
Q_UNUSED(model);
Q_UNUSED(index);
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index 155b5389fc..16f8b97d49 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -77,7 +77,7 @@ public:
void drawDisplay(QPainter *painter,
const QStyleOptionViewItem &option,
- const QRect &rect, const QString &text) const
+ const QRect &rect, const QString &text) const override
{
displayText = text;
displayFont = option.font;
@@ -86,7 +86,7 @@ public:
void drawDecoration(QPainter *painter,
const QStyleOptionViewItem &option,
- const QRect &rect, const QPixmap &pixmap) const
+ const QRect &rect, const QPixmap &pixmap) const override
{
decorationPixmap = pixmap;
decorationRect = rect;
@@ -113,7 +113,7 @@ public:
return QItemDelegate::rect(option, index, role);
}
- inline bool eventFilter(QObject *object, QEvent *event)
+ inline bool eventFilter(QObject *object, QEvent *event) override
{
return QItemDelegate::eventFilter(object, event);
}
@@ -121,7 +121,7 @@ public:
inline bool editorEvent(QEvent *event,
QAbstractItemModel *model,
const QStyleOptionViewItem &option,
- const QModelIndex &index)
+ const QModelIndex &index) override
{
return QItemDelegate::editorEvent(event, model, option, index);
}
@@ -149,19 +149,19 @@ public:
~TestItemModel() {}
- int rowCount(const QModelIndex &parent) const
+ int rowCount(const QModelIndex &parent) const override
{
Q_UNUSED(parent);
return 1;
}
- int columnCount(const QModelIndex &parent) const
+ int columnCount(const QModelIndex &parent) const override
{
Q_UNUSED(parent);
return 1;
}
- QVariant data(const QModelIndex& index, int role) const
+ QVariant data(const QModelIndex& index, int role) const override
{
Q_UNUSED(index);
static QPixmap pixmap(size);
@@ -812,7 +812,7 @@ void tst_QItemDelegate::dateTimeEditor()
class ChooseEditorDelegate : public QItemDelegate
{
public:
- virtual QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &o, const QModelIndex &i) const
+ virtual QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &o, const QModelIndex &i) const override
{
if (m_editor) {
m_editor->setParent(parent);
@@ -822,7 +822,7 @@ public:
return m_editor;
}
- virtual void destroyEditor(QWidget *editor, const QModelIndex &i) const
+ virtual void destroyEditor(QWidget *editor, const QModelIndex &i) const override
{ // This is a reimplementation of QAbstractItemDelegate::destroyEditor just set the variable m_editor to 0
// The only reason we do this is to avoid the not recommended direct delete of editor (destroyEditor uses deleteLater)
QItemDelegate::destroyEditor(editor, i); // Allow destroy
@@ -1307,7 +1307,7 @@ void tst_QItemDelegate::enterKey()
struct TestDelegate : public QItemDelegate
{
WidgetType widgetType;
- virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& /*option*/, const QModelIndex& /*index*/) const
+ virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& /*option*/, const QModelIndex& /*index*/) const override
{
QWidget *editor = 0;
switch(widgetType) {
@@ -1456,7 +1456,7 @@ void tst_QItemDelegate::testLineEditValidation()
struct TestDelegate : public QItemDelegate
{
- virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
+ virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override
{
Q_UNUSED(option);
Q_UNUSED(index);