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>
---
 examples/embedded/flightinfo/flightinfo.cpp          | 2 +-
 examples/embedded/lightmaps/slippymap.cpp            | 2 +-
 examples/network/download/main.cpp                   | 2 +-
 examples/network/downloadmanager/downloadmanager.cpp | 2 +-
 examples/network/googlesuggest/googlesuggest.cpp     | 2 +-
 examples/network/http/httpwindow.cpp                 | 2 +-
 examples/network/torrent/trackerclient.cpp           | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'examples')

diff --git a/examples/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp
index f46fc9693f..732e07583a 100644
--- a/examples/embedded/flightinfo/flightinfo.cpp
+++ b/examples/embedded/flightinfo/flightinfo.cpp
@@ -144,7 +144,7 @@ public:
 private slots:
 
     void handleNetworkData(QNetworkReply *networkReply) {
-        if (!networkReply->error()) {
+        if (!networkReply->networkError()) {
             if (!mapReplies.contains(networkReply)) {
                 // Assume UTF-8 encoded
                 QByteArray data = networkReply->readAll();
diff --git a/examples/embedded/lightmaps/slippymap.cpp b/examples/embedded/lightmaps/slippymap.cpp
index da003981ff..dfc21862fb 100644
--- a/examples/embedded/lightmaps/slippymap.cpp
+++ b/examples/embedded/lightmaps/slippymap.cpp
@@ -162,7 +162,7 @@ void SlippyMap::handleNetworkData(QNetworkReply *reply)
 {
     QImage img;
     QPoint tp = reply->request().attribute(QNetworkRequest::User).toPoint();
-    if (!reply->error())
+    if (!reply->networkError())
         if (!img.load(reply, 0))
             img = QImage();
     reply->deleteLater();
diff --git a/examples/network/download/main.cpp b/examples/network/download/main.cpp
index 076dfdfd0b..f496c1723e 100644
--- a/examples/network/download/main.cpp
+++ b/examples/network/download/main.cpp
@@ -175,7 +175,7 @@ void DownloadManager::sslErrors(const QList<QSslError> &sslErrors)
 void DownloadManager::downloadFinished(QNetworkReply *reply)
 {
     QUrl url = reply->url();
-    if (reply->error()) {
+    if (reply->networkError()) {
         fprintf(stderr, "Download of %s failed: %s\n",
                 url.toEncoded().constData(),
                 qPrintable(reply->errorString()));
diff --git a/examples/network/downloadmanager/downloadmanager.cpp b/examples/network/downloadmanager/downloadmanager.cpp
index cbad29541a..eceb48977b 100644
--- a/examples/network/downloadmanager/downloadmanager.cpp
+++ b/examples/network/downloadmanager/downloadmanager.cpp
@@ -162,7 +162,7 @@ void DownloadManager::downloadFinished()
     progressBar.clear();
     output.close();
 
-    if (currentDownload->error()) {
+    if (currentDownload->networkError()) {
         // download failed
         fprintf(stderr, "Failed: %s\n", qPrintable(currentDownload->errorString()));
         output.remove();
diff --git a/examples/network/googlesuggest/googlesuggest.cpp b/examples/network/googlesuggest/googlesuggest.cpp
index 2cba43178e..1ae515f530 100644
--- a/examples/network/googlesuggest/googlesuggest.cpp
+++ b/examples/network/googlesuggest/googlesuggest.cpp
@@ -209,7 +209,7 @@ void GSuggestCompletion::preventSuggest()
 void GSuggestCompletion::handleNetworkData(QNetworkReply *networkReply)
 {
     QUrl url = networkReply->url();
-    if (networkReply->error() == QNetworkReply::NoError) {
+    if (networkReply->networkError() == QNetworkReply::NoError) {
         QVector<QString> choices;
 
         QByteArray response(networkReply->readAll());
diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp
index c7bf0c0dff..d0eb2529cd 100644
--- a/examples/network/http/httpwindow.cpp
+++ b/examples/network/http/httpwindow.cpp
@@ -249,7 +249,7 @@ void HttpWindow::httpFinished()
         return;
     }
 
-    if (reply->error()) {
+    if (reply->networkError()) {
         QFile::remove(fi.absoluteFilePath());
         statusLabel->setText(tr("Download failed:\n%1.").arg(reply->errorString()));
         downloadButton->setEnabled(true);
diff --git a/examples/network/torrent/trackerclient.cpp b/examples/network/torrent/trackerclient.cpp
index 00810a98af..540ab31557 100644
--- a/examples/network/torrent/trackerclient.cpp
+++ b/examples/network/torrent/trackerclient.cpp
@@ -165,8 +165,8 @@ void TrackerClient::httpRequestDone(QNetworkReply *reply)
         return;
     }
 
-    if (reply->error() != QNetworkReply::NoError) {
-        emit connectionError(reply->error());
+    if (reply->networkError() != QNetworkReply::NoError) {
+        emit connectionError(reply->networkError());
         return;
     }
 
-- 
cgit v1.2.3