Add missing override and remove redundant virtual

Change-Id: I12f79f8fecdd03e4e6d4ce76e49d3c2d91003676
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

18 files changed, 85 insertions, 85 deletions

diff --git a/src/plugins/imageformats/dds/main.cpp b/src/plugins/imageformats/dds/main.cpp
index 0c1db67..837a570 100644
--- a/src/plugins/imageformats/dds/main.cpp
+++ b/src/plugins/imageformats/dds/main.cpp
@@ -53,8 +53,8 @@ class QDDSPlugin : public QImageIOPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "dds.json")
 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };
 
 QImageIOPlugin::Capabilities QDDSPlugin::capabilities(QIODevice *device, const QByteArray &format) const
diff --git a/src/plugins/imageformats/dds/qddshandler.h b/src/plugins/imageformats/dds/qddshandler.h
index ad383e8..665bd16 100644
--- a/src/plugins/imageformats/dds/qddshandler.h
+++ b/src/plugins/imageformats/dds/qddshandler.h
@@ -53,18 +53,18 @@ class QDDSHandler : public QImageIOHandler
 public:
     QDDSHandler();
 
-    QByteArray name() const;
+    QByteArray name() const override;
 
-    bool canRead() const;
-    bool read(QImage *image);
-    bool write(const QImage &image);
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;
 
-    QVariant option(QImageIOHandler::ImageOption option) const;
-    void setOption(ImageOption option, const QVariant &value);
-    bool supportsOption(QImageIOHandler::ImageOption option) const;
+    QVariant option(QImageIOHandler::ImageOption option) const override;
+    void setOption(ImageOption option, const QVariant &value) override;
+    bool supportsOption(QImageIOHandler::ImageOption option) const override;
 
-    int imageCount() const;
-    bool jumpToImage(int imageNumber);
+    int imageCount() const override;
+    bool jumpToImage(int imageNumber) override;
 
     static bool canRead(QIODevice *device);
 
diff --git a/src/plugins/imageformats/icns/main.cpp b/src/plugins/imageformats/icns/main.cpp
index abe78eb..d25d884 100644
--- a/src/plugins/imageformats/icns/main.cpp
+++ b/src/plugins/imageformats/icns/main.cpp
@@ -52,8 +52,8 @@ class QICNSPlugin : public QImageIOPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "icns.json")
 
 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };
 
 QImageIOPlugin::Capabilities QICNSPlugin::capabilities(QIODevice *device, const QByteArray &format) const
diff --git a/src/plugins/imageformats/icns/qicnshandler_p.h b/src/plugins/imageformats/icns/qicnshandler_p.h
index 2ac975b..84c7bf1 100644
--- a/src/plugins/imageformats/icns/qicnshandler_p.h
+++ b/src/plugins/imageformats/icns/qicnshandler_p.h
@@ -128,18 +128,18 @@ class QICNSHandler : public QImageIOHandler
 public:
     QICNSHandler();
 
-    bool canRead() const;
-    bool read(QImage *image);
-    bool write(const QImage &image);
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;
 
-    QByteArray name() const;
+    QByteArray name() const override;
 
-    bool supportsOption(ImageOption option) const;
-    QVariant option(ImageOption option) const;
+    bool supportsOption(ImageOption option) const override;
+    QVariant option(ImageOption option) const override;
 
-    int imageCount() const;
-    bool jumpToImage(int imageNumber);
-    bool jumpToNextImage();
+    int imageCount() const override;
+    bool jumpToImage(int imageNumber) override;
+    bool jumpToNextImage() override;
 
     static bool canRead(QIODevice *device);
 
diff --git a/src/plugins/imageformats/jp2/main.cpp b/src/plugins/imageformats/jp2/main.cpp
index 888a101..4b8057a 100644
--- a/src/plugins/imageformats/jp2/main.cpp
+++ b/src/plugins/imageformats/jp2/main.cpp
@@ -57,8 +57,8 @@ class QJp2Plugin : public QImageIOPlugin
 
 public:
     QStringList keys() const;
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };
 
 QStringList QJp2Plugin::keys() const
diff --git a/src/plugins/imageformats/jp2/qjp2handler_p.h b/src/plugins/imageformats/jp2/qjp2handler_p.h
index 0264a9e..e81ec9e 100644
--- a/src/plugins/imageformats/jp2/qjp2handler_p.h
+++ b/src/plugins/imageformats/jp2/qjp2handler_p.h
@@ -56,15 +56,15 @@ class QJp2Handler : public QImageIOHandler
 {
 public:
     QJp2Handler();
-    virtual ~QJp2Handler();
+    ~QJp2Handler();
     static bool canRead(QIODevice *iod, QByteArray *subType);
-    virtual bool canRead() const;
-    virtual bool read(QImage *image);
-    virtual bool write(const QImage &image);
-    virtual QVariant option(ImageOption option) const;
-    virtual void setOption(ImageOption option, const QVariant &value);
-    virtual bool supportsOption(ImageOption option) const;
-    virtual QByteArray name() const;
+    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;
 
 private:
     Q_DECLARE_PRIVATE(QJp2Handler)
diff --git a/src/plugins/imageformats/macjp2/main.cpp b/src/plugins/imageformats/macjp2/main.cpp
index 95f7175..d017449 100644
--- a/src/plugins/imageformats/macjp2/main.cpp
+++ b/src/plugins/imageformats/macjp2/main.cpp
@@ -50,8 +50,8 @@ class QMacJp2Plugin : public QImageIOPlugin
 
 public:
     QStringList keys() const;
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };
 
 QStringList QMacJp2Plugin::keys() const
diff --git a/src/plugins/imageformats/macjp2/qmacjp2handler.h b/src/plugins/imageformats/macjp2/qmacjp2handler.h
index abe43cc..bf0496d 100644
--- a/src/plugins/imageformats/macjp2/qmacjp2handler.h
+++ b/src/plugins/imageformats/macjp2/qmacjp2handler.h
@@ -55,7 +55,7 @@ class QMacJp2Handler : public QImageIOHandler
 {
 public:
     QMacJp2Handler();
-    virtual ~QMacJp2Handler();
+    ~QMacJp2Handler();
 
     bool canRead() const override;
     bool read(QImage *image) override;
diff --git a/src/plugins/imageformats/mng/main.cpp b/src/plugins/imageformats/mng/main.cpp
index 0941141..ed0ccca 100644
--- a/src/plugins/imageformats/mng/main.cpp
+++ b/src/plugins/imageformats/mng/main.cpp
@@ -59,8 +59,8 @@ class QMngPlugin : public QImageIOPlugin
 
 public:
     QStringList keys() const;
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };
 
 QStringList QMngPlugin::keys() const
diff --git a/src/plugins/imageformats/mng/qmnghandler_p.h b/src/plugins/imageformats/mng/qmnghandler_p.h
index 252e238..0f9a207 100644
--- a/src/plugins/imageformats/mng/qmnghandler_p.h
+++ b/src/plugins/imageformats/mng/qmnghandler_p.h
@@ -56,20 +56,20 @@ class QMngHandler : public QImageIOHandler
     public:
     QMngHandler();
     ~QMngHandler();
-    virtual bool canRead() const;
-    virtual QByteArray name() const;
-    virtual bool read(QImage *image);
-    virtual bool write(const QImage &image);
-    virtual int currentImageNumber() const;
-    virtual int imageCount() const;
-    virtual bool jumpToImage(int imageNumber);
-    virtual bool jumpToNextImage();
-    virtual int loopCount() const;
-    virtual int nextImageDelay() const;
+    bool canRead() const override;
+    QByteArray name() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;
+    int currentImageNumber() const override;
+    int imageCount() const override;
+    bool jumpToImage(int imageNumber) override;
+    bool jumpToNextImage() override;
+    int loopCount() const override;
+    int nextImageDelay() const override;
     static bool canRead(QIODevice *device);
-    virtual QVariant option(ImageOption option) const;
-    virtual void setOption(ImageOption option, const QVariant & value);
-    virtual bool supportsOption(ImageOption option) const;
+    QVariant option(ImageOption option) const override;
+    void setOption(ImageOption option, const QVariant & value) override;
+    bool supportsOption(ImageOption option) const override;
 
     private:
     Q_DECLARE_PRIVATE(QMngHandler)
diff --git a/src/plugins/imageformats/tga/main.cpp b/src/plugins/imageformats/tga/main.cpp
index bb80283..d7bf227 100644
--- a/src/plugins/imageformats/tga/main.cpp
+++ b/src/plugins/imageformats/tga/main.cpp
@@ -56,8 +56,8 @@ class QTgaPlugin : public QImageIOPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "tga.json")
 
 public:
-    Capabilities capabilities(QIODevice * device, const QByteArray & format) const;
-    QImageIOHandler * create(QIODevice * device, const QByteArray & format = QByteArray()) const;
+    Capabilities capabilities(QIODevice * device, const QByteArray & format) const override;
+    QImageIOHandler * create(QIODevice * device, const QByteArray & format = QByteArray()) const override;
     QStringList keys() const;
 };
 
diff --git a/src/plugins/imageformats/tga/qtgafile.cpp b/src/plugins/imageformats/tga/qtgafile.cpp
index 52e5eab..14a7a74 100644
--- a/src/plugins/imageformats/tga/qtgafile.cpp
+++ b/src/plugins/imageformats/tga/qtgafile.cpp
@@ -52,7 +52,7 @@ struct TgaReader
 struct Tga16Reader : public TgaReader
 {
     ~Tga16Reader() {}
-    QRgb operator()(QIODevice *s) const
+    QRgb operator()(QIODevice *s) const override
     {
         char ch1, ch2;
         if (s->getChar(&ch1) && s->getChar(&ch2)) {
@@ -68,7 +68,7 @@ struct Tga16Reader : public TgaReader
 
 struct Tga24Reader : public TgaReader
 {
-    QRgb operator()(QIODevice *s) const
+    QRgb operator()(QIODevice *s) const override
     {
         char r, g, b;
         if (s->getChar(&b) && s->getChar(&g) && s->getChar(&r))
@@ -80,7 +80,7 @@ struct Tga24Reader : public TgaReader
 
 struct Tga32Reader : public TgaReader
 {
-    QRgb operator()(QIODevice *s) const
+    QRgb operator()(QIODevice *s) const override
     {
         char r, g, b, a;
         if (s->getChar(&b) && s->getChar(&g) && s->getChar(&r) && s->getChar(&a))
diff --git a/src/plugins/imageformats/tga/qtgahandler.h b/src/plugins/imageformats/tga/qtgahandler.h
index 757f187..5ef7e02 100644
--- a/src/plugins/imageformats/tga/qtgahandler.h
+++ b/src/plugins/imageformats/tga/qtgahandler.h
@@ -52,16 +52,16 @@ public:
     QTgaHandler();
     ~QTgaHandler();
 
-    bool canRead() const;
-    bool read(QImage *image);
+    bool canRead() const override;
+    bool read(QImage *image) override;
 
-    QByteArray name() const;
+    QByteArray name() const override;
 
     static bool canRead(QIODevice *device);
 
-    QVariant option(ImageOption option) const;
-    void setOption(ImageOption option, const QVariant &value);
-    bool supportsOption(ImageOption option) const;
+    QVariant option(ImageOption option) const override;
+    void setOption(ImageOption option, const QVariant &value) override;
+    bool supportsOption(ImageOption option) const override;
 
 private:
     mutable QTgaFile *tga;
diff --git a/src/plugins/imageformats/tiff/main.cpp b/src/plugins/imageformats/tiff/main.cpp
index e16b178..478ed3c 100644
--- a/src/plugins/imageformats/tiff/main.cpp
+++ b/src/plugins/imageformats/tiff/main.cpp
@@ -55,8 +55,8 @@ class QTiffPlugin : public QImageIOPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "tiff.json")
 
 public:
-    Capabilities capabilities(QIODevice * device, const QByteArray & format) const;
-    QImageIOHandler * create(QIODevice * device, const QByteArray & format = QByteArray()) const;
+    Capabilities capabilities(QIODevice * device, const QByteArray & format) const override;
+    QImageIOHandler * create(QIODevice * device, const QByteArray & format = QByteArray()) const override;
     QStringList keys() const;
 };
 
diff --git a/src/plugins/imageformats/wbmp/main.cpp b/src/plugins/imageformats/wbmp/main.cpp
index 819808e..c24b7c4 100644
--- a/src/plugins/imageformats/wbmp/main.cpp
+++ b/src/plugins/imageformats/wbmp/main.cpp
@@ -56,8 +56,8 @@ class QWbmpPlugin : public QImageIOPlugin
 
 public:
     QStringList keys() const;
-    QImageIOPlugin::Capabilities capabilities(QIODevice *device, const QByteArray &format) const;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const;
+    QImageIOPlugin::Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };
 
 QImageIOPlugin::Capabilities QWbmpPlugin::capabilities(QIODevice *device, const QByteArray &format) const
diff --git a/src/plugins/imageformats/wbmp/qwbmphandler_p.h b/src/plugins/imageformats/wbmp/qwbmphandler_p.h
index 437d794..3856fc4 100644
--- a/src/plugins/imageformats/wbmp/qwbmphandler_p.h
+++ b/src/plugins/imageformats/wbmp/qwbmphandler_p.h
@@ -61,14 +61,14 @@ class QWbmpHandler : public QImageIOHandler
 {
 public:
     QWbmpHandler(QIODevice *device);
-    virtual ~QWbmpHandler();
+    ~QWbmpHandler();
 
-    bool canRead() const;
-    bool read(QImage *image);
-    bool write(const QImage &image);
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;
 
-    QVariant option(ImageOption option) const;
-    bool supportsOption(ImageOption option) const;
+    QVariant option(ImageOption option) const override;
+    bool supportsOption(ImageOption option) const override;
 
     static bool canRead(QIODevice *device);
 
diff --git a/src/plugins/imageformats/webp/main.cpp b/src/plugins/imageformats/webp/main.cpp
index 6aa34e6..064f3ab 100644
--- a/src/plugins/imageformats/webp/main.cpp
+++ b/src/plugins/imageformats/webp/main.cpp
@@ -58,8 +58,8 @@ class QWebpPlugin : public QImageIOPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "webp.json")
 
 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };
 
 QWebpPlugin::Capabilities QWebpPlugin::capabilities(QIODevice *device, const QByteArray &format) const
diff --git a/src/plugins/imageformats/webp/qwebphandler_p.h b/src/plugins/imageformats/webp/qwebphandler_p.h
index 36dfed7..99a7c21 100644
--- a/src/plugins/imageformats/webp/qwebphandler_p.h
+++ b/src/plugins/imageformats/webp/qwebphandler_p.h
@@ -56,23 +56,23 @@ public:
     ~QWebpHandler();
 
 public:
-    QByteArray name() const;
+    QByteArray name() const override;
 
-    bool canRead() const;
-    bool read(QImage *image);
+    bool canRead() const override;
+    bool read(QImage *image) override;
 
     static bool canRead(QIODevice *device);
 
-    bool write(const QImage &image);
-    QVariant option(ImageOption option) const;
-    void setOption(ImageOption option, const QVariant &value);
-    bool supportsOption(ImageOption option) const;
+    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;
 
-    int imageCount() const;
-    int currentImageNumber() const;
-    QRect currentImageRect() const;
-    int loopCount() const;
-    int nextImageDelay() const;
+    int imageCount() const override;
+    int currentImageNumber() const override;
+    QRect currentImageRect() const override;
+    int loopCount() const override;
+    int nextImageDelay() const override;
 
 private:
     bool ensureScanned() const;