diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h index 98ad286e9e9..f2a9f923c84 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 2cf950a350c..bedf0cf8221 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 dd136aeddbd..635150b18ef 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 9b8500538b8..7d192232d78 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 4db87288176..1ffe4a63f69 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 0209843ecf6..23112ce4d36 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 7dfa6f7fe41..6257a7875c5 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 2fd3c35378e..1a74d618bef 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; }; diff --git a/src/corelib/io/qsettings_mac.cpp b/src/corelib/io/qsettings_mac.cpp index aa14d8435a3..28f01eae4d5 100644 --- a/src/corelib/io/qsettings_mac.cpp +++ b/src/corelib/io/qsettings_mac.cpp @@ -355,15 +355,15 @@ public: const QString &application); ~QMacSettingsPrivate(); - void remove(const QString &key); - void set(const QString &key, const QVariant &value); - bool get(const QString &key, QVariant *value) const; - QStringList children(const QString &prefix, ChildSpec spec) const; - void clear(); - void sync(); - void flush(); - bool isWritable() const; - QString fileName() const; + void remove(const QString &key) override; + void set(const QString &key, const QVariant &value) override; + bool get(const QString &key, QVariant *value) const override; + QStringList children(const QString &prefix, ChildSpec spec) const override; + void clear() override; + void sync() override; + void flush() override; + bool isWritable() const override; + QString fileName() const override; private: struct SearchDomain diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp index edcae16776f..43e1411c765 100644 --- a/src/corelib/io/qsettings_win.cpp +++ b/src/corelib/io/qsettings_win.cpp @@ -383,17 +383,17 @@ public: QWinSettingsPrivate(QString rKey, REGSAM access = 0); ~QWinSettingsPrivate(); - void remove(const QString &uKey); - void set(const QString &uKey, const QVariant &value); - bool get(const QString &uKey, QVariant *value) const; - QStringList children(const QString &uKey, ChildSpec spec) const; - void clear(); - void sync(); - void flush(); - bool isWritable() const; + void remove(const QString &uKey) override; + void set(const QString &uKey, const QVariant &value) override; + bool get(const QString &uKey, QVariant *value) const override; + QStringList children(const QString &uKey, ChildSpec spec) const override; + void clear() override; + void sync() override; + void flush() override; + bool isWritable() const override; HKEY writeHandle() const; bool readKey(HKEY parentHandle, const QString &rSubKey, QVariant *value) const; - QString fileName() const; + QString fileName() const override; private: RegistryKeyList regList; // list of registry locations to search for keys diff --git a/src/corelib/io/qsettings_winrt.cpp b/src/corelib/io/qsettings_winrt.cpp index 209b56d920a..4c757f9dda4 100644 --- a/src/corelib/io/qsettings_winrt.cpp +++ b/src/corelib/io/qsettings_winrt.cpp @@ -290,15 +290,15 @@ public: QWinRTSettingsPrivate(const QString &rKey); ~QWinRTSettingsPrivate(); - void remove(const QString &uKey); - void set(const QString &uKey, const QVariant &value); - bool get(const QString &uKey, QVariant *value) const; - QStringList children(const QString &uKey, ChildSpec spec) const; - void clear(); - void sync(); - void flush(); - bool isWritable() const; - QString fileName() const; + void remove(const QString &uKey) override; + void set(const QString &uKey, const QVariant &value) override; + bool get(const QString &uKey, QVariant *value) const override; + QStringList children(const QString &uKey, ChildSpec spec) const override; + void clear() override; + void sync() override; + void flush() override; + bool isWritable() const override; + QString fileName() const override; private: void init(QSettings::Scope scope); diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp index 86992ce10b4..54372106993 100644 --- a/src/corelib/kernel/qtcore_eval.cpp +++ b/src/corelib/kernel/qtcore_eval.cpp @@ -168,7 +168,7 @@ public: } } - void timerEvent(QTimerEvent *e) { + void timerEvent(QTimerEvent *e) override { if (e->timerId() == warn) { killTimer(warn); fprintf(stderr, "%s\n", will_shutdown_1min); diff --git a/src/corelib/kernel/qwineventnotifier.h b/src/corelib/kernel/qwineventnotifier.h index 624e77e6384..71a1d29057d 100644 --- a/src/corelib/kernel/qwineventnotifier.h +++ b/src/corelib/kernel/qwineventnotifier.h @@ -70,7 +70,7 @@ Q_SIGNALS: void activated(HANDLE hEvent, QPrivateSignal); protected: - bool event(QEvent * e); + bool event(QEvent *e) override; }; QT_END_NAMESPACE