diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-08-22 15:09:25 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-08-23 14:43:13 +0200 |
| commit | ec29ae5ad6afb4a4b0507bf2f81bdcfe0fcec123 (patch) | |
| tree | b36f761ab8f01b64db2e57cafb3d9baa785bed6f /src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp | |
| parent | 4c4ef4ae797549ac4597d4c8aeba1533c8e4c1f6 (diff) | |
Port to pointer-to-member-function connection syntax
Rename overloads that would cause conflict and require explicit overloa
resolution via QOverload:
- Q*Reply::error -> errorOccurred (equivalent to QNetworkReply)
- Q*Engine::error -> errorOccurred (for consistency, even if no overloa
- Q*Manager::error -> errorOccurred (ditto)
- QDeclarativeGeoMap::copyrightChanged -> copyrightImageChanged
As a drive-by, change QString value parameters to const references.
Pick-to: 6.2
Change-Id: I1ab16079842540ca0a86f711d83b35c8c56135e6
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp')
| -rw-r--r-- | src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
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 |