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 <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/opengl/qglpaintdevice_p.h b/src/opengl/qglpaintdevice_p.h
index 3b34b2d244..bfecdabd53 100644
--- a/src/opengl/qglpaintdevice_p.h
+++ b/src/opengl/qglpaintdevice_p.h
@@ -64,7 +64,7 @@ public:
     QGLPaintDevice();
     virtual ~QGLPaintDevice();
 
-    int devType() const Q_DECL_OVERRIDE {return QInternal::OpenGL;}
+    int devType() const override {return QInternal::OpenGL;}
 
     virtual void beginPaint();
     virtual void ensureActiveTarget();
@@ -80,7 +80,7 @@ public:
     static QGLPaintDevice* getDevice(QPaintDevice*);
 
 protected:
-    int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE;
+    int metric(QPaintDevice::PaintDeviceMetric metric) const override;
     GLuint m_previousFBO;
     GLuint m_thisFBO;
 };
@@ -93,13 +93,13 @@ class Q_OPENGL_EXPORT QGLWidgetGLPaintDevice : public QGLPaintDevice
 public:
     QGLWidgetGLPaintDevice();
 
-    virtual QPaintEngine* paintEngine() const Q_DECL_OVERRIDE;
+    virtual QPaintEngine* paintEngine() const override;
 
     // QGLWidgets need to do swapBufers in endPaint:
-    virtual void beginPaint() Q_DECL_OVERRIDE;
-    virtual void endPaint() Q_DECL_OVERRIDE;
-    virtual QSize size() const Q_DECL_OVERRIDE;
-    virtual QGLContext* context() const Q_DECL_OVERRIDE;
+    virtual void beginPaint() override;
+    virtual void endPaint() override;
+    virtual QSize size() const override;
+    virtual QGLContext* context() const override;
 
     void setWidget(QGLWidget*);