diff options
Diffstat (limited to 'src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h index ac1d63df17..576ae75666 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_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$ @@ -102,37 +102,37 @@ public: QGL2PaintEngineEx(); ~QGL2PaintEngineEx(); - bool begin(QPaintDevice *device); + bool begin(QPaintDevice *device) Q_DECL_OVERRIDE; void ensureActive(); - bool end(); - - virtual void clipEnabledChanged(); - virtual void penChanged(); - virtual void brushChanged(); - virtual void brushOriginChanged(); - virtual void opacityChanged(); - virtual void compositionModeChanged(); - virtual void renderHintsChanged(); - virtual void transformChanged(); - - virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); + bool end() Q_DECL_OVERRIDE; + + virtual void clipEnabledChanged() Q_DECL_OVERRIDE; + virtual void penChanged() Q_DECL_OVERRIDE; + virtual void brushChanged() Q_DECL_OVERRIDE; + virtual void brushOriginChanged() Q_DECL_OVERRIDE; + virtual void opacityChanged() Q_DECL_OVERRIDE; + virtual void compositionModeChanged() Q_DECL_OVERRIDE; + virtual void renderHintsChanged() Q_DECL_OVERRIDE; + virtual void transformChanged() Q_DECL_OVERRIDE; + + virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap, - QPainter::PixmapFragmentHints hints); + QPainter::PixmapFragmentHints hints) Q_DECL_OVERRIDE; virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor); - virtual void drawTextItem(const QPointF &p, const QTextItem &textItem); - virtual void fill(const QVectorPath &path, const QBrush &brush); - virtual void stroke(const QVectorPath &path, const QPen &pen); - virtual void clip(const QVectorPath &path, Qt::ClipOperation op); + Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; + virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE; + virtual void fill(const QVectorPath &path, const QBrush &brush) Q_DECL_OVERRIDE; + virtual void stroke(const QVectorPath &path, const QPen &pen) Q_DECL_OVERRIDE; + virtual void clip(const QVectorPath &path, Qt::ClipOperation op) Q_DECL_OVERRIDE; - virtual void drawStaticTextItem(QStaticTextItem *textItem); + virtual void drawStaticTextItem(QStaticTextItem *textItem) Q_DECL_OVERRIDE; bool drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr); - Type type() const { return OpenGL2; } + Type type() const Q_DECL_OVERRIDE { return OpenGL2; } - virtual void setState(QPainterState *s); - virtual QPainterState *createState(QPainterState *orig) const; + virtual void setState(QPainterState *s) Q_DECL_OVERRIDE; + virtual QPainterState *createState(QPainterState *orig) const Q_DECL_OVERRIDE; inline QGL2PaintEngineState *state() { return static_cast<QGL2PaintEngineState *>(QPaintEngineEx::state()); } @@ -140,16 +140,16 @@ public: return static_cast<const QGL2PaintEngineState *>(QPaintEngineEx::state()); } - void beginNativePainting(); - void endNativePainting(); + void beginNativePainting() Q_DECL_OVERRIDE; + void endNativePainting() Q_DECL_OVERRIDE; void invalidateState(); void setRenderTextActive(bool); bool isNativePaintingActive() const; - bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const { return false; } - bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const; + bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE { return false; } + bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE; void setTranslateZ(GLfloat z); @@ -238,7 +238,7 @@ public: void updateClipScissorTest(); void setScissor(const QRect &rect); void regenerateClip(); - void systemStateChanged(); + void systemStateChanged() Q_DECL_OVERRIDE; static QGLEngineShaderManager* shaderManagerForEngine(QGL2PaintEngineEx *engine) { return engine->d_func()->shaderManager; } |