From 6f0d2e65654b74d21ef35eb78a8ec5a1312b95a6 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 7 Jul 2022 19:03:51 +0200 Subject: [PATCH] QmlDesigner: Add unusedProperty() as public member Change-Id: If24e0d09145f0bb9e5459cae1b13302610818913 Reviewed-by: Qt CI Bot Reviewed-by: Thomas Hartmann --- .../dynamicpropertiesmodel.cpp | 32 +++++++++---------- .../connectioneditor/dynamicpropertiesmodel.h | 2 ++ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp index 52401a74009..2f61fc360fc 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp @@ -62,22 +62,6 @@ QString idOrTypeNameForNode(const QmlDesigner::ModelNode &modelNode) return idLabel; } -QmlDesigner::PropertyName unusedProperty(const QmlDesigner::ModelNode &modelNode) -{ - QmlDesigner::PropertyName propertyName = "property"; - int i = 0; - if (modelNode.metaInfo().isValid()) { - while (true) { - const QmlDesigner::PropertyName currentPropertyName = propertyName + QString::number(i).toLatin1(); - if (!modelNode.hasProperty(currentPropertyName) && !modelNode.metaInfo().hasProperty(currentPropertyName)) - return currentPropertyName; - i++; - } - } - - return propertyName; -} - QVariant convertVariantForTypeName(const QVariant &variant, const QmlDesigner::TypeName &typeName) { QVariant returnValue = variant; @@ -119,6 +103,22 @@ namespace QmlDesigner { namespace Internal { +QmlDesigner::PropertyName DynamicPropertiesModel::unusedProperty(const QmlDesigner::ModelNode &modelNode) +{ + QmlDesigner::PropertyName propertyName = "property"; + int i = 0; + if (modelNode.metaInfo().isValid()) { + while (true) { + const QmlDesigner::PropertyName currentPropertyName = propertyName + QString::number(i).toLatin1(); + if (!modelNode.hasProperty(currentPropertyName) && !modelNode.metaInfo().hasProperty(currentPropertyName)) + return currentPropertyName; + i++; + } + } + + return propertyName; +} + DynamicPropertiesModel::DynamicPropertiesModel(ConnectionView *parent) : QStandardItemModel(parent) , m_connectionView(parent) diff --git a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.h b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.h index 3b7d0cf4231..a5b674c1f8a 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.h +++ b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.h @@ -69,6 +69,8 @@ public: BindingProperty replaceVariantWithBinding(const PropertyName &name, bool copyValue = false); void resetProperty(const PropertyName &name); + QmlDesigner::PropertyName unusedProperty(const QmlDesigner::ModelNode &modelNode); + protected: void addProperty(const QVariant &propertyValue, const QString &propertyType,