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.cpp | |
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.cpp')
-rw-r--r-- | src/core/gl_surface_qt.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp index af2e1e5f6..766c14738 100644 --- a/src/core/gl_surface_qt.cpp +++ b/src/core/gl_surface_qt.cpp @@ -102,10 +102,10 @@ public: static bool InitializeOneOff(); - virtual bool Initialize() Q_DECL_OVERRIDE; - virtual void Destroy() Q_DECL_OVERRIDE; - virtual void* GetHandle() Q_DECL_OVERRIDE; - virtual bool Resize(const gfx::Size& size, float scale_factor, bool has_alpha) Q_DECL_OVERRIDE; + bool Initialize() override; + void Destroy() override; + void* GetHandle() override; + bool Resize(const gfx::Size& size, float scale_factor, bool has_alpha) override; protected: ~GLSurfaceQtEGL(); @@ -124,12 +124,12 @@ public: explicit GLSurfacelessQtEGL(const gfx::Size& size); public: - bool Initialize() Q_DECL_OVERRIDE; - void Destroy() Q_DECL_OVERRIDE; - bool IsSurfaceless() const Q_DECL_OVERRIDE; - bool Resize(const gfx::Size& size, float scale_factor, bool has_alpha) Q_DECL_OVERRIDE; - EGLSurface GetHandle() Q_DECL_OVERRIDE; - void* GetShareHandle() Q_DECL_OVERRIDE; + bool Initialize() override; + void Destroy() override; + bool IsSurfaceless() const override; + bool Resize(const gfx::Size& size, float scale_factor, bool has_alpha) override; + EGLSurface GetHandle() override; + void* GetShareHandle() override; private: DISALLOW_COPY_AND_ASSIGN(GLSurfacelessQtEGL); @@ -152,9 +152,9 @@ public: static bool InitializeOneOff(); - virtual bool Initialize() Q_DECL_OVERRIDE; - virtual void Destroy() Q_DECL_OVERRIDE; - virtual void* GetHandle() Q_DECL_OVERRIDE; + bool Initialize() override; + void Destroy() override; + void* GetHandle() override; protected: ~GLSurfaceQtGLX(); @@ -296,11 +296,11 @@ public: static bool InitializeOneOff(); - virtual bool Initialize() Q_DECL_OVERRIDE; - virtual void Destroy() Q_DECL_OVERRIDE; - virtual void* GetHandle() Q_DECL_OVERRIDE; - virtual void* GetDisplay() Q_DECL_OVERRIDE; - virtual void* GetConfig() Q_DECL_OVERRIDE; + bool Initialize() override; + void Destroy() override; + void *GetHandle() override; + void *GetDisplay() override; + void *GetConfig() override; protected: ~GLSurfaceQtWGL(); |