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/location/maps/qgeomap_p.h | |
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/location/maps/qgeomap_p.h')
-rw-r--r-- | src/location/maps/qgeomap_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/maps/qgeomap_p.h b/src/location/maps/qgeomap_p.h index 331359ad..9d0c04ee 100644 --- a/src/location/maps/qgeomap_p.h +++ b/src/location/maps/qgeomap_p.h @@ -176,7 +176,7 @@ Q_SIGNALS: void sgNodeChanged(); void activeMapTypeChanged(); void cameraCapabilitiesChanged(const QGeoCameraCapabilities &oldCameraCapabilities); - void copyrightsChanged(const QImage ©rightsImage); + void copyrightsImageChanged(const QImage ©rightsImage); void copyrightsChanged(const QString ©rightsHtml); void copyrightsStyleSheetChanged(const QString &styleSheet); void visibleAreaChanged(); |