diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 10:36:49 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:42 +0000 |
| commit | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (patch) | |
| tree | 330914ff8225867e19b9ed5e049813d9f1e5ec08 /src/network/access/qnetworkreplyhttpimpl_p.h | |
| parent | 93dd85141b35460a83dac86083581ba1c1975927 (diff) | |
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>
Diffstat (limited to 'src/network/access/qnetworkreplyhttpimpl_p.h')
| -rw-r--r-- | src/network/access/qnetworkreplyhttpimpl_p.h | 24 |
1 files changed, 12 insertions, 12 deletions
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: |