From 01e57909d4bce31483d023cf11dd2298391b38f3 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 1 Aug 2018 18:26:26 +0200 Subject: Add a few overrides in Qt Core Clang-tidy says: warning: annotate this function with 'override' or (rarely) 'final' [modernize-use-override] Change-Id: Ic2304cf35f4132ba1f55714493db93836f8b413d Reviewed-by: Thiago Macieira --- src/corelib/codecs/qeucjpcodec_p.h | 10 +++---- src/corelib/codecs/qeuckrcodec_p.h | 20 ++++++------- src/corelib/codecs/qgb18030codec_p.h | 28 +++++++++---------- src/corelib/codecs/qiconvcodec_p.h | 8 +++--- src/corelib/codecs/qjiscodec_p.h | 10 +++---- src/corelib/codecs/qjpunicode.cpp | 54 ++++++++++++++++++------------------ src/corelib/codecs/qsjiscodec_p.h | 10 +++---- src/corelib/codecs/qwindowscodec_p.h | 8 +++--- 8 files changed, 74 insertions(+), 74 deletions(-) (limited to 'src/corelib/codecs') diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h index 98ad286e9e..f2a9f923c8 100644 --- a/src/corelib/codecs/qeucjpcodec_p.h +++ b/src/corelib/codecs/qeucjpcodec_p.h @@ -94,12 +94,12 @@ public: static QList _aliases() { return QList(); } static int _mibEnum(); - QByteArray name() const { return _name(); } - QList aliases() const { return _aliases(); } - int mibEnum() const { return _mibEnum(); } + QByteArray name() const override { return _name(); } + QList aliases() const override { return _aliases(); } + int mibEnum() const override { return _mibEnum(); } - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; QEucJpCodec(); ~QEucJpCodec(); diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h index 2cf950a350..bedf0cf822 100644 --- a/src/corelib/codecs/qeuckrcodec_p.h +++ b/src/corelib/codecs/qeuckrcodec_p.h @@ -90,12 +90,12 @@ public: static QList _aliases() { return QList(); } static int _mibEnum(); - QByteArray name() const { return _name(); } - QList aliases() const { return _aliases(); } - int mibEnum() const { return _mibEnum(); } + QByteArray name() const override { return _name(); } + QList aliases() const override { return _aliases(); } + int mibEnum() const override { return _mibEnum(); } - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; }; class QCP949Codec : public QTextCodec { @@ -104,12 +104,12 @@ public: static QList _aliases(); static int _mibEnum(); - QByteArray name() const { return _name(); } - QList aliases() const { return _aliases(); } - int mibEnum() const { return _mibEnum(); } + QByteArray name() const override { return _name(); } + QList aliases() const override { return _aliases(); } + int mibEnum() const override { return _mibEnum(); } - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; }; #endif // QT_NO_BIG_CODECS diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h index dd136aeddb..635150b18e 100644 --- a/src/corelib/codecs/qgb18030codec_p.h +++ b/src/corelib/codecs/qgb18030codec_p.h @@ -69,12 +69,12 @@ public: static QList _aliases() { return QList(); } static int _mibEnum() { return 114; } - QByteArray name() const { return _name(); } - QList aliases() const { return _aliases(); } - int mibEnum() const { return _mibEnum(); } + QByteArray name() const override { return _name(); } + QList aliases() const override { return _aliases(); } + int mibEnum() const override { return _mibEnum(); } - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; }; class QGbkCodec : public QGb18030Codec { @@ -85,12 +85,12 @@ public: static QList _aliases(); static int _mibEnum(); - QByteArray name() const { return _name(); } - QList aliases() const { return _aliases(); } - int mibEnum() const { return _mibEnum(); } + QByteArray name() const override { return _name(); } + QList aliases() const override { return _aliases(); } + int mibEnum() const override { return _mibEnum(); } - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; }; class QGb2312Codec : public QGb18030Codec { @@ -101,11 +101,11 @@ public: static QList _aliases() { return QList(); } static int _mibEnum(); - QByteArray name() const { return _name(); } - int mibEnum() const { return _mibEnum(); } + QByteArray name() const override { return _name(); } + int mibEnum() const override { return _mibEnum(); } - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; }; #endif // QT_NO_BIG_CODECS diff --git a/src/corelib/codecs/qiconvcodec_p.h b/src/corelib/codecs/qiconvcodec_p.h index 9b8500538b..7d192232d7 100644 --- a/src/corelib/codecs/qiconvcodec_p.h +++ b/src/corelib/codecs/qiconvcodec_p.h @@ -69,11 +69,11 @@ public: QIconvCodec(); ~QIconvCodec(); - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; - QByteArray name() const; - int mibEnum() const; + QByteArray name() const override; + int mibEnum() const override; void init() const; iconv_t createIconv_t(const char *to, const char *from) const; diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h index 4db8728817..1ffe4a63f6 100644 --- a/src/corelib/codecs/qjiscodec_p.h +++ b/src/corelib/codecs/qjiscodec_p.h @@ -94,12 +94,12 @@ public: static QList _aliases(); static int _mibEnum(); - QByteArray name() const { return _name(); } - QList aliases() const { return _aliases(); } - int mibEnum() const { return _mibEnum(); } + QByteArray name() const override { return _name(); } + QList aliases() const override { return _aliases(); } + int mibEnum() const override { return _mibEnum(); } - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; QJisCodec(); ~QJisCodec(); diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp index 0209843ecf..23112ce4d3 100644 --- a/src/corelib/codecs/qjpunicode.cpp +++ b/src/corelib/codecs/qjpunicode.cpp @@ -349,15 +349,15 @@ public: // uint Jisx0201ToUnicode(uint h, uint l) const; // uint Jisx0201LatinToUnicode(uint h, uint l) const; // uint Jisx0201KanaToUnicode(uint h, uint l) const; - uint jisx0208ToUnicode(uint h, uint l) const; - uint jisx0212ToUnicode(uint h, uint l) const; + uint jisx0208ToUnicode(uint h, uint l) const override; + uint jisx0212ToUnicode(uint h, uint l) const override; // uint UnicodeToAscii(uint h, uint l) const; // uint UnicodeToJisx0201(uint h, uint l) const; // uint UnicodeToJisx0201Latin(uint h, uint l) const; // uint UnicodeToJisx0201Kana(uint h, uint l) const; - uint unicodeToJisx0208(uint h, uint l) const; - uint unicodeToJisx0212(uint h, uint l) const; + uint unicodeToJisx0208(uint h, uint l) const override; + uint unicodeToJisx0212(uint h, uint l) const override; }; uint QJpUnicodeConv_Unicode_ASCII::jisx0208ToUnicode(uint h, uint l) const @@ -406,18 +406,18 @@ class QJpUnicodeConv_JISX0221_JISX0201 : public QJpUnicodeConv { public: QJpUnicodeConv_JISX0221_JISX0201(int r) : QJpUnicodeConv(r) {} - uint asciiToUnicode(uint h, uint l) const; + uint asciiToUnicode(uint h, uint l) const override; // uint Jisx0201ToUnicode(uint h, uint l) const; // uint Jisx0201LatinToUnicode(uint h, uint l) const; // uint Jisx0201KanaToUnicode(uint h, uint l) const; - uint jisx0208ToUnicode(uint h, uint l) const; + uint jisx0208ToUnicode(uint h, uint l) const override; // uint Jisx0212ToUnicode(uint h, uint l) const; - uint unicodeToAscii(uint h, uint l) const; + uint unicodeToAscii(uint h, uint l) const override; // uint UnicodeToJisx0201(uint h, uint l) const; // uint UnicodeToJisx0201Latin(uint h, uint l) const; // uint UnicodeToJisx0201Kana(uint h, uint l) const; - uint unicodeToJisx0208(uint h, uint l) const; + uint unicodeToJisx0208(uint h, uint l) const override; // uint UnicodeToJisx0212(uint h, uint l) const; }; @@ -462,17 +462,17 @@ public: // uint AsciiToUnicode(uint h, uint l) const; // uint Jisx0201ToUnicode(uint h, uint l) const; - uint jisx0201LatinToUnicode(uint h, uint l) const; + uint jisx0201LatinToUnicode(uint h, uint l) const override; // uint Jisx0201KanaToUnicode(uint h, uint l) const; - uint jisx0208ToUnicode(uint h, uint l) const; - uint jisx0212ToUnicode(uint h, uint l) const; + uint jisx0208ToUnicode(uint h, uint l) const override; + uint jisx0212ToUnicode(uint h, uint l) const override; // uint UnicodeToAscii(uint h, uint l) const; // uint UnicodeToJisx0201(uint h, uint l) const; - uint unicodeToJisx0201Latin(uint h, uint l) const; + uint unicodeToJisx0201Latin(uint h, uint l) const override; // uint UnicodeToJisx0201Kana(uint h, uint l) const; - uint unicodeToJisx0208(uint h, uint l) const; - uint unicodeToJisx0212(uint h, uint l) const; + uint unicodeToJisx0208(uint h, uint l) const override; + uint unicodeToJisx0212(uint h, uint l) const override; }; uint QJpUnicodeConv_JISX0221_ASCII::jisx0201LatinToUnicode(uint h, uint l) const @@ -558,17 +558,17 @@ public: // uint AsciiToUnicode(uint h, uint l) const; // uint Jisx0201ToUnicode(uint h, uint l) const; - uint jisx0201LatinToUnicode(uint h, uint l) const; + uint jisx0201LatinToUnicode(uint h, uint l) const override; // uint Jisx0201KanaToUnicode(uint h, uint l) const; - uint jisx0208ToUnicode(uint h, uint l) const; - uint jisx0212ToUnicode(uint h, uint l) const; + uint jisx0208ToUnicode(uint h, uint l) const override; + uint jisx0212ToUnicode(uint h, uint l) const override; - uint unicodeToAscii(uint h, uint l) const; + uint unicodeToAscii(uint h, uint l) const override; // uint UnicodeToJisx0201(uint h, uint l) const; - uint unicodeToJisx0201Latin(uint h, uint l) const; + uint unicodeToJisx0201Latin(uint h, uint l) const override; // uint UnicodeToJisx0201Kana(uint h, uint l) const; - uint unicodeToJisx0208(uint h, uint l) const; - uint unicodeToJisx0212(uint h, uint l) const; + uint unicodeToJisx0208(uint h, uint l) const override; + uint unicodeToJisx0212(uint h, uint l) const override; }; uint QJpUnicodeConv_Sun::jisx0201LatinToUnicode(uint h, uint l) const @@ -647,17 +647,17 @@ public: // uint AsciiToUnicode(uint h, uint l) const; // uint Jisx0201ToUnicode(uint h, uint l) const; - uint jisx0201LatinToUnicode(uint h, uint l) const; + uint jisx0201LatinToUnicode(uint h, uint l) const override; // uint Jisx0201KanaToUnicode(uint h, uint l) const; - uint jisx0208ToUnicode(uint h, uint l) const; - uint jisx0212ToUnicode(uint h, uint l) const; + uint jisx0208ToUnicode(uint h, uint l) const override; + uint jisx0212ToUnicode(uint h, uint l) const override; // uint UnicodeToAscii(uint h, uint l) const; // uint UnicodeToJisx0201(uint h, uint l) const; - uint unicodeToJisx0201Latin(uint h, uint l) const; + uint unicodeToJisx0201Latin(uint h, uint l) const override; // uint UnicodeToJisx0201Kana(uint h, uint l) const; - uint unicodeToJisx0208(uint h, uint l) const; - uint unicodeToJisx0212(uint h, uint l) const; + uint unicodeToJisx0208(uint h, uint l) const override; + uint unicodeToJisx0212(uint h, uint l) const override; }; uint QJpUnicodeConv_Microsoft::jisx0201LatinToUnicode(uint h, uint l) const diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h index 7dfa6f7fe4..6257a7875c 100644 --- a/src/corelib/codecs/qsjiscodec_p.h +++ b/src/corelib/codecs/qsjiscodec_p.h @@ -94,12 +94,12 @@ public: static QList _aliases(); static int _mibEnum(); - QByteArray name() const { return _name(); } - QList aliases() const { return _aliases(); } - int mibEnum() const { return _mibEnum(); } + QByteArray name() const override { return _name(); } + QList aliases() const override { return _aliases(); } + int mibEnum() const override { return _mibEnum(); } - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; QSjisCodec(); ~QSjisCodec(); diff --git a/src/corelib/codecs/qwindowscodec_p.h b/src/corelib/codecs/qwindowscodec_p.h index 2fd3c35378..1a74d618be 100644 --- a/src/corelib/codecs/qwindowscodec_p.h +++ b/src/corelib/codecs/qwindowscodec_p.h @@ -61,12 +61,12 @@ public: QWindowsLocalCodec(); ~QWindowsLocalCodec(); - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; QString convertToUnicodeCharByChar(const char *chars, int length, ConverterState *state) const; - QByteArray name() const; - int mibEnum() const; + QByteArray name() const override; + int mibEnum() const override; }; -- cgit v1.2.3