diff options
author | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-01-13 13:21:55 +0100 |
---|---|---|
committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2017-04-07 08:45:51 +0000 |
commit | 86005ea2570fcce81db8e3f4988f5541b4624de8 (patch) | |
tree | 7724957e56851ffc65dcc3057fec9e265d6b69fe /src/plugins/imageformats/ico | |
parent | 191a21047863cd327d3e8102b08dbf20a4c6e0a5 (diff) |
Replace Q_DECL_OVERRIDE with override in imageformats
Change-Id: I7280cdf674b2a202f9ef7ff2bb9b6732e09a5a76
Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/plugins/imageformats/ico')
-rw-r--r-- | src/plugins/imageformats/ico/main.h | 4 | ||||
-rw-r--r-- | src/plugins/imageformats/ico/qicohandler.h | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/imageformats/ico/main.h b/src/plugins/imageformats/ico/main.h index 8e54d7c643..b5875183c1 100644 --- a/src/plugins/imageformats/ico/main.h +++ b/src/plugins/imageformats/ico/main.h @@ -52,8 +52,8 @@ class QICOPlugin : public QImageIOPlugin Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "ico.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; }; QT_END_NAMESPACE diff --git a/src/plugins/imageformats/ico/qicohandler.h b/src/plugins/imageformats/ico/qicohandler.h index eea894a950..435f036113 100644 --- a/src/plugins/imageformats/ico/qicohandler.h +++ b/src/plugins/imageformats/ico/qicohandler.h @@ -50,20 +50,20 @@ public: QtIcoHandler(QIODevice *device); virtual ~QtIcoHandler(); - 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; - int imageCount() const Q_DECL_OVERRIDE; - bool jumpToImage(int imageNumber) Q_DECL_OVERRIDE; - bool jumpToNextImage() Q_DECL_OVERRIDE; + int imageCount() const override; + bool jumpToImage(int imageNumber) override; + bool jumpToNextImage() override; static bool canRead(QIODevice *device); - bool supportsOption(ImageOption option) const Q_DECL_OVERRIDE; - QVariant option(ImageOption option) const Q_DECL_OVERRIDE; + bool supportsOption(ImageOption option) const override; + QVariant option(ImageOption option) const override; private: int m_currentIconIndex; |