diff options
Diffstat (limited to 'src/network')
40 files changed, 306 insertions, 306 deletions
diff --git a/src/network/access/qhttpmultipart_p.h b/src/network/access/qhttpmultipart_p.h index a03df9cb13..342ec775b4 100644 --- a/src/network/access/qhttpmultipart_p.h +++ b/src/network/access/qhttpmultipart_p.h @@ -124,30 +124,30 @@ public: ~QHttpMultiPartIODevice() { } - virtual bool atEnd() const Q_DECL_OVERRIDE { + virtual bool atEnd() const override { return readPointer == size(); } - virtual qint64 bytesAvailable() const Q_DECL_OVERRIDE { + virtual qint64 bytesAvailable() const override { return size() - readPointer; } - virtual void close() Q_DECL_OVERRIDE { + virtual void close() override { readPointer = 0; partOffsets.clear(); deviceSize = -1; QIODevice::close(); } - virtual qint64 bytesToWrite() const Q_DECL_OVERRIDE { + virtual qint64 bytesToWrite() const override { return 0; } - virtual qint64 size() const Q_DECL_OVERRIDE; - virtual bool isSequential() const Q_DECL_OVERRIDE; - virtual bool reset() Q_DECL_OVERRIDE; - virtual qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE; - virtual qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE; + virtual qint64 size() const override; + virtual bool isSequential() const override; + virtual bool reset() override; + virtual qint64 readData(char *data, qint64 maxSize) override; + virtual qint64 writeData(const char *data, qint64 maxSize) override; QHttpMultiPartPrivate *multiPart; qint64 readPointer; diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index faab03f056..d2248740b8 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -92,18 +92,18 @@ public: explicit QHttpNetworkReply(const QUrl &url = QUrl(), QObject *parent = 0); virtual ~QHttpNetworkReply(); - QUrl url() const Q_DECL_OVERRIDE; - void setUrl(const QUrl &url) Q_DECL_OVERRIDE; + QUrl url() const override; + void setUrl(const QUrl &url) override; - int majorVersion() const Q_DECL_OVERRIDE; - int minorVersion() const Q_DECL_OVERRIDE; + int majorVersion() const override; + int minorVersion() const override; - qint64 contentLength() const Q_DECL_OVERRIDE; - void setContentLength(qint64 length) Q_DECL_OVERRIDE; + qint64 contentLength() const override; + void setContentLength(qint64 length) override; - QList<QPair<QByteArray, QByteArray> > header() const Q_DECL_OVERRIDE; - QByteArray headerField(const QByteArray &name, const QByteArray &defaultValue = QByteArray()) const Q_DECL_OVERRIDE; - void setHeaderField(const QByteArray &name, const QByteArray &data) Q_DECL_OVERRIDE; + QList<QPair<QByteArray, QByteArray> > header() const override; + QByteArray headerField(const QByteArray &name, const QByteArray &defaultValue = QByteArray()) const override; + void setHeaderField(const QByteArray &name, const QByteArray &data) override; void parseHeader(const QByteArray &header); // mainly for testing QHttpNetworkRequest request() const; diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h index 00f0e0df97..4fd973cf3f 100644 --- a/src/network/access/qhttpnetworkrequest_p.h +++ b/src/network/access/qhttpnetworkrequest_p.h @@ -90,18 +90,18 @@ public: QHttpNetworkRequest &operator=(const QHttpNetworkRequest &other); bool operator==(const QHttpNetworkRequest &other) const; - QUrl url() const Q_DECL_OVERRIDE; - void setUrl(const QUrl &url) Q_DECL_OVERRIDE; + QUrl url() const override; + void setUrl(const QUrl &url) override; - int majorVersion() const Q_DECL_OVERRIDE; - int minorVersion() const Q_DECL_OVERRIDE; + int majorVersion() const override; + int minorVersion() const override; - qint64 contentLength() const Q_DECL_OVERRIDE; - void setContentLength(qint64 length) Q_DECL_OVERRIDE; + qint64 contentLength() const override; + void setContentLength(qint64 length) override; - QList<QPair<QByteArray, QByteArray> > header() const Q_DECL_OVERRIDE; - QByteArray headerField(const QByteArray &name, const QByteArray &defaultValue = QByteArray()) const Q_DECL_OVERRIDE; - void setHeaderField(const QByteArray &name, const QByteArray &data) Q_DECL_OVERRIDE; + QList<QPair<QByteArray, QByteArray> > header() const override; + QByteArray headerField(const QByteArray &name, const QByteArray &defaultValue = QByteArray()) const override; + void setHeaderField(const QByteArray &name, const QByteArray &data) override; Operation operation() const; void setOperation(Operation operation); diff --git a/src/network/access/qhttpprotocolhandler_p.h b/src/network/access/qhttpprotocolhandler_p.h index 863b988be3..902a7ea0b2 100644 --- a/src/network/access/qhttpprotocolhandler_p.h +++ b/src/network/access/qhttpprotocolhandler_p.h @@ -64,9 +64,9 @@ public: QHttpProtocolHandler(QHttpNetworkConnectionChannel *channel); private: - virtual void _q_receiveReply() Q_DECL_OVERRIDE; - virtual void _q_readyRead() Q_DECL_OVERRIDE; - virtual bool sendRequest() Q_DECL_OVERRIDE; + virtual void _q_receiveReply() override; + virtual void _q_readyRead() override; + virtual bool sendRequest() override; }; QT_END_NAMESPACE diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp index c4225536af..a3c8227fda 100644 --- a/src/network/access/qhttpthreaddelegate.cpp +++ b/src/network/access/qhttpthreaddelegate.cpp @@ -197,7 +197,7 @@ public: setShareable(true); } - virtual void dispose() Q_DECL_OVERRIDE + virtual void dispose() override { #if 0 // sample code; do this right with the API Q_ASSERT(!isWorking()); diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h index 2f6954aa3b..d59cf095ca 100644 --- a/src/network/access/qhttpthreaddelegate_p.h +++ b/src/network/access/qhttpthreaddelegate_p.h @@ -216,12 +216,12 @@ public: { } - qint64 pos() const Q_DECL_OVERRIDE + qint64 pos() const override { return m_pos; } - const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE + const char* readPointer(qint64 maximumLength, qint64 &len) override { if (m_amount > 0) { len = m_amount; @@ -241,7 +241,7 @@ public: return 0; } - bool advanceReadPointer(qint64 a) Q_DECL_OVERRIDE + bool advanceReadPointer(qint64 a) override { if (m_data == 0) return false; @@ -256,7 +256,7 @@ public: return true; } - bool atEnd() const Q_DECL_OVERRIDE + bool atEnd() const override { if (m_amount > 0) return false; @@ -264,7 +264,7 @@ public: return m_atEnd; } - bool reset() Q_DECL_OVERRIDE + bool reset() override { m_amount = 0; m_data = 0; @@ -286,7 +286,7 @@ public: return b; } - qint64 size() const Q_DECL_OVERRIDE + qint64 size() const override { return m_size; } diff --git a/src/network/access/qnetworkaccessauthenticationmanager.cpp b/src/network/access/qnetworkaccessauthenticationmanager.cpp index 2b07833cda..b661cc45b3 100644 --- a/src/network/access/qnetworkaccessauthenticationmanager.cpp +++ b/src/network/access/qnetworkaccessauthenticationmanager.cpp @@ -95,7 +95,7 @@ public: } } - virtual void dispose() Q_DECL_OVERRIDE { delete this; } + virtual void dispose() override { delete this; } }; #ifndef QT_NO_NETWORKPROXY diff --git a/src/network/access/qnetworkaccesscache_p.h b/src/network/access/qnetworkaccesscache_p.h index 3732b5cbb4..69ea649a8a 100644 --- a/src/network/access/qnetworkaccesscache_p.h +++ b/src/network/access/qnetworkaccesscache_p.h @@ -106,7 +106,7 @@ signals: void entryReady(QNetworkAccessCache::CacheableObject *); protected: - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; private: // idea copied from qcache.h diff --git a/src/network/access/qnetworkaccesscachebackend_p.h b/src/network/access/qnetworkaccesscachebackend_p.h index 8db1a6b1d5..dfb0ce84d9 100644 --- a/src/network/access/qnetworkaccesscachebackend_p.h +++ b/src/network/access/qnetworkaccesscachebackend_p.h @@ -65,12 +65,12 @@ public: QNetworkAccessCacheBackend(); ~QNetworkAccessCacheBackend(); - void open() Q_DECL_OVERRIDE; - void closeDownstreamChannel() Q_DECL_OVERRIDE; + void open() override; + void closeDownstreamChannel() override; void closeUpstreamChannel(); void upstreamReadyRead(); - void downstreamReadyWrite() Q_DECL_OVERRIDE; + void downstreamReadyWrite() override; private: bool sendCacheContents(); diff --git a/src/network/access/qnetworkaccessdebugpipebackend_p.h b/src/network/access/qnetworkaccessdebugpipebackend_p.h index 1d1af61dbd..d9a7aabdad 100644 --- a/src/network/access/qnetworkaccessdebugpipebackend_p.h +++ b/src/network/access/qnetworkaccessdebugpipebackend_p.h @@ -68,10 +68,10 @@ public: QNetworkAccessDebugPipeBackend(); virtual ~QNetworkAccessDebugPipeBackend(); - virtual void open() Q_DECL_OVERRIDE; - virtual void closeDownstreamChannel() Q_DECL_OVERRIDE; + virtual void open() override; + virtual void closeDownstreamChannel() override; - virtual void downstreamReadyWrite() Q_DECL_OVERRIDE; + virtual void downstreamReadyWrite() override; protected: void pushFromSocketToDownstream(); @@ -101,9 +101,9 @@ private: class QNetworkAccessDebugPipeBackendFactory: public QNetworkAccessBackendFactory { public: - virtual QStringList supportedSchemes() const Q_DECL_OVERRIDE; + virtual QStringList supportedSchemes() const override; virtual QNetworkAccessBackend *create(QNetworkAccessManager::Operation op, - const QNetworkRequest &request) const Q_DECL_OVERRIDE; + const QNetworkRequest &request) const override; }; #endif // QT_BUILD_INTERNAL diff --git a/src/network/access/qnetworkaccessfilebackend_p.h b/src/network/access/qnetworkaccessfilebackend_p.h index 081ff2b9e7..2c01fb1121 100644 --- a/src/network/access/qnetworkaccessfilebackend_p.h +++ b/src/network/access/qnetworkaccessfilebackend_p.h @@ -66,10 +66,10 @@ public: QNetworkAccessFileBackend(); virtual ~QNetworkAccessFileBackend(); - virtual void open() Q_DECL_OVERRIDE; - virtual void closeDownstreamChannel() Q_DECL_OVERRIDE; + virtual void open() override; + virtual void closeDownstreamChannel() override; - virtual void downstreamReadyWrite() Q_DECL_OVERRIDE; + virtual void downstreamReadyWrite() override; public slots: void uploadReadyReadSlot(); @@ -87,9 +87,9 @@ private: class QNetworkAccessFileBackendFactory: public QNetworkAccessBackendFactory { public: - virtual QStringList supportedSchemes() const Q_DECL_OVERRIDE; + virtual QStringList supportedSchemes() const override; virtual QNetworkAccessBackend *create(QNetworkAccessManager::Operation op, - const QNetworkRequest &request) const Q_DECL_OVERRIDE; + const QNetworkRequest &request) const override; }; QT_END_NAMESPACE diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp index 6d1ee645fe..239f37daf5 100644 --- a/src/network/access/qnetworkaccessftpbackend.cpp +++ b/src/network/access/qnetworkaccessftpbackend.cpp @@ -96,7 +96,7 @@ public: setShareable(false); } - void dispose() Q_DECL_OVERRIDE + void dispose() override { connect(this, SIGNAL(done(bool)), this, SLOT(deleteLater())); close(); diff --git a/src/network/access/qnetworkaccessftpbackend_p.h b/src/network/access/qnetworkaccessftpbackend_p.h index cdf6b7a07f..39a6b957f1 100644 --- a/src/network/access/qnetworkaccessftpbackend_p.h +++ b/src/network/access/qnetworkaccessftpbackend_p.h @@ -84,10 +84,10 @@ public: QNetworkAccessFtpBackend(); virtual ~QNetworkAccessFtpBackend(); - virtual void open() Q_DECL_OVERRIDE; - virtual void closeDownstreamChannel() Q_DECL_OVERRIDE; + virtual void open() override; + virtual void closeDownstreamChannel() override; - virtual void downstreamReadyWrite() Q_DECL_OVERRIDE; + virtual void downstreamReadyWrite() override; enum CacheCleanupMode { ReleaseCachedConnection, @@ -115,9 +115,9 @@ private: class QNetworkAccessFtpBackendFactory: public QNetworkAccessBackendFactory { public: - virtual QStringList supportedSchemes() const Q_DECL_OVERRIDE; + virtual QStringList supportedSchemes() const override; virtual QNetworkAccessBackend *create(QNetworkAccessManager::Operation op, - const QNetworkRequest &request) const Q_DECL_OVERRIDE; + const QNetworkRequest &request) const override; }; QT_END_NAMESPACE diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h index a3aa8d3a07..4f1bbe44e7 100644 --- a/src/network/access/qnetworkdiskcache.h +++ b/src/network/access/qnetworkdiskcache.h @@ -63,18 +63,18 @@ public: qint64 maximumCacheSize() const; void setMaximumCacheSize(qint64 size); - qint64 cacheSize() const Q_DECL_OVERRIDE; - QNetworkCacheMetaData metaData(const QUrl &url) Q_DECL_OVERRIDE; - void updateMetaData(const QNetworkCacheMetaData &metaData) Q_DECL_OVERRIDE; - QIODevice *data(const QUrl &url) Q_DECL_OVERRIDE; - bool remove(const QUrl &url) Q_DECL_OVERRIDE; - QIODevice *prepare(const QNetworkCacheMetaData &metaData) Q_DECL_OVERRIDE; - void insert(QIODevice *device) Q_DECL_OVERRIDE; + qint64 cacheSize() const override; + QNetworkCacheMetaData metaData(const QUrl &url) override; + void updateMetaData(const QNetworkCacheMetaData &metaData) override; + QIODevice *data(const QUrl &url) override; + bool remove(const QUrl &url) override; + QIODevice *prepare(const QNetworkCacheMetaData &metaData) override; + void insert(QIODevice *device) override; QNetworkCacheMetaData fileMetaData(const QString &fileName) const; public Q_SLOTS: - void clear() Q_DECL_OVERRIDE; + void clear() override; protected: virtual qint64 expire(); diff --git a/src/network/access/qnetworkfile_p.h b/src/network/access/qnetworkfile_p.h index dd56b24bd8..e788308d82 100644 --- a/src/network/access/qnetworkfile_p.h +++ b/src/network/access/qnetworkfile_p.h @@ -67,7 +67,7 @@ public: public Q_SLOTS: void open(); - void close() Q_DECL_OVERRIDE; + void close() override; Q_SIGNALS: void finished(bool ok); diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index d858e07d84..0912294a10 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -114,8 +114,8 @@ public: ~QNetworkReply(); // reimplemented from QIODevice - virtual void close() Q_DECL_OVERRIDE; - virtual bool isSequential() const Q_DECL_OVERRIDE; + virtual void close() override; + virtual bool isSequential() const override; // like QAbstractSocket: qint64 readBufferSize() const; @@ -171,7 +171,7 @@ Q_SIGNALS: protected: explicit QNetworkReply(QObject *parent = Q_NULLPTR); QNetworkReply(QNetworkReplyPrivate &dd, QObject *parent); - virtual qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + virtual qint64 writeData(const char *data, qint64 len) override; void setOperation(QNetworkAccessManager::Operation operation); void setRequest(const QNetworkRequest &request); diff --git a/src/network/access/qnetworkreplydataimpl_p.h b/src/network/access/qnetworkreplydataimpl_p.h index c8b44d7539..81d2110d69 100644 --- a/src/network/access/qnetworkreplydataimpl_p.h +++ b/src/network/access/qnetworkreplydataimpl_p.h @@ -67,15 +67,15 @@ class QNetworkReplyDataImpl: public QNetworkReply public: QNetworkReplyDataImpl(QObject *parent, const QNetworkRequest &req, const QNetworkAccessManager::Operation op); ~QNetworkReplyDataImpl(); - virtual void abort() Q_DECL_OVERRIDE; + virtual void abort() override; // reimplemented from QNetworkReply - virtual void close() Q_DECL_OVERRIDE; - virtual qint64 bytesAvailable() const Q_DECL_OVERRIDE; - virtual bool isSequential () const Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; + virtual void close() override; + virtual qint64 bytesAvailable() const override; + virtual bool isSequential () const override; + qint64 size() const override; - virtual qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; + virtual qint64 readData(char *data, qint64 maxlen) override; Q_DECLARE_PRIVATE(QNetworkReplyDataImpl) }; diff --git a/src/network/access/qnetworkreplyfileimpl_p.h b/src/network/access/qnetworkreplyfileimpl_p.h index d6af66152e..55aece0bed 100644 --- a/src/network/access/qnetworkreplyfileimpl_p.h +++ b/src/network/access/qnetworkreplyfileimpl_p.h @@ -67,15 +67,15 @@ class QNetworkReplyFileImpl: public QNetworkReply public: QNetworkReplyFileImpl(QNetworkAccessManager *manager, const QNetworkRequest &req, const QNetworkAccessManager::Operation op); ~QNetworkReplyFileImpl(); - virtual void abort() Q_DECL_OVERRIDE; + virtual void abort() override; // reimplemented from QNetworkReply - virtual void close() Q_DECL_OVERRIDE; - virtual qint64 bytesAvailable() const Q_DECL_OVERRIDE; - virtual bool isSequential () const Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; + virtual void close() override; + virtual qint64 bytesAvailable() const override; + virtual bool isSequential () const override; + qint64 size() const override; - virtual qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; + virtual qint64 readData(char *data, qint64 maxlen) override; private Q_SLOTS: void fileOpenFinished(bool isOpen); diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index 26b16e8386..91e9207601 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/src/network/access/qnetworkreplyhttpimpl_p.h @@ -86,14 +86,14 @@ public: QNetworkReplyHttpImpl(QNetworkAccessManager* const, const QNetworkRequest&, QNetworkAccessManager::Operation&, QIODevice* outgoingData); virtual ~QNetworkReplyHttpImpl(); - void close() Q_DECL_OVERRIDE; - void abort() Q_DECL_OVERRIDE; - qint64 bytesAvailable() const Q_DECL_OVERRIDE; - bool isSequential () const Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 readData(char*, qint64) Q_DECL_OVERRIDE; - void setReadBufferSize(qint64 size) Q_DECL_OVERRIDE; - bool canReadLine () const Q_DECL_OVERRIDE; + void close() override; + void abort() override; + qint64 bytesAvailable() const override; + bool isSequential () const override; + qint64 size() const override; + qint64 readData(char*, qint64) override; + void setReadBufferSize(qint64 size) override; + bool canReadLine () const override; Q_DECLARE_PRIVATE(QNetworkReplyHttpImpl) Q_PRIVATE_SLOT(d_func(), void _q_startOperation()) @@ -141,10 +141,10 @@ public: #ifndef QT_NO_SSL protected: - void ignoreSslErrors() Q_DECL_OVERRIDE; - void ignoreSslErrorsImplementation(const QList<QSslError> &errors) Q_DECL_OVERRIDE; - void setSslConfigurationImplementation(const QSslConfiguration &configuration) Q_DECL_OVERRIDE; - void sslConfigurationImplementation(QSslConfiguration &configuration) const Q_DECL_OVERRIDE; + void ignoreSslErrors() override; + void ignoreSslErrorsImplementation(const QList<QSslError> &errors) override; + void setSslConfigurationImplementation(const QSslConfiguration &configuration) override; + void sslConfigurationImplementation(QSslConfiguration &configuration) const override; #endif signals: diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index 7cd99392d3..f4e8284ab6 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -76,15 +76,15 @@ class QNetworkReplyImpl: public QNetworkReply public: QNetworkReplyImpl(QObject *parent = 0); ~QNetworkReplyImpl(); - virtual void abort() Q_DECL_OVERRIDE; + virtual void abort() override; // reimplemented from QNetworkReply / QIODevice - virtual void close() Q_DECL_OVERRIDE; - virtual qint64 bytesAvailable() const Q_DECL_OVERRIDE; - virtual void setReadBufferSize(qint64 size) Q_DECL_OVERRIDE; + virtual void close() override; + virtual qint64 bytesAvailable() const override; + virtual void setReadBufferSize(qint64 size) override; - virtual qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - virtual bool event(QEvent *) Q_DECL_OVERRIDE; + virtual qint64 readData(char *data, qint64 maxlen) override; + virtual bool event(QEvent *) override; Q_DECLARE_PRIVATE(QNetworkReplyImpl) Q_PRIVATE_SLOT(d_func(), void _q_startOperation()) @@ -101,10 +101,10 @@ public: #ifndef QT_NO_SSL protected: - void sslConfigurationImplementation(QSslConfiguration &configuration) const Q_DECL_OVERRIDE; - void setSslConfigurationImplementation(const QSslConfiguration &configuration) Q_DECL_OVERRIDE; - virtual void ignoreSslErrors() Q_DECL_OVERRIDE; - virtual void ignoreSslErrorsImplementation(const QList<QSslError> &errors) Q_DECL_OVERRIDE; + void sslConfigurationImplementation(QSslConfiguration &configuration) const override; + void setSslConfigurationImplementation(const QSslConfiguration &configuration) override; + virtual void ignoreSslErrors() override; + virtual void ignoreSslErrorsImplementation(const QList<QSslError> &errors) override; #endif }; @@ -219,9 +219,9 @@ public: QNetworkAccessManager::Operation op); ~QDisabledNetworkReply(); - void abort() Q_DECL_OVERRIDE { } + void abort() override { } protected: - qint64 readData(char *, qint64) Q_DECL_OVERRIDE { return -1; } + qint64 readData(char *, qint64) override { return -1; } }; #endif diff --git a/src/network/access/qspdyprotocolhandler_p.h b/src/network/access/qspdyprotocolhandler_p.h index 0a18505b23..bfc2390ccc 100644 --- a/src/network/access/qspdyprotocolhandler_p.h +++ b/src/network/access/qspdyprotocolhandler_p.h @@ -101,9 +101,9 @@ public: Q_DECLARE_FLAGS(SETTINGS_ID_Flags, SETTINGS_ID_Flag) - virtual void _q_receiveReply() Q_DECL_OVERRIDE; - virtual void _q_readyRead() Q_DECL_OVERRIDE; - virtual bool sendRequest() Q_DECL_OVERRIDE; + virtual void _q_receiveReply() override; + virtual void _q_readyRead() override; + virtual bool sendRequest() override; private slots: void _q_uploadDataReadyRead(); diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index d96b8915eb..c7e27145a2 100644 --- a/src/network/bearer/qnetworksession.h +++ b/src/network/bearer/qnetworksession.h @@ -131,8 +131,8 @@ Q_SIGNALS: void usagePoliciesChanged(QNetworkSession::UsagePolicies usagePolicies); protected: - virtual void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; - virtual void disconnectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; + virtual void connectNotify(const QMetaMethod &signal) override; + virtual void disconnectNotify(const QMetaMethod &signal) override; private: Q_DISABLE_COPY(QNetworkSession) diff --git a/src/network/kernel/qdnslookup_p.h b/src/network/kernel/qdnslookup_p.h index d070286383..5b5f4b1f12 100644 --- a/src/network/kernel/qdnslookup_p.h +++ b/src/network/kernel/qdnslookup_p.h @@ -118,7 +118,7 @@ public: , requestName(name) , nameserver(nameserver) { } - void run() Q_DECL_OVERRIDE; + void run() override; signals: void finished(const QDnsLookupReply &reply); diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index dd46818a19..d1da814e54 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -194,7 +194,7 @@ public: QHostInfoRunnable(const QString &hn, int i); QHostInfoRunnable(const QString &hn, int i, const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj); - void run() Q_DECL_OVERRIDE; + void run() override; QString toBeLookedUp; int id; @@ -225,7 +225,7 @@ public: QHostInfoLookupManager(); ~QHostInfoLookupManager(); - void clear() Q_DECL_OVERRIDE; + void clear() override; void work(); // called from QHostInfo 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 }; diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index 1b29cd4637..43b60e4f39 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -81,20 +81,20 @@ public: explicit QSslSocket(QObject *parent = Q_NULLPTR); ~QSslSocket(); - void resume() Q_DECL_OVERRIDE; // to continue after proxy authentication required, SSL errors etc. + void resume() override; // to continue after proxy authentication required, SSL errors etc. // Autostarting the SSL client handshake. void connectToHostEncrypted(const QString &hostName, quint16 port, OpenMode mode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol); void connectToHostEncrypted(const QString &hostName, quint16 port, const QString &sslPeerName, OpenMode mode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol); bool setSocketDescriptor(qintptr socketDescriptor, SocketState state = ConnectedState, - OpenMode openMode = ReadWrite) Q_DECL_OVERRIDE; + OpenMode openMode = ReadWrite) override; using QAbstractSocket::connectToHost; - void connectToHost(const QString &hostName, quint16 port, OpenMode openMode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol) Q_DECL_OVERRIDE; - void disconnectFromHost() Q_DECL_OVERRIDE; + void connectToHost(const QString &hostName, quint16 port, OpenMode openMode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol) override; + void disconnectFromHost() override; - virtual void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value) Q_DECL_OVERRIDE; - virtual QVariant socketOption(QAbstractSocket::SocketOption option) Q_DECL_OVERRIDE; + virtual void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value) override; + virtual QVariant socketOption(QAbstractSocket::SocketOption option) override; SslMode mode() const; bool isEncrypted() const; @@ -112,16 +112,16 @@ public: void setPeerVerifyName(const QString &hostName); // From QIODevice - qint64 bytesAvailable() const Q_DECL_OVERRIDE; - qint64 bytesToWrite() const Q_DECL_OVERRIDE; - bool canReadLine() const Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; + qint64 bytesAvailable() const override; + qint64 bytesToWrite() const override; + bool canReadLine() const override; + void close() override; + bool atEnd() const override; bool flush(); // ### Qt6: remove me (implementation moved to private flush()) void abort(); // From QAbstractSocket: - void setReadBufferSize(qint64 size) Q_DECL_OVERRIDE; + void setReadBufferSize(qint64 size) override; // Similar to QIODevice's: qint64 encryptedBytesAvailable() const; @@ -179,11 +179,11 @@ public: QT_DEPRECATED_X("Use QSslConfiguration::systemCaCertificates()") static QList<QSslCertificate> systemCaCertificates(); #endif // QT_DEPRECATED_SINCE(5, 5) - bool waitForConnected(int msecs = 30000) Q_DECL_OVERRIDE; + bool waitForConnected(int msecs = 30000) override; bool waitForEncrypted(int msecs = 30000); - bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE; - bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE; - bool waitForDisconnected(int msecs = 30000) Q_DECL_OVERRIDE; + bool waitForReadyRead(int msecs = 30000) override; + bool waitForBytesWritten(int msecs = 30000) override; + bool waitForDisconnected(int msecs = 30000) override; QList<QSslError> sslErrors() const; @@ -209,8 +209,8 @@ Q_SIGNALS: void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator); protected: - qint64 readData(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 writeData(const char *data, qint64 len) override; private: Q_DECLARE_PRIVATE(QSslSocket) diff --git a/src/network/ssl/qsslsocket_mac_p.h b/src/network/ssl/qsslsocket_mac_p.h index 9e1d18981e..34e30ebb16 100644 --- a/src/network/ssl/qsslsocket_mac_p.h +++ b/src/network/ssl/qsslsocket_mac_p.h @@ -86,14 +86,14 @@ public: virtual ~QSslSocketBackendPrivate(); // Final-overriders (QSslSocketPrivate): - void continueHandshake() Q_DECL_OVERRIDE; - void disconnected() Q_DECL_OVERRIDE; - void disconnectFromHost() Q_DECL_OVERRIDE; - QSslCipher sessionCipher() const Q_DECL_OVERRIDE; - QSsl::SslProtocol sessionProtocol() const Q_DECL_OVERRIDE; - void startClientEncryption() Q_DECL_OVERRIDE; - void startServerEncryption() Q_DECL_OVERRIDE; - void transmit() Q_DECL_OVERRIDE; + void continueHandshake() override; + void disconnected() override; + void disconnectFromHost() override; + QSslCipher sessionCipher() const override; + QSsl::SslProtocol sessionProtocol() const override; + void startClientEncryption() override; + void startServerEncryption() override; + void transmit() override; static QList<QSslError> verify(QList<QSslCertificate> certificateChain, const QString &hostName); diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index 7f9e884045..2a800cdc34 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -132,22 +132,22 @@ public: #endif // Platform specific functions - void startClientEncryption() Q_DECL_OVERRIDE; - void startServerEncryption() Q_DECL_OVERRIDE; - void transmit() Q_DECL_OVERRIDE; + void startClientEncryption() override; + void startServerEncryption() override; + void transmit() override; bool startHandshake(); - void disconnectFromHost() Q_DECL_OVERRIDE; - void disconnected() Q_DECL_OVERRIDE; - QSslCipher sessionCipher() const Q_DECL_OVERRIDE; - QSsl::SslProtocol sessionProtocol() const Q_DECL_OVERRIDE; - void continueHandshake() Q_DECL_OVERRIDE; + void disconnectFromHost() override; + void disconnected() override; + QSslCipher sessionCipher() const override; + QSsl::SslProtocol sessionProtocol() const override; + void continueHandshake() override; bool checkSslErrors(); void storePeerCertificates(); unsigned int tlsPskClientCallback(const char *hint, char *identity, unsigned int max_identity_len, unsigned char *psk, unsigned int max_psk_len); unsigned int tlsPskServerCallback(const char *identity, unsigned char *psk, unsigned int max_psk_len); #ifdef Q_OS_WIN void fetchCaRootForCert(const QSslCertificate &cert); - void _q_caRootLoaded(QSslCertificate,QSslCertificate) Q_DECL_OVERRIDE; + void _q_caRootLoaded(QSslCertificate,QSslCertificate) override; #endif Q_AUTOTEST_EXPORT static long setupOpenSslOptions(QSsl::SslProtocol protocol, QSsl::SslOptions sslOptions); diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index 5e5a8d2371..a545c618ce 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -170,7 +170,7 @@ public: static void checkSettingSslContext(QSslSocket*, QSharedPointer<QSslContext>); static QSharedPointer<QSslContext> sslContext(QSslSocket *socket); bool isPaused() const; - bool bind(const QHostAddress &address, quint16, QAbstractSocket::BindMode) Q_DECL_OVERRIDE; + bool bind(const QHostAddress &address, quint16, QAbstractSocket::BindMode) override; void _q_connectedSlot(); void _q_hostFoundSlot(); void _q_disconnectedSlot(); @@ -189,9 +189,9 @@ public: static QList<QByteArray> unixRootCertDirectories(); // used also by QSslContext - virtual qint64 peek(char *data, qint64 maxSize) Q_DECL_OVERRIDE; - virtual QByteArray peek(qint64 maxSize) Q_DECL_OVERRIDE; - bool flush() Q_DECL_OVERRIDE; + virtual qint64 peek(char *data, qint64 maxSize) override; + virtual QByteArray peek(qint64 maxSize) override; + bool flush() override; // Platform specific functions virtual void startClientEncryption() = 0; diff --git a/src/network/ssl/qsslsocket_winrt_p.h b/src/network/ssl/qsslsocket_winrt_p.h index 1043aeee11..030db6d4fa 100644 --- a/src/network/ssl/qsslsocket_winrt_p.h +++ b/src/network/ssl/qsslsocket_winrt_p.h @@ -80,14 +80,14 @@ public: ~QSslSocketBackendPrivate(); // Platform specific functions - void startClientEncryption() Q_DECL_OVERRIDE; - void startServerEncryption() Q_DECL_OVERRIDE; - void transmit() Q_DECL_OVERRIDE; - void disconnectFromHost() Q_DECL_OVERRIDE; - void disconnected() Q_DECL_OVERRIDE; - QSslCipher sessionCipher() const Q_DECL_OVERRIDE; - QSsl::SslProtocol sessionProtocol() const Q_DECL_OVERRIDE; - void continueHandshake() Q_DECL_OVERRIDE; + void startClientEncryption() override; + void startServerEncryption() override; + void transmit() override; + void disconnectFromHost() override; + void disconnected() override; + QSslCipher sessionCipher() const override; + QSsl::SslProtocol sessionProtocol() const override; + void continueHandshake() override; static QList<QSslCipher> defaultCiphers(); static QList<QSslError> verify(const QList<QSslCertificate> &certificateChain, const QString &hostName); |