aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/scenegraph/softwarecontext/context.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/scenegraph/softwarecontext/context.h')
-rw-r--r--src/plugins/scenegraph/softwarecontext/context.h62
1 files changed, 35 insertions, 27 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/context.h b/src/plugins/scenegraph/softwarecontext/context.h
index bc633b50e1..11b0af9240 100644
--- a/src/plugins/scenegraph/softwarecontext/context.h
+++ b/src/plugins/scenegraph/softwarecontext/context.h
@@ -1,23 +1,31 @@
-/******************************************************************************
+/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
-** This file is part of the Qt Quick 2d Renderer module.
-**
-** $QT_BEGIN_LICENSE:COMM$
+** This file is part of the Qt Quick 2D Renderer module of the Qt Toolkit.
**
+** $QT_BEGIN_LICENSE:GPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
-******************************************************************************/
+****************************************************************************/
#ifndef CONTEXT_H
#define CONTEXT_H
@@ -45,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(); }
@@ -63,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);
@@ -76,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;
@@ -93,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