diff options
Diffstat (limited to 'src/opengl/qglpaintdevice_p.h')
| -rw-r--r-- | src/opengl/qglpaintdevice_p.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/opengl/qglpaintdevice_p.h b/src/opengl/qglpaintdevice_p.h index f0855317ea..33144dab6b 100644 --- a/src/opengl/qglpaintdevice_p.h +++ b/src/opengl/qglpaintdevice_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtOpenGL module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -58,7 +58,7 @@ public: QGLPaintDevice(); virtual ~QGLPaintDevice(); - int devType() const {return QInternal::OpenGL;} + int devType() const Q_DECL_OVERRIDE {return QInternal::OpenGL;} virtual void beginPaint(); virtual void ensureActiveTarget(); @@ -74,7 +74,7 @@ public: static QGLPaintDevice* getDevice(QPaintDevice*); protected: - int metric(QPaintDevice::PaintDeviceMetric metric) const; + int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; GLuint m_previousFBO; GLuint m_thisFBO; }; @@ -87,13 +87,13 @@ class Q_OPENGL_EXPORT QGLWidgetGLPaintDevice : public QGLPaintDevice public: QGLWidgetGLPaintDevice(); - virtual QPaintEngine* paintEngine() const; + virtual QPaintEngine* paintEngine() const Q_DECL_OVERRIDE; // QGLWidgets need to do swapBufers in endPaint: - virtual void beginPaint(); - virtual void endPaint(); - virtual QSize size() const; - virtual QGLContext* context() const; + virtual void beginPaint() Q_DECL_OVERRIDE; + virtual void endPaint() Q_DECL_OVERRIDE; + virtual QSize size() const Q_DECL_OVERRIDE; + virtual QGLContext* context() const Q_DECL_OVERRIDE; void setWidget(QGLWidget*); |