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, 11 insertions, 11 deletions

diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
index 73a8f11537..ce4d2a74c6 100644
--- a/src/network/socket/qabstractsocket.h
+++ b/src/network/socket/qabstractsocket.h
@@ -154,10 +154,10 @@ public:
 
     bool isValid() const;
 
-    qint64 bytesAvailable() const Q_DECL_OVERRIDE;
-    qint64 bytesToWrite() const Q_DECL_OVERRIDE;
+    qint64 bytesAvailable() const override;
+    qint64 bytesToWrite() const override;
 
-    bool canReadLine() const Q_DECL_OVERRIDE; // ### Qt6: remove me
+    bool canReadLine() const override; // ### Qt6: remove me
 
     quint16 localPort() const;
     QHostAddress localAddress() const;
@@ -182,15 +182,15 @@ public:
     SocketError error() const;
 
     // from QIODevice
-    void close() Q_DECL_OVERRIDE;
-    bool isSequential() const Q_DECL_OVERRIDE;
-    bool atEnd() const Q_DECL_OVERRIDE; // ### Qt6: remove me
+    void close() override;
+    bool isSequential() const override;
+    bool atEnd() const override; // ### Qt6: remove me
     bool flush();
 
     // for synchronous access
     virtual bool waitForConnected(int msecs = 30000);
-    bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE;
-    bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE;
+    bool waitForReadyRead(int msecs = 30000) override;
+    bool waitForBytesWritten(int msecs = 30000) override;
     virtual bool waitForDisconnected(int msecs = 30000);
 
 #ifndef QT_NO_NETWORKPROXY
@@ -209,9 +209,9 @@ Q_SIGNALS:
 #endif
 
 protected:
-    qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
-    qint64 readLineData(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
-    qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE;
+    qint64 readData(char *data, qint64 maxlen) override;
+    qint64 readLineData(char *data, qint64 maxlen) override;
+    qint64 writeData(const char *data, qint64 len) override;
 
     void setSocketState(SocketState state);
     void setSocketError(SocketError socketError);