diff options
Diffstat (limited to 'src/plugins')
43 files changed, 247 insertions, 208 deletions
diff --git a/src/plugins/geoservices/esri/geocodereply_esri.cpp b/src/plugins/geoservices/esri/geocodereply_esri.cpp index ea89e6a0..1ef3c9d6 100644 --- a/src/plugins/geoservices/esri/geocodereply_esri.cpp +++ b/src/plugins/geoservices/esri/geocodereply_esri.cpp @@ -57,9 +57,9 @@ GeoCodeReplyEsri::GeoCodeReplyEsri(QNetworkReply *reply, OperationType operation setError(UnknownError, QStringLiteral("Null reply")); return; } - connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(networkReplyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, this, &GeoCodeReplyEsri::networkReplyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &GeoCodeReplyEsri::networkReplyError); connect(this, &QGeoCodeReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); diff --git a/src/plugins/geoservices/esri/geocodingmanagerengine_esri.cpp b/src/plugins/geoservices/esri/geocodingmanagerengine_esri.cpp index d123c6a8..c8fe5f27 100644 --- a/src/plugins/geoservices/esri/geocodingmanagerengine_esri.cpp +++ b/src/plugins/geoservices/esri/geocodingmanagerengine_esri.cpp @@ -132,9 +132,10 @@ QGeoCodeReply *GeoCodingManagerEngineEsri::geocode(const QString &address, int l QNetworkReply *reply = m_networkManager->get(request); GeoCodeReplyEsri *geocodeReply = new GeoCodeReplyEsri(reply, GeoCodeReplyEsri::Geocode, this); - connect(geocodeReply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(geocodeReply, SIGNAL(error(QGeoCodeReply::Error,QString)), - this, SLOT(replyError(QGeoCodeReply::Error,QString))); + connect(geocodeReply, &GeoCodeReplyEsri::finished, + this, &GeoCodingManagerEngineEsri::replyFinished); + connect(geocodeReply, &GeoCodeReplyEsri::errorOccurred, + this, &GeoCodingManagerEngineEsri::replyError); return geocodeReply; } @@ -163,9 +164,10 @@ QGeoCodeReply *GeoCodingManagerEngineEsri::reverseGeocode(const QGeoCoordinate & GeoCodeReplyEsri *geocodeReply = new GeoCodeReplyEsri(reply, GeoCodeReplyEsri::ReverseGeocode, this); - connect(geocodeReply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(geocodeReply, SIGNAL(error(QGeoCodeReply::Error,QString)), - this, SLOT(replyError(QGeoCodeReply::Error,QString))); + connect(geocodeReply, &GeoCodeReplyEsri::finished, + this, &GeoCodingManagerEngineEsri::replyFinished); + connect(geocodeReply, &GeoCodeReplyEsri::errorOccurred, + this, &GeoCodingManagerEngineEsri::replyError); return geocodeReply; } @@ -182,7 +184,7 @@ void GeoCodingManagerEngineEsri::replyError(QGeoCodeReply::Error errorCode, { QGeoCodeReply *reply = qobject_cast<QGeoCodeReply *>(sender()); if (reply) - emit error(reply, errorCode, errorString); + emit errorOccurred(reply, errorCode, errorString); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/esri/georoutereply_esri.cpp b/src/plugins/geoservices/esri/georoutereply_esri.cpp index 92b6bb13..59537fb5 100644 --- a/src/plugins/geoservices/esri/georoutereply_esri.cpp +++ b/src/plugins/geoservices/esri/georoutereply_esri.cpp @@ -55,9 +55,10 @@ GeoRouteReplyEsri::GeoRouteReplyEsri(QNetworkReply *reply, const QGeoRouteReques setError(UnknownError, QStringLiteral("Null reply")); return; } - connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(networkReplyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &GeoRouteReplyEsri::networkReplyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &GeoRouteReplyEsri::networkReplyError); connect(this, &QGeoRouteReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } diff --git a/src/plugins/geoservices/esri/georoutingmanagerengine_esri.cpp b/src/plugins/geoservices/esri/georoutingmanagerengine_esri.cpp index 52d92ac4..5c8d11f2 100644 --- a/src/plugins/geoservices/esri/georoutingmanagerengine_esri.cpp +++ b/src/plugins/geoservices/esri/georoutingmanagerengine_esri.cpp @@ -103,8 +103,10 @@ QGeoRouteReply *GeoRoutingManagerEngineEsri::calculateRoute(const QGeoRouteReque QNetworkReply *reply = m_networkManager->get(networkRequest); GeoRouteReplyEsri *routeReply = new GeoRouteReplyEsri(reply, request, this); - connect(routeReply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(routeReply, SIGNAL(error(QGeoRouteReply::Error,QString)), this, SLOT(replyError(QGeoRouteReply::Error,QString))); + connect(routeReply, &GeoRouteReplyEsri::finished, + this, &GeoRoutingManagerEngineEsri::replyFinished); + connect(routeReply, &GeoRouteReplyEsri::errorOccurred, + this, &GeoRoutingManagerEngineEsri::replyError); return routeReply; } @@ -120,7 +122,7 @@ void GeoRoutingManagerEngineEsri::replyError(QGeoRouteReply::Error errorCode, co { QGeoRouteReply *reply = qobject_cast<QGeoRouteReply *>(sender()); if (reply) - emit error(reply, errorCode, errorString); + emit errorOccurred(reply, errorCode, errorString); } QString GeoRoutingManagerEngineEsri::preferedDirectionLangage() diff --git a/src/plugins/geoservices/esri/geotiledmapreply_esri.cpp b/src/plugins/geoservices/esri/geotiledmapreply_esri.cpp index 1f72b1ea..de826640 100644 --- a/src/plugins/geoservices/esri/geotiledmapreply_esri.cpp +++ b/src/plugins/geoservices/esri/geotiledmapreply_esri.cpp @@ -55,9 +55,10 @@ GeoTiledMapReplyEsri::GeoTiledMapReplyEsri(QNetworkReply *reply, const QGeoTileS setError(UnknownError, QStringLiteral("Null reply")); return; } - connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(networkReplyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &GeoTiledMapReplyEsri::networkReplyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &GeoTiledMapReplyEsri::networkReplyError); connect(this, &QGeoTiledMapReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } diff --git a/src/plugins/geoservices/esri/placecategoriesreply_esri.cpp b/src/plugins/geoservices/esri/placecategoriesreply_esri.cpp index 44c27b19..67df52d0 100644 --- a/src/plugins/geoservices/esri/placecategoriesreply_esri.cpp +++ b/src/plugins/geoservices/esri/placecategoriesreply_esri.cpp @@ -59,7 +59,7 @@ void PlaceCategoriesReplyEsri::emitFinished() void PlaceCategoriesReplyEsri::setError(QPlaceReply::Error errorCode, const QString &errorString) { QPlaceReply::setError(errorCode, errorString); - emit error(errorCode, errorString); + emit errorOccurred(errorCode, errorString); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/esri/placemanagerengine_esri.cpp b/src/plugins/geoservices/esri/placemanagerengine_esri.cpp index 0df3d0c9..f48a9e6d 100644 --- a/src/plugins/geoservices/esri/placemanagerengine_esri.cpp +++ b/src/plugins/geoservices/esri/placemanagerengine_esri.cpp @@ -155,8 +155,10 @@ QPlaceSearchReply *PlaceManagerEngineEsri::search(const QPlaceSearchRequest &req QNetworkReply *networkReply = m_networkManager->get(networkRequest); PlaceSearchReplyEsri *reply = new PlaceSearchReplyEsri(request, networkReply, m_candidateFieldsLocale, m_countriesLocale, this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &PlaceSearchReplyEsri::finished, + this, &PlaceManagerEngineEsri::replyFinished); + connect(reply, &PlaceSearchReplyEsri::errorOccurred, + this, &PlaceManagerEngineEsri::replyError); return reply; } @@ -172,7 +174,7 @@ void PlaceManagerEngineEsri::replyError(QPlaceReply::Error errorCode, const QStr { QPlaceReply *reply = qobject_cast<QPlaceReply *>(sender()); if (reply) - emit error(reply, errorCode, errorString); + emit errorOccurred(reply, errorCode, errorString); } /***** Categories *****/ @@ -182,8 +184,10 @@ QPlaceReply *PlaceManagerEngineEsri::initializeCategories() initializeGeocodeServer(); PlaceCategoriesReplyEsri *reply = new PlaceCategoriesReplyEsri(this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &PlaceCategoriesReplyEsri::finished, + this, &PlaceManagerEngineEsri::replyFinished); + connect(reply, &PlaceCategoriesReplyEsri::errorOccurred, + this, &PlaceManagerEngineEsri::replyError); // TODO delayed finished() emission if (!m_categories.isEmpty()) @@ -267,8 +271,10 @@ void PlaceManagerEngineEsri::initializeGeocodeServer() if (m_categories.isEmpty() && !m_geocodeServerReply) { m_geocodeServerReply = m_networkManager->get(QNetworkRequest(kUrlGeocodeServer)); - connect(m_geocodeServerReply, SIGNAL(finished()), this, SLOT(geocodeServerReplyFinished())); - connect(m_geocodeServerReply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(geocodeServerReplyError())); + connect(m_geocodeServerReply, &QNetworkReply::finished, + this, &PlaceManagerEngineEsri::geocodeServerReplyFinished); + connect(m_geocodeServerReply, &QNetworkReply::errorOccurred, + this, &PlaceManagerEngineEsri::geocodeServerReplyError); } } diff --git a/src/plugins/geoservices/esri/placesearchreply_esri.cpp b/src/plugins/geoservices/esri/placesearchreply_esri.cpp index b5ecace2..2d26d2ca 100644 --- a/src/plugins/geoservices/esri/placesearchreply_esri.cpp +++ b/src/plugins/geoservices/esri/placesearchreply_esri.cpp @@ -92,8 +92,8 @@ PlaceSearchReplyEsri::PlaceSearchReplyEsri(const QPlaceSearchRequest &request, Q } setRequest(request); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(networkError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, this, &PlaceSearchReplyEsri::replyFinished); + connect(reply, &QNetworkReply::errorOccurred, this, &PlaceSearchReplyEsri::networkError); connect(this, &QPlaceReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } @@ -105,7 +105,7 @@ PlaceSearchReplyEsri::~PlaceSearchReplyEsri() void PlaceSearchReplyEsri::setError(QPlaceReply::Error errorCode, const QString &errorString) { QPlaceReply::setError(errorCode, errorString); - emit error(errorCode, errorString); + emit errorOccurred(errorCode, errorString); setFinished(true); emit finished(); } diff --git a/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.cpp index 3780d6ca..8aa48be9 100644 --- a/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.cpp +++ b/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.cpp @@ -181,8 +181,9 @@ QGeoCodeReply *QGeoCodingManagerEngineMapbox::doSearch(const QString &request, Q QNetworkReply *networkReply = m_networkManager->get(networkRequest); QGeoCodeReplyMapbox *reply = new QGeoCodeReplyMapbox(networkReply, this); - connect(reply, &QGeoCodeReplyMapbox::finished, this, &QGeoCodingManagerEngineMapbox::onReplyFinished); - connect(reply, QOverload<QGeoCodeReply::Error, const QString &>::of(&QGeoCodeReply::error), + connect(reply, &QGeoCodeReplyMapbox::finished, + this, &QGeoCodingManagerEngineMapbox::onReplyFinished); + connect(reply, &QGeoCodeReply::errorOccurred, this, &QGeoCodingManagerEngineMapbox::onReplyError); return reply; @@ -199,7 +200,7 @@ void QGeoCodingManagerEngineMapbox::onReplyError(QGeoCodeReply::Error errorCode, { QGeoCodeReply *reply = qobject_cast<QGeoCodeReply *>(sender()); if (reply) - emit error(reply, errorCode, errorString); + emit errorOccurred(reply, errorCode, errorString); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/mapbox/qgeomapreplymapbox.cpp b/src/plugins/geoservices/mapbox/qgeomapreplymapbox.cpp index cb74c3a9..4d9cde99 100644 --- a/src/plugins/geoservices/mapbox/qgeomapreplymapbox.cpp +++ b/src/plugins/geoservices/mapbox/qgeomapreplymapbox.cpp @@ -48,9 +48,10 @@ QGeoMapReplyMapbox::QGeoMapReplyMapbox(QNetworkReply *reply, const QGeoTileSpec setError(UnknownError, QStringLiteral("Null reply")); return; } - connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(networkReplyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QGeoMapReplyMapbox::networkReplyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QGeoMapReplyMapbox::networkReplyError); connect(this, &QGeoTiledMapReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } diff --git a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp index cc270181..feb02213 100644 --- a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp +++ b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp @@ -100,9 +100,10 @@ QGeoRouteReplyMapbox::QGeoRouteReplyMapbox(QNetworkReply *reply, const QGeoRoute setError(UnknownError, QStringLiteral("Null reply")); return; } - connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(networkReplyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QGeoRouteReplyMapbox::networkReplyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QGeoRouteReplyMapbox::networkReplyError); connect(this, &QGeoRouteReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } diff --git a/src/plugins/geoservices/mapbox/qgeoroutingmanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qgeoroutingmanagerenginemapbox.cpp index 78753a80..99e0c619 100644 --- a/src/plugins/geoservices/mapbox/qgeoroutingmanagerenginemapbox.cpp +++ b/src/plugins/geoservices/mapbox/qgeoroutingmanagerenginemapbox.cpp @@ -285,9 +285,10 @@ QGeoRouteReply* QGeoRoutingManagerEngineMapbox::calculateRoute(const QGeoRouteRe QGeoRouteReplyMapbox *routeReply = new QGeoRouteReplyMapbox(reply, request, this); - connect(routeReply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(routeReply, SIGNAL(error(QGeoRouteReply::Error,QString)), - this, SLOT(replyError(QGeoRouteReply::Error,QString))); + connect(routeReply, &QGeoRouteReplyMapbox::finished, + this, &QGeoRoutingManagerEngineMapbox::replyFinished); + connect(routeReply, &QGeoRouteReplyMapbox::errorOccurred, + this, &QGeoRoutingManagerEngineMapbox::replyError); return routeReply; } @@ -309,7 +310,7 @@ void QGeoRoutingManagerEngineMapbox::replyError(QGeoRouteReply::Error errorCode, { QGeoRouteReply *reply = qobject_cast<QGeoRouteReply *>(sender()); if (reply) - emit error(reply, errorCode, errorString); + emit errorOccurred(reply, errorCode, errorString); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/mapbox/qplacecategoriesreplymapbox.cpp b/src/plugins/geoservices/mapbox/qplacecategoriesreplymapbox.cpp index 8951efbb..4e7838a7 100644 --- a/src/plugins/geoservices/mapbox/qplacecategoriesreplymapbox.cpp +++ b/src/plugins/geoservices/mapbox/qplacecategoriesreplymapbox.cpp @@ -59,7 +59,7 @@ void QPlaceCategoriesReplyMapbox::finish() void QPlaceCategoriesReplyMapbox::setError(QPlaceReply::Error errorCode, const QString &errorString) { QPlaceReply::setError(errorCode, errorString); - emit error(errorCode, errorString); + emit errorOccurred(errorCode, errorString); finish(); } diff --git a/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.cpp index af228f8e..aec7f59e 100644 --- a/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.cpp +++ b/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.cpp @@ -148,8 +148,9 @@ QPlaceReply *QPlaceManagerEngineMapbox::doSearch(const QPlaceSearchRequest &requ else reply = new QPlaceSearchSuggestionReplyMapbox(0, this); - connect(reply, &QPlaceReply::finished, this, &QPlaceManagerEngineMapbox::onReplyFinished); - connect(reply, QOverload<QPlaceReply::Error, const QString &>::of(&QPlaceReply::error), + connect(reply, &QPlaceReply::finished, + this, &QPlaceManagerEngineMapbox::onReplyFinished); + connect(reply, &QPlaceReply::errorOccurred, this, &QPlaceManagerEngineMapbox::onReplyError); QMetaObject::invokeMethod(reply, "setError", Qt::QueuedConnection, @@ -234,8 +235,9 @@ QPlaceReply *QPlaceManagerEngineMapbox::doSearch(const QPlaceSearchRequest &requ else reply = new QPlaceSearchSuggestionReplyMapbox(networkReply, this); - connect(reply, &QPlaceReply::finished, this, &QPlaceManagerEngineMapbox::onReplyFinished); - connect(reply, QOverload<QPlaceReply::Error, const QString &>::of(&QPlaceReply::error), + connect(reply, &QPlaceReply::finished, + this, &QPlaceManagerEngineMapbox::onReplyFinished); + connect(reply, &QPlaceReply::errorOccurred, this, &QPlaceManagerEngineMapbox::onReplyError); return reply; @@ -254,8 +256,9 @@ QPlaceReply *QPlaceManagerEngineMapbox::initializeCategories() } QPlaceCategoriesReplyMapbox *reply = new QPlaceCategoriesReplyMapbox(this); - connect(reply, &QPlaceReply::finished, this, &QPlaceManagerEngineMapbox::onReplyFinished); - connect(reply, QOverload<QPlaceReply::Error, const QString &>::of(&QPlaceReply::error), + connect(reply, &QPlaceReply::finished, + this, &QPlaceManagerEngineMapbox::onReplyFinished); + connect(reply, &QPlaceReply::errorOccurred, this, &QPlaceManagerEngineMapbox::onReplyError); // Queue a future finished() emission from the reply. @@ -316,5 +319,5 @@ void QPlaceManagerEngineMapbox::onReplyError(QPlaceReply::Error errorCode, const { QPlaceReply *reply = qobject_cast<QPlaceReply *>(sender()); if (reply) - emit error(reply, errorCode, errorString); + emit errorOccurred(reply, errorCode, errorString); } diff --git a/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp b/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp index e67f259c..6f8ee83a 100644 --- a/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp +++ b/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp @@ -158,7 +158,7 @@ QPlaceSearchReplyMapbox::~QPlaceSearchReplyMapbox() void QPlaceSearchReplyMapbox::setError(QPlaceReply::Error errorCode, const QString &errorString) { QPlaceReply::setError(errorCode, errorString); - emit error(errorCode, errorString); + emit errorOccurred(errorCode, errorString); setFinished(true); emit finished(); diff --git a/src/plugins/geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp b/src/plugins/geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp index a1c56272..ad3ecd0c 100644 --- a/src/plugins/geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp +++ b/src/plugins/geoservices/mapbox/qplacesearchsuggestionreplymapbox.cpp @@ -74,7 +74,7 @@ QPlaceSearchSuggestionReplyMapbox::~QPlaceSearchSuggestionReplyMapbox() void QPlaceSearchSuggestionReplyMapbox::setError(QPlaceReply::Error errorCode, const QString &errorString) { QPlaceReply::setError(errorCode, errorString); - emit error(errorCode, errorString); + emit errorOccurred(errorCode, errorString); setFinished(true); emit finished(); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyhere.cpp b/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyhere.cpp index d0379801..b85e04b0 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyhere.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyhere.cpp @@ -59,7 +59,7 @@ void QPlaceCategoriesReplyHere::emitFinished() void QPlaceCategoriesReplyHere::setError(QPlaceReply::Error error_, const QString &errorString) { QPlaceReply::setError(error_, errorString); - emit error(error_, errorString); + emit errorOccurred(error_, errorString); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp index 587456f6..32e1e5c9 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp @@ -62,9 +62,10 @@ QPlaceContentReplyImpl::QPlaceContentReplyImpl(const QPlaceContentRequest &reque } setRequest(request); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(replyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QPlaceContentReplyImpl::replyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QPlaceContentReplyImpl::replyError); connect(this, &QPlaceReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } @@ -76,7 +77,7 @@ QPlaceContentReplyImpl::~QPlaceContentReplyImpl() void QPlaceContentReplyImpl::setError(QPlaceReply::Error error_, const QString &errorString) { QPlaceContentReply::setError(error_, errorString); - emit error(error_, errorString); + emit errorOccurred(error_, errorString); setFinished(true); emit finished(); } diff --git a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp index 16ec97ab..844a6235 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp @@ -106,9 +106,10 @@ QPlaceDetailsReplyImpl::QPlaceDetailsReplyImpl(QNetworkReply *reply, setError(UnknownError, QStringLiteral("Null reply")); return; } - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(replyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QPlaceDetailsReplyImpl::replyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QPlaceDetailsReplyImpl::replyError); connect(this, &QPlaceReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } @@ -120,7 +121,7 @@ QPlaceDetailsReplyImpl::~QPlaceDetailsReplyImpl() void QPlaceDetailsReplyImpl::setError(QPlaceReply::Error error_, const QString &errorString) { QPlaceReply::setError(error_, errorString); - emit error(error_, errorString); + emit errorOccurred(error_, errorString); setFinished(true); emit finished(); } diff --git a/src/plugins/geoservices/nokia/placesv2/qplaceidreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplaceidreplyimpl.cpp index 33b900cb..509c260c 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplaceidreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplaceidreplyimpl.cpp @@ -59,7 +59,7 @@ void QPlaceIdReplyImpl::setError(QPlaceReply::Error error_, const QString &error { if (error_ != QPlaceReply::NoError) { QPlaceIdReply::setError(error_, errorString); - emit error(error_, errorString); + emit errorOccurred(error_, errorString); } setFinished(true); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp index ee32fd4a..847087b7 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp @@ -72,9 +72,10 @@ QPlaceSearchReplyHere::QPlaceSearchReplyHere(const QPlaceSearchRequest &request, } setRequest(request); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(replyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QPlaceSearchReplyHere::replyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QPlaceSearchReplyHere::replyError); connect(this, &QPlaceReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } @@ -86,7 +87,7 @@ QPlaceSearchReplyHere::~QPlaceSearchReplyHere() void QPlaceSearchReplyHere::setError(QPlaceReply::Error error_, const QString &errorString) { QPlaceReply::setError(error_, errorString); - emit error(error_, errorString); + emit errorOccurred(error_, errorString); setFinished(true); emit finished(); } diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp index d4bb5ee3..484f69d2 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp @@ -55,9 +55,10 @@ QPlaceSearchSuggestionReplyImpl::QPlaceSearchSuggestionReplyImpl(QNetworkReply * setError(UnknownError, QStringLiteral("Null reply")); return; } - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(replyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QPlaceSearchSuggestionReplyImpl::replyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QPlaceSearchSuggestionReplyImpl::replyError); connect(this, &QPlaceReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } @@ -70,7 +71,7 @@ void QPlaceSearchSuggestionReplyImpl::setError(QPlaceReply::Error error_, const QString &errorString) { QPlaceReply::setError(error_, errorString); - emit error(error_, errorString); + emit errorOccurred(error_, errorString); setFinished(true); emit finished(); } @@ -86,7 +87,7 @@ void QPlaceSearchSuggestionReplyImpl::replyFinished() QJsonDocument document = QJsonDocument::fromJson(reply->readAll()); if (!document.isObject()) { setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR)); - emit error(error(), errorString()); + emit errorOccurred(error(), errorString()); return; } diff --git a/src/plugins/geoservices/nokia/qgeocodejsonparser.cpp b/src/plugins/geoservices/nokia/qgeocodejsonparser.cpp index cc8725c4..7706b6b6 100644 --- a/src/plugins/geoservices/nokia/qgeocodejsonparser.cpp +++ b/src/plugins/geoservices/nokia/qgeocodejsonparser.cpp @@ -410,7 +410,7 @@ void QGeoCodeJsonParser::run() } } - emit error(m_errorString); + emit errorOccurred(m_errorString); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeocodejsonparser.h b/src/plugins/geoservices/nokia/qgeocodejsonparser.h index 04f52d5e..e341508b 100644 --- a/src/plugins/geoservices/nokia/qgeocodejsonparser.h +++ b/src/plugins/geoservices/nokia/qgeocodejsonparser.h @@ -63,7 +63,7 @@ public: signals: void results(const QList<QGeoLocation> &locations); - void error(const QString &errorString); + void errorOccurred(const QString &errorString); private: QJsonDocument m_document; diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp index 5c1acaba..71049c45 100644 --- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp @@ -64,9 +64,10 @@ QGeoCodeReplyNokia::QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offs } qRegisterMetaType<QList<QGeoLocation> >(); - connect(reply, SIGNAL(finished()), this, SLOT(networkFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(networkError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QGeoCodeReplyNokia::networkFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QGeoCodeReplyNokia::networkError); connect(this, &QGeoCodeReply::aborted, reply, &QNetworkReply::abort); connect(this, &QGeoCodeReply::aborted, [this](){ m_parsing = false; }); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); @@ -92,9 +93,8 @@ void QGeoCodeReplyNokia::networkFinished() QGeoCodeJsonParser *parser = new QGeoCodeJsonParser; // QRunnable, autoDelete = true. if (m_manualBoundsRequired) parser->setBounds(viewport()); - connect(parser, SIGNAL(results(QList<QGeoLocation>)), - this, SLOT(appendResults(QList<QGeoLocation>))); - connect(parser, SIGNAL(error(QString)), this, SLOT(parseError(QString))); + connect(parser, &QGeoCodeJsonParser::results, this, &QGeoCodeReplyNokia::appendResults); + connect(parser, &QGeoCodeJsonParser::errorOccurred, this, &QGeoCodeReplyNokia::parseError); m_parsing = true; parser->parse(reply->readAll()); diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp index d243b280..4e964980 100644 --- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp @@ -261,7 +261,7 @@ QGeoCodeReply *QGeoCodingManagerEngineNokia::geocode(QString requestString, connect(reply, &QGeoCodeReplyNokia::finished, this, &QGeoCodingManagerEngineNokia::placesFinished); - connect(reply, static_cast<void (QGeoCodeReply::*)(QGeoCodeReply::Error, const QString &)>(&QGeoCodeReplyNokia::error), + connect(reply, &QGeoCodeReplyNokia::errorOccurred, this, &QGeoCodingManagerEngineNokia::placesError); return reply; @@ -337,12 +337,12 @@ void QGeoCodingManagerEngineNokia::placesError(QGeoCodeReply::Error error, const if (!reply) return; - if (receivers(SIGNAL(error(QGeoCodeReply*,QGeoCodeReply::Error,QString))) == 0) { + if (receivers(SIGNAL(errorOccurred(QGeoCodeReply*,QGeoCodeReply::Error,QString))) == 0) { reply->deleteLater(); return; } - emit this->error(reply, error, errorString); + emit errorOccurred(reply, error, errorString); } QString QGeoCodingManagerEngineNokia::languageToMarc(QLocale::Language language) diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp index e9d5b2c4..274ba45a 100644 --- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp @@ -51,15 +51,10 @@ QGeoMapReplyNokia::QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTileSpec &s setError(UnknownError, QStringLiteral("Null reply")); return; } - connect(reply, - SIGNAL(finished()), - this, - SLOT(networkFinished())); - - connect(reply, - SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, - SLOT(networkError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QGeoMapReplyNokia::networkFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QGeoMapReplyNokia::networkError); connect(this, &QGeoTiledMapReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp index 918e8147..6337f7bc 100644 --- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp @@ -62,9 +62,10 @@ QGeoRouteReplyNokia::QGeoRouteReplyNokia(const QGeoRouteRequest &request, failure = true; continue; } - connect(reply, SIGNAL(finished()), this, SLOT(networkFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(networkError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QGeoRouteReplyNokia::networkFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QGeoRouteReplyNokia::networkError); connect(this, &QGeoRouteReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } @@ -89,9 +90,10 @@ void QGeoRouteReplyNokia::networkFinished() } QGeoRouteXmlParser *parser = new QGeoRouteXmlParser(request()); - connect(parser, SIGNAL(results(QList<QGeoRoute>)), - this, SLOT(appendResults(QList<QGeoRoute>))); - connect(parser, SIGNAL(error(QString)), this, SLOT(parserError(QString))); + connect(parser, &QGeoRouteXmlParser::results, + this, &QGeoRouteReplyNokia::appendResults); + connect(parser, &QGeoRouteXmlParser::errorOccurred, + this, &QGeoRouteReplyNokia::parserError); ++m_parsers; parser->parse(reply->readAll()); diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp index dd406896..519c8231 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp @@ -83,7 +83,7 @@ void QGeoRouteXmlParser::run() m_reader = new QXmlStreamReader(m_data); if (!parseRootElement()) - emit error(m_reader->errorString()); + emit errorOccurred(m_reader->errorString()); else emit results(m_results); diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h index 75fe6cca..cbcda653 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h @@ -108,7 +108,7 @@ public: signals: void results(const QList<QGeoRoute> &routes); - void error(const QString &errorString); + void errorOccurred(const QString &errorString); private: bool parseRootElement(); diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp index dc6f9435..6d40a417 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp @@ -116,7 +116,7 @@ QGeoRouteReply *QGeoRoutingManagerEngineNokia::calculateRoute(const QGeoRouteReq if (reqStrings.isEmpty()) { QGeoRouteReply *reply = new QGeoRouteReply(QGeoRouteReply::UnsupportedOptionError, "The given route request options are not supported by this service provider.", this); - emit error(reply, reply->error(), reply->errorString()); + emit errorOccurred(reply, reply->error(), reply->errorString()); return reply; } @@ -126,15 +126,10 @@ QGeoRouteReply *QGeoRoutingManagerEngineNokia::calculateRoute(const QGeoRouteReq QGeoRouteReplyNokia *reply = new QGeoRouteReplyNokia(request, replies, this); - connect(reply, - SIGNAL(finished()), - this, - SLOT(routeFinished())); - - connect(reply, - SIGNAL(error(QGeoRouteReply::Error,QString)), - this, - SLOT(routeError(QGeoRouteReply::Error,QString))); + connect(reply, &QGeoRouteReplyNokia::finished, + this, &QGeoRoutingManagerEngineNokia::routeFinished); + connect(reply, &QGeoRouteReplyNokia::errorOccurred, + this, &QGeoRoutingManagerEngineNokia::routeError); return reply; } @@ -145,7 +140,7 @@ QGeoRouteReply *QGeoRoutingManagerEngineNokia::updateRoute(const QGeoRoute &rout if (reqStrings.isEmpty()) { QGeoRouteReply *reply = new QGeoRouteReply(QGeoRouteReply::UnsupportedOptionError, "The given route request options are not supported by this service provider.", this); - emit error(reply, reply->error(), reply->errorString()); + emit errorOccurred(reply, reply->error(), reply->errorString()); return reply; } @@ -157,15 +152,10 @@ QGeoRouteReply *QGeoRoutingManagerEngineNokia::updateRoute(const QGeoRoute &rout updateRequest.setTravelModes(route.travelMode()); QGeoRouteReplyNokia *reply = new QGeoRouteReplyNokia(updateRequest, replies, this); - connect(reply, - SIGNAL(finished()), - this, - SLOT(routeFinished())); - - connect(reply, - SIGNAL(error(QGeoRouteReply::Error,QString)), - this, - SLOT(routeError(QGeoRouteReply::Error,QString))); + connect(reply, &QGeoRouteReplyNokia::finished, + this, &QGeoRoutingManagerEngineNokia::routeFinished); + connect(reply, &QGeoRouteReplyNokia::errorOccurred, + this, &QGeoRoutingManagerEngineNokia::routeError); return reply; } @@ -486,12 +476,12 @@ void QGeoRoutingManagerEngineNokia::routeError(QGeoRouteReply::Error error, cons if (!reply) return; - if (receivers(SIGNAL(error(QGeoRouteReply*,QGeoRouteReply::Error,QString))) == 0) { + if (receivers(SIGNAL(errorOccurred(QGeoRouteReply*,QGeoRouteReply::Error,QString))) == 0) { reply->deleteLater(); return; } - emit this->error(reply, error, errorString); + emit errorOccurred(reply, error, errorString); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp index efb11a6b..c5bd6f03 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp @@ -109,7 +109,7 @@ void QGeoTiledMapNokia::evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTile m_lastCopyrightsString = copyrightsString; } - emit copyrightsChanged(m_copyrightsSlab); + emit copyrightsImageChanged(m_copyrightsSlab); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp index 57fad1f1..b86383bf 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp @@ -300,7 +300,8 @@ void QGeoTileFetcherNokia::fetchCopyrightsData() if (m_copyrightsReply->isFinished()) { copyrightsFetched(); } else { - connect(m_copyrightsReply, SIGNAL(finished()), this, SLOT(copyrightsFetched())); + connect(m_copyrightsReply, &QNetworkReply::finished, + this, &QGeoTileFetcherNokia::copyrightsFetched); } } @@ -333,7 +334,8 @@ void QGeoTileFetcherNokia::fetchVersionData() if (m_versionReply->isFinished()) versionFetched(); else - connect(m_versionReply, SIGNAL(finished()), this, SLOT(versionFetched())); + connect(m_versionReply, &QNetworkReply::finished, + this, &QGeoTileFetcherNokia::versionFetched); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index c325c5a8..69c5932c 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -259,9 +259,10 @@ QPlaceDetailsReply *QPlaceManagerEngineNokiaV2::getPlaceDetails(const QString &p QPlaceDetailsReplyImpl *reply = new QPlaceDetailsReplyImpl(networkReply, this); reply->setPlaceId(placeId); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceDetailsReplyImpl::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceDetailsReplyImpl::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); return reply; } @@ -327,9 +328,10 @@ QPlaceContentReply *QPlaceManagerEngineNokiaV2::getPlaceContent(const QPlaceCont } QPlaceContentReply *reply = new QPlaceContentReplyImpl(request, networkReply, this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceContentReply::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceContentReply::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); if (!networkReply) { QMetaObject::invokeMethod(reply, "setError", Qt::QueuedConnection, @@ -371,9 +373,10 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest if (unsupported) { QPlaceSearchReplyHere *reply = new QPlaceSearchReplyHere(query, 0, this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceSearchReplyHere::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceSearchReplyHere::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); QMetaObject::invokeMethod(reply, "setError", Qt::QueuedConnection, Q_ARG(QPlaceReply::Error, QPlaceReply::BadArgumentError), Q_ARG(QString, "Unsupported search request options specified.")); @@ -387,9 +390,10 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest if (query.recommendationId().isEmpty() && !query.searchContext().isValid()) { if (!addAtForBoundingArea(query.searchArea(), &queryItems)) { QPlaceSearchReplyHere *reply = new QPlaceSearchReplyHere(query, 0, this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceSearchReplyHere::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceSearchReplyHere::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); QMetaObject::invokeMethod(reply, "setError", Qt::QueuedConnection, Q_ARG(QPlaceReply::Error, QPlaceReply::BadArgumentError), Q_ARG(QString, "Invalid search area provided")); @@ -433,9 +437,10 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest QNetworkReply *networkReply = sendRequest(requestUrl); QPlaceSearchReplyHere *reply = new QPlaceSearchReplyHere(query, networkReply, this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceSearchReplyHere::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceSearchReplyHere::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); return reply; } else if (!query.recommendationId().isEmpty()) { @@ -477,9 +482,10 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest } QPlaceSearchReplyHere *reply = new QPlaceSearchReplyHere(query, networkReply, this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceSearchReplyHere::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceSearchReplyHere::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); return reply; } @@ -496,9 +502,10 @@ QPlaceSearchSuggestionReply *QPlaceManagerEngineNokiaV2::searchSuggestions(const if (unsupported) { QPlaceSearchSuggestionReplyImpl *reply = new QPlaceSearchSuggestionReplyImpl(0, this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceSearchSuggestionReplyImpl::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceSearchSuggestionReplyImpl::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); QMetaObject::invokeMethod(reply, "setError", Qt::QueuedConnection, Q_ARG(QPlaceReply::Error, QPlaceReply::BadArgumentError), Q_ARG(QString, "Unsupported search request options specified.")); @@ -514,9 +521,10 @@ QPlaceSearchSuggestionReply *QPlaceManagerEngineNokiaV2::searchSuggestions(const if (!addAtForBoundingArea(query.searchArea(), &queryItems)) { QPlaceSearchSuggestionReplyImpl *reply = new QPlaceSearchSuggestionReplyImpl(0, this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceSearchSuggestionReplyImpl::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceSearchSuggestionReplyImpl::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); QMetaObject::invokeMethod(reply, "setError", Qt::QueuedConnection, Q_ARG(QPlaceReply::Error, QPlaceReply::BadArgumentError), Q_ARG(QString, "Invalid search area provided")); @@ -528,9 +536,10 @@ QPlaceSearchSuggestionReply *QPlaceManagerEngineNokiaV2::searchSuggestions(const QNetworkReply *networkReply = sendRequest(requestUrl); QPlaceSearchSuggestionReplyImpl *reply = new QPlaceSearchSuggestionReplyImpl(networkReply, this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceSearchSuggestionReplyImpl::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceSearchSuggestionReplyImpl::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); return reply; } @@ -542,9 +551,10 @@ QPlaceIdReply *QPlaceManagerEngineNokiaV2::savePlace(const QPlace &place) QMetaObject::invokeMethod(reply, "setError", Qt::QueuedConnection, Q_ARG(QPlaceReply::Error, QPlaceReply::UnsupportedError), Q_ARG(QString, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, SAVING_PLACE_NOT_SUPPORTED))); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceIdReplyImpl::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceIdReplyImpl::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); return reply; } @@ -555,9 +565,10 @@ QPlaceIdReply *QPlaceManagerEngineNokiaV2::removePlace(const QString &placeId) QMetaObject::invokeMethod(reply, "setError", Qt::QueuedConnection, Q_ARG(QPlaceReply::Error, QPlaceReply::UnsupportedError), Q_ARG(QString, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, REMOVING_PLACE_NOT_SUPPORTED))); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceIdReplyImpl::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceIdReplyImpl::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); return reply; } @@ -570,9 +581,10 @@ QPlaceIdReply *QPlaceManagerEngineNokiaV2::saveCategory(const QPlaceCategory &ca QMetaObject::invokeMethod(reply, "setError", Qt::QueuedConnection, Q_ARG(QPlaceReply::Error, QPlaceReply::UnsupportedError), Q_ARG(QString, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, SAVING_CATEGORY_NOT_SUPPORTED))); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceIdReplyImpl::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceIdReplyImpl::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); return reply; } @@ -583,9 +595,10 @@ QPlaceIdReply *QPlaceManagerEngineNokiaV2::removeCategory(const QString &categor QMetaObject::invokeMethod(reply, "setError", Qt::QueuedConnection, Q_ARG(QPlaceReply::Error, QPlaceReply::UnsupportedError), Q_ARG(QString, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, REMOVING_CATEGORY_NOT_SUPPORTED))); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceIdReplyImpl::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceIdReplyImpl::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); return reply; } @@ -643,17 +656,19 @@ QPlaceReply *QPlaceManagerEngineNokiaV2::initializeCategories() QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + QStringLiteral("/places/v1/categories/places/") + *it); QNetworkReply *networkReply = sendRequest(requestUrl); - connect(networkReply, SIGNAL(finished()), this, SLOT(categoryReplyFinished())); - connect(networkReply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(categoryReplyError())); + connect(networkReply, &QNetworkReply::finished, + this, &QPlaceManagerEngineNokiaV2::categoryReplyFinished); + connect(networkReply, &QNetworkReply::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::categoryReplyError); m_categoryRequests.insert(*it, networkReply); } QPlaceCategoriesReplyHere *reply = new QPlaceCategoriesReplyHere(this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceCategoriesReplyHere::finished, + this, &QPlaceManagerEngineNokiaV2::replyFinished); + connect(reply, &QPlaceCategoriesReplyHere::errorOccurred, + this, &QPlaceManagerEngineNokiaV2::replyError); m_categoryReply = reply; return reply; @@ -773,7 +788,7 @@ void QPlaceManagerEngineNokiaV2::replyError(QPlaceReply::Error error_, const QSt { QPlaceReply *reply = qobject_cast<QPlaceReply *>(sender()); if (reply) - emit error(reply, error_, errorString); + emit errorOccurred(reply, error_, errorString); } void QPlaceManagerEngineNokiaV2::categoryReplyFinished() diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp index 4354fba7..22a6d1eb 100644 --- a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp @@ -57,9 +57,10 @@ QGeoCodeReplyOsm::QGeoCodeReplyOsm(QNetworkReply *reply, bool includeExtraData, setError(UnknownError, QStringLiteral("Null reply")); return; } - connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(networkReplyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QGeoCodeReplyOsm::networkReplyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QGeoCodeReplyOsm::networkReplyError); connect(this, &QGeoCodeReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); setLimit(1); diff --git a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp index 85554c76..d91815b2 100644 --- a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp @@ -138,9 +138,10 @@ QGeoCodeReply *QGeoCodingManagerEngineOsm::geocode(const QString &address, int l replyPrivate->m_extraData["request_url"] = url; } - connect(geocodeReply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(geocodeReply, SIGNAL(error(QGeoCodeReply::Error,QString)), - this, SLOT(replyError(QGeoCodeReply::Error,QString))); + connect(geocodeReply, &QGeoCodeReplyOsm::finished, + this, &QGeoCodingManagerEngineOsm::replyFinished); + connect(geocodeReply, &QGeoCodeReplyOsm::errorOccurred, + this, &QGeoCodingManagerEngineOsm::replyError); return geocodeReply; } @@ -174,9 +175,10 @@ QGeoCodeReply *QGeoCodingManagerEngineOsm::reverseGeocode(const QGeoCoordinate & replyPrivate->m_extraData["request_url"] = url; } - connect(geocodeReply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(geocodeReply, SIGNAL(error(QGeoCodeReply::Error,QString)), - this, SLOT(replyError(QGeoCodeReply::Error,QString))); + connect(geocodeReply, &QGeoCodeReplyOsm::finished, + this, &QGeoCodingManagerEngineOsm::replyFinished); + connect(geocodeReply, &QGeoCodeReplyOsm::errorOccurred, + this, &QGeoCodingManagerEngineOsm::replyError); return geocodeReply; } @@ -192,7 +194,7 @@ void QGeoCodingManagerEngineOsm::replyError(QGeoCodeReply::Error errorCode, cons { QGeoCodeReply *reply = qobject_cast<QGeoCodeReply *>(sender()); if (reply) - emit error(reply, errorCode, errorString); + emit errorOccurred(reply, errorCode, errorString); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/osm/qgeomapreplyosm.cpp b/src/plugins/geoservices/osm/qgeomapreplyosm.cpp index 1d693455..58597a06 100644 --- a/src/plugins/geoservices/osm/qgeomapreplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeomapreplyosm.cpp @@ -51,9 +51,10 @@ QGeoMapReplyOsm::QGeoMapReplyOsm(QNetworkReply *reply, setError(UnknownError, QStringLiteral("Null reply")); return; } - connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(networkReplyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QGeoMapReplyOsm::networkReplyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QGeoMapReplyOsm::networkReplyError); connect(this, &QGeoTiledMapReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); setMapImageFormat(imageFormat); diff --git a/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp b/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp index 255ccfe5..7ff78c78 100644 --- a/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp @@ -50,9 +50,10 @@ QGeoRouteReplyOsm::QGeoRouteReplyOsm(QNetworkReply *reply, const QGeoRouteReques setError(UnknownError, QStringLiteral("Null reply")); return; } - connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(networkReplyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QGeoRouteReplyOsm::networkReplyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QGeoRouteReplyOsm::networkReplyError); connect(this, &QGeoRouteReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } diff --git a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp index 29a35aaa..3bbe6576 100644 --- a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp @@ -94,9 +94,10 @@ QGeoRouteReply* QGeoRoutingManagerEngineOsm::calculateRoute(const QGeoRouteReque QGeoRouteReplyOsm *routeReply = new QGeoRouteReplyOsm(reply, request, this); - connect(routeReply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(routeReply, SIGNAL(error(QGeoRouteReply::Error,QString)), - this, SLOT(replyError(QGeoRouteReply::Error,QString))); + connect(routeReply, &QGeoRouteReplyOsm::finished, + this, &QGeoRoutingManagerEngineOsm::replyFinished); + connect(routeReply, &QGeoRouteReplyOsm::errorOccurred, + this, &QGeoRoutingManagerEngineOsm::replyError); return routeReply; } @@ -118,5 +119,5 @@ void QGeoRoutingManagerEngineOsm::replyError(QGeoRouteReply::Error errorCode, { QGeoRouteReply *reply = qobject_cast<QGeoRouteReply *>(sender()); if (reply) - emit error(reply, errorCode, errorString); + emit errorOccurred(reply, errorCode, errorString); } diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp index 12f1476e..fb3c1748 100644 --- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp +++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp @@ -344,8 +344,10 @@ void TileProvider::resolveProvider() request.setAttribute(QNetworkRequest::BackgroundRequestAttribute, true); request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork); QNetworkReply *reply = m_nm->get(request); - connect(reply, SIGNAL(finished()), this, SLOT(onNetworkReplyFinished()) ); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(onNetworkReplyError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &TileProvider::onNetworkReplyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &TileProvider::onNetworkReplyError); } void TileProvider::handleError(QNetworkReply::NetworkError error) diff --git a/src/plugins/geoservices/osm/qplacecategoriesreplyosm.cpp b/src/plugins/geoservices/osm/qplacecategoriesreplyosm.cpp index fe506bb2..eaedca73 100644 --- a/src/plugins/geoservices/osm/qplacecategoriesreplyosm.cpp +++ b/src/plugins/geoservices/osm/qplacecategoriesreplyosm.cpp @@ -59,7 +59,7 @@ void QPlaceCategoriesReplyOsm::emitFinished() void QPlaceCategoriesReplyOsm::setError(QPlaceReply::Error errorCode, const QString &errorString) { QPlaceReply::setError(errorCode, errorString); - emit error(errorCode, errorString); + emit errorOccurred(errorCode, errorString); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp index ac1c2349..99ee19a5 100644 --- a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp @@ -191,9 +191,10 @@ QPlaceSearchReply *QPlaceManagerEngineOsm::search(const QPlaceSearchRequest &req QNetworkReply *networkReply = m_networkManager->get(rq); QPlaceSearchReplyOsm *reply = new QPlaceSearchReplyOsm(request, networkReply, this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceSearchReplyOsm::finished, + this, &QPlaceManagerEngineOsm::replyFinished); + connect(reply, &QPlaceSearchReplyOsm::errorOccurred, + this, &QPlaceManagerEngineOsm::replyError); if (m_debugQuery) reply->requestUrl = requestUrl.url(QUrl::None); @@ -211,9 +212,10 @@ QPlaceReply *QPlaceManagerEngineOsm::initializeCategories() } QPlaceCategoriesReplyOsm *reply = new QPlaceCategoriesReplyOsm(this); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), - this, SLOT(replyError(QPlaceReply::Error,QString))); + connect(reply, &QPlaceCategoriesReplyOsm::finished, + this, &QPlaceManagerEngineOsm::replyFinished); + connect(reply, &QPlaceCategoriesReplyOsm::errorOccurred, + this, &QPlaceManagerEngineOsm::replyError); // TODO delayed finished() emission if (!m_categories.isEmpty()) @@ -342,7 +344,7 @@ void QPlaceManagerEngineOsm::replyError(QPlaceReply::Error errorCode, const QStr { QPlaceReply *reply = qobject_cast<QPlaceReply *>(sender()); if (reply) - emit error(reply, errorCode, errorString); + emit errorOccurred(reply, errorCode, errorString); } void QPlaceManagerEngineOsm::fetchNextCategoryLocale() @@ -358,7 +360,8 @@ void QPlaceManagerEngineOsm::fetchNextCategoryLocale() QUrl requestUrl = QUrl(SpecialPhrasesBaseUrl + locale.name().left(2).toUpper()); m_categoriesReply = m_networkManager->get(QNetworkRequest(requestUrl)); - connect(m_categoriesReply, SIGNAL(finished()), this, SLOT(categoryReplyFinished())); - connect(m_categoriesReply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(categoryReplyError())); + connect(m_categoriesReply, &QNetworkReply::finished, + this, &QPlaceManagerEngineOsm::categoryReplyFinished); + connect(m_categoriesReply, &QNetworkReply::errorOccurred, + this, &QPlaceManagerEngineOsm::categoryReplyError); } diff --git a/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp index 05571aca..deb68e0e 100644 --- a/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp +++ b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp @@ -68,9 +68,10 @@ QPlaceSearchReplyOsm::QPlaceSearchReplyOsm(const QPlaceSearchRequest &request, } setRequest(request); - connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), - this, SLOT(networkError(QNetworkReply::NetworkError))); + connect(reply, &QNetworkReply::finished, + this, &QPlaceSearchReplyOsm::replyFinished); + connect(reply, &QNetworkReply::errorOccurred, + this, &QPlaceSearchReplyOsm::networkError); connect(this, &QPlaceReply::aborted, reply, &QNetworkReply::abort); connect(this, &QObject::destroyed, reply, &QObject::deleteLater); } @@ -82,7 +83,7 @@ QPlaceSearchReplyOsm::~QPlaceSearchReplyOsm() void QPlaceSearchReplyOsm::setError(QPlaceReply::Error errorCode, const QString &errorString) { QPlaceReply::setError(errorCode, errorString); - emit error(errorCode, errorString); + emit errorOccurred(errorCode, errorString); setFinished(true); emit finished(); } |