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>

11 files changed, 145 insertions, 145 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);
diff --git a/src/network/socket/qhttpsocketengine_p.h b/src/network/socket/qhttpsocketengine_p.h
index 07815a7e51..c8863f1fb5 100644
--- a/src/network/socket/qhttpsocketengine_p.h
+++ b/src/network/socket/qhttpsocketengine_p.h
@@ -80,62 +80,62 @@ public:
     QHttpSocketEngine(QObject *parent = 0);
     ~QHttpSocketEngine();
 
-    bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) Q_DECL_OVERRIDE;
-    bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState) Q_DECL_OVERRIDE;
+    bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) override;
+    bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState) override;
 
     void setProxy(const QNetworkProxy &networkProxy);
 
-    qintptr socketDescriptor() const Q_DECL_OVERRIDE;
+    qintptr socketDescriptor() const override;
 
-    bool isValid() const Q_DECL_OVERRIDE;
+    bool isValid() const override;
 
     bool connectInternal();
-    bool connectToHost(const QHostAddress &address, quint16 port) Q_DECL_OVERRIDE;
-    bool connectToHostByName(const QString &name, quint16 port) Q_DECL_OVERRIDE;
-    bool bind(const QHostAddress &address, quint16 port) Q_DECL_OVERRIDE;
-    bool listen() Q_DECL_OVERRIDE;
-    int accept() Q_DECL_OVERRIDE;
-    void close() Q_DECL_OVERRIDE;
+    bool connectToHost(const QHostAddress &address, quint16 port) override;
+    bool connectToHostByName(const QString &name, quint16 port) override;
+    bool bind(const QHostAddress &address, quint16 port) override;
+    bool listen() override;
+    int accept() override;
+    void close() override;
 
-    qint64 bytesAvailable() const Q_DECL_OVERRIDE;
+    qint64 bytesAvailable() const override;
 
-    qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
-    qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE;
+    qint64 read(char *data, qint64 maxlen) override;
+    qint64 write(const char *data, qint64 len) override;
 
 #ifndef QT_NO_UDPSOCKET
 #ifndef QT_NO_NETWORKINTERFACE
     bool joinMulticastGroup(const QHostAddress &groupAddress,
-                            const QNetworkInterface &interface) Q_DECL_OVERRIDE;
+                            const QNetworkInterface &interface) override;
     bool leaveMulticastGroup(const QHostAddress &groupAddress,
-                             const QNetworkInterface &interface) Q_DECL_OVERRIDE;
-    QNetworkInterface multicastInterface() const Q_DECL_OVERRIDE;
-    bool setMulticastInterface(const QNetworkInterface &iface) Q_DECL_OVERRIDE;
+                             const QNetworkInterface &interface) override;
+    QNetworkInterface multicastInterface() const override;
+    bool setMulticastInterface(const QNetworkInterface &iface) override;
 #endif // QT_NO_NETWORKINTERFACE
 
-    bool hasPendingDatagrams() const Q_DECL_OVERRIDE;
-    qint64 pendingDatagramSize() const Q_DECL_OVERRIDE;
+    bool hasPendingDatagrams() const override;
+    qint64 pendingDatagramSize() const override;
 #endif // QT_NO_UDPSOCKET
 
     qint64 readDatagram(char *data, qint64 maxlen, QIpPacketHeader *,
-                        PacketHeaderOptions) Q_DECL_OVERRIDE;
-    qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) Q_DECL_OVERRIDE;
-    qint64 bytesToWrite() const Q_DECL_OVERRIDE;
+                        PacketHeaderOptions) override;
+    qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) override;
+    qint64 bytesToWrite() const override;
 
-    int option(SocketOption option) const Q_DECL_OVERRIDE;
-    bool setOption(SocketOption option, int value) Q_DECL_OVERRIDE;
+    int option(SocketOption option) const override;
+    bool setOption(SocketOption option, int value) override;
 
-    bool waitForRead(int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE;
-    bool waitForWrite(int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE;
+    bool waitForRead(int msecs = 30000, bool *timedOut = 0) override;
+    bool waitForWrite(int msecs = 30000, bool *timedOut = 0) override;
     bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite,
                             bool checkRead, bool checkWrite,
-                            int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE;
+                            int msecs = 30000, bool *timedOut = 0) override;
 
-    bool isReadNotificationEnabled() const Q_DECL_OVERRIDE;
-    void setReadNotificationEnabled(bool enable) Q_DECL_OVERRIDE;
-    bool isWriteNotificationEnabled() const Q_DECL_OVERRIDE;
-    void setWriteNotificationEnabled(bool enable) Q_DECL_OVERRIDE;
-    bool isExceptionNotificationEnabled() const Q_DECL_OVERRIDE;
-    void setExceptionNotificationEnabled(bool enable) Q_DECL_OVERRIDE;
+    bool isReadNotificationEnabled() const override;
+    void setReadNotificationEnabled(bool enable) override;
+    bool isWriteNotificationEnabled() const override;
+    void setWriteNotificationEnabled(bool enable) override;
+    bool isExceptionNotificationEnabled() const override;
+    void setExceptionNotificationEnabled(bool enable) override;
 
 public slots:
     void slotSocketConnected();
@@ -190,8 +190,8 @@ class Q_AUTOTEST_EXPORT QHttpSocketEngineHandler : public QSocketEngineHandler
 {
 public:
     virtual QAbstractSocketEngine *createSocketEngine(QAbstractSocket::SocketType socketType,
-                                                      const QNetworkProxy &, QObject *parent) Q_DECL_OVERRIDE;
-    virtual QAbstractSocketEngine *createSocketEngine(qintptr socketDescripter, QObject *parent) Q_DECL_OVERRIDE;
+                                                      const QNetworkProxy &, QObject *parent) override;
+    virtual QAbstractSocketEngine *createSocketEngine(qintptr socketDescripter, QObject *parent) override;
 };
 #endif
 
diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h
index 9905d3a86c..bea87236b8 100644
--- a/src/network/socket/qlocalsocket.h
+++ b/src/network/socket/qlocalsocket.h
@@ -91,12 +91,12 @@ public:
     QString fullServerName() const;
 
     void abort();
-    virtual bool isSequential() const Q_DECL_OVERRIDE;
-    virtual qint64 bytesAvailable() const Q_DECL_OVERRIDE;
-    virtual qint64 bytesToWrite() const Q_DECL_OVERRIDE;
-    virtual bool canReadLine() const Q_DECL_OVERRIDE;
-    virtual bool open(OpenMode openMode = ReadWrite) Q_DECL_OVERRIDE;
-    virtual void close() Q_DECL_OVERRIDE;
+    virtual bool isSequential() const override;
+    virtual qint64 bytesAvailable() const override;
+    virtual qint64 bytesToWrite() const override;
+    virtual bool canReadLine() const override;
+    virtual bool open(OpenMode openMode = ReadWrite) override;
+    virtual void close() override;
     LocalSocketError error() const;
     bool flush();
     bool isValid() const;
@@ -109,10 +109,10 @@ public:
     qintptr socketDescriptor() const;
 
     LocalSocketState state() const;
-    bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE;
+    bool waitForBytesWritten(int msecs = 30000) override;
     bool waitForConnected(int msecs = 30000);
     bool waitForDisconnected(int msecs = 30000);
-    bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE;
+    bool waitForReadyRead(int msecs = 30000) override;
 
 Q_SIGNALS:
     void connected();
@@ -121,8 +121,8 @@ Q_SIGNALS:
     void stateChanged(QLocalSocket::LocalSocketState socketState);
 
 protected:
-    virtual qint64 readData(char*, qint64) Q_DECL_OVERRIDE;
-    virtual qint64 writeData(const char*, qint64) Q_DECL_OVERRIDE;
+    virtual qint64 readData(char*, qint64) override;
+    virtual qint64 writeData(const char*, qint64) override;
 
 private:
     Q_DISABLE_COPY(QLocalSocket)
diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h
index 08e72072ef..bfea824bcb 100644
--- a/src/network/socket/qnativesocketengine_p.h
+++ b/src/network/socket/qnativesocketengine_p.h
@@ -128,43 +128,43 @@ public:
     QNativeSocketEngine(QObject *parent = 0);
     ~QNativeSocketEngine();
 
-    bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) Q_DECL_OVERRIDE;
-    bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState) Q_DECL_OVERRIDE;
+    bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) override;
+    bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState) override;
 
-    qintptr socketDescriptor() const Q_DECL_OVERRIDE;
+    qintptr socketDescriptor() const override;
 
-    bool isValid() const Q_DECL_OVERRIDE;
+    bool isValid() const override;
 
-    bool connectToHost(const QHostAddress &address, quint16 port) Q_DECL_OVERRIDE;
-    bool connectToHostByName(const QString &name, quint16 port) Q_DECL_OVERRIDE;
-    bool bind(const QHostAddress &address, quint16 port) Q_DECL_OVERRIDE;
-    bool listen() Q_DECL_OVERRIDE;
-    int accept() Q_DECL_OVERRIDE;
-    void close() Q_DECL_OVERRIDE;
+    bool connectToHost(const QHostAddress &address, quint16 port) override;
+    bool connectToHostByName(const QString &name, quint16 port) override;
+    bool bind(const QHostAddress &address, quint16 port) override;
+    bool listen() override;
+    int accept() override;
+    void close() override;
 
-    qint64 bytesAvailable() const Q_DECL_OVERRIDE;
+    qint64 bytesAvailable() const override;
 
-    qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
-    qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE;
+    qint64 read(char *data, qint64 maxlen) override;
+    qint64 write(const char *data, qint64 len) override;
 
 #ifndef QT_NO_UDPSOCKET
 #ifndef QT_NO_NETWORKINTERFACE
     bool joinMulticastGroup(const QHostAddress &groupAddress,
-                            const QNetworkInterface &iface) Q_DECL_OVERRIDE;
+                            const QNetworkInterface &iface) override;
     bool leaveMulticastGroup(const QHostAddress &groupAddress,
-                             const QNetworkInterface &iface) Q_DECL_OVERRIDE;
-    QNetworkInterface multicastInterface() const Q_DECL_OVERRIDE;
-    bool setMulticastInterface(const QNetworkInterface &iface) Q_DECL_OVERRIDE;
+                             const QNetworkInterface &iface) override;
+    QNetworkInterface multicastInterface() const override;
+    bool setMulticastInterface(const QNetworkInterface &iface) override;
 #endif
 
-    bool hasPendingDatagrams() const Q_DECL_OVERRIDE;
-    qint64 pendingDatagramSize() const Q_DECL_OVERRIDE;
+    bool hasPendingDatagrams() const override;
+    qint64 pendingDatagramSize() const override;
 #endif // QT_NO_UDPSOCKET
 
     qint64 readDatagram(char *data, qint64 maxlen, QIpPacketHeader * = 0,
-                        PacketHeaderOptions = WantNone) Q_DECL_OVERRIDE;
-    qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) Q_DECL_OVERRIDE;
-    qint64 bytesToWrite() const Q_DECL_OVERRIDE;
+                        PacketHeaderOptions = WantNone) override;
+    qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) override;
+    qint64 bytesToWrite() const override;
 
     qint64 receiveBufferSize() const;
     void setReceiveBufferSize(qint64 bufferSize);
@@ -172,21 +172,21 @@ public:
     qint64 sendBufferSize() const;
     void setSendBufferSize(qint64 bufferSize);
 
-    int option(SocketOption option) const Q_DECL_OVERRIDE;
-    bool setOption(SocketOption option, int value) Q_DECL_OVERRIDE;
+    int option(SocketOption option) const override;
+    bool setOption(SocketOption option, int value) override;
 
-    bool waitForRead(int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE;
-    bool waitForWrite(int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE;
+    bool waitForRead(int msecs = 30000, bool *timedOut = 0) override;
+    bool waitForWrite(int msecs = 30000, bool *timedOut = 0) override;
     bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite,
                             bool checkRead, bool checkWrite,
-                            int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE;
-
-    bool isReadNotificationEnabled() const Q_DECL_OVERRIDE;
-    void setReadNotificationEnabled(bool enable) Q_DECL_OVERRIDE;
-    bool isWriteNotificationEnabled() const Q_DECL_OVERRIDE;
-    void setWriteNotificationEnabled(bool enable) Q_DECL_OVERRIDE;
-    bool isExceptionNotificationEnabled() const Q_DECL_OVERRIDE;
-    void setExceptionNotificationEnabled(bool enable) Q_DECL_OVERRIDE;
+                            int msecs = 30000, bool *timedOut = 0) override;
+
+    bool isReadNotificationEnabled() const override;
+    void setReadNotificationEnabled(bool enable) override;
+    bool isWriteNotificationEnabled() const override;
+    void setWriteNotificationEnabled(bool enable) override;
+    bool isExceptionNotificationEnabled() const override;
+    void setExceptionNotificationEnabled(bool enable) override;
 
 public Q_SLOTS:
     // non-virtual override;
diff --git a/src/network/socket/qsctpserver.h b/src/network/socket/qsctpserver.h
index 1afdab28a0..b678ba053d 100644
--- a/src/network/socket/qsctpserver.h
+++ b/src/network/socket/qsctpserver.h
@@ -63,7 +63,7 @@ public:
     QSctpSocket *nextPendingDatagramConnection();
 
 protected:
-    void incomingConnection(qintptr handle) Q_DECL_OVERRIDE;
+    void incomingConnection(qintptr handle) override;
 
 private:
     Q_DISABLE_COPY(QSctpServer)
diff --git a/src/network/socket/qsctpserver_p.h b/src/network/socket/qsctpserver_p.h
index 274939fc3d..8816cc150e 100644
--- a/src/network/socket/qsctpserver_p.h
+++ b/src/network/socket/qsctpserver_p.h
@@ -66,7 +66,7 @@ public:
 
     int maximumChannelCount;
 
-    void configureCreatedSocket() Q_DECL_OVERRIDE;
+    void configureCreatedSocket() override;
 };
 
 #endif // QT_NO_SCTP
diff --git a/src/network/socket/qsctpsocket.h b/src/network/socket/qsctpsocket.h
index 9bed1890ff..5288da6129 100644
--- a/src/network/socket/qsctpsocket.h
+++ b/src/network/socket/qsctpsocket.h
@@ -56,8 +56,8 @@ public:
     explicit QSctpSocket(QObject *parent = nullptr);
     virtual ~QSctpSocket();
 
-    void close() Q_DECL_OVERRIDE;
-    void disconnectFromHost() Q_DECL_OVERRIDE;
+    void close() override;
+    void disconnectFromHost() override;
 
     void setMaximumChannelCount(int count);
     int maximumChannelCount() const;
@@ -67,8 +67,8 @@ public:
     bool writeDatagram(const QNetworkDatagram &datagram);
 
 protected:
-    qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
-    qint64 readLineData(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
+    qint64 readData(char *data, qint64 maxlen) override;
+    qint64 readLineData(char *data, qint64 maxlen) override;
 
 private:
     Q_DISABLE_COPY(QSctpSocket)
diff --git a/src/network/socket/qsctpsocket_p.h b/src/network/socket/qsctpsocket_p.h
index 3f765ebed9..8f9413cb47 100644
--- a/src/network/socket/qsctpsocket_p.h
+++ b/src/network/socket/qsctpsocket_p.h
@@ -70,8 +70,8 @@ public:
     QSctpSocketPrivate();
     virtual ~QSctpSocketPrivate();
 
-    bool canReadNotification() Q_DECL_OVERRIDE;
-    bool writeToSocket() Q_DECL_OVERRIDE;
+    bool canReadNotification() override;
+    bool writeToSocket() override;
 
     QByteArray incomingDatagram;
     int maximumChannelCount;
@@ -80,7 +80,7 @@ public:
     QVector<IpHeaderList> readHeaders;
     QVector<IpHeaderList> writeHeaders;
 
-    void configureCreatedSocket() Q_DECL_OVERRIDE;
+    void configureCreatedSocket() override;
 };
 
 #endif // QT_NO_SCTP
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index 2847b910f3..64bbdedcfd 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -322,7 +322,7 @@ public:
     QSocks5BindData *retrieve(qintptr socketDescriptor);
 
 protected:
-    void timerEvent(QTimerEvent * event) Q_DECL_OVERRIDE;
+    void timerEvent(QTimerEvent * event) override;
 
     QMutex mutex;
     int sweepTimerId;
diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h
index ec50d71283..38139b065f 100644
--- a/src/network/socket/qsocks5socketengine_p.h
+++ b/src/network/socket/qsocks5socketengine_p.h
@@ -68,62 +68,62 @@ public:
     QSocks5SocketEngine(QObject *parent = 0);
     ~QSocks5SocketEngine();
 
-    bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) Q_DECL_OVERRIDE;
-    bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState) Q_DECL_OVERRIDE;
+    bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) override;
+    bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState) override;
 
     void setProxy(const QNetworkProxy &networkProxy);
 
-    qintptr socketDescriptor() const Q_DECL_OVERRIDE;
+    qintptr socketDescriptor() const override;
 
-    bool isValid() const Q_DECL_OVERRIDE;
+    bool isValid() const override;
 
     bool connectInternal();
-    bool connectToHost(const QHostAddress &address, quint16 port) Q_DECL_OVERRIDE;
-    bool connectToHostByName(const QString &name, quint16 port) Q_DECL_OVERRIDE;
-    bool bind(const QHostAddress &address, quint16 port) Q_DECL_OVERRIDE;
-    bool listen() Q_DECL_OVERRIDE;
-    int accept() Q_DECL_OVERRIDE;
-    void close() Q_DECL_OVERRIDE;
+    bool connectToHost(const QHostAddress &address, quint16 port) override;
+    bool connectToHostByName(const QString &name, quint16 port) override;
+    bool bind(const QHostAddress &address, quint16 port) override;
+    bool listen() override;
+    int accept() override;
+    void close() override;
 
-    qint64 bytesAvailable() const Q_DECL_OVERRIDE;
+    qint64 bytesAvailable() const override;
 
-    qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
-    qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE;
+    qint64 read(char *data, qint64 maxlen) override;
+    qint64 write(const char *data, qint64 len) override;
 
 #ifndef QT_NO_UDPSOCKET
 #ifndef QT_NO_NETWORKINTERFACE
     bool joinMulticastGroup(const QHostAddress &groupAddress,
-                            const QNetworkInterface &interface) Q_DECL_OVERRIDE;
+                            const QNetworkInterface &interface) override;
     bool leaveMulticastGroup(const QHostAddress &groupAddress,
-                             const QNetworkInterface &interface) Q_DECL_OVERRIDE;
-    QNetworkInterface multicastInterface() const Q_DECL_OVERRIDE;
-    bool setMulticastInterface(const QNetworkInterface &iface) Q_DECL_OVERRIDE;
+                             const QNetworkInterface &interface) override;
+    QNetworkInterface multicastInterface() const override;
+    bool setMulticastInterface(const QNetworkInterface &iface) override;
 #endif // QT_NO_NETWORKINTERFACE
 
-    bool hasPendingDatagrams() const Q_DECL_OVERRIDE;
-    qint64 pendingDatagramSize() const Q_DECL_OVERRIDE;
+    bool hasPendingDatagrams() const override;
+    qint64 pendingDatagramSize() const override;
 #endif // QT_NO_UDPSOCKET
 
     qint64 readDatagram(char *data, qint64 maxlen, QIpPacketHeader * = 0,
-                        PacketHeaderOptions = WantNone) Q_DECL_OVERRIDE;
-    qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) Q_DECL_OVERRIDE;
-    qint64 bytesToWrite() const Q_DECL_OVERRIDE;
+                        PacketHeaderOptions = WantNone) override;
+    qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) override;
+    qint64 bytesToWrite() const override;
 
-    int option(SocketOption option) const Q_DECL_OVERRIDE;
-    bool setOption(SocketOption option, int value) Q_DECL_OVERRIDE;
+    int option(SocketOption option) const override;
+    bool setOption(SocketOption option, int value) override;
 
-    bool waitForRead(int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE;
-    bool waitForWrite(int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE;
+    bool waitForRead(int msecs = 30000, bool *timedOut = 0) override;
+    bool waitForWrite(int msecs = 30000, bool *timedOut = 0) override;
     bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite,
                             bool checkRead, bool checkWrite,
-                            int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE;
+                            int msecs = 30000, bool *timedOut = 0) override;
 
-    bool isReadNotificationEnabled() const Q_DECL_OVERRIDE;
-    void setReadNotificationEnabled(bool enable) Q_DECL_OVERRIDE;
-    bool isWriteNotificationEnabled() const Q_DECL_OVERRIDE;
-    void setWriteNotificationEnabled(bool enable) Q_DECL_OVERRIDE;
-    bool isExceptionNotificationEnabled() const Q_DECL_OVERRIDE;
-    void setExceptionNotificationEnabled(bool enable) Q_DECL_OVERRIDE;
+    bool isReadNotificationEnabled() const override;
+    void setReadNotificationEnabled(bool enable) override;
+    bool isWriteNotificationEnabled() const override;
+    void setWriteNotificationEnabled(bool enable) override;
+    bool isExceptionNotificationEnabled() const override;
+    void setExceptionNotificationEnabled(bool enable) override;
 
 private:
     Q_DECLARE_PRIVATE(QSocks5SocketEngine)
@@ -166,11 +166,11 @@ class QSocks5PasswordAuthenticator : public QSocks5Authenticator
 {
 public:
     QSocks5PasswordAuthenticator(const QString &userName, const QString &password);
-    char methodId() Q_DECL_OVERRIDE;
-    bool beginAuthenticate(QTcpSocket *socket, bool *completed) Q_DECL_OVERRIDE;
-    bool continueAuthenticate(QTcpSocket *socket, bool *completed) Q_DECL_OVERRIDE;
+    char methodId() override;
+    bool beginAuthenticate(QTcpSocket *socket, bool *completed) override;
+    bool continueAuthenticate(QTcpSocket *socket, bool *completed) override;
 
-    QString errorString() Q_DECL_OVERRIDE;
+    QString errorString() override;
 
 private:
     QString userName;
@@ -287,8 +287,8 @@ class Q_AUTOTEST_EXPORT QSocks5SocketEngineHandler : public QSocketEngineHandler
 {
 public:
     virtual QAbstractSocketEngine *createSocketEngine(QAbstractSocket::SocketType socketType,
-                                                      const QNetworkProxy &, QObject *parent) Q_DECL_OVERRIDE;
-    virtual QAbstractSocketEngine *createSocketEngine(qintptr socketDescriptor, QObject *parent) Q_DECL_OVERRIDE;
+                                                      const QNetworkProxy &, QObject *parent) override;
+    virtual QAbstractSocketEngine *createSocketEngine(qintptr socketDescriptor, QObject *parent) override;
 };
 
 
diff --git a/src/network/socket/qtcpserver_p.h b/src/network/socket/qtcpserver_p.h
index b7fae4c105..6ee8c5f0b1 100644
--- a/src/network/socket/qtcpserver_p.h
+++ b/src/network/socket/qtcpserver_p.h
@@ -93,13 +93,13 @@ public:
     virtual void configureCreatedSocket();
 
     // from QAbstractSocketEngineReceiver
-    void readNotification() Q_DECL_OVERRIDE;
-    void closeNotification() Q_DECL_OVERRIDE { readNotification(); }
-    void writeNotification() Q_DECL_OVERRIDE {}
-    void exceptionNotification() Q_DECL_OVERRIDE {}
-    void connectionNotification() Q_DECL_OVERRIDE {}
+    void readNotification() override;
+    void closeNotification() override { readNotification(); }
+    void writeNotification() override {}
+    void exceptionNotification() override {}
+    void connectionNotification() override {}
 #ifndef QT_NO_NETWORKPROXY
-    void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *) Q_DECL_OVERRIDE {}
+    void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *) override {}
 #endif
 
 };