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/codecs | |
| 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/codecs')
| -rw-r--r-- | tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp index c3b53a2fc0..f8f9387abb 100644 --- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp @@ -2406,16 +2406,16 @@ void tst_QTextCodec::shiftJis() struct UserCodec : public QTextCodec { // implement pure virtuals - QByteArray name() const Q_DECL_OVERRIDE + QByteArray name() const override { return "UserCodec"; } - QList<QByteArray> aliases() const Q_DECL_OVERRIDE + QList<QByteArray> aliases() const override { return QList<QByteArray>() << "usercodec" << "user-codec"; } - int mibEnum() const Q_DECL_OVERRIDE + int mibEnum() const override { return 5000; } - virtual QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE + virtual QString convertToUnicode(const char *, int, ConverterState *) const override { return QString(); } - virtual QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE + virtual QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override { return QByteArray(); } }; |