diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-01-14 13:49:06 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-01-15 19:57:51 +0100 |
| commit | b482674e51c097fccffa1e1cc32b4843ad393894 (patch) | |
| tree | 03c67ef532c63174d51e23d644caa96680779e64 /src/plugins/geoservices/osm | |
| parent | b359faca3420916efd649b743501df3fdf5b6f35 (diff) | |
qtlocation: remove uses of the deprecated member-function
Which is QNetworkReply::error(). Use QNetworkReply::networkError()
instead.
Task-number: QTBUG-80369
Change-Id: Id41166a72c0d14bc77d9ec853db2f665617195ee
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/plugins/geoservices/osm')
5 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp index b4733d69..145a26ca 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<QNetworkReply *>(sender()); reply->deleteLater(); - if (reply->error() != QNetworkReply::NoError) + if (reply->networkError() != QNetworkReply::NoError) return; QList<QGeoLocation> locations; diff --git a/src/plugins/geoservices/osm/qgeomapreplyosm.cpp b/src/plugins/geoservices/osm/qgeomapreplyosm.cpp index a06f91f3..b83d9015 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<QNetworkReply *>(sender()); reply->deleteLater(); - if (reply->error() != QNetworkReply::NoError) // Already handled in networkReplyError + if (reply->networkError() != 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 e60dc068..45e6b2c3 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<QNetworkReply *>(sender()); reply->deleteLater(); - if (reply->error() != QNetworkReply::NoError) + if (reply->networkError() != QNetworkReply::NoError) return; QGeoRoutingManagerEngineOsm *engine = qobject_cast<QGeoRoutingManagerEngineOsm *>(parent()); diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp index 1eedddb1..13b9f47e 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->error() != QNetworkReply::NoError) { - handleError(reply->error()); + if (reply->networkError() != QNetworkReply::NoError) { + handleError(reply->networkError()); return; } m_status = Invalid; diff --git a/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp index 366ff852..ba6eb81c 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<QNetworkReply *>(sender()); reply->deleteLater(); - if (reply->error() != QNetworkReply::NoError) + if (reply->networkError() != QNetworkReply::NoError) return; QJsonDocument document = QJsonDocument::fromJson(reply->readAll()); |