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

QmlDesigner: Unify and fix property comparison

Browse Source 
So far string and QString were not considered equal.
Unifying the type comparison.

Task-number: QDS-9938
Change-Id: Ia64fee9b56b8cf916669aca1d3f09a3f05ecf29f
Reviewed-by: Aleksei German <aleksei.german@qt.io>
This commit is contained in:
Thomas Hartmann
2023-06-01 13:14:47 +02:00
parent 94b5b09586
commit a687af8324
1 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/plugins/qmldesigner/components/bindingeditor/bindingeditor.cpp
View File

@@ -174,27 +174,38 @@ void BindingEditor::prepareBindings()
QList<BindingEditorDialog::BindingOption> bindings; QList<BindingEditorDialog::BindingOption> bindings;
const QList<TypeName> variantTypes = {"alias", "unknown", "variant", "var"}; const QVarLengthArray<TypeName> variantTypes = {"alias", "unknown", "variant", "var"};
const QList<TypeName> numericTypes = {"double", "real", "int"}; const QVarLengthArray<TypeName> numericTypes = {"double", "real", "int"};
const QList<TypeName> colorTypes = {"QColor", "color"}; const QVarLengthArray<TypeName> colorTypes = {"QColor", "color"};
auto isVariant = [&variantTypes](const TypeName &compareType) { return variantTypes.contains(compareType); }; const QVarLengthArray<TypeName> stringTypes = {"QString", "string"};
auto isNumeric = [&numericTypes](const TypeName &compareType) { return numericTypes.contains(compareType); };
auto isColor = [&colorTypes](const TypeName &compareType) { return colorTypes.contains(compareType); };
const bool skipTypeFiltering = isVariant(m_backendValueTypeName); auto isVariant = [&variantTypes](const TypeName &compareType) {
const bool targetTypeIsNumeric = isNumeric(m_backendValueTypeName); return variantTypes.contains(compareType);
};
auto isNumeric = [&numericTypes](const TypeName &compareType) {
return numericTypes.contains(compareType);
};
auto isColor = [&colorTypes](const TypeName &compareType) {
return colorTypes.contains(compareType);
};
auto isString = [&stringTypes](const TypeName &compareType) {
return stringTypes.contains(compareType);
};
auto compareTypes = [&](const TypeName &targetType, const TypeName &sourceType) {
return isVariant(targetType) || isVariant(sourceType) || (targetType == sourceType)
|| (isNumeric(targetType) && isNumeric(sourceType))
|| (isColor(targetType) && isColor(sourceType))
|| (isString(targetType) && isString(sourceType));
};
for (const auto &objnode : allNodes) { for (const auto &objnode : allNodes) {
BindingEditorDialog::BindingOption binding; BindingEditorDialog::BindingOption binding;
for (const auto &property : objnode.metaInfo().properties()) { for (const auto &property : objnode.metaInfo().properties()) {
const TypeName &propertyTypeName = property.propertyType().simplifiedTypeName(); const TypeName &propertyTypeName = property.propertyType().simplifiedTypeName();
if (skipTypeFiltering if (compareTypes(m_backendValueTypeName, propertyTypeName))
|| (m_backendValueTypeName == propertyTypeName)
|| isVariant(propertyTypeName)
|| (targetTypeIsNumeric && isNumeric(propertyTypeName))) {
binding.properties.append(QString::fromUtf8(property.name())); binding.properties.append(QString::fromUtf8(property.name()));
}
} }
//dynamic properties: //dynamic properties:
@@ -202,12 +213,8 @@ void BindingEditor::prepareBindings()
if (bindingProperty.isValid()) { if (bindingProperty.isValid()) {
if (bindingProperty.isDynamic()) { if (bindingProperty.isDynamic()) {
const TypeName dynamicTypeName = bindingProperty.dynamicTypeName(); const TypeName dynamicTypeName = bindingProperty.dynamicTypeName();
if (skipTypeFiltering if (compareTypes(m_backendValueTypeName, dynamicTypeName))
|| (dynamicTypeName == m_backendValueTypeName)
|| isVariant(dynamicTypeName)
|| (targetTypeIsNumeric && isNumeric(dynamicTypeName))) {
binding.properties.append(QString::fromUtf8(bindingProperty.name())); binding.properties.append(QString::fromUtf8(bindingProperty.name()));
}
} }
} }
} }
@@ -215,12 +222,8 @@ void BindingEditor::prepareBindings()
if (variantProperty.isValid()) { if (variantProperty.isValid()) {
if (variantProperty.isDynamic()) { if (variantProperty.isDynamic()) {
const TypeName dynamicTypeName = variantProperty.dynamicTypeName(); const TypeName dynamicTypeName = variantProperty.dynamicTypeName();
if (skipTypeFiltering if (compareTypes(m_backendValueTypeName, dynamicTypeName))
|| (dynamicTypeName == m_backendValueTypeName)
|| isVariant(dynamicTypeName)
|| (targetTypeIsNumeric && isNumeric(dynamicTypeName))) {
binding.properties.append(QString::fromUtf8(variantProperty.name())); binding.properties.append(QString::fromUtf8(variantProperty.name()));
}
} }
} }
} }
@@ -241,15 +244,10 @@ void BindingEditor::prepareBindings()
BindingEditorDialog::BindingOption binding; BindingEditorDialog::BindingOption binding;
for (const auto &property : metaInfo.properties()) { for (const auto &property : metaInfo.properties()) {
TypeName propertyTypeName = property.propertyType().typeName(); const TypeName propertyTypeName = property.propertyType().typeName();
if (skipTypeFiltering if (compareTypes(m_backendValueTypeName, propertyTypeName))
|| (m_backendValueTypeName == propertyTypeName)
|| (isVariant(propertyTypeName))
|| (targetTypeIsNumeric && isNumeric(propertyTypeName))
|| (isColor(m_backendValueTypeName) && isColor(propertyTypeName))) {
binding.properties.append(QString::fromUtf8(property.name())); binding.properties.append(QString::fromUtf8(property.name()));
}
} }
if (!binding.properties.isEmpty()) { if (!binding.properties.isEmpty()) {