Replace Q_DECL_OVERRIDE with override

Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 89 insertions, 89 deletions

diff --git a/src/render/graphicshelpers/graphicshelpergl3_3_p.h b/src/render/graphicshelpers/graphicshelpergl3_3_p.h
index d36386a73..0ecdd3620 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_3_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl3_3_p.h
@@ -71,95 +71,95 @@ public:
     ~GraphicsHelperGL3_3();
 
     // QGraphicHelperInterface interface
-    void alphaTest(GLenum mode1, GLenum mode2) Q_DECL_OVERRIDE;
-    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
-    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
-    bool frameBufferNeedsRenderBuffer(const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(RenderBuffer *renderBuffer, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode) Q_DECL_OVERRIDE;
-    void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) Q_DECL_OVERRIDE;
-    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
-    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
-    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) Q_DECL_OVERRIDE;
-    void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) Q_DECL_OVERRIDE;
-    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) Q_DECL_OVERRIDE;
-    GLuint boundFrameBufferObject() Q_DECL_OVERRIDE;
-    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
-    bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
-    void clearBufferf(GLint drawbuffer, const QVector4D &values) Q_DECL_OVERRIDE;
-    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
-    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
-    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
-    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void disablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE;
-    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
-    void dispatchCompute(GLuint wx, GLuint wy, GLuint wz) Q_DECL_OVERRIDE;
-    char *mapBuffer(GLenum target, GLsizeiptr size) Q_DECL_OVERRIDE;
-    GLboolean unmapBuffer(GLenum target) Q_DECL_OVERRIDE;
-    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
-    void drawArraysIndirect(GLenum mode,void *indirect) Q_DECL_OVERRIDE;
-    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
-    void drawArraysInstancedBaseInstance(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances, GLsizei baseInstance) Q_DECL_OVERRIDE;
-    void drawBuffers(GLsizei n, const int *bufs) Q_DECL_OVERRIDE;
-    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
-    void drawElementsIndirect(GLenum mode, GLenum type, void *indirect) Q_DECL_OVERRIDE;
-    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
-    void enableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void enablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE;
-    void enablePrimitiveRestart(int primitiveRestartIndex) Q_DECL_OVERRIDE;
-    void enableVertexAttributeArray(int location) Q_DECL_OVERRIDE;
-    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
-    QSize getRenderBufferDimensions(GLuint renderBufferId) Q_DECL_OVERRIDE;
-    QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) Q_DECL_OVERRIDE;
-    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
-    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
-    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
-    void memoryBarrier(QMemoryBarrier::Operations barriers) Q_DECL_OVERRIDE;
-    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
-    void setMSAAEnabled(bool enable) Q_DECL_OVERRIDE;
-    void setAlphaCoverageEnabled(bool enable) Q_DECL_OVERRIDE;
-    void setClipPlane(int clipPlane, const QVector3D &normal, float distance) Q_DECL_OVERRIDE;
-    void setSeamlessCubemap(bool enable) Q_DECL_OVERRIDE;
-    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
-    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
-    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
-    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
-    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
-    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) Q_DECL_OVERRIDE;
-    void readBuffer(GLenum mode) Q_DECL_OVERRIDE;
-    void drawBuffer(GLenum mode) Q_DECL_OVERRIDE;
-
-    void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-
-    void glUniform1iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform2iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform3iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform4iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-
-    void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-
-    void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-
-    UniformType uniformTypeFromGLType(GLenum glType) Q_DECL_OVERRIDE;
+    void alphaTest(GLenum mode1, GLenum mode2) override;
+    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) override;
+    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) override;
+    bool frameBufferNeedsRenderBuffer(const Attachment &attachment) override;
+    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) override;
+    void bindFrameBufferAttachment(RenderBuffer *renderBuffer, const Attachment &attachment) override;
+    void bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode) override;
+    void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) override;
+    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) override;
+    void blendEquation(GLenum mode) override;
+    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) override;
+    void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) override;
+    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) override;
+    GLuint boundFrameBufferObject() override;
+    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) override;
+    bool checkFrameBufferComplete() override;
+    void clearBufferf(GLint drawbuffer, const QVector4D &values) override;
+    GLuint createFrameBufferObject() override;
+    void depthMask(GLenum mode) override;
+    void depthTest(GLenum mode) override;
+    void disableClipPlane(int clipPlane) override;
+    void disablei(GLenum cap, GLuint index) override;
+    void disablePrimitiveRestart() override;
+    void dispatchCompute(GLuint wx, GLuint wy, GLuint wz) override;
+    char *mapBuffer(GLenum target, GLsizeiptr size) override;
+    GLboolean unmapBuffer(GLenum target) override;
+    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) override;
+    void drawArraysIndirect(GLenum mode,void *indirect) override;
+    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) override;
+    void drawArraysInstancedBaseInstance(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances, GLsizei baseInstance) override;
+    void drawBuffers(GLsizei n, const int *bufs) override;
+    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) override;
+    void drawElementsIndirect(GLenum mode, GLenum type, void *indirect) override;
+    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) override;
+    void enableClipPlane(int clipPlane) override;
+    void enablei(GLenum cap, GLuint index) override;
+    void enablePrimitiveRestart(int primitiveRestartIndex) override;
+    void enableVertexAttributeArray(int location) override;
+    void frontFace(GLenum mode) override;
+    QSize getRenderBufferDimensions(GLuint renderBufferId) override;
+    QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) override;
+    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) override;
+    void pointSize(bool programmable, GLfloat value) override;
+    GLint maxClipPlaneCount() override;
+    void memoryBarrier(QMemoryBarrier::Operations barriers) override;
+    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) override;
+    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) override;
+    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) override;
+    QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) override;
+    void releaseFrameBufferObject(GLuint frameBufferId) override;
+    void setMSAAEnabled(bool enable) override;
+    void setAlphaCoverageEnabled(bool enable) override;
+    void setClipPlane(int clipPlane, const QVector3D &normal, float distance) override;
+    void setSeamlessCubemap(bool enable) override;
+    void setVerticesPerPatch(GLint verticesPerPatch) override;
+    bool supportsFeature(Feature feature) const override;
+    uint uniformByteSize(const ShaderUniform &description) override;
+    void useProgram(GLuint programId) override;
+    void vertexAttribDivisor(GLuint index, GLuint divisor) override;
+    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) override;
+    void readBuffer(GLenum mode) override;
+    void drawBuffer(GLenum mode) override;
+
+    void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) override;
+
+    void glUniform1iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform2iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform3iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform4iv(GLint location, GLsizei count, const GLint *value) override;
+
+    void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) override;
+
+    void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) override;
+
+    UniformType uniformTypeFromGLType(GLenum glType) override;
 
 private:
     QOpenGLFunctions_3_3_Core *m_funcs;