From ac2b63046fcd3845a5f51ba35ee5824779d7407e Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Fri, 13 Feb 2015 13:31:27 +0100 Subject: [PATCH] Use Q_DECL_OVERRIDE where possible REVIEW: 122542 --- src/imageformats/eps_p.h | 10 +++++----- src/imageformats/exr.cpp | 8 ++++---- src/imageformats/exr_p.h | 8 ++++---- src/imageformats/pcx_p.h | 10 +++++----- src/imageformats/pic_p.h | 4 ++-- 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 +++++----- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/imageformats/eps_p.h b/src/imageformats/eps_p.h index 20b6635..55d15a2 100644 --- a/src/imageformats/eps_p.h +++ b/src/imageformats/eps_p.h @@ -14,9 +14,9 @@ class EPSHandler : public QImageIOHandler public: EPSHandler(); - virtual bool canRead() const; - virtual bool read(QImage *image); - virtual bool write(const QImage &image); + bool canRead() const Q_DECL_OVERRIDE; + bool read(QImage *image) Q_DECL_OVERRIDE; + bool write(const QImage &image) Q_DECL_OVERRIDE; static bool canRead(QIODevice *device); }; @@ -27,8 +27,8 @@ class EPSPlugin : public QImageIOPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "eps.json") public: - virtual Capabilities capabilities(QIODevice *device, const QByteArray &format) const; - virtual QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; }; #endif // KIMG_EPS_H diff --git a/src/imageformats/exr.cpp b/src/imageformats/exr.cpp index 95475ef..622763e 100644 --- a/src/imageformats/exr.cpp +++ b/src/imageformats/exr.cpp @@ -41,10 +41,10 @@ public: { } - virtual bool read(char c[], int n); - virtual Imf::Int64 tellg(); - virtual void seekg(Imf::Int64 pos); - virtual void clear(); + bool read(char c[], int n) Q_DECL_OVERRIDE; + Imf::Int64 tellg() Q_DECL_OVERRIDE; + void seekg(Imf::Int64 pos) Q_DECL_OVERRIDE; + void clear() Q_DECL_OVERRIDE; private: QIODevice *m_dev; diff --git a/src/imageformats/exr_p.h b/src/imageformats/exr_p.h index adc9d6a..8e5006a 100644 --- a/src/imageformats/exr_p.h +++ b/src/imageformats/exr_p.h @@ -18,8 +18,8 @@ class EXRHandler : public QImageIOHandler public: EXRHandler(); - virtual bool canRead() const; - virtual bool read(QImage *outImage); + bool canRead() const Q_DECL_OVERRIDE; + bool read(QImage *outImage) Q_DECL_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: - virtual Capabilities capabilities(QIODevice *device, const QByteArray &format) const; - virtual QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; }; #endif // KIMG_EXR_H diff --git a/src/imageformats/pcx_p.h b/src/imageformats/pcx_p.h index d46218a..977e55c 100644 --- a/src/imageformats/pcx_p.h +++ b/src/imageformats/pcx_p.h @@ -17,9 +17,9 @@ class PCXHandler : public QImageIOHandler public: PCXHandler(); - virtual bool canRead() const; - virtual bool read(QImage *image); - virtual bool write(const QImage &image); + bool canRead() const Q_DECL_OVERRIDE; + bool read(QImage *image) Q_DECL_OVERRIDE; + bool write(const QImage &image) Q_DECL_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: - virtual Capabilities capabilities(QIODevice *device, const QByteArray &format) const; - virtual QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; }; #endif // KIMG_PCX_H diff --git a/src/imageformats/pic_p.h b/src/imageformats/pic_p.h index f5c8a34..48b92e9 100644 --- a/src/imageformats/pic_p.h +++ b/src/imageformats/pic_p.h @@ -195,8 +195,8 @@ class SoftimagePICPlugin : public QImageIOPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "pic.json") public: - virtual Capabilities capabilities(QIODevice *device, const QByteArray &format) const; - virtual QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; }; #endif // KIMG_PIC_H diff --git a/src/imageformats/psd_p.h b/src/imageformats/psd_p.h index 1ede006..7a1f51c 100644 --- a/src/imageformats/psd_p.h +++ b/src/imageformats/psd_p.h @@ -17,8 +17,8 @@ class PSDHandler : public QImageIOHandler public: PSDHandler(); - virtual bool canRead() const; - virtual bool read(QImage *image); + bool canRead() const Q_DECL_OVERRIDE; + bool read(QImage *image) Q_DECL_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: - virtual Capabilities capabilities(QIODevice *device, const QByteArray &format) const; - virtual QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; }; #endif // KIMG_PSD_H diff --git a/src/imageformats/ras_p.h b/src/imageformats/ras_p.h index 0139d7b..df73911 100644 --- a/src/imageformats/ras_p.h +++ b/src/imageformats/ras_p.h @@ -18,8 +18,8 @@ class RASHandler : public QImageIOHandler public: RASHandler(); - virtual bool canRead() const; - virtual bool read(QImage *image); + bool canRead() const Q_DECL_OVERRIDE; + bool read(QImage *image) Q_DECL_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: - virtual Capabilities capabilities(QIODevice *device, const QByteArray &format) const; - virtual QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; }; #endif // KIMG_RAS_H diff --git a/src/imageformats/rgb_p.h b/src/imageformats/rgb_p.h index 0bacba8..923a9d0 100644 --- a/src/imageformats/rgb_p.h +++ b/src/imageformats/rgb_p.h @@ -17,9 +17,9 @@ class RGBHandler : public QImageIOHandler public: RGBHandler(); - virtual bool canRead() const; - virtual bool read(QImage *image); - virtual bool write(const QImage &image); + bool canRead() const Q_DECL_OVERRIDE; + bool read(QImage *image) Q_DECL_OVERRIDE; + bool write(const QImage &image) Q_DECL_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: - virtual Capabilities capabilities(QIODevice *device, const QByteArray &format) const; - virtual QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; }; #endif // KIMG_RGB_H diff --git a/src/imageformats/tga_p.h b/src/imageformats/tga_p.h index 1222f61..3ac8b0c 100644 --- a/src/imageformats/tga_p.h +++ b/src/imageformats/tga_p.h @@ -17,9 +17,9 @@ class TGAHandler : public QImageIOHandler public: TGAHandler(); - virtual bool canRead() const; - virtual bool read(QImage *image); - virtual bool write(const QImage &image); + bool canRead() const Q_DECL_OVERRIDE; + bool read(QImage *image) Q_DECL_OVERRIDE; + bool write(const QImage &image) Q_DECL_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: - virtual Capabilities capabilities(QIODevice *device, const QByteArray &format) const; - virtual QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; }; #endif // KIMG_TGA_H diff --git a/src/imageformats/xcf_p.h b/src/imageformats/xcf_p.h index 22d3316..2b7191e 100644 --- a/src/imageformats/xcf_p.h +++ b/src/imageformats/xcf_p.h @@ -29,9 +29,9 @@ class XCFHandler : public QImageIOHandler public: XCFHandler(); - virtual bool canRead() const; - virtual bool read(QImage *image); - virtual bool write(const QImage &image); + bool canRead() const Q_DECL_OVERRIDE; + bool read(QImage *image) Q_DECL_OVERRIDE; + bool write(const QImage &image) Q_DECL_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: - virtual Capabilities capabilities(QIODevice *device, const QByteArray &format) const; - virtual QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE; }; #endif // KIMG_XCF_H