diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 10:36:49 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:42 +0000 |
commit | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (patch) | |
tree | 330914ff8225867e19b9ed5e049813d9f1e5ec08 /tests/manual/qscreen | |
parent | 93dd85141b35460a83dac86083581ba1c1975927 (diff) |
Replace Q_DECL_OVERRIDE with override where possible
Remaining uses of Q_DECL_OVERRIDE are in:
src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
doc/global/qt-cpp-defines.qdocconf
(definition and documentation of Q_DECL_OVERRIDE)
tests/manual/qcursor/qcursorhighdpi/main.cpp
(a test executable compilable both under Qt4 and Qt5)
Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'tests/manual/qscreen')
-rw-r--r-- | tests/manual/qscreen/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/manual/qscreen/main.cpp b/tests/manual/qscreen/main.cpp index 445af82e09..4b9f49e9f0 100644 --- a/tests/manual/qscreen/main.cpp +++ b/tests/manual/qscreen/main.cpp @@ -73,12 +73,12 @@ public: } protected: - void mouseMoveEvent(QMouseEvent *ev) Q_DECL_OVERRIDE { + void mouseMoveEvent(QMouseEvent *ev) override { m_cursorPos = ev->screenPos().toPoint(); updateText(); } - void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE { + void mousePressEvent(QMouseEvent *ev) override { m_cursorPos = ev->screenPos().toPoint(); qDebug() << "top level @" << m_cursorPos << ":" << QGuiApplication::topLevelAt(m_cursorPos); updateText(); @@ -150,7 +150,7 @@ public: QScreen *screenSubject() const { return m_watcher->screenSubject(); } protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; void startMouseMonitor(); private: |