From 5180f32c5abe01acd65cde68c2c16aedda4028ec Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Sun, 16 Nov 2014 13:09:01 +0100 Subject: Add Q_DECL_OVERRIDE in the src subdirectory Done automatically with clang-modernize on linux (But does not add Q_DECL_OVERRIDE to the function that are marked as inline because it a compilation error with MSVC2010) Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171 Reviewed-by: Thiago Macieira --- src/corelib/codecs/qicucodec_p.h | 10 ++++---- src/corelib/codecs/qisciicodec_p.h | 8 +++--- src/corelib/codecs/qlatincodec_p.h | 20 +++++++-------- src/corelib/codecs/qtsciicodec_p.h | 8 +++--- src/corelib/codecs/qutfcodec_p.h | 52 +++++++++++++++++++------------------- 5 files changed, 49 insertions(+), 49 deletions(-) (limited to 'src/corelib/codecs') diff --git a/src/corelib/codecs/qicucodec_p.h b/src/corelib/codecs/qicucodec_p.h index 9786b4398a..900debeb7b 100644 --- a/src/corelib/codecs/qicucodec_p.h +++ b/src/corelib/codecs/qicucodec_p.h @@ -66,12 +66,12 @@ public: static QTextCodec *codecForNameUnlocked(const char *name); static QTextCodec *codecForMibUnlocked(int mib); - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; - QByteArray name() const; - QList aliases() const; - int mibEnum() const; + QByteArray name() const Q_DECL_OVERRIDE; + QList aliases() const Q_DECL_OVERRIDE; + int mibEnum() const Q_DECL_OVERRIDE; private: QIcuCodec(const char *name); diff --git a/src/corelib/codecs/qisciicodec_p.h b/src/corelib/codecs/qisciicodec_p.h index ce49975445..4bf89ccd5e 100644 --- a/src/corelib/codecs/qisciicodec_p.h +++ b/src/corelib/codecs/qisciicodec_p.h @@ -58,11 +58,11 @@ public: static QTextCodec *create(const char *name); - QByteArray name() const; - int mibEnum() const; + QByteArray name() const Q_DECL_OVERRIDE; + int mibEnum() const Q_DECL_OVERRIDE; - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; private: int idx; diff --git a/src/corelib/codecs/qlatincodec_p.h b/src/corelib/codecs/qlatincodec_p.h index c4c9b11ef7..b51cfb856e 100644 --- a/src/corelib/codecs/qlatincodec_p.h +++ b/src/corelib/codecs/qlatincodec_p.h @@ -56,12 +56,12 @@ class QLatin1Codec : public QTextCodec public: ~QLatin1Codec(); - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; - QByteArray name() const; - QList aliases() const; - int mibEnum() const; + QByteArray name() const Q_DECL_OVERRIDE; + QList aliases() const Q_DECL_OVERRIDE; + int mibEnum() const Q_DECL_OVERRIDE; }; @@ -71,12 +71,12 @@ class QLatin15Codec: public QTextCodec public: ~QLatin15Codec(); - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; - QByteArray name() const; - QList aliases() const; - int mibEnum() const; + QByteArray name() const Q_DECL_OVERRIDE; + QList aliases() const Q_DECL_OVERRIDE; + int mibEnum() const Q_DECL_OVERRIDE; }; #endif // QT_NO_TEXTCODEC diff --git a/src/corelib/codecs/qtsciicodec_p.h b/src/corelib/codecs/qtsciicodec_p.h index 62a62b718c..030e9a5ed0 100644 --- a/src/corelib/codecs/qtsciicodec_p.h +++ b/src/corelib/codecs/qtsciicodec_p.h @@ -84,11 +84,11 @@ class QTsciiCodec : public QTextCodec { public: ~QTsciiCodec(); - QByteArray name() const; - int mibEnum() const; + QByteArray name() const Q_DECL_OVERRIDE; + int mibEnum() const Q_DECL_OVERRIDE; - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; }; #endif // QT_NO_CODECS diff --git a/src/corelib/codecs/qutfcodec_p.h b/src/corelib/codecs/qutfcodec_p.h index eb222bb2d5..16fc9945d3 100644 --- a/src/corelib/codecs/qutfcodec_p.h +++ b/src/corelib/codecs/qutfcodec_p.h @@ -305,11 +305,11 @@ class QUtf8Codec : public QTextCodec { public: ~QUtf8Codec(); - QByteArray name() const; - int mibEnum() const; + QByteArray name() const Q_DECL_OVERRIDE; + int mibEnum() const Q_DECL_OVERRIDE; - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; void convertToUnicode(QString *target, const char *, int, ConverterState *) const; }; @@ -319,12 +319,12 @@ public: QUtf16Codec() { e = DetectEndianness; } ~QUtf16Codec(); - QByteArray name() const; - QList aliases() const; - int mibEnum() const; + QByteArray name() const Q_DECL_OVERRIDE; + QList aliases() const Q_DECL_OVERRIDE; + int mibEnum() const Q_DECL_OVERRIDE; - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; protected: DataEndianness e; @@ -333,17 +333,17 @@ protected: class QUtf16BECodec : public QUtf16Codec { public: QUtf16BECodec() : QUtf16Codec() { e = BigEndianness; } - QByteArray name() const; - QList aliases() const; - int mibEnum() const; + QByteArray name() const Q_DECL_OVERRIDE; + QList aliases() const Q_DECL_OVERRIDE; + int mibEnum() const Q_DECL_OVERRIDE; }; class QUtf16LECodec : public QUtf16Codec { public: QUtf16LECodec() : QUtf16Codec() { e = LittleEndianness; } - QByteArray name() const; - QList aliases() const; - int mibEnum() const; + QByteArray name() const Q_DECL_OVERRIDE; + QList aliases() const Q_DECL_OVERRIDE; + int mibEnum() const Q_DECL_OVERRIDE; }; class QUtf32Codec : public QTextCodec { @@ -351,12 +351,12 @@ public: QUtf32Codec() { e = DetectEndianness; } ~QUtf32Codec(); - QByteArray name() const; - QList aliases() const; - int mibEnum() const; + QByteArray name() const Q_DECL_OVERRIDE; + QList aliases() const Q_DECL_OVERRIDE; + int mibEnum() const Q_DECL_OVERRIDE; - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; protected: DataEndianness e; @@ -365,17 +365,17 @@ protected: class QUtf32BECodec : public QUtf32Codec { public: QUtf32BECodec() : QUtf32Codec() { e = BigEndianness; } - QByteArray name() const; - QList aliases() const; - int mibEnum() const; + QByteArray name() const Q_DECL_OVERRIDE; + QList aliases() const Q_DECL_OVERRIDE; + int mibEnum() const Q_DECL_OVERRIDE; }; class QUtf32LECodec : public QUtf32Codec { public: QUtf32LECodec() : QUtf32Codec() { e = LittleEndianness; } - QByteArray name() const; - QList aliases() const; - int mibEnum() const; + QByteArray name() const Q_DECL_OVERRIDE; + QList aliases() const Q_DECL_OVERRIDE; + int mibEnum() const Q_DECL_OVERRIDE; }; -- cgit v1.2.3