aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/context2d/qquickcontext2dtexture_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/items/context2d/qquickcontext2dtexture_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/items/context2d/qquickcontext2dtexture_p.h')
-rw-r--r--src/quick/items/context2d/qquickcontext2dtexture_p.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quick/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h
index 97d7e6574d..88d7b6858f 100644
--- a/src/quick/items/context2d/qquickcontext2dtexture_p.h
+++ b/src/quick/items/context2d/qquickcontext2dtexture_p.h
@@ -165,21 +165,21 @@ class QQuickContext2DFBOTexture : public QQuickContext2DTexture
public:
QQuickContext2DFBOTexture();
~QQuickContext2DFBOTexture();
- virtual QQuickContext2DTile* createTile() const;
- virtual QPaintDevice* beginPainting();
- virtual void endPainting();
+ QQuickContext2DTile* createTile() const Q_DECL_OVERRIDE;
+ QPaintDevice* beginPainting() Q_DECL_OVERRIDE;
+ void endPainting() Q_DECL_OVERRIDE;
QRectF normalizedTextureSubRect() const;
- virtual QQuickCanvasItem::RenderTarget renderTarget() const;
- virtual void compositeTile(QQuickContext2DTile* tile);
- QSize adjustedTileSize(const QSize &ts);
+ QQuickCanvasItem::RenderTarget renderTarget() const Q_DECL_OVERRIDE;
+ void compositeTile(QQuickContext2DTile* tile) Q_DECL_OVERRIDE;
+ QSize adjustedTileSize(const QSize &ts) Q_DECL_OVERRIDE;
- QSGTexture *textureForNextFrame(QSGTexture *, QQuickWindow *window);
+ QSGTexture *textureForNextFrame(QSGTexture *, QQuickWindow *window) Q_DECL_OVERRIDE;
protected:
QVector2D scaleFactor() const Q_DECL_OVERRIDE;
public Q_SLOTS:
- virtual void grabImage(const QRectF& region = QRectF());
+ void grabImage(const QRectF& region = QRectF()) Q_DECL_OVERRIDE;
private:
bool doMultisampling() const;