diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-12 11:58:21 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-04-21 11:10:13 +0000 |
| commit | a5c1754faa7bd9491fcf64dda34b479cdf62c9bd (patch) | |
| tree | 61a093917f9c8308d2153335d49c58acc3836981 /src/core/gl_surface_qt.h | |
| parent | d08524fbfbb78eca09bbab58d5a9840387d2d0e7 (diff) | |
Standardize override declaration
Update our overrides to Qt coding standard getting rid of
Q_DECL_OVERRIDE and redundant virtual declarations.
Change-Id: Id8b0750eb05c51fc8f50cac4000a811eebcbf918
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/core/gl_surface_qt.h')
| -rw-r--r-- | src/core/gl_surface_qt.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/gl_surface_qt.h b/src/core/gl_surface_qt.h index 9e0692c60..08b501846 100644 --- a/src/core/gl_surface_qt.h +++ b/src/core/gl_surface_qt.h @@ -45,8 +45,6 @@ #include "ui/gfx/geometry/size.h" #include "ui/gl/gl_surface.h" -#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE - namespace gl { class GLSurfaceQt: public GLSurface { @@ -56,11 +54,11 @@ public: static bool HasEGLExtension(const char* name); // Implement GLSurface. - virtual void* GetDisplay() Q_DECL_OVERRIDE; - virtual void* GetConfig() Q_DECL_OVERRIDE; - virtual bool IsOffscreen() Q_DECL_OVERRIDE; - virtual gfx::SwapResult SwapBuffers() Q_DECL_OVERRIDE; - virtual gfx::Size GetSize() Q_DECL_OVERRIDE; + void *GetDisplay() override; + void *GetConfig() override; + bool IsOffscreen() override; + gfx::SwapResult SwapBuffers() override; + gfx::Size GetSize() override; protected: GLSurfaceQt(); |