diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-01 14:45:19 +0300 |
|---|---|---|
| committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-05 11:57:15 +0000 |
| commit | 33c311cce864f28ccd9205d51656424bd6d39404 (patch) | |
| tree | 0f4262bb7d0a1e2a1bc605fea22bc44818c73aec | |
| parent | 65db62e4398c5ddfba1ea7825987b3f4ab04369e (diff) | |
Replace Q_DECL_OVERRIDE by override
The 'override' specifier can be used directly since Qt 5.7.
Change-Id: I673d4a3028132318dc5e686100476a8758984f0d
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| -rw-r--r-- | src/plugins/imageformats/macjp2/qmacjp2handler.h | 14 | ||||
| -rw-r--r-- | src/plugins/imageformats/tiff/qtiffhandler_p.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/imageformats/macjp2/qmacjp2handler.h b/src/plugins/imageformats/macjp2/qmacjp2handler.h index 3706d98..abe43cc 100644 --- a/src/plugins/imageformats/macjp2/qmacjp2handler.h +++ b/src/plugins/imageformats/macjp2/qmacjp2handler.h @@ -57,13 +57,13 @@ public: QMacJp2Handler(); virtual ~QMacJp2Handler(); - bool canRead() const Q_DECL_OVERRIDE; - bool read(QImage *image) Q_DECL_OVERRIDE; - bool write(const QImage &image) Q_DECL_OVERRIDE; - QVariant option(ImageOption option) const Q_DECL_OVERRIDE; - void setOption(ImageOption option, const QVariant &value) Q_DECL_OVERRIDE; - bool supportsOption(ImageOption option) const Q_DECL_OVERRIDE; - QByteArray name() const Q_DECL_OVERRIDE; + bool canRead() const override; + bool read(QImage *image) override; + bool write(const QImage &image) override; + QVariant option(ImageOption option) const override; + void setOption(ImageOption option, const QVariant &value) override; + bool supportsOption(ImageOption option) const override; + QByteArray name() const override; static bool canRead(QIODevice *iod); diff --git a/src/plugins/imageformats/tiff/qtiffhandler_p.h b/src/plugins/imageformats/tiff/qtiffhandler_p.h index be2c753..f362a90 100644 --- a/src/plugins/imageformats/tiff/qtiffhandler_p.h +++ b/src/plugins/imageformats/tiff/qtiffhandler_p.h @@ -51,17 +51,17 @@ class QTiffHandler : public QImageIOHandler public: QTiffHandler(); - bool canRead() const Q_DECL_OVERRIDE; - bool read(QImage *image) Q_DECL_OVERRIDE; - bool write(const QImage &image) Q_DECL_OVERRIDE; + bool canRead() const override; + bool read(QImage *image) override; + bool write(const QImage &image) override; - QByteArray name() const Q_DECL_OVERRIDE; + QByteArray name() const override; static bool canRead(QIODevice *device); - QVariant option(ImageOption option) const Q_DECL_OVERRIDE; - void setOption(ImageOption option, const QVariant &value) Q_DECL_OVERRIDE; - bool supportsOption(ImageOption option) const Q_DECL_OVERRIDE; + QVariant option(ImageOption option) const override; + void setOption(ImageOption option, const QVariant &value) override; + bool supportsOption(ImageOption option) const override; enum Compression { NoCompression = 0, |