[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kimageformats] src/imageformats: WebP: use Q_DECL_OVERRIDE
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-02-20 12:56:31
Message-ID: E1WGTB1-0006VP-LM () scm ! kde ! org
[Download RAW message or body]

Git commit 4fbbc75429597dc545ae8af24e870d9bac5f2f2a by Alex Merry.
Committed on 16/02/2014 at 11:09.
Pushed by alexmerry into branch 'master'.

WebP: use Q_DECL_OVERRIDE

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

REVIEW: 115355

M  +0    -7    src/imageformats/webp.cpp
M  +8    -10   src/imageformats/webp.h

http://commits.kde.org/kimageformats/4fbbc75429597dc545ae8af24e870d9bac5f2f2a

diff --git a/src/imageformats/webp.cpp b/src/imageformats/webp.cpp
index cb68ae9..c92b7bb 100644
--- a/src/imageformats/webp.cpp
+++ b/src/imageformats/webp.cpp
@@ -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);
diff --git a/src/imageformats/webp.h b/src/imageformats/webp.h
index 02b90ee..91e724e 100644
--- a/src/imageformats/webp.h
+++ b/src/imageformats/webp.h
@@ -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


[prev in list] [next in list] [prev in thread] [next in thread]