summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-10-19 15:09:16 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2016-11-11 09:16:39 +0000
commit2e6bc23b8846893a87fc7a0496efed25a945917e (patch)
tree1c2e6aad1028e82cc0a7cd529cdd9d2dbfcf5362
parentb7afe09e68b8ac582d72a94aaa5ca7d15a3f3ed9 (diff)
downloadqtsvg-2e6bc23b8846893a87fc7a0496efed25a945917e.tar.gz
Add missing 'override' keyword to plugins
Change-Id: I423b8531434d221880410cb3b40f10e6061769ff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
-rw-r--r--src/plugins/iconengines/svgiconengine/main.cpp2
-rw-r--r--src/plugins/iconengines/svgiconengine/qsvgiconengine.h18
-rw-r--r--src/plugins/imageformats/svg/main.cpp4
-rw-r--r--src/plugins/imageformats/svg/qsvgiohandler.h12
4 files changed, 18 insertions, 18 deletions
diff --git a/src/plugins/iconengines/svgiconengine/main.cpp b/src/plugins/iconengines/svgiconengine/main.cpp
index ebcdc82..ef1c8c1 100644
--- a/src/plugins/iconengines/svgiconengine/main.cpp
+++ b/src/plugins/iconengines/svgiconengine/main.cpp
@@ -55,7 +55,7 @@ class QSvgIconPlugin : public QIconEnginePlugin
public:
QStringList keys() const;
- QIconEngine *create(const QString &filename = QString());
+ QIconEngine *create(const QString &filename = QString()) override;
};
QStringList QSvgIconPlugin::keys() const
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
index 495a8b0..cf4f255 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
@@ -54,21 +54,21 @@ public:
QSvgIconEngine(const QSvgIconEngine &other);
~QSvgIconEngine();
void paint(QPainter *painter, const QRect &rect,
- QIcon::Mode mode, QIcon::State state);
+ QIcon::Mode mode, QIcon::State state) override;
QSize actualSize(const QSize &size, QIcon::Mode mode,
- QIcon::State state);
+ QIcon::State state) override;
QPixmap pixmap(const QSize &size, QIcon::Mode mode,
- QIcon::State state);
+ QIcon::State state) override;
void addPixmap(const QPixmap &pixmap, QIcon::Mode mode,
- QIcon::State state);
+ QIcon::State state) override;
void addFile(const QString &fileName, const QSize &size,
- QIcon::Mode mode, QIcon::State state);
+ QIcon::Mode mode, QIcon::State state) override;
- QString key() const;
- QIconEngine *clone() const;
- bool read(QDataStream &in);
- bool write(QDataStream &out) const;
+ QString key() const override;
+ QIconEngine *clone() const override;
+ bool read(QDataStream &in) override;
+ bool write(QDataStream &out) const override;
private:
QSharedDataPointer<QSvgIconEnginePrivate> d;
diff --git a/src/plugins/imageformats/svg/main.cpp b/src/plugins/imageformats/svg/main.cpp
index f18c1b4..a01398c 100644
--- a/src/plugins/imageformats/svg/main.cpp
+++ b/src/plugins/imageformats/svg/main.cpp
@@ -57,8 +57,8 @@ class QSvgPlugin : 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 QSvgPlugin::keys() const
diff --git a/src/plugins/imageformats/svg/qsvgiohandler.h b/src/plugins/imageformats/svg/qsvgiohandler.h
index 864031f..fdafa0a 100644
--- a/src/plugins/imageformats/svg/qsvgiohandler.h
+++ b/src/plugins/imageformats/svg/qsvgiohandler.h
@@ -57,13 +57,13 @@ class QSvgIOHandler : public QImageIOHandler
public:
QSvgIOHandler();
~QSvgIOHandler();
- virtual bool canRead() const;
- virtual QByteArray name() const;
- virtual bool read(QImage *image);
+ bool canRead() const override;
+ QByteArray name() const override;
+ bool read(QImage *image) 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:
QSvgIOHandlerPrivate *d;