1 files changed, 37 insertions, 29 deletions

diff --git a/src/plugins/scenegraph/softwarecontext/softwarelayer.h b/src/plugins/scenegraph/softwarecontext/softwarelayer.h
index eb01e8b276..dae42e0b96 100644
--- a/src/plugins/scenegraph/softwarecontext/softwarelayer.h
+++ b/src/plugins/scenegraph/softwarecontext/softwarelayer.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 SOFTWARELAYER_H
 #define SOFTWARELAYER_H
@@ -40,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();