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/qcsvbenchmarklogger_p.h | |
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 'src/testlib/qcsvbenchmarklogger_p.h')
-rw-r--r-- | src/testlib/qcsvbenchmarklogger_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/testlib/qcsvbenchmarklogger_p.h b/src/testlib/qcsvbenchmarklogger_p.h index f321494e8a..5840aee0f5 100644 --- a/src/testlib/qcsvbenchmarklogger_p.h +++ b/src/testlib/qcsvbenchmarklogger_p.h @@ -61,18 +61,18 @@ public: QCsvBenchmarkLogger(const char *filename); ~QCsvBenchmarkLogger(); - void startLogging() Q_DECL_OVERRIDE; - void stopLogging() Q_DECL_OVERRIDE; + void startLogging() override; + void stopLogging() override; - void enterTestFunction(const char *function) Q_DECL_OVERRIDE; - void leaveTestFunction() Q_DECL_OVERRIDE; + void enterTestFunction(const char *function) override; + void leaveTestFunction() override; void addIncident(IncidentTypes type, const char *description, - const char *file = 0, int line = 0) Q_DECL_OVERRIDE; - void addBenchmarkResult(const QBenchmarkResult &result) Q_DECL_OVERRIDE; + const char *file = 0, int line = 0) override; + void addBenchmarkResult(const QBenchmarkResult &result) override; void addMessage(MessageTypes type, const QString &message, - const char *file = 0, int line = 0) Q_DECL_OVERRIDE; + const char *file = 0, int line = 0) override; }; QT_END_NAMESPACE |