feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix model utils

Browse Source 
QStringView is easily convertable to std::u16string_view, because data()
is returning QChar* and not char16_t*.

Change-Id: I4dcdceca0c1ee82ea02494d8a45e9ab3011e4dcb
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2024-06-26 16:13:44 +02:00
parent cca45dcc9b
commit 7947b18d87
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmldesigner/designercore/model/modelutils.cpp
View File

@@ -315,23 +315,27 @@ ModelNode lowestCommonAncestor(Utils::span<const ModelNode> 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)