WebP: use Q_DECL_OVERRIDE

In doing so, found a method that should not have been overridden, and so
removed it.

REVIEW: 115355
This commit is contained in:
Alex Merry 2014-02-16 11:09:59 +00:00
parent 331a813662
commit 4fbbc75429
2 changed files with 8 additions and 17 deletions

View File

@ -131,13 +131,6 @@ bool WebPHandler::write(const QImage &image)
//---------------------------------------------------------------------
QByteArray WebPHandler::format() const
{
return "webp";
}
//---------------------------------------------------------------------
bool WebPHandler::supportsOption(ImageOption option) const
{
return (option == Quality) || (option == Size);

View File

@ -30,15 +30,13 @@ class WebPHandler : public QImageIOHandler
public:
WebPHandler();
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;
virtual QByteArray format() const;
virtual bool supportsOption(ImageOption option) const;
virtual QVariant option(ImageOption option) const;
virtual void setOption(ImageOption option, const QVariant &value);
bool supportsOption(ImageOption option) const Q_DECL_OVERRIDE;
QVariant option(ImageOption option) const Q_DECL_OVERRIDE;
void setOption(ImageOption option, const QVariant &value) Q_DECL_OVERRIDE;
static bool canRead(QIODevice *device);
@ -52,8 +50,8 @@ class WebPPlugin : public QImageIOPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "webp.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