1 files changed, 37 insertions, 29 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/renderingvisitor.h b/src/plugins/scenegraph/softwarecontext/renderingvisitor.h
index 4a18c00512..6cded6c995 100644
--- a/src/plugins/scenegraph/softwarecontext/renderingvisitor.h
+++ b/src/plugins/scenegraph/softwarecontext/renderingvisitor.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 RENDERINGVISITOR_H
 #define RENDERINGVISITOR_H
@@ -29,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;