diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 10:36:49 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:42 +0000 |
commit | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (patch) | |
tree | 330914ff8225867e19b9ed5e049813d9f1e5ec08 /src/gui/opengl | |
parent | 93dd85141b35460a83dac86083581ba1c1975927 (diff) |
Replace Q_DECL_OVERRIDE with override where possible
Remaining uses of Q_DECL_OVERRIDE are in:
src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
doc/global/qt-cpp-defines.qdocconf
(definition and documentation of Q_DECL_OVERRIDE)
tests/manual/qcursor/qcursorhighdpi/main.cpp
(a test executable compilable both under Qt4 and Qt5)
Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/gui/opengl')
33 files changed, 71 insertions, 71 deletions
diff --git a/src/gui/opengl/qopenglengineshadermanager.cpp b/src/gui/opengl/qopenglengineshadermanager.cpp index 3a94fa8805..2f7afa4a66 100644 --- a/src/gui/opengl/qopenglengineshadermanager.cpp +++ b/src/gui/opengl/qopenglengineshadermanager.cpp @@ -69,13 +69,13 @@ public: delete m_shaders; } - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { delete m_shaders; m_shaders = 0; } - void freeResource(QOpenGLContext *) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *) override { } diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index 5e3537e47b..739ecacc51 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -216,13 +216,13 @@ struct QOpenGLFunctionsPrivateEx : public QOpenGLExtensionsPrivate, public QOpen , m_extensions(-1) {} - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { m_features = -1; m_extensions = -1; } - void freeResource(QOpenGLContext *) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *) override { // no gl resources to free } diff --git a/src/gui/opengl/qopenglfunctions_1_0.h b/src/gui/opengl/qopenglfunctions_1_0.h index 8284604086..cddb7251ed 100644 --- a/src/gui/opengl/qopenglfunctions_1_0.h +++ b/src/gui/opengl/qopenglfunctions_1_0.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_0(); ~QOpenGLFunctions_1_0(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_1.h b/src/gui/opengl/qopenglfunctions_1_1.h index 052d3e93bd..8a9f16ec4c 100644 --- a/src/gui/opengl/qopenglfunctions_1_1.h +++ b/src/gui/opengl/qopenglfunctions_1_1.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_1(); ~QOpenGLFunctions_1_1(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_2.h b/src/gui/opengl/qopenglfunctions_1_2.h index 6b36500a79..7daca0923d 100644 --- a/src/gui/opengl/qopenglfunctions_1_2.h +++ b/src/gui/opengl/qopenglfunctions_1_2.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_2(); ~QOpenGLFunctions_1_2(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_3.h b/src/gui/opengl/qopenglfunctions_1_3.h index 3ed5851d5d..b527b57946 100644 --- a/src/gui/opengl/qopenglfunctions_1_3.h +++ b/src/gui/opengl/qopenglfunctions_1_3.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_3(); ~QOpenGLFunctions_1_3(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_4.h b/src/gui/opengl/qopenglfunctions_1_4.h index 849fad6744..1f3f5a9c0a 100644 --- a/src/gui/opengl/qopenglfunctions_1_4.h +++ b/src/gui/opengl/qopenglfunctions_1_4.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_4(); ~QOpenGLFunctions_1_4(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_5.h b/src/gui/opengl/qopenglfunctions_1_5.h index 18914a8957..d2f5311211 100644 --- a/src/gui/opengl/qopenglfunctions_1_5.h +++ b/src/gui/opengl/qopenglfunctions_1_5.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_5(); ~QOpenGLFunctions_1_5(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_2_0.h b/src/gui/opengl/qopenglfunctions_2_0.h index 74a91e0ff0..556597a9b3 100644 --- a/src/gui/opengl/qopenglfunctions_2_0.h +++ b/src/gui/opengl/qopenglfunctions_2_0.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_2_0(); ~QOpenGLFunctions_2_0(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_2_1.h b/src/gui/opengl/qopenglfunctions_2_1.h index e9212640f7..f053222c71 100644 --- a/src/gui/opengl/qopenglfunctions_2_1.h +++ b/src/gui/opengl/qopenglfunctions_2_1.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_2_1(); ~QOpenGLFunctions_2_1(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_0.h b/src/gui/opengl/qopenglfunctions_3_0.h index 1082d869d1..c592050c24 100644 --- a/src/gui/opengl/qopenglfunctions_3_0.h +++ b/src/gui/opengl/qopenglfunctions_3_0.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_0(); ~QOpenGLFunctions_3_0(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_1.h b/src/gui/opengl/qopenglfunctions_3_1.h index 2691dd29e7..3a8d3891f3 100644 --- a/src/gui/opengl/qopenglfunctions_3_1.h +++ b/src/gui/opengl/qopenglfunctions_3_1.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_1(); ~QOpenGLFunctions_3_1(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_2_compatibility.h b/src/gui/opengl/qopenglfunctions_3_2_compatibility.h index 9f34190721..391e725953 100644 --- a/src/gui/opengl/qopenglfunctions_3_2_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_3_2_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_2_Compatibility(); ~QOpenGLFunctions_3_2_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_2_core.h b/src/gui/opengl/qopenglfunctions_3_2_core.h index 2d5ee14bee..1eafb6f441 100644 --- a/src/gui/opengl/qopenglfunctions_3_2_core.h +++ b/src/gui/opengl/qopenglfunctions_3_2_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_2_Core(); ~QOpenGLFunctions_3_2_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_3_compatibility.h b/src/gui/opengl/qopenglfunctions_3_3_compatibility.h index a5c0cab63c..185dd5aab4 100644 --- a/src/gui/opengl/qopenglfunctions_3_3_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_3_3_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_3_Compatibility(); ~QOpenGLFunctions_3_3_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_3_core.h b/src/gui/opengl/qopenglfunctions_3_3_core.h index 4f0132d959..47d54d717e 100644 --- a/src/gui/opengl/qopenglfunctions_3_3_core.h +++ b/src/gui/opengl/qopenglfunctions_3_3_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_3_Core(); ~QOpenGLFunctions_3_3_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_0_compatibility.h b/src/gui/opengl/qopenglfunctions_4_0_compatibility.h index 1fa5e8a361..c0e42443d3 100644 --- a/src/gui/opengl/qopenglfunctions_4_0_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_0_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_0_Compatibility(); ~QOpenGLFunctions_4_0_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_0_core.h b/src/gui/opengl/qopenglfunctions_4_0_core.h index 8fd2af2d04..6cb55e86f7 100644 --- a/src/gui/opengl/qopenglfunctions_4_0_core.h +++ b/src/gui/opengl/qopenglfunctions_4_0_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_0_Core(); ~QOpenGLFunctions_4_0_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_1_compatibility.h b/src/gui/opengl/qopenglfunctions_4_1_compatibility.h index a284f8e6d3..bee169b50c 100644 --- a/src/gui/opengl/qopenglfunctions_4_1_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_1_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_1_Compatibility(); ~QOpenGLFunctions_4_1_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_1_core.h b/src/gui/opengl/qopenglfunctions_4_1_core.h index d35db3c839..3a4fd0743b 100644 --- a/src/gui/opengl/qopenglfunctions_4_1_core.h +++ b/src/gui/opengl/qopenglfunctions_4_1_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_1_Core(); ~QOpenGLFunctions_4_1_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_2_compatibility.h b/src/gui/opengl/qopenglfunctions_4_2_compatibility.h index 7b45859984..6726d5fc44 100644 --- a/src/gui/opengl/qopenglfunctions_4_2_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_2_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_2_Compatibility(); ~QOpenGLFunctions_4_2_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_2_core.h b/src/gui/opengl/qopenglfunctions_4_2_core.h index 80bb33e7d8..a921329741 100644 --- a/src/gui/opengl/qopenglfunctions_4_2_core.h +++ b/src/gui/opengl/qopenglfunctions_4_2_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_2_Core(); ~QOpenGLFunctions_4_2_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_3_compatibility.h b/src/gui/opengl/qopenglfunctions_4_3_compatibility.h index 515467a38d..b9d4eb1d6f 100644 --- a/src/gui/opengl/qopenglfunctions_4_3_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_3_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_3_Compatibility(); ~QOpenGLFunctions_4_3_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_3_core.h b/src/gui/opengl/qopenglfunctions_4_3_core.h index 4a700c36d7..da552d64af 100644 --- a/src/gui/opengl/qopenglfunctions_4_3_core.h +++ b/src/gui/opengl/qopenglfunctions_4_3_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_3_Core(); ~QOpenGLFunctions_4_3_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_4_compatibility.h b/src/gui/opengl/qopenglfunctions_4_4_compatibility.h index f2d640cdaf..7a05bd802d 100644 --- a/src/gui/opengl/qopenglfunctions_4_4_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_4_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_4_Compatibility(); ~QOpenGLFunctions_4_4_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_4_core.h b/src/gui/opengl/qopenglfunctions_4_4_core.h index bcb7383a9e..6b29a9659b 100644 --- a/src/gui/opengl/qopenglfunctions_4_4_core.h +++ b/src/gui/opengl/qopenglfunctions_4_4_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_4_Core(); ~QOpenGLFunctions_4_4_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_5_compatibility.h b/src/gui/opengl/qopenglfunctions_4_5_compatibility.h index b164538686..7a97085a85 100644 --- a/src/gui/opengl/qopenglfunctions_4_5_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_5_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_5_Compatibility(); ~QOpenGLFunctions_4_5_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_5_core.h b/src/gui/opengl/qopenglfunctions_4_5_core.h index 0940d8cf61..bb1b17f7b1 100644 --- a/src/gui/opengl/qopenglfunctions_4_5_core.h +++ b/src/gui/opengl/qopenglfunctions_4_5_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_5_Core(); ~QOpenGLFunctions_4_5_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_es2.h b/src/gui/opengl/qopenglfunctions_es2.h index 3b7d2806ea..851eb5951b 100644 --- a/src/gui/opengl/qopenglfunctions_es2.h +++ b/src/gui/opengl/qopenglfunctions_es2.h @@ -57,7 +57,7 @@ public: QOpenGLFunctions_ES2(); ~QOpenGLFunctions_ES2(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL ES2 core functions void glActiveTexture(GLenum texture); diff --git a/src/gui/opengl/qopenglgradientcache_p.h b/src/gui/opengl/qopenglgradientcache_p.h index a2ed85c061..cbdbbb0c54 100644 --- a/src/gui/opengl/qopenglgradientcache_p.h +++ b/src/gui/opengl/qopenglgradientcache_p.h @@ -85,8 +85,8 @@ public: GLuint getBuffer(const QGradient &gradient, qreal opacity); inline int paletteSize() const { return 1024; } - void invalidateResource() Q_DECL_OVERRIDE; - void freeResource(QOpenGLContext *ctx) Q_DECL_OVERRIDE; + void invalidateResource() override; + void freeResource(QOpenGLContext *ctx) override; private: inline int maxCacheSize() const { return 60; } diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h index 679b3c0557..0541ce6168 100644 --- a/src/gui/opengl/qopenglpaintengine_p.h +++ b/src/gui/opengl/qopenglpaintengine_p.h @@ -116,37 +116,37 @@ public: QOpenGL2PaintEngineEx(); ~QOpenGL2PaintEngineEx(); - bool begin(QPaintDevice *device) Q_DECL_OVERRIDE; + bool begin(QPaintDevice *device) override; void ensureActive(); - 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; + bool end() override; + + virtual void clipEnabledChanged() override; + virtual void penChanged() override; + virtual void brushChanged() override; + virtual void brushOriginChanged() override; + virtual void opacityChanged() override; + virtual void compositionModeChanged() override; + virtual void renderHintsChanged() override; + virtual void transformChanged() override; + + virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap, - QPainter::PixmapFragmentHints hints) Q_DECL_OVERRIDE; + QPainter::PixmapFragmentHints hints) override; virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - 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; + Qt::ImageConversionFlags flags = Qt::AutoColor) override; + virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) override; + virtual void fill(const QVectorPath &path, const QBrush &brush) override; + virtual void stroke(const QVectorPath &path, const QPen &pen) override; + virtual void clip(const QVectorPath &path, Qt::ClipOperation op) override; - virtual void drawStaticTextItem(QStaticTextItem *textItem) Q_DECL_OVERRIDE; + virtual void drawStaticTextItem(QStaticTextItem *textItem) override; bool drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr); - Type type() const Q_DECL_OVERRIDE { return OpenGL2; } + Type type() const override { return OpenGL2; } - virtual void setState(QPainterState *s) Q_DECL_OVERRIDE; - virtual QPainterState *createState(QPainterState *orig) const Q_DECL_OVERRIDE; + virtual void setState(QPainterState *s) override; + virtual QPainterState *createState(QPainterState *orig) const override; inline QOpenGL2PaintEngineState *state() { return static_cast<QOpenGL2PaintEngineState *>(QPaintEngineEx::state()); } @@ -154,16 +154,16 @@ public: return static_cast<const QOpenGL2PaintEngineState *>(QPaintEngineEx::state()); } - void beginNativePainting() Q_DECL_OVERRIDE; - void endNativePainting() Q_DECL_OVERRIDE; + void beginNativePainting() override; + void endNativePainting() override; void invalidateState(); void setRenderTextActive(bool); bool isNativePaintingActive() const; - bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE { return false; } - bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE; + bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const override { return false; } + bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const override; private: Q_DISABLE_COPY(QOpenGL2PaintEngineEx) @@ -265,7 +265,7 @@ public: void updateClipScissorTest(); void setScissor(const QRect &rect); void regenerateClip(); - void systemStateChanged() Q_DECL_OVERRIDE; + void systemStateChanged() override; void setVertexAttribArrayEnabled(int arrayIndex, bool enabled = true); void syncGlState(); diff --git a/src/gui/opengl/qopengltexturecache_p.h b/src/gui/opengl/qopengltexturecache_p.h index 4a438c8d95..b9d7df91e3 100644 --- a/src/gui/opengl/qopengltexturecache_p.h +++ b/src/gui/opengl/qopengltexturecache_p.h @@ -82,8 +82,8 @@ public: void invalidate(qint64 key); - void invalidateResource() Q_DECL_OVERRIDE; - void freeResource(QOpenGLContext *ctx) Q_DECL_OVERRIDE; + void invalidateResource() override; + void freeResource(QOpenGLContext *ctx) override; private: GLuint bindTexture(QOpenGLContext *context, qint64 key, const QImage &image, QOpenGLTextureCache::BindOptions options); diff --git a/src/gui/opengl/qopengltextureglyphcache_p.h b/src/gui/opengl/qopengltextureglyphcache_p.h index 6a1550dbed..0b7b5f6082 100644 --- a/src/gui/opengl/qopengltextureglyphcache_p.h +++ b/src/gui/opengl/qopengltextureglyphcache_p.h @@ -81,7 +81,7 @@ public: #endif } - void freeResource(QOpenGLContext *context) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *context) override { QOpenGLContext *ctx = context; #ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG @@ -93,7 +93,7 @@ public: ctx->functions()->glDeleteTextures(1, &m_texture); } - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { m_texture = 0; m_fbo = 0; @@ -113,12 +113,12 @@ public: QOpenGLTextureGlyphCache(QFontEngine::GlyphFormat glyphFormat, const QTransform &matrix); ~QOpenGLTextureGlyphCache(); - virtual void createTextureData(int width, int height) Q_DECL_OVERRIDE; - virtual void resizeTextureData(int width, int height) Q_DECL_OVERRIDE; - virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) Q_DECL_OVERRIDE; - virtual int glyphPadding() const Q_DECL_OVERRIDE; - virtual int maxTextureWidth() const Q_DECL_OVERRIDE; - virtual int maxTextureHeight() const Q_DECL_OVERRIDE; + virtual void createTextureData(int width, int height) override; + virtual void resizeTextureData(int width, int height) override; + virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) override; + virtual int glyphPadding() const override; + virtual int maxTextureWidth() const override; + virtual int maxTextureHeight() const override; inline GLuint texture() const { QOpenGLTextureGlyphCache *that = const_cast<QOpenGLTextureGlyphCache *>(this); |