diff options
Diffstat (limited to 'src/plugins/geoservices/osm')
6 files changed, 13 insertions, 12 deletions
diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp index 145a26ca..e309c87f 100644 --- a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp @@ -58,7 +58,7 @@ QGeoCodeReplyOsm::QGeoCodeReplyOsm(QNetworkReply *reply, bool includeExtraData, return; } connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); - connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), + connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(networkReplyError(QNetworkReply::NetworkError))); connect(this, &QGeoCodeReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); @@ -129,7 +129,7 @@ void QGeoCodeReplyOsm::networkReplyFinished() QNetworkReply *reply = static_cast<QNetworkReply *>(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QList<QGeoLocation> locations; diff --git a/src/plugins/geoservices/osm/qgeomapreplyosm.cpp b/src/plugins/geoservices/osm/qgeomapreplyosm.cpp index b83d9015..1d693455 100644 --- a/src/plugins/geoservices/osm/qgeomapreplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeomapreplyosm.cpp @@ -52,7 +52,7 @@ QGeoMapReplyOsm::QGeoMapReplyOsm(QNetworkReply *reply, return; } connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); - connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), + connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(networkReplyError(QNetworkReply::NetworkError))); connect(this, &QGeoTiledMapReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); @@ -68,7 +68,7 @@ void QGeoMapReplyOsm::networkReplyFinished() QNetworkReply *reply = static_cast<QNetworkReply *>(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..255ccfe5 100644 --- a/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp @@ -51,7 +51,7 @@ QGeoRouteReplyOsm::QGeoRouteReplyOsm(QNetworkReply *reply, const QGeoRouteReques return; } connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); - connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), + connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(networkReplyError(QNetworkReply::NetworkError))); connect(this, &QGeoRouteReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); @@ -66,7 +66,7 @@ void QGeoRouteReplyOsm::networkReplyFinished() QNetworkReply *reply = static_cast<QNetworkReply *>(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != 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 13b9f47e..dfe3d8e9 100644 --- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp +++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp @@ -339,7 +339,7 @@ void TileProvider::resolveProvider() request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork); QNetworkReply *reply = m_nm->get(request); connect(reply, SIGNAL(finished()), this, SLOT(onNetworkReplyFinished()) ); - connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onNetworkReplyError(QNetworkReply::NetworkError))); + connect(reply, SIGNAL(errorOccured(QNetworkReply::NetworkError)), this, SLOT(onNetworkReplyError(QNetworkReply::NetworkError))); } void TileProvider::handleError(QNetworkReply::NetworkError error) @@ -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/qplacemanagerengineosm.cpp b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp index 80964d35..d6344989 100644 --- a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp @@ -354,6 +354,6 @@ void QPlaceManagerEngineOsm::fetchNextCategoryLocale() m_categoriesReply = m_networkManager->get(QNetworkRequest(requestUrl)); connect(m_categoriesReply, SIGNAL(finished()), this, SLOT(categoryReplyFinished())); - connect(m_categoriesReply, SIGNAL(error(QNetworkReply::NetworkError)), + connect(m_categoriesReply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(categoryReplyError())); } diff --git a/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp index ba6eb81c..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); } @@ -99,7 +100,7 @@ void QPlaceSearchReplyOsm::replyFinished() QNetworkReply *reply = static_cast<QNetworkReply *>(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QJsonDocument document = QJsonDocument::fromJson(reply->readAll()); |