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 /src/testlib/qbenchmarkperfevents_p.h | |
parent | 93dd85141b35460a83dac86083581ba1c1975927 (diff) | |
download | qtbase-47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7.tar.gz |
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 'src/testlib/qbenchmarkperfevents_p.h')
-rw-r--r-- | src/testlib/qbenchmarkperfevents_p.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/testlib/qbenchmarkperfevents_p.h b/src/testlib/qbenchmarkperfevents_p.h index 085dc620d7..86ba556549 100644 --- a/src/testlib/qbenchmarkperfevents_p.h +++ b/src/testlib/qbenchmarkperfevents_p.h @@ -60,16 +60,16 @@ class QBenchmarkPerfEventsMeasurer : public QBenchmarkMeasurerBase public: QBenchmarkPerfEventsMeasurer(); ~QBenchmarkPerfEventsMeasurer(); - virtual void init() Q_DECL_OVERRIDE; - virtual void start() Q_DECL_OVERRIDE; - virtual qint64 checkpoint() Q_DECL_OVERRIDE; - virtual qint64 stop() Q_DECL_OVERRIDE; - virtual bool isMeasurementAccepted(qint64 measurement) Q_DECL_OVERRIDE; - virtual int adjustIterationCount(int suggestion) Q_DECL_OVERRIDE; - virtual int adjustMedianCount(int suggestion) Q_DECL_OVERRIDE; - virtual bool repeatCount() Q_DECL_OVERRIDE { return 1; } - virtual bool needsWarmupIteration() Q_DECL_OVERRIDE { return true; } - virtual QTest::QBenchmarkMetric metricType() Q_DECL_OVERRIDE; + virtual void init() override; + virtual void start() override; + virtual qint64 checkpoint() override; + virtual qint64 stop() override; + virtual bool isMeasurementAccepted(qint64 measurement) override; + virtual int adjustIterationCount(int suggestion) override; + virtual int adjustMedianCount(int suggestion) override; + virtual bool repeatCount() override { return 1; } + virtual bool needsWarmupIteration() override { return true; } + virtual QTest::QBenchmarkMetric metricType() override; static bool isAvailable(); static QTest::QBenchmarkMetric metricForEvent(quint32 type, quint64 event_id); |