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>

8 files changed, 15 insertions, 15 deletions

diff --git a/examples/network/multistreamclient/chatconsumer.h b/examples/network/multistreamclient/chatconsumer.h
index 9e12f99359..e10c0d7850 100644
--- a/examples/network/multistreamclient/chatconsumer.h
+++ b/examples/network/multistreamclient/chatconsumer.h
@@ -64,8 +64,8 @@ class ChatConsumer : public Consumer
 public:
     explicit ChatConsumer(QObject *parent = nullptr);
 
-    QWidget *widget() Q_DECL_OVERRIDE;
-    void readDatagram(const QByteArray &ba) Q_DECL_OVERRIDE;
+    QWidget *widget() override;
+    void readDatagram(const QByteArray &ba) override;
 
 private slots:
     void returnPressed();
diff --git a/examples/network/multistreamclient/movieconsumer.h b/examples/network/multistreamclient/movieconsumer.h
index 74321a8505..3f78bf2060 100644
--- a/examples/network/multistreamclient/movieconsumer.h
+++ b/examples/network/multistreamclient/movieconsumer.h
@@ -63,9 +63,9 @@ class MovieConsumer : public Consumer
 public:
     explicit MovieConsumer(QObject *parent = nullptr);
 
-    QWidget *widget() Q_DECL_OVERRIDE;
-    void readDatagram(const QByteArray &ba) Q_DECL_OVERRIDE;
-    void serverDisconnected() Q_DECL_OVERRIDE;
+    QWidget *widget() override;
+    void readDatagram(const QByteArray &ba) override;
+    void serverDisconnected() override;
 
 private:
     QLabel *label;
diff --git a/examples/network/multistreamclient/timeconsumer.h b/examples/network/multistreamclient/timeconsumer.h
index 3faa4a6b1a..84a7796699 100644
--- a/examples/network/multistreamclient/timeconsumer.h
+++ b/examples/network/multistreamclient/timeconsumer.h
@@ -64,9 +64,9 @@ class TimeConsumer : public Consumer
 public:
     explicit TimeConsumer(QObject *parent = nullptr);
 
-    QWidget *widget() Q_DECL_OVERRIDE;
-    void readDatagram(const QByteArray &ba) Q_DECL_OVERRIDE;
-    void serverDisconnected() Q_DECL_OVERRIDE;
+    QWidget *widget() override;
+    void readDatagram(const QByteArray &ba) override;
+    void serverDisconnected() override;
 
 private slots:
     void timerTick();
diff --git a/examples/network/multistreamserver/chatprovider.h b/examples/network/multistreamserver/chatprovider.h
index b6ff61a917..c52fa89240 100644
--- a/examples/network/multistreamserver/chatprovider.h
+++ b/examples/network/multistreamserver/chatprovider.h
@@ -59,9 +59,9 @@ class ChatProvider : public Provider
 public:
     explicit ChatProvider(QObject *parent = nullptr);
 
-    void readDatagram(QSctpSocket &from, const QByteArray &ba) Q_DECL_OVERRIDE;
-    void newConnection(QSctpSocket &client) Q_DECL_OVERRIDE;
-    void clientDisconnected(QSctpSocket &client) Q_DECL_OVERRIDE;
+    void readDatagram(QSctpSocket &from, const QByteArray &ba) override;
+    void newConnection(QSctpSocket &client) override;
+    void clientDisconnected(QSctpSocket &client) override;
 };
 
 #endif
diff --git a/examples/network/multistreamserver/server.h b/examples/network/multistreamserver/server.h
index d9a38e61a4..2380d6ffd6 100644
--- a/examples/network/multistreamserver/server.h
+++ b/examples/network/multistreamserver/server.h
@@ -72,7 +72,7 @@ public:
     virtual ~Server();
 
 public slots:
-    int exec() Q_DECL_OVERRIDE;
+    int exec() override;
 
 private slots:
     void newConnection();
diff --git a/examples/network/multistreamserver/timeprovider.h b/examples/network/multistreamserver/timeprovider.h
index f99cdbc717..a4d08fd67c 100644
--- a/examples/network/multistreamserver/timeprovider.h
+++ b/examples/network/multistreamserver/timeprovider.h
@@ -59,7 +59,7 @@ class TimeProvider : public Provider
 public:
     explicit TimeProvider(QObject *parent = nullptr);
 
-    void readDatagram(QSctpSocket &from, const QByteArray &ba) Q_DECL_OVERRIDE;
+    void readDatagram(QSctpSocket &from, const QByteArray &ba) override;
 };
 
 #endif
diff --git a/examples/opengl/computegles31/glwindow.h b/examples/opengl/computegles31/glwindow.h
index 877f7b732e..f243858a45 100644
--- a/examples/opengl/computegles31/glwindow.h
+++ b/examples/opengl/computegles31/glwindow.h
@@ -86,7 +86,7 @@ public:
     void setBlurRadius(float blurRadius);
 
 protected:
-    void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent *e) override;
     void setAnimating(bool animate);
 
 private:
diff --git a/examples/xml/dombookmarks/xbeltree.h b/examples/xml/dombookmarks/xbeltree.h
index f6c7ef8bfe..c58e1148ff 100644
--- a/examples/xml/dombookmarks/xbeltree.h
+++ b/examples/xml/dombookmarks/xbeltree.h
@@ -67,7 +67,7 @@ public:
 
 protected:
 #if !defined(QT_NO_CONTEXTMENU) && !defined(QT_NO_CLIPBOARD)
-    void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
+    void contextMenuEvent(QContextMenuEvent *event) override;
 #endif
 
 private slots: