diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-09-10 20:39:49 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-11 00:20:47 +0200 |
commit | 6ae7a02104631a2234c475575ae15ca79bef14f9 (patch) | |
tree | 5ca2db0e3aa3c7851c6d19117147c581bebeeee3 /tests/auto/widgets/dialogs | |
parent | 459e8dfdfb8ac164383c14332b2b0919f59f8b3c (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/dialogs')
7 files changed, 25 insertions, 22 deletions
diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index a73279018d..266ed0de05 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -104,12 +104,14 @@ public: bool wasActive() const { return mWasActive; } bool wasModalWindow() const { return mWasModalWindow; } - int exec() { + int exec() override + { tId = startTimer(300); return QDialog::exec(); } protected: - void timerEvent(QTimerEvent *event) { + void timerEvent(QTimerEvent *event) override + { if (tId == event->timerId()) { killTimer(tId); mWasActive = isActiveWindow(); @@ -414,7 +416,7 @@ class TestRejectDialog : public QDialog { public: TestRejectDialog() : cancelReject(false), called(0) {} - void reject() + void reject() override { called++; if (!cancelReject) diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 20c0dd993b..4b9466d3b6 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -201,8 +201,8 @@ class MyAbstractItemDelegate : public QAbstractItemDelegate { public: MyAbstractItemDelegate() : QAbstractItemDelegate() {}; - void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const {} - QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const { return QSize(); } + void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override {} + QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const override { return QSize(); } }; // emitted any time the selection model emits current changed diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index cbb1c72b11..beec8db0d9 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -482,7 +482,7 @@ public: {}; protected: - bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const + bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override { QModelIndex parentIndex; parentIndex = source_parent; @@ -515,7 +515,7 @@ public: { } protected: - virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const + virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const override { QFileSystemModel * const model = qobject_cast<QFileSystemModel *>(sourceModel()); const QFileInfo leftInfo(model->fileInfo(left)); diff --git a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp index 877784041b..2a40af320b 100644 --- a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp +++ b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp @@ -48,7 +48,7 @@ class tst_QInputDialog : public QObject static void testFuncGetText(QInputDialog *dialog); static void testFuncGetItem(QInputDialog *dialog); static void testFuncSingleStepDouble(QInputDialog *dialog); - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; private slots: void getInt_data(); void getInt(); diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp index 3169a9cb4e..dfb8dc1c37 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp @@ -80,7 +80,8 @@ public: bool resized; protected: - void resizeEvent ( QResizeEvent * event ) { + void resizeEvent ( QResizeEvent * event ) override + { resized = true; QMessageBox::resizeEvent(event); } diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index e9bf14b1e6..3e8a81c33c 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -821,9 +821,9 @@ struct MyPage2 : public QWizardPage public: MyPage2() : init(0), cleanup(0), validate(0) {} - void initializePage() { ++init; QWizardPage::initializePage(); } - void cleanupPage() { ++cleanup; QWizardPage::cleanupPage(); } - bool validatePage() { ++validate; return QWizardPage::validatePage(); } + void initializePage() override { ++init; QWizardPage::initializePage(); } + void cleanupPage() override { ++cleanup; QWizardPage::cleanupPage(); } + bool validatePage() override { ++validate; return QWizardPage::validatePage(); } bool sanityCheck(int init, int cleanup) { @@ -1592,13 +1592,13 @@ protected: class SetPage : public Operation { - void apply(QWizard *wizard) const + void apply(QWizard *wizard) const override { wizard->restart(); for (int j = 0; j < page; ++j) wizard->next(); } - QString describe() const { return QLatin1String("set page ") + QString::number(page); } + QString describe() const override { return QLatin1String("set page ") + QString::number(page); } int page; public: static QSharedPointer<SetPage> create(int page) @@ -1611,8 +1611,8 @@ public: class SetStyle : public Operation { - void apply(QWizard *wizard) const { wizard->setWizardStyle(style); } - QString describe() const { return QLatin1String("set style ") + QString::number(style); } + void apply(QWizard *wizard) const override { wizard->setWizardStyle(style); } + QString describe() const override { return QLatin1String("set style ") + QString::number(style); } QWizard::WizardStyle style; public: static QSharedPointer<SetStyle> create(QWizard::WizardStyle style) @@ -1625,8 +1625,8 @@ public: class SetOption : public Operation { - void apply(QWizard *wizard) const { wizard->setOption(option, on); } - QString describe() const; + void apply(QWizard *wizard) const override { wizard->setOption(option, on); } + QString describe() const override; QWizard::WizardOption option; bool on; public: @@ -2117,8 +2117,8 @@ class WizardPage : public QWizardPage { Q_OBJECT bool shown_; - void showEvent(QShowEvent *) { shown_ = true; } - void hideEvent(QHideEvent *) { shown_ = false; } + void showEvent(QShowEvent *) override { shown_ = true; } + void hideEvent(QHideEvent *) override { shown_ = false; } public: WizardPage() : shown_(false) {} bool shown() const { return shown_; } @@ -2511,7 +2511,7 @@ private: QTreeWidget *treeWidget; QSizePolicy::Policy verticalPolicy; - void initializePage() + void initializePage() override { if (layout()) delete layout(); diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp index 0969cecc45..cc48543a76 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp @@ -61,7 +61,7 @@ class taskQTBUG_25691Page2 : public QWizardPage public: taskQTBUG_25691Page2( QWidget * parent = 0 ); - virtual void initializePage(void); + virtual void initializePage(void) override; ~taskQTBUG_25691Page2(void); |