From b35fce76f14b05d0fcdc88e67451063b95775876 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Thu, 14 Jan 2016 14:48:06 +0300 Subject: Add the override specifier Change-Id: I83ac9f6590cc00606aba0631dbd885437997fc16 Reviewed-by: Andy Nichols --- src/plugins/scenegraph/softwarecontext/context.h | 36 +++++++++---------- src/plugins/scenegraph/softwarecontext/glyphnode.h | 14 ++++---- src/plugins/scenegraph/softwarecontext/imagenode.h | 26 +++++++------- .../scenegraph/softwarecontext/ninepatchnode.h | 10 +++--- .../scenegraph/softwarecontext/painternode.h | 28 +++++++-------- .../scenegraph/softwarecontext/pixmaptexture.h | 10 +++--- .../scenegraph/softwarecontext/pluginmain.h | 6 ++-- .../scenegraph/softwarecontext/rectanglenode.h | 18 +++++----- .../scenegraph/softwarecontext/renderingvisitor.h | 40 +++++++++++----------- .../scenegraph/softwarecontext/renderloop.h | 26 +++++++------- .../scenegraph/softwarecontext/softwarelayer.h | 40 +++++++++++----------- .../softwarecontext/threadedrenderloop.h | 30 ++++++++-------- 12 files changed, 142 insertions(+), 142 deletions(-) diff --git a/src/plugins/scenegraph/softwarecontext/context.h b/src/plugins/scenegraph/softwarecontext/context.h index 649e8ae7f0..11b0af9240 100644 --- a/src/plugins/scenegraph/softwarecontext/context.h +++ b/src/plugins/scenegraph/softwarecontext/context.h @@ -53,11 +53,11 @@ class Renderer : public QSGRenderer public: Renderer(QSGRenderContext *context); - virtual void renderScene(GLuint fboId = 0); + void renderScene(GLuint fboId = 0) override; - virtual void render(); + void render() override; - void nodeChanged(QSGNode *node, QSGNode::DirtyState state); + void nodeChanged(QSGNode *node, QSGNode::DirtyState state) override; QBackingStore *backingStore() const { return m_backingStore.data(); } @@ -71,9 +71,9 @@ class PixmapRenderer : public QSGRenderer public: PixmapRenderer(QSGRenderContext *context); - virtual void renderScene(GLuint fboId = 0); + void renderScene(GLuint fboId = 0) override; - virtual void render(); + void render() override; void render(QPixmap *target); @@ -84,12 +84,12 @@ class RenderContext : public QSGRenderContext { public: RenderContext(QSGContext *ctx); - void initialize(QOpenGLContext *context); + void initialize(QOpenGLContext *context) override; void initializeIfNeeded(); - void invalidate(); - void renderNextFrame(QSGRenderer *renderer, GLuint fbo); - QSGTexture *createTexture(const QImage &image, uint flags = CreateTexture_Alpha) const; - QSGRenderer *createRenderer(); + void invalidate() override; + void renderNextFrame(QSGRenderer *renderer, GLuint fbo) override; + QSGTexture *createTexture(const QImage &image, uint flags = CreateTexture_Alpha) const override; + QSGRenderer *createRenderer() override; QWindow *currentWindow; bool m_initialized; @@ -101,15 +101,15 @@ class Context : public QSGContext public: explicit Context(QObject *parent = 0); - QSGRenderContext *createRenderContext() { return new RenderContext(this); } + QSGRenderContext *createRenderContext() override { return new RenderContext(this); } - virtual QSGRectangleNode *createRectangleNode(); - virtual QSGImageNode *createImageNode(); - virtual QSGPainterNode *createPainterNode(QQuickPaintedItem *item); - virtual QSGGlyphNode *createGlyphNode(QSGRenderContext *rc, bool preferNativeGlyphNode); - virtual QSGNinePatchNode *createNinePatchNode(); - virtual QSGLayer *createLayer(QSGRenderContext *renderContext); - virtual QSurfaceFormat defaultSurfaceFormat() const; + QSGRectangleNode *createRectangleNode() override; + QSGImageNode *createImageNode() override; + QSGPainterNode *createPainterNode(QQuickPaintedItem *item) override; + QSGGlyphNode *createGlyphNode(QSGRenderContext *rc, bool preferNativeGlyphNode) override; + QSGNinePatchNode *createNinePatchNode() override; + QSGLayer *createLayer(QSGRenderContext *renderContext) override; + QSurfaceFormat defaultSurfaceFormat() const override; }; } // namespace diff --git a/src/plugins/scenegraph/softwarecontext/glyphnode.h b/src/plugins/scenegraph/softwarecontext/glyphnode.h index 55c841d457..50620fc910 100644 --- a/src/plugins/scenegraph/softwarecontext/glyphnode.h +++ b/src/plugins/scenegraph/softwarecontext/glyphnode.h @@ -37,13 +37,13 @@ class GlyphNode : public QSGGlyphNode public: GlyphNode(); - virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs); - virtual void setColor(const QColor &color); - virtual void setStyle(QQuickText::TextStyle style); - virtual void setStyleColor(const QColor &color); - virtual QPointF baseLine() const; - virtual void setPreferredAntialiasingMode(AntialiasingMode); - virtual void update(); + void setGlyphs(const QPointF &position, const QGlyphRun &glyphs) override; + void setColor(const QColor &color) override; + void setStyle(QQuickText::TextStyle style) override; + void setStyleColor(const QColor &color) override; + QPointF baseLine() const override; + void setPreferredAntialiasingMode(AntialiasingMode) override; + void update() override; void paint(QPainter *painter); diff --git a/src/plugins/scenegraph/softwarecontext/imagenode.h b/src/plugins/scenegraph/softwarecontext/imagenode.h index 9d38942790..6f8dcea91b 100644 --- a/src/plugins/scenegraph/softwarecontext/imagenode.h +++ b/src/plugins/scenegraph/softwarecontext/imagenode.h @@ -83,19 +83,19 @@ class ImageNode : public QSGImageNode public: ImageNode(); - virtual void setTargetRect(const QRectF &rect); - virtual void setInnerTargetRect(const QRectF &rect); - virtual void setInnerSourceRect(const QRectF &rect); - virtual void setSubSourceRect(const QRectF &rect); - virtual void setTexture(QSGTexture *texture); - virtual void setMirror(bool mirror); - virtual void setMipmapFiltering(QSGTexture::Filtering filtering); - virtual void setFiltering(QSGTexture::Filtering filtering); - virtual void setHorizontalWrapMode(QSGTexture::WrapMode wrapMode); - virtual void setVerticalWrapMode(QSGTexture::WrapMode wrapMode); - virtual void update(); - - virtual void preprocess(); + void setTargetRect(const QRectF &rect) override; + void setInnerTargetRect(const QRectF &rect) override; + void setInnerSourceRect(const QRectF &rect) override; + void setSubSourceRect(const QRectF &rect) override; + void setTexture(QSGTexture *texture) override; + void setMirror(bool mirror) override; + void setMipmapFiltering(QSGTexture::Filtering filtering) override; + void setFiltering(QSGTexture::Filtering filtering) override; + void setHorizontalWrapMode(QSGTexture::WrapMode wrapMode) override; + void setVerticalWrapMode(QSGTexture::WrapMode wrapMode) override; + void update() override; + + void preprocess() override; void paint(QPainter *painter); diff --git a/src/plugins/scenegraph/softwarecontext/ninepatchnode.h b/src/plugins/scenegraph/softwarecontext/ninepatchnode.h index 2be1d870fb..30cde5b05b 100644 --- a/src/plugins/scenegraph/softwarecontext/ninepatchnode.h +++ b/src/plugins/scenegraph/softwarecontext/ninepatchnode.h @@ -37,11 +37,11 @@ class NinePatchNode : public QSGNinePatchNode public: NinePatchNode(); - virtual void setTexture(QSGTexture *texture); - virtual void setBounds(const QRectF &bounds); - virtual void setDevicePixelRatio(qreal ratio); - virtual void setPadding(qreal left, qreal top, qreal right, qreal bottom); - virtual void update(); + void setTexture(QSGTexture *texture) override; + void setBounds(const QRectF &bounds) override; + void setDevicePixelRatio(qreal ratio) override; + void setPadding(qreal left, qreal top, qreal right, qreal bottom) override; + void update() override; void paint(QPainter *painter); diff --git a/src/plugins/scenegraph/softwarecontext/painternode.h b/src/plugins/scenegraph/softwarecontext/painternode.h index 5a4a01ef47..60391feca8 100644 --- a/src/plugins/scenegraph/softwarecontext/painternode.h +++ b/src/plugins/scenegraph/softwarecontext/painternode.h @@ -41,43 +41,43 @@ public: PainterNode(QQuickPaintedItem *item); ~PainterNode(); - void setPreferredRenderTarget(QQuickPaintedItem::RenderTarget target); + void setPreferredRenderTarget(QQuickPaintedItem::RenderTarget target) override; - void setSize(const QSize &size); + void setSize(const QSize &size) override; QSize size() const { return m_size; } - void setDirty(const QRect &dirtyRect = QRect()); + void setDirty(const QRect &dirtyRect = QRect()) override; - void setOpaquePainting(bool opaque); + void setOpaquePainting(bool opaque) override; bool opaquePainting() const { return m_opaquePainting; } - void setLinearFiltering(bool linearFiltering); + void setLinearFiltering(bool linearFiltering) override; bool linearFiltering() const { return m_linear_filtering; } - void setMipmapping(bool mipmapping); + void setMipmapping(bool mipmapping) override; bool mipmapping() const { return m_mipmapping; } - void setSmoothPainting(bool s); + void setSmoothPainting(bool s) override; bool smoothPainting() const { return m_smoothPainting; } - void setFillColor(const QColor &c); + void setFillColor(const QColor &c) override; QColor fillColor() const { return m_fillColor; } - void setContentsScale(qreal s); + void setContentsScale(qreal s) override; qreal contentsScale() const { return m_contentsScale; } - void setFastFBOResizing(bool dynamic); + void setFastFBOResizing(bool dynamic) override; bool fastFBOResizing() const { return m_fastFBOResizing; } - QImage toImage() const; - void update(); - QSGTexture *texture() const { return m_texture; } + QImage toImage() const override; + void update() override; + QSGTexture *texture() const override { return m_texture; } void paint(QPainter *painter); void paint(); - void setTextureSize(const QSize &size); + void setTextureSize(const QSize &size) override; QSize textureSize() const { return m_textureSize; } private: diff --git a/src/plugins/scenegraph/softwarecontext/pixmaptexture.h b/src/plugins/scenegraph/softwarecontext/pixmaptexture.h index 209b58ba73..302854223f 100644 --- a/src/plugins/scenegraph/softwarecontext/pixmaptexture.h +++ b/src/plugins/scenegraph/softwarecontext/pixmaptexture.h @@ -39,11 +39,11 @@ public: PixmapTexture(const QImage &image); PixmapTexture(const QPixmap &pixmap); - virtual int textureId() const; - virtual QSize textureSize() const; - virtual bool hasAlphaChannel() const; - virtual bool hasMipmaps() const; - virtual void bind(); + int textureId() const override; + QSize textureSize() const override; + bool hasAlphaChannel() const override; + bool hasMipmaps() const override; + void bind() override; const QPixmap &pixmap() const { return m_pixmap; } diff --git a/src/plugins/scenegraph/softwarecontext/pluginmain.h b/src/plugins/scenegraph/softwarecontext/pluginmain.h index e08bf7319d..23b1c023ca 100644 --- a/src/plugins/scenegraph/softwarecontext/pluginmain.h +++ b/src/plugins/scenegraph/softwarecontext/pluginmain.h @@ -46,9 +46,9 @@ class ContextPlugin : public QSGContextPlugin public: ContextPlugin(QObject *parent = 0); - QStringList keys() const; - QSGContext *create(const QString &key) const; - QSGRenderLoop *createWindowManager(); + QStringList keys() const override; + QSGContext *create(const QString &key) const override; + QSGRenderLoop *createWindowManager() override; static SoftwareContext::Context *instance; }; diff --git a/src/plugins/scenegraph/softwarecontext/rectanglenode.h b/src/plugins/scenegraph/softwarecontext/rectanglenode.h index 3ff16e8f1d..d660b13b45 100644 --- a/src/plugins/scenegraph/softwarecontext/rectanglenode.h +++ b/src/plugins/scenegraph/softwarecontext/rectanglenode.h @@ -41,16 +41,16 @@ class RectangleNode : public QSGRectangleNode public: RectangleNode(); - virtual void setRect(const QRectF &rect); - virtual void setColor(const QColor &color); - virtual void setPenColor(const QColor &color); - virtual void setPenWidth(qreal width); - virtual void setGradientStops(const QGradientStops &stops); - virtual void setRadius(qreal radius); - virtual void setAntialiasing(bool antialiasing) { Q_UNUSED(antialiasing) } - virtual void setAligned(bool aligned); + void setRect(const QRectF &rect) override; + void setColor(const QColor &color) override; + void setPenColor(const QColor &color) override; + void setPenWidth(qreal width) override; + void setGradientStops(const QGradientStops &stops) override; + void setRadius(qreal radius) override; + void setAntialiasing(bool antialiasing) override { Q_UNUSED(antialiasing) } + void setAligned(bool aligned) override; - virtual void update(); + void update() override; void paint(QPainter *); diff --git a/src/plugins/scenegraph/softwarecontext/renderingvisitor.h b/src/plugins/scenegraph/softwarecontext/renderingvisitor.h index 90624aab03..6cded6c995 100644 --- a/src/plugins/scenegraph/softwarecontext/renderingvisitor.h +++ b/src/plugins/scenegraph/softwarecontext/renderingvisitor.h @@ -37,26 +37,26 @@ class RenderingVisitor : public QSGNodeVisitorEx public: RenderingVisitor(QPainter *painter); - virtual bool visit(QSGTransformNode *node); - virtual void endVisit(QSGTransformNode *); - virtual bool visit(QSGClipNode *node); - virtual void endVisit(QSGClipNode *node); - virtual bool visit(QSGGeometryNode *node); - virtual void endVisit(QSGGeometryNode *node); - virtual bool visit(QSGOpacityNode *node); - virtual void endVisit(QSGOpacityNode *node); - virtual bool visit(QSGImageNode *node); - virtual void endVisit(QSGImageNode *node); - virtual bool visit(QSGPainterNode *node); - virtual void endVisit(QSGPainterNode *); - virtual bool visit(QSGRectangleNode *node); - virtual void endVisit(QSGRectangleNode *node); - virtual bool visit(QSGGlyphNode *node); - virtual void endVisit(QSGGlyphNode *node); - virtual bool visit(QSGNinePatchNode *node); - virtual void endVisit(QSGNinePatchNode *); - virtual bool visit(QSGRootNode *); - virtual void endVisit(QSGRootNode *); + bool visit(QSGTransformNode *node) override; + void endVisit(QSGTransformNode *) override; + bool visit(QSGClipNode *node) override; + void endVisit(QSGClipNode *node) override; + bool visit(QSGGeometryNode *node) override; + void endVisit(QSGGeometryNode *node) override; + bool visit(QSGOpacityNode *node) override; + void endVisit(QSGOpacityNode *node) override; + bool visit(QSGImageNode *node) override; + void endVisit(QSGImageNode *node) override; + bool visit(QSGPainterNode *node) override; + void endVisit(QSGPainterNode *) override; + bool visit(QSGRectangleNode *node) override; + void endVisit(QSGRectangleNode *node) override; + bool visit(QSGGlyphNode *node) override; + void endVisit(QSGGlyphNode *node) override; + bool visit(QSGNinePatchNode *node) override; + void endVisit(QSGNinePatchNode *) override; + bool visit(QSGRootNode *) override; + void endVisit(QSGRootNode *) override; private: QPainter *painter; diff --git a/src/plugins/scenegraph/softwarecontext/renderloop.h b/src/plugins/scenegraph/softwarecontext/renderloop.h index 6cdf7dab6f..f653f49aba 100644 --- a/src/plugins/scenegraph/softwarecontext/renderloop.h +++ b/src/plugins/scenegraph/softwarecontext/renderloop.h @@ -39,27 +39,27 @@ public: RenderLoop(); ~RenderLoop(); - void show(QQuickWindow *window); - void hide(QQuickWindow *window); + void show(QQuickWindow *window) override; + void hide(QQuickWindow *window) override; - void windowDestroyed(QQuickWindow *window); + void windowDestroyed(QQuickWindow *window) override; void renderWindow(QQuickWindow *window); - void exposureChanged(QQuickWindow *window); - QImage grab(QQuickWindow *window); + void exposureChanged(QQuickWindow *window) override; + QImage grab(QQuickWindow *window) override; - void maybeUpdate(QQuickWindow *window); - void update(QQuickWindow *window) { maybeUpdate(window); } // identical for this implementation. - void handleUpdateRequest(QQuickWindow *); + void maybeUpdate(QQuickWindow *window) override; + void update(QQuickWindow *window) override { maybeUpdate(window); } // identical for this implementation. + void handleUpdateRequest(QQuickWindow *) override; - void releaseResources(QQuickWindow *) { } + void releaseResources(QQuickWindow *) override { } - virtual QSurface::SurfaceType windowSurfaceType() const; + QSurface::SurfaceType windowSurfaceType() const override; - QAnimationDriver *animationDriver() const { return 0; } + QAnimationDriver *animationDriver() const override { return 0; } - QSGContext *sceneGraphContext() const; - QSGRenderContext *createRenderContext(QSGContext *) const { return rc; } + QSGContext *sceneGraphContext() const override; + QSGRenderContext *createRenderContext(QSGContext *) const override { return rc; } struct WindowData { bool updatePending : 1; diff --git a/src/plugins/scenegraph/softwarecontext/softwarelayer.h b/src/plugins/scenegraph/softwarecontext/softwarelayer.h index 86ffc9f235..dae42e0b96 100644 --- a/src/plugins/scenegraph/softwarecontext/softwarelayer.h +++ b/src/plugins/scenegraph/softwarecontext/softwarelayer.h @@ -48,34 +48,34 @@ public: // QSGTexture interface public: - virtual int textureId() const; - virtual QSize textureSize() const; - virtual bool hasAlphaChannel() const; - virtual bool hasMipmaps() const; - virtual void bind(); + int textureId() const override; + QSize textureSize() const override; + bool hasAlphaChannel() const override; + bool hasMipmaps() const override; + void bind() override; // QSGDynamicTexture interface public: - virtual bool updateTexture(); + bool updateTexture() override; // QSGLayer interface public: - virtual void setItem(QSGNode *item); - virtual void setRect(const QRectF &rect); - virtual void setSize(const QSize &size); - virtual void scheduleUpdate(); - virtual QImage toImage() const; - virtual void setLive(bool live); - virtual void setRecursive(bool recursive); - virtual void setFormat(GLenum); - virtual void setHasMipmaps(bool); - virtual void setDevicePixelRatio(qreal ratio); - virtual void setMirrorHorizontal(bool mirror); - virtual void setMirrorVertical(bool mirror); + void setItem(QSGNode *item) override; + void setRect(const QRectF &rect) override; + void setSize(const QSize &size) override; + void scheduleUpdate() override; + QImage toImage() const override; + void setLive(bool live) override; + void setRecursive(bool recursive) override; + void setFormat(GLenum) override; + void setHasMipmaps(bool) override; + void setDevicePixelRatio(qreal ratio) override; + void setMirrorHorizontal(bool mirror) override; + void setMirrorVertical(bool mirror) override; public slots: - virtual void markDirtyTexture(); - virtual void invalidated(); + void markDirtyTexture() override; + void invalidated() override; private: void grab(); diff --git a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h index 3af241962e..5e3366cce2 100644 --- a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h +++ b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h @@ -43,29 +43,29 @@ class ThreadedRenderLoop : public QSGRenderLoop public: ThreadedRenderLoop(); - void show(QQuickWindow *) {} - void hide(QQuickWindow *); + void show(QQuickWindow *) override {} + void hide(QQuickWindow *) override; - void windowDestroyed(QQuickWindow *window); - void exposureChanged(QQuickWindow *window); + void windowDestroyed(QQuickWindow *window) override; + void exposureChanged(QQuickWindow *window) override; - QImage grab(QQuickWindow *); + QImage grab(QQuickWindow *) override; - void update(QQuickWindow *window); - void maybeUpdate(QQuickWindow *window); - void handleUpdateRequest(QQuickWindow *window); + void update(QQuickWindow *window) override; + void maybeUpdate(QQuickWindow *window) override; + void handleUpdateRequest(QQuickWindow *window) override; - QSGContext *sceneGraphContext() const; - QSGRenderContext *createRenderContext(QSGContext *) const; + QSGContext *sceneGraphContext() const override; + QSGRenderContext *createRenderContext(QSGContext *) const override; - QAnimationDriver *animationDriver() const; + QAnimationDriver *animationDriver() const override; - void releaseResources(QQuickWindow *window); + void releaseResources(QQuickWindow *window) override; - bool event(QEvent *); - void postJob(QQuickWindow *window, QRunnable *job); + bool event(QEvent *) override; + void postJob(QQuickWindow *window, QRunnable *job) override; - bool interleaveIncubation() const; + bool interleaveIncubation() const override; public Q_SLOTS: void animationStarted(); -- cgit v1.2.3