From ec29ae5ad6afb4a4b0507bf2f81bdcfe0fcec123 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 22 Aug 2022 15:09:25 +0200 Subject: 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 --- src/plugins/geoservices/osm/qgeotileproviderosm.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/plugins/geoservices/osm/qgeotileproviderosm.cpp') 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) -- cgit v1.2.1