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/gui/kernel | |
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/gui/kernel')
8 files changed, 18 insertions, 17 deletions
diff --git a/tests/auto/gui/kernel/qbackingstore/tst_qbackingstore.cpp b/tests/auto/gui/kernel/qbackingstore/tst_qbackingstore.cpp index 79c669753b..b2dc8ee035 100644 --- a/tests/auto/gui/kernel/qbackingstore/tst_qbackingstore.cpp +++ b/tests/auto/gui/kernel/qbackingstore/tst_qbackingstore.cpp @@ -53,12 +53,12 @@ public: { } - void resizeEvent(QResizeEvent *) + void resizeEvent(QResizeEvent *) override { backingStore.resize(size()); } - void exposeEvent(QExposeEvent *event) + void exposeEvent(QExposeEvent *event) override { QRect rect(QPoint(), size()); diff --git a/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp b/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp index 43b2b79698..9da15b3e36 100644 --- a/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp +++ b/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp @@ -55,7 +55,7 @@ private: QByteArray readFileContent(QFileOpenEvent& event); bool appendFileContent(QFileOpenEvent& event, const QByteArray& writeContent); - bool event(QEvent *); + bool event(QEvent *) override; QTemporaryDir m_temporaryDir; QString m_originalCurrent; diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp index e0415441b9..b68f00ea46 100644 --- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp +++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp @@ -186,7 +186,7 @@ class DummyWindow : public QWindow public: DummyWindow() : m_focusObject(nullptr) {} - virtual QObject *focusObject() const + virtual QObject *focusObject() const override { return m_focusObject; } @@ -353,14 +353,14 @@ void tst_QGuiApplication::abortQuitOnShow() class FocusChangeWindow: public QWindow { protected: - virtual bool event(QEvent *ev) + virtual bool event(QEvent *ev) override { if (ev->type() == QEvent::FocusAboutToChange) windowDuringFocusAboutToChange = qGuiApp->focusWindow(); return QWindow::event(ev); } - virtual void focusOutEvent(QFocusEvent *) + virtual void focusOutEvent(QFocusEvent *) override { windowDuringFocusOut = qGuiApp->focusWindow(); } @@ -602,7 +602,7 @@ public: inline explicit BlockableWindow(QWindow *parent = nullptr) : QWindow(parent), blocked(false), leaves(0), enters(0) {} - bool event(QEvent *e) + bool event(QEvent *e) override { switch (e->type()) { case QEvent::WindowBlocked: @@ -985,7 +985,7 @@ class TestPluginFactory : public QGenericPlugin Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "testplugin.json") public: - QObject* create(const QString &key, const QString &) + QObject* create(const QString &key, const QString &) override { if (key == "testplugin") return new TestPlugin; @@ -1003,7 +1003,7 @@ public: : customEvents(0) {} - virtual void customEvent(QEvent *) + virtual void customEvent(QEvent *) override { customEvents++; } diff --git a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp index 15c905f943..d28dab3ad0 100644 --- a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp +++ b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp @@ -39,7 +39,7 @@ class InputItem : public QObject public: InputItem() : cursorRectangle(1, 2, 3, 4), m_enabled(true) {} - bool event(QEvent *event) + bool event(QEvent *event) override { if (event->type() == QEvent::InputMethodQuery) { QInputMethodQueryEvent *query = static_cast<QInputMethodQueryEvent *>(event); @@ -74,7 +74,7 @@ class DummyWindow : public QWindow public: DummyWindow() : m_focusObject(0) {} - virtual QObject *focusObject() const + virtual QObject *focusObject() const override { return m_focusObject; } diff --git a/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp b/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp index 66160df21b..09becfe860 100644 --- a/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp +++ b/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp @@ -37,8 +37,8 @@ class Window : public QWindow public: ~Window() { reset(); } - void keyPressEvent(QKeyEvent *event) { recordEvent(event); } - void keyReleaseEvent(QKeyEvent *event) { recordEvent(event); } + void keyPressEvent(QKeyEvent *event) override { recordEvent(event); } + void keyReleaseEvent(QKeyEvent *event) override { recordEvent(event); } void reset() { qDeleteAll(keyEvents.begin(), keyEvents.end()); diff --git a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp index 258ea0c85d..c0a0eb18f3 100644 --- a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp +++ b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp @@ -46,7 +46,7 @@ public: int mouseReleaseButtons; int mouseReleaseModifiers; protected: - void mousePressEvent(QMouseEvent *e) + void mousePressEvent(QMouseEvent *e) override { QWindow::mousePressEvent(e); mousePressButton = e->button(); @@ -55,7 +55,7 @@ protected: mousePressEventRecieved = true; e->accept(); } - void mouseReleaseEvent(QMouseEvent *e) + void mouseReleaseEvent(QMouseEvent *e) override { QWindow::mouseReleaseEvent(e); mouseReleaseButton = e->button(); diff --git a/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp index 758aeb42b9..c430148a91 100644 --- a/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp +++ b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp @@ -88,7 +88,7 @@ public: TstDialog( QWidget *mouseWidget, QWidget *parent, const char *name ); int count() { return c; } protected: - void showEvent ( QShowEvent * ); + void showEvent(QShowEvent *) override; public slots: void releaseMouse(); void closeDialog(); diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index dd0fb46eca..e84efa6ac3 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -402,7 +402,8 @@ public: using Window::Window; protected: - void paintEvent(QPaintEvent *) { + void paintEvent(QPaintEvent *) override + { // Handled, not calling base class } }; |