diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-11-26 12:40:58 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-01 12:07:13 +0000 |
commit | 7183fc8f0d2d1e16c52fe78d029ee9fa13868b79 (patch) | |
tree | bb6cb13ada8ded9613039becf02b2c0d6b7e039c /src/network/socket | |
parent | ed6f1290262af7a5e64c732d91df52e5968e1067 (diff) |
Add missing override into Qt modules
Change-Id: I014ac8c7b590c77b054fbb01f0ab5601c44ca88e
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/network/socket')
-rw-r--r-- | src/network/socket/qabstractsocket_p.h | 12 | ||||
-rw-r--r-- | src/network/socket/qlocalsocket_p.h | 4 | ||||
-rw-r--r-- | src/network/socket/qnativesocketengine.cpp | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h index 1578d7bb35..8a96cb9d48 100644 --- a/src/network/socket/qabstractsocket_p.h +++ b/src/network/socket/qabstractsocket_p.h @@ -72,13 +72,13 @@ public: virtual ~QAbstractSocketPrivate(); // from QAbstractSocketEngineReceiver - inline void readNotification() { canReadNotification(); } - inline void writeNotification() { canWriteNotification(); } - inline void exceptionNotification() {} - inline void closeNotification() { canCloseNotification(); } - void connectionNotification(); + inline void readNotification() override { canReadNotification(); } + inline void writeNotification() override { canWriteNotification(); } + inline void exceptionNotification() override {} + inline void closeNotification() override { canCloseNotification(); } + void connectionNotification() override; #ifndef QT_NO_NETWORKPROXY - inline void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator) { + inline void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator) override { Q_Q(QAbstractSocket); q->proxyAuthenticationRequired(proxy, authenticator); } diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h index 560d74328e..9da37d2af3 100644 --- a/src/network/socket/qlocalsocket_p.h +++ b/src/network/socket/qlocalsocket_p.h @@ -99,12 +99,12 @@ public: QTcpSocket::setSocketError(error); } - inline qint64 readData(char *data, qint64 maxSize) + inline qint64 readData(char *data, qint64 maxSize) override { return QTcpSocket::readData(data, maxSize); } - inline qint64 writeData(const char *data, qint64 maxSize) + inline qint64 writeData(const char *data, qint64 maxSize) override { return QTcpSocket::writeData(data, maxSize); } diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp index 11d19682d8..928c7fc68f 100644 --- a/src/network/socket/qnativesocketengine.cpp +++ b/src/network/socket/qnativesocketengine.cpp @@ -1230,7 +1230,7 @@ public: { engine = parent; } protected: - bool event(QEvent *); + bool event(QEvent *) override; QNativeSocketEngine *engine; }; @@ -1262,7 +1262,7 @@ public: : QSocketNotifier(fd, QSocketNotifier::Write, parent) { engine = parent; } protected: - bool event(QEvent *); + bool event(QEvent *) override; QNativeSocketEngine *engine; }; @@ -1286,7 +1286,7 @@ public: : QSocketNotifier(fd, QSocketNotifier::Exception, parent) { engine = parent; } protected: - bool event(QEvent *); + bool event(QEvent *) override; QNativeSocketEngine *engine; }; |