diff options
Diffstat (limited to 'src/network/access/qhttpnetworkreply_p.h')
-rw-r--r-- | src/network/access/qhttpnetworkreply_p.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index faab03f056..863e21ea3e 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -53,8 +53,6 @@ #include <QtNetwork/private/qtnetworkglobal_p.h> -#ifndef QT_NO_HTTP - #include <qplatformdefs.h> #ifndef QT_NO_COMPRESS @@ -77,6 +75,8 @@ struct z_stream_s; #include <private/qringbuffer_p.h> #include <private/qbytedata_p.h> +QT_REQUIRE_CONFIG(http); + QT_BEGIN_NAMESPACE class QHttpNetworkConnection; @@ -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; @@ -285,7 +285,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_HTTP - - #endif // QHTTPNETWORKREPLY_H |