From ec3001c3490b14de3b242dce6af97ec519433305 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 24 Feb 2020 16:03:17 +0000 Subject: Revert "qtlocation: remove uses of the deprecated member-function" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b482674e51c097fccffa1e1cc32b4843ad393894. Reason for revert: naming in QProcess is considered to be the correct one. Change-Id: I6722adfc06b351c76fb432628a678c4ce887d594 Reviewed-by: Mårten Nordheim --- src/plugins/geoservices/osm/qplacesearchreplyosm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/geoservices/osm/qplacesearchreplyosm.cpp') diff --git a/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp index ba6eb81c..366ff852 100644 --- a/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp +++ b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp @@ -99,7 +99,7 @@ void QPlaceSearchReplyOsm::replyFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QJsonDocument document = QJsonDocument::fromJson(reply->readAll()); -- cgit v1.2.1 From ae9a8826d73fa689e81c43038bb13226c9cb9ac7 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 23 Mar 2020 10:03:47 +0100 Subject: QtLocation: get rid of now unneeded qOverloads MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In a preparation for final cleanup in dev/Qt6. This amends the recent change in QtNetwork where we deprecated ambiguous signal overload. Also, fix old SIGNAL to use the proper name. Task-number: QTBUG-82605 Change-Id: Ifc92ce4569ba15ac5429fe379f134a6dbe3a5f73 Reviewed-by: Mårten Nordheim --- src/plugins/geoservices/osm/qplacesearchreplyosm.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/geoservices/osm/qplacesearchreplyosm.cpp') diff --git a/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp index 366ff852..593f476a 100644 --- a/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp +++ b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp @@ -64,7 +64,8 @@ QPlaceSearchReplyOsm::QPlaceSearchReplyOsm(const QPlaceSearchRequest &request, setRequest(request); connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(networkError(QNetworkReply::NetworkError))); + connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), + this, SLOT(networkError(QNetworkReply::NetworkError))); connect(this, &QPlaceReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } -- cgit v1.2.1