summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2022-08-22 15:09:25 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2022-08-23 14:43:13 +0200
commitec29ae5ad6afb4a4b0507bf2f81bdcfe0fcec123 (patch)
treeb36f761ab8f01b64db2e57cafb3d9baa785bed6f /src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
parent4c4ef4ae797549ac4597d4c8aeba1533c8e4c1f6 (diff)
downloadqtlocation-ec29ae5ad6afb4a4b0507bf2f81bdcfe0fcec123.tar.gz
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/nokia/qgeotilefetcher_nokia.cpp')
-rw-r--r--src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp6
1 files changed, 4 insertions, 2 deletions
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