aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/qsgdefaultlayer_p.h
diff options
context:
space:
mode:
authorSérgio Martins <sergio.martins@kdab.com>2015-02-04 23:10:21 +0000
committerSérgio Martins <sergio.martins@kdab.com>2015-02-13 13:52:05 +0000
commit3f3be0fa64f8745b05a417d3e9c8c20da74d5fa9 (patch)
treef88e3bf2ed1766605a95a964361ab5270ecd9575 /src/quick/scenegraph/qsgdefaultlayer_p.h
parent6a50e6f63d46dfed4b1edc6a2a8d49f27ef9695f (diff)
Fix 590 inconsistent override warnings [-Winconsistent-missing-override]
Classes should either use or not use override, otherwise it hurts code readability. Change-Id: Ieb899a3475b0c36ab20285740b2cec2cd1677a54 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultlayer_p.h')
-rw-r--r--src/quick/scenegraph/qsgdefaultlayer_p.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/quick/scenegraph/qsgdefaultlayer_p.h b/src/quick/scenegraph/qsgdefaultlayer_p.h
index e6c7b65445..f3d58ac920 100644
--- a/src/quick/scenegraph/qsgdefaultlayer_p.h
+++ b/src/quick/scenegraph/qsgdefaultlayer_p.h
@@ -50,41 +50,41 @@ public:
// The item's "paint node", not effect node.
QSGNode *item() const { return m_item; }
- void setItem(QSGNode *item);
+ void setItem(QSGNode *item) Q_DECL_OVERRIDE;
QRectF rect() const { return m_rect; }
- void setRect(const QRectF &rect);
+ void setRect(const QRectF &rect) Q_DECL_OVERRIDE;
QSize size() const { return m_size; }
- void setSize(const QSize &size);
+ void setSize(const QSize &size) Q_DECL_OVERRIDE;
- void setHasMipmaps(bool mipmap);
+ void setHasMipmaps(bool mipmap) Q_DECL_OVERRIDE;
- void bind();
+ void bind() Q_DECL_OVERRIDE;
- bool hasAlphaChannel() const;
- bool hasMipmaps() const;
- int textureId() const;
- QSize textureSize() const { return m_size; }
+ bool hasAlphaChannel() const Q_DECL_OVERRIDE;
+ bool hasMipmaps() const Q_DECL_OVERRIDE;
+ int textureId() const Q_DECL_OVERRIDE;
+ QSize textureSize() const Q_DECL_OVERRIDE { return m_size; }
GLenum format() const { return m_format; }
- void setFormat(GLenum format);
+ void setFormat(GLenum format) Q_DECL_OVERRIDE;
bool live() const { return bool(m_live); }
- void setLive(bool live);
+ void setLive(bool live) Q_DECL_OVERRIDE;
bool recursive() const { return bool(m_recursive); }
- void setRecursive(bool recursive);
+ void setRecursive(bool recursive) Q_DECL_OVERRIDE;
- void setDevicePixelRatio(qreal ratio) { m_device_pixel_ratio = ratio; }
+ void setDevicePixelRatio(qreal ratio) Q_DECL_OVERRIDE { m_device_pixel_ratio = ratio; }
- void scheduleUpdate();
+ void scheduleUpdate() Q_DECL_OVERRIDE;
- QImage toImage() const;
+ QImage toImage() const Q_DECL_OVERRIDE;
public Q_SLOTS:
- void markDirtyTexture();
- void invalidated();
+ void markDirtyTexture() Q_DECL_OVERRIDE;
+ void invalidated() Q_DECL_OVERRIDE;
private:
void grab();