From ccb2cb84f535b0bfce19a95d7f3a36803480cae8 Mon Sep 17 00:00:00 2001
From: Timur Pocheptsov <timur.pocheptsov@qt.io>
Date: Fri, 10 Jan 2020 14:15:35 +0100
Subject: QNetworkReply: deprecate the 'error' getter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/network/access/qnetworkreply.cpp | 25 +++++++++++++++++++++++--
 src/network/access/qnetworkreply.h   |  7 ++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'src')

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,13 +554,34 @@ 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;
-- 
cgit v1.2.3