From 7947b18d873931ac25ce4779de7b12228241e580 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 26 Jun 2024 16:13:44 +0200 Subject: [PATCH] QmlDesigner: Fix model utils QStringView is easily convertable to std::u16string_view, because data() is returning QChar* and not char16_t*. Change-Id: I4dcdceca0c1ee82ea02494d8a45e9ab3011e4dcb Reviewed-by: Ali Kianian Reviewed-by: Tim Jenssen --- .../qmldesigner/designercore/model/modelutils.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/modelutils.cpp b/src/plugins/qmldesigner/designercore/model/modelutils.cpp index d034278831e..db707a9c0f6 100644 --- a/src/plugins/qmldesigner/designercore/model/modelutils.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelutils.cpp @@ -315,23 +315,27 @@ ModelNode lowestCommonAncestor(Utils::span nodes) bool isQmlKeyword(QStringView id) { - return std::binary_search(std::begin(qmlKeywords), std::end(qmlKeywords), id); + return std::binary_search(std::begin(qmlKeywords), std::end(qmlKeywords), toStdStringView(id)); } bool isDiscouragedQmlId(QStringView id) { - return std::binary_search(std::begin(qmlDiscouragedIds), std::end(qmlDiscouragedIds), id); + return std::binary_search(std::begin(qmlDiscouragedIds), + std::end(qmlDiscouragedIds), + toStdStringView(id)); } bool isQmlBuiltinType(QStringView id) { - return std::binary_search(std::begin(qmlBuiltinTypes), std::end(qmlBuiltinTypes), id); + return std::binary_search(std::begin(qmlBuiltinTypes), + std::end(qmlBuiltinTypes), + toStdStringView(id)); } bool isBannedQmlId(QStringView id) { static constexpr auto invalidIds = createBannedQmlIds(); - return std::binary_search(invalidIds.begin(), invalidIds.end(), id); + return std::binary_search(invalidIds.begin(), invalidIds.end(), toStdStringView(id)); } bool isValidQmlIdentifier(QStringView id)