summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/qnetworkreply.cpp23
-rw-r--r--src/network/access/qnetworkreply.h7
2 files changed, 3 insertions, 27 deletions
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index c22dce8f1c..fb30bfd4f1 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -554,32 +554,13 @@ 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(), 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
+QNetworkReply::NetworkError QNetworkReply::error() const
{
return d_func()->errorCode;
}
@@ -877,7 +858,7 @@ void QNetworkReply::setRequest(const QNetworkRequest &request)
Calling setError() does not emit the error(QNetworkReply::NetworkError)
signal.
- \sa error(), errorString(), networkError()
+ \sa error(), errorString()
*/
void QNetworkReply::setError(NetworkError errorCode, const QString &errorString)
{
diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h
index 139009a56a..4a402daa91 100644
--- a/src/network/access/qnetworkreply.h
+++ b/src/network/access/qnetworkreply.h
@@ -124,12 +124,7 @@ public:
QNetworkAccessManager *manager() const;
QNetworkAccessManager::Operation operation() const;
QNetworkRequest request() const;
-
-#if QT_DEPRECATED_SINCE(5, 15)
- QT_DEPRECATED_X("Use networkError()") NetworkError error() const;
-#endif // QT_DEPRECATED_SINCE(5, 15)
- NetworkError networkError() const;
-
+ NetworkError error() const;
bool isFinished() const;
bool isRunning() const;
QUrl url() const;