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 --- examples/positioning/weatherinfo/appmodel.cpp | 6 +++--- src/plugins/geoservices/esri/geocodereply_esri.cpp | 2 +- src/plugins/geoservices/esri/georoutereply_esri.cpp | 2 +- src/plugins/geoservices/esri/geotiledmapreply_esri.cpp | 2 +- src/plugins/geoservices/esri/placesearchreply_esri.cpp | 2 +- src/plugins/geoservices/mapbox/qgeocodereplymapbox.cpp | 2 +- src/plugins/geoservices/mapbox/qgeomapreplymapbox.cpp | 2 +- src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp | 2 +- src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp | 2 +- .../geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp | 2 +- src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp | 2 +- src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp | 2 +- src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp | 2 +- .../nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp | 2 +- src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp | 2 +- src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp | 2 +- src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp | 4 ++-- src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp | 8 ++++---- src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp | 2 +- src/plugins/geoservices/osm/qgeocodereplyosm.cpp | 2 +- src/plugins/geoservices/osm/qgeomapreplyosm.cpp | 2 +- src/plugins/geoservices/osm/qgeoroutereplyosm.cpp | 2 +- src/plugins/geoservices/osm/qgeotileproviderosm.cpp | 4 ++-- src/plugins/geoservices/osm/qplacesearchreplyosm.cpp | 2 +- tests/auto/nokia_services/routing/tst_routing.cpp | 4 ++-- 25 files changed, 33 insertions(+), 33 deletions(-) diff --git a/examples/positioning/weatherinfo/appmodel.cpp b/examples/positioning/weatherinfo/appmodel.cpp index bace7510..6d31d5ba 100644 --- a/examples/positioning/weatherinfo/appmodel.cpp +++ b/examples/positioning/weatherinfo/appmodel.cpp @@ -327,7 +327,7 @@ void AppModel::handleGeoNetworkData(QNetworkReply *networkReply) return; } - if (!networkReply->networkError()) { + if (!networkReply->error()) { d->nErrors = 0; if (!d->throttle.isValid()) d->throttle.start(); @@ -383,7 +383,7 @@ void AppModel::handleWeatherNetworkData(QNetworkReply *networkReply) if (!networkReply) return; - if (!networkReply->networkError()) { + if (!networkReply->error()) { foreach (WeatherData *inf, d->forecast) delete inf; d->forecast.clear(); @@ -435,7 +435,7 @@ void AppModel::handleForecastNetworkData(QNetworkReply *networkReply) if (!networkReply) return; - if (!networkReply->networkError()) { + if (!networkReply->error()) { QJsonDocument document = QJsonDocument::fromJson(networkReply->readAll()); QJsonObject jo; diff --git a/src/plugins/geoservices/esri/geocodereply_esri.cpp b/src/plugins/geoservices/esri/geocodereply_esri.cpp index 05f941d1..eca3def1 100644 --- a/src/plugins/geoservices/esri/geocodereply_esri.cpp +++ b/src/plugins/geoservices/esri/geocodereply_esri.cpp @@ -84,7 +84,7 @@ void GeoCodeReplyEsri::networkReplyFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QJsonDocument document = QJsonDocument::fromJson(reply->readAll()); diff --git a/src/plugins/geoservices/esri/georoutereply_esri.cpp b/src/plugins/geoservices/esri/georoutereply_esri.cpp index 78e14a9b..a47db6fb 100644 --- a/src/plugins/geoservices/esri/georoutereply_esri.cpp +++ b/src/plugins/geoservices/esri/georoutereply_esri.cpp @@ -70,7 +70,7 @@ void GeoRouteReplyEsri::networkReplyFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QJsonDocument document = QJsonDocument::fromJson(reply->readAll()); diff --git a/src/plugins/geoservices/esri/geotiledmapreply_esri.cpp b/src/plugins/geoservices/esri/geotiledmapreply_esri.cpp index 2f4016a9..78f6c69a 100644 --- a/src/plugins/geoservices/esri/geotiledmapreply_esri.cpp +++ b/src/plugins/geoservices/esri/geotiledmapreply_esri.cpp @@ -71,7 +71,7 @@ void GeoTiledMapReplyEsri::networkReplyFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QByteArray const& imageData = reply->readAll(); diff --git a/src/plugins/geoservices/esri/placesearchreply_esri.cpp b/src/plugins/geoservices/esri/placesearchreply_esri.cpp index b674c136..a5a3585a 100644 --- a/src/plugins/geoservices/esri/placesearchreply_esri.cpp +++ b/src/plugins/geoservices/esri/placesearchreply_esri.cpp @@ -109,7 +109,7 @@ void PlaceSearchReplyEsri::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()); diff --git a/src/plugins/geoservices/mapbox/qgeocodereplymapbox.cpp b/src/plugins/geoservices/mapbox/qgeocodereplymapbox.cpp index 7e94e6e0..bb84b531 100644 --- a/src/plugins/geoservices/mapbox/qgeocodereplymapbox.cpp +++ b/src/plugins/geoservices/mapbox/qgeocodereplymapbox.cpp @@ -76,7 +76,7 @@ void QGeoCodeReplyMapbox::onNetworkReplyFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QList locations; diff --git a/src/plugins/geoservices/mapbox/qgeomapreplymapbox.cpp b/src/plugins/geoservices/mapbox/qgeomapreplymapbox.cpp index c10aba19..4b60231d 100644 --- a/src/plugins/geoservices/mapbox/qgeomapreplymapbox.cpp +++ b/src/plugins/geoservices/mapbox/qgeomapreplymapbox.cpp @@ -61,7 +61,7 @@ void QGeoMapReplyMapbox::networkReplyFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; setMapImageData(reply->readAll()); diff --git a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp index f10b0086..86da24ab 100644 --- a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp +++ b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp @@ -116,7 +116,7 @@ void QGeoRouteReplyMapbox::networkReplyFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QGeoRoutingManagerEngineMapbox *engine = qobject_cast(parent()); diff --git a/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp b/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp index 7284b67a..8d34d2ec 100644 --- a/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp +++ b/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp @@ -167,7 +167,7 @@ void QPlaceSearchReplyMapbox::onReplyFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; const QJsonDocument document = QJsonDocument::fromJson(reply->readAll()); diff --git a/src/plugins/geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp b/src/plugins/geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp index 95296172..8c0bfdc1 100644 --- a/src/plugins/geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp +++ b/src/plugins/geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp @@ -86,7 +86,7 @@ void QPlaceSearchSuggestionReplyMapbox::onReplyFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QJsonDocument document = QJsonDocument::fromJson(reply->readAll()); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp index 196b68d3..f67fa5bb 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp @@ -81,7 +81,7 @@ void QPlaceContentReplyImpl::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()); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp index 677efddc..1e7f2d2f 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp @@ -118,7 +118,7 @@ void QPlaceDetailsReplyImpl::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()); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp index 49574084..28aa930f 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp @@ -87,7 +87,7 @@ void QPlaceSearchReplyHere::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()); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp index 236af184..9882545d 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp @@ -77,7 +77,7 @@ void QPlaceSearchSuggestionReplyImpl::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()); diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp index 2b302a76..2a8549ff 100644 --- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp @@ -83,7 +83,7 @@ void QGeoCodeReplyNokia::networkFinished() QNetworkReply *reply = qobject_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QGeoCodeJsonParser *parser = new QGeoCodeJsonParser; // QRunnable, autoDelete = true. diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp index 1ae32004..6e1a1e85 100644 --- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp @@ -70,7 +70,7 @@ void QGeoMapReplyNokia::networkFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; setMapImageData(reply->readAll()); diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp index 6aed85cc..941a0200 100644 --- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp @@ -80,8 +80,8 @@ void QGeoRouteReplyNokia::networkFinished() QNetworkReply *reply = qobject_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError - && reply->networkError() != QNetworkReply::UnknownContentError) { + if (reply->error() != QNetworkReply::NoError + && reply->error() != QNetworkReply::UnknownContentError) { return; } diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp index 2e16a5d8..d07a93ba 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp @@ -247,7 +247,7 @@ QString QGeoTileFetcherNokia::applicationId() const void QGeoTileFetcherNokia::copyrightsFetched() { - if (m_engineNokia && m_copyrightsReply->networkError() == QNetworkReply::NoError) { + if (m_engineNokia && m_copyrightsReply->error() == QNetworkReply::NoError) { QMetaObject::invokeMethod(m_engineNokia.data(), "loadCopyrightsDescriptorsFromJson", Qt::QueuedConnection, @@ -259,7 +259,7 @@ void QGeoTileFetcherNokia::copyrightsFetched() void QGeoTileFetcherNokia::versionFetched() { - if (m_engineNokia && m_versionReply->networkError() == QNetworkReply::NoError) { + if (m_engineNokia && m_versionReply->error() == QNetworkReply::NoError) { QMetaObject::invokeMethod(m_engineNokia.data(), "parseNewVersionInfo", Qt::QueuedConnection, @@ -288,7 +288,7 @@ void QGeoTileFetcherNokia::fetchCopyrightsData() QNetworkRequest netRequest((QUrl(copyrightUrl))); m_copyrightsReply = m_networkManager->get(netRequest); - if (m_copyrightsReply->networkError() != QNetworkReply::NoError) { + if (m_copyrightsReply->error() != QNetworkReply::NoError) { qWarning() << __FUNCTION__ << m_copyrightsReply->errorString(); m_copyrightsReply->deleteLater(); return; @@ -321,7 +321,7 @@ void QGeoTileFetcherNokia::fetchVersionData() QNetworkRequest netRequest((QUrl(versionUrl))); m_versionReply = m_networkManager->get(netRequest); - if (m_versionReply->networkError() != QNetworkReply::NoError) { + if (m_versionReply->error() != QNetworkReply::NoError) { qWarning() << __FUNCTION__ << m_versionReply->errorString(); m_versionReply->deleteLater(); return; diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index acf43a01..3b507ff2 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -777,7 +777,7 @@ void QPlaceManagerEngineNokiaV2::categoryReplyFinished() QString categoryId; - if (reply->networkError() == QNetworkReply::NoError) { + if (reply->error() == QNetworkReply::NoError) { QJsonDocument document = QJsonDocument::fromJson(reply->readAll()); if (!document.isObject()) { if (m_categoryReply) { diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp index 145a26ca..b4733d69 100644 --- a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp @@ -129,7 +129,7 @@ void QGeoCodeReplyOsm::networkReplyFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QList locations; diff --git a/src/plugins/geoservices/osm/qgeomapreplyosm.cpp b/src/plugins/geoservices/osm/qgeomapreplyosm.cpp index b83d9015..a06f91f3 100644 --- a/src/plugins/geoservices/osm/qgeomapreplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeomapreplyosm.cpp @@ -68,7 +68,7 @@ void QGeoMapReplyOsm::networkReplyFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) // Already handled in networkReplyError + if (reply->error() != QNetworkReply::NoError) // Already handled in networkReplyError return; QByteArray a = reply->readAll(); diff --git a/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp b/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp index 45e6b2c3..e60dc068 100644 --- a/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp @@ -66,7 +66,7 @@ void QGeoRouteReplyOsm::networkReplyFinished() QNetworkReply *reply = static_cast(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QGeoRoutingManagerEngineOsm *engine = qobject_cast(parent()); diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp index 13b9f47e..1eedddb1 100644 --- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp +++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp @@ -383,8 +383,8 @@ void TileProvider::onNetworkReplyFinished() QObject errorEmitter; QMetaObject::Connection errorEmitterConnection = connect(&errorEmitter, &QObject::destroyed, [this](){ this->resolutionError(this); }); - if (reply->networkError() != QNetworkReply::NoError) { - handleError(reply->networkError()); + if (reply->error() != QNetworkReply::NoError) { + handleError(reply->error()); return; } m_status = Invalid; 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()); diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp index ff3fd6ac..833c95af 100644 --- a/tests/auto/nokia_services/routing/tst_routing.cpp +++ b/tests/auto/nokia_services/routing/tst_routing.cpp @@ -102,8 +102,8 @@ void MockGeoNetworkReply::setFile(QFile* file) void MockGeoNetworkReply::complete() { - if (networkError() != QNetworkReply::NoError) - emit error(networkError()); + if (error() != QNetworkReply::NoError) + emit error(error()); setFinished(true); emit finished(); } -- cgit v1.2.1