diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-02 15:46:06 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-10 10:39:21 +0200 |
commit | 3794e0c252a8e7a0288d3fb74dde6f5fdc09950d (patch) | |
tree | ef73bbd08465b7ac7335d6dc969be401df7caf7b | |
parent | 275efcc6c493e01fcbb623de4a277cffd584fa58 (diff) | |
download | qtlocation-3794e0c252a8e7a0288d3fb74dde6f5fdc09950d.tar.gz |
Qt6: Port QtLocation to QStringView
Task-number: QTBUG-84319
Change-Id: I48cfafbf0a489947468b4b4e3fcf851e459cdfd3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r-- | src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp | 2 | ||||
-rw-r--r-- | src/plugins/geoservices/osm/qplacemanagerengineosm.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index c5c05a2e..c489325d 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -696,7 +696,7 @@ QPlaceIcon QPlaceManagerEngineNokiaV2::icon(const QString &remotePath, QString iconPrefix; QString nokiaIcon; - if (match.hasMatch() && !match.capturedRef(1).isEmpty() && !match.capturedRef(2).isEmpty()) { + if (match.hasMatch() && !match.capturedView(1).isEmpty() && !match.capturedView(2).isEmpty()) { iconPrefix = match.captured(1); nokiaIcon = match.captured(2); diff --git a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp index d6344989..93b3ce59 100644 --- a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp @@ -274,11 +274,11 @@ void QPlaceManagerEngineOsm::categoryReplyFinished() QRegularExpressionMatchIterator i = regex.globalMatch(page); while (i.hasNext()) { QRegularExpressionMatch match = i.next(); - QString name = match.capturedRef(1).toString(); - QString tagKey = match.capturedRef(2).toString(); - QString tagValue = match.capturedRef(3).toString(); - QString op = match.capturedRef(4).toString(); - QString plural = match.capturedRef(5).toString(); + QString name = match.capturedView(1).toString(); + QString tagKey = match.capturedView(2).toString(); + QString tagValue = match.capturedView(3).toString(); + QString op = match.capturedView(4).toString(); + QString plural = match.capturedView(5).toString(); // Only interested in any operator plural forms if (op != QLatin1String("-") || plural != QLatin1String("Y")) |