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/esri/placesearchreply_esri.cpp | |
parent | 4c4ef4ae797549ac4597d4c8aeba1533c8e4c1f6 (diff) | |
download | qtlocation-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/esri/placesearchreply_esri.cpp')
-rw-r--r-- | src/plugins/geoservices/esri/placesearchreply_esri.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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(); } |