diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-11-16 13:09:01 +0100 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-12-03 09:57:11 +0100 |
| commit | 5180f32c5abe01acd65cde68c2c16aedda4028ec (patch) | |
| tree | a8ed3b4af80751cdc0442c750f2915bfa9c8af40 /src/opengl/qgl.h | |
| parent | 2e271795e7c460254a27ea617846ff7b598a7b9b (diff) | |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/opengl/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 482c215b51..cf35dc7e20 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -398,7 +398,7 @@ public: const QFont & fnt = QFont()); void renderText(double x, double y, double z, const QString & str, const QFont & fnt = QFont()); - QPaintEngine *paintEngine() const; + QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; GLuint bindTexture(const QImage &image, GLenum target, GLint format, QGLContext::BindOptions options); @@ -422,7 +422,7 @@ public Q_SLOTS: virtual void updateOverlayGL(); protected: - bool event(QEvent *); + bool event(QEvent *) Q_DECL_OVERRIDE; virtual void initializeGL(); virtual void resizeGL(int w, int h); virtual void paintGL(); @@ -434,8 +434,8 @@ protected: void setAutoBufferSwap(bool on); bool autoBufferSwap() const; - void paintEvent(QPaintEvent*); - void resizeEvent(QResizeEvent*); + void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE; virtual void glInit(); virtual void glDraw(); |