diff options
author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-01-10 14:15:35 +0100 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-01-13 15:50:47 +0100 |
commit | ccb2cb84f535b0bfce19a95d7f3a36803480cae8 (patch) | |
tree | 11bdd158aaf56f1c18fcb92f8f37d9e5f4ef066b /src | |
parent | 46b433b971999610dcc007a6f57ef4045d159548 (diff) |
QNetworkReply: deprecate the 'error' getter
To disambiguate &QNetworkReply::error expression.
[ChangeLog][Deprecation Notice] QNetworkReply::error() (the getter) was deprecated; superseded by networkError().
Task-number: QTBUG-80369
Change-Id: I545f963788bce0800c9e0f0c94d5f1029946effe
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/network/access/qnetworkreply.cpp | 25 | ||||
-rw-r--r-- | src/network/access/qnetworkreply.h | 7 |
2 files changed, 29 insertions, 3 deletions
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp index fb30bfd4f1..0a5a17a3b8 100644 --- a/src/network/access/qnetworkreply.cpp +++ b/src/network/access/qnetworkreply.cpp @@ -554,14 +554,35 @@ QNetworkAccessManager::Operation QNetworkReply::operation() const return d_func()->operation; } +#if QT_DEPRECATED_SINCE(5, 15) /*! + \deprecated + + Use networkError() instead. + Returns the error that was found during the processing of this request. If no error was found, returns NoError. - \sa setError() + \sa setError(), networkError() */ +/* QNetworkReply::NetworkError QNetworkReply::error() const { + return networkError(); +} +*/ +#endif // QT_DEPRECATED_SINCE(5, 15) + +/*! + \since 5.15 + + Returns the error that was found during the processing of this + request. If no error was found, returns NoError. + + \sa setError() +*/ +QNetworkReply::NetworkError QNetworkReply::networkError() const +{ return d_func()->errorCode; } @@ -858,7 +879,7 @@ void QNetworkReply::setRequest(const QNetworkRequest &request) Calling setError() does not emit the error(QNetworkReply::NetworkError) signal. - \sa error(), errorString() + \sa error(), errorString(), networkError() */ void QNetworkReply::setError(NetworkError errorCode, const QString &errorString) { diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index 4a402daa91..1bcb6d9680 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -124,7 +124,12 @@ public: QNetworkAccessManager *manager() const; QNetworkAccessManager::Operation operation() const; QNetworkRequest request() const; - NetworkError error() const; + +#if QT_DEPRECATED_SINCE(5, 15) + // QT_DEPRECATED_X("Use networkError()") NetworkError error() const; +#endif // QT_DEPRECATED_SINCE(5, 15) + NetworkError networkError() const; + bool isFinished() const; bool isRunning() const; QUrl url() const; |