From a4d1f4db1d1e4197bf4497c7b6250fc998816584 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 23 May 2018 08:06:50 +0200 Subject: [PATCH] Use override --- src/imageformats/eps_p.h | 10 +++++----- src/imageformats/exr_p.h | 8 ++++---- src/imageformats/kra.h | 8 ++++---- src/imageformats/ora.h | 8 ++++---- src/imageformats/pcx_p.h | 10 +++++----- src/imageformats/pic_p.h | 16 ++++++++-------- src/imageformats/psd_p.h | 8 ++++---- src/imageformats/ras_p.h | 8 ++++---- src/imageformats/rgb_p.h | 10 +++++----- src/imageformats/tga_p.h | 10 +++++----- src/imageformats/xcf_p.h | 10 +++++----- 11 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/imageformats/eps_p.h b/src/imageformats/eps_p.h index 527f054..6b4b493 100644 --- a/src/imageformats/eps_p.h +++ b/src/imageformats/eps_p.h @@ -15,9 +15,9 @@ class EPSHandler : public QImageIOHandler public: EPSHandler(); - 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; static bool canRead(QIODevice *device); }; @@ -28,8 +28,8 @@ class EPSPlugin : public QImageIOPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "eps.json") public: - Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; Q_DECLARE_LOGGING_CATEGORY(EPSPLUGIN) diff --git a/src/imageformats/exr_p.h b/src/imageformats/exr_p.h index 8e5006a..0dcbb7c 100644 --- a/src/imageformats/exr_p.h +++ b/src/imageformats/exr_p.h @@ -18,8 +18,8 @@ class EXRHandler : public QImageIOHandler public: EXRHandler(); - bool canRead() const Q_DECL_OVERRIDE; - bool read(QImage *outImage) Q_DECL_OVERRIDE; + bool canRead() const override; + bool read(QImage *outImage) override; static bool canRead(QIODevice *device); }; @@ -30,8 +30,8 @@ class EXRPlugin : public QImageIOPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "exr.json") public: - Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; #endif // KIMG_EXR_H diff --git a/src/imageformats/kra.h b/src/imageformats/kra.h index fc97f65..ea99f5d 100644 --- a/src/imageformats/kra.h +++ b/src/imageformats/kra.h @@ -17,8 +17,8 @@ class KraHandler : public QImageIOHandler public: KraHandler(); - bool canRead() const Q_DECL_OVERRIDE; - bool read(QImage *image) Q_DECL_OVERRIDE; + bool canRead() const override; + bool read(QImage *image) override; static bool canRead(QIODevice *device); }; @@ -29,8 +29,8 @@ class KraPlugin : public QImageIOPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "kra.json") public: - Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; diff --git a/src/imageformats/ora.h b/src/imageformats/ora.h index 68a426e..ed2ea97 100644 --- a/src/imageformats/ora.h +++ b/src/imageformats/ora.h @@ -17,8 +17,8 @@ class OraHandler : public QImageIOHandler public: OraHandler(); - bool canRead() const Q_DECL_OVERRIDE; - bool read(QImage *image) Q_DECL_OVERRIDE; + bool canRead() const override; + bool read(QImage *image) override; static bool canRead(QIODevice *device); }; @@ -29,8 +29,8 @@ class OraPlugin : public QImageIOPlugin Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "ora.json") public: - Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; diff --git a/src/imageformats/pcx_p.h b/src/imageformats/pcx_p.h index 977e55c..af9cb94 100644 --- a/src/imageformats/pcx_p.h +++ b/src/imageformats/pcx_p.h @@ -17,9 +17,9 @@ class PCXHandler : public QImageIOHandler public: PCXHandler(); - 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; static bool canRead(QIODevice *device); }; @@ -30,8 +30,8 @@ class PCXPlugin : public QImageIOPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "pcx.json") public: - Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; #endif // KIMG_PCX_H diff --git a/src/imageformats/pic_p.h b/src/imageformats/pic_p.h index 48b92e9..8de1c39 100644 --- a/src/imageformats/pic_p.h +++ b/src/imageformats/pic_p.h @@ -154,13 +154,13 @@ struct PicChannel { class SoftimagePICHandler : public QImageIOHandler { public: - bool canRead() const Q_DECL_OVERRIDE; - bool read(QImage *image) Q_DECL_OVERRIDE; - bool write(const QImage &) Q_DECL_OVERRIDE; + bool canRead() const override; + bool read(QImage *image) override; + bool write(const QImage &) 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; + QVariant option(ImageOption option) const override; + void setOption(ImageOption option, const QVariant &value) override; + bool supportsOption(ImageOption option) const override; static bool canRead(QIODevice *device); @@ -195,8 +195,8 @@ class SoftimagePICPlugin : public QImageIOPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "pic.json") public: - Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; #endif // KIMG_PIC_H diff --git a/src/imageformats/psd_p.h b/src/imageformats/psd_p.h index 7a1f51c..1083576 100644 --- a/src/imageformats/psd_p.h +++ b/src/imageformats/psd_p.h @@ -17,8 +17,8 @@ class PSDHandler : public QImageIOHandler public: PSDHandler(); - bool canRead() const Q_DECL_OVERRIDE; - bool read(QImage *image) Q_DECL_OVERRIDE; + bool canRead() const override; + bool read(QImage *image) override; static bool canRead(QIODevice *device); }; @@ -29,8 +29,8 @@ class PSDPlugin : public QImageIOPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "psd.json") public: - Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; #endif // KIMG_PSD_H diff --git a/src/imageformats/ras_p.h b/src/imageformats/ras_p.h index df73911..728161f 100644 --- a/src/imageformats/ras_p.h +++ b/src/imageformats/ras_p.h @@ -18,8 +18,8 @@ class RASHandler : public QImageIOHandler public: RASHandler(); - bool canRead() const Q_DECL_OVERRIDE; - bool read(QImage *image) Q_DECL_OVERRIDE; + bool canRead() const override; + bool read(QImage *image) override; static bool canRead(QIODevice *device); }; @@ -30,8 +30,8 @@ class RASPlugin : public QImageIOPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "ras.json") public: - Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; #endif // KIMG_RAS_H diff --git a/src/imageformats/rgb_p.h b/src/imageformats/rgb_p.h index 923a9d0..6ff2a49 100644 --- a/src/imageformats/rgb_p.h +++ b/src/imageformats/rgb_p.h @@ -17,9 +17,9 @@ class RGBHandler : public QImageIOHandler public: RGBHandler(); - 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; static bool canRead(QIODevice *device); }; @@ -30,8 +30,8 @@ class RGBPlugin : public QImageIOPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "rgb.json") public: - Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; #endif // KIMG_RGB_H diff --git a/src/imageformats/tga_p.h b/src/imageformats/tga_p.h index 3ac8b0c..28fe2fd 100644 --- a/src/imageformats/tga_p.h +++ b/src/imageformats/tga_p.h @@ -17,9 +17,9 @@ class TGAHandler : public QImageIOHandler public: TGAHandler(); - 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; static bool canRead(QIODevice *device); }; @@ -30,8 +30,8 @@ class TGAPlugin : public QImageIOPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "tga.json") public: - Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; #endif // KIMG_TGA_H diff --git a/src/imageformats/xcf_p.h b/src/imageformats/xcf_p.h index 2b7191e..aa9cc16 100644 --- a/src/imageformats/xcf_p.h +++ b/src/imageformats/xcf_p.h @@ -29,9 +29,9 @@ class XCFHandler : public QImageIOHandler public: XCFHandler(); - 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; static bool canRead(QIODevice *device); }; @@ -42,8 +42,8 @@ class XCFPlugin : public QImageIOPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "xcf.json") public: - Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const override; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; #endif // KIMG_XCF_H