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/auto/corelib/thread/qfuture | |
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/auto/corelib/thread/qfuture')
-rw-r--r-- | tests/auto/corelib/thread/qfuture/tst_qfuture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp index 37b052bf1d..408a90afc4 100644 --- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp @@ -1303,8 +1303,8 @@ QFuture<int> createExceptionResultFuture() class DerivedException : public QException { public: - void raise() const Q_DECL_OVERRIDE { throw *this; } - DerivedException *clone() const Q_DECL_OVERRIDE { return new DerivedException(*this); } + void raise() const override { throw *this; } + DerivedException *clone() const override { return new DerivedException(*this); } }; QFuture<void> createDerivedExceptionFuture() @@ -1454,7 +1454,7 @@ void tst_QFuture::nonGlobalThreadPool() return f; } - void run() Q_DECL_OVERRIDE + void run() override { const int ms = 100 + (qrand() % 100 - 100/2); QThread::msleep(ms); |