From 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 10:36:49 +0200 Subject: Replace Q_DECL_OVERRIDE with override where possible Remaining uses of Q_DECL_OVERRIDE are in: src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.cpp doc/global/qt-cpp-defines.qdocconf (definition and documentation of Q_DECL_OVERRIDE) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba Reviewed-by: Lars Knoll Reviewed-by: Ville Voutilainen Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/opengl/qgl.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/opengl/qgl.h') diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index ab418c191a..8bafdb1031 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -413,7 +413,7 @@ public: const QFont & fnt = QFont()); void renderText(double x, double y, double z, const QString & str, const QFont & fnt = QFont()); - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; GLuint bindTexture(const QImage &image, GLenum target, GLint format, QGLContext::BindOptions options); @@ -437,7 +437,7 @@ public Q_SLOTS: virtual void updateOverlayGL(); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; virtual void initializeGL(); virtual void resizeGL(int w, int h); virtual void paintGL(); @@ -449,8 +449,8 @@ protected: void setAutoBufferSwap(bool on); bool autoBufferSwap() const; - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent*) override; + void resizeEvent(QResizeEvent*) override; virtual void glInit(); virtual void glDraw(); -- cgit v1.2.3