From 5180f32c5abe01acd65cde68c2c16aedda4028ec Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Sun, 16 Nov 2014 13:09:01 +0100 Subject: Add Q_DECL_OVERRIDE in the src subdirectory Done automatically with clang-modernize on linux (But does not add Q_DECL_OVERRIDE to the function that are marked as inline because it a compilation error with MSVC2010) Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171 Reviewed-by: Thiago Macieira --- src/opengl/qgl_p.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/opengl/qgl_p.h') diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 4cf656fd86..20b17fb4ae 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -134,7 +134,7 @@ public: void initContext(QGLContext *context, const QGLWidget* shareWidget); bool renderCxPm(QPixmap *pixmap); void cleanupColormaps(); - void aboutToDestroy() { + void aboutToDestroy() Q_DECL_OVERRIDE { if (glcx && !parent_changing) glcx->reset(); } @@ -482,12 +482,12 @@ public: } protected: - void invalidateResource() + void invalidateResource() Q_DECL_OVERRIDE { m_id = 0; } - void freeResource(QOpenGLContext *context) + void freeResource(QOpenGLContext *context) Q_DECL_OVERRIDE { if (m_id) { freeResource(QGLContext::fromOpenGLContext(context), m_id); @@ -511,7 +511,7 @@ public: } protected: - void freeResource(QGLContext *ctx, GLuint id) + void freeResource(QGLContext *ctx, GLuint id) Q_DECL_OVERRIDE { m_func(ctx, id); } -- cgit v1.2.3