mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2025-06-03 17:08:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

WebP: use Q_DECL_OVERRIDE

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/imageformats/webp.cpp
View File

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

18
src/imageformats/webp.h
View File

@ -30,15 +30,13 @@ class WebPHandler : public QImageIOHandler
public: public:
WebPHandler(); WebPHandler();
virtual bool canRead() const; bool canRead() const Q_DECL_OVERRIDE;
virtual bool read(QImage *image); bool read(QImage *image) Q_DECL_OVERRIDE;
virtual bool write(const QImage &image); bool write(const QImage &image) Q_DECL_OVERRIDE;
virtual QByteArray format() const; bool supportsOption(ImageOption option) const Q_DECL_OVERRIDE;
QVariant option(ImageOption option) const Q_DECL_OVERRIDE;
virtual bool supportsOption(ImageOption option) const; void setOption(ImageOption option, const QVariant &value) Q_DECL_OVERRIDE;
virtual QVariant option(ImageOption option) const;
virtual void setOption(ImageOption option, const QVariant &value);
static bool canRead(QIODevice *device); 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") Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "webp.json")
public: public:
virtual Capabilities capabilities(QIODevice *device, const QByteArray &format) const; Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
virtual QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
}; };
#endif #endif