forked from qt-creator/qt-creator
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 <ali.kianian@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -315,23 +315,27 @@ ModelNode lowestCommonAncestor(Utils::span<const ModelNode> nodes)
|
|||||||
|
|
||||||
bool isQmlKeyword(QStringView id)
|
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)
|
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)
|
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)
|
bool isBannedQmlId(QStringView id)
|
||||||
{
|
{
|
||||||
static constexpr auto invalidIds = createBannedQmlIds();
|
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)
|
bool isValidQmlIdentifier(QStringView id)
|
||||||
|
Reference in New Issue
Block a user