Commit 6810fd52 authored by Marco Bubke's avatar Marco Bubke

QmlDesigner: Remove qmlTypeInQtContainer

Not needed any more because the code model is already doing it.

Change-Id: Id612f3c40a350a9c5c41b33db9f81110552ff9f4
Reviewed-by: default avatarMarco Bubke <marco.bubke@digia.com>
parent a734a8cf
...@@ -50,22 +50,6 @@ ...@@ -50,22 +50,6 @@
namespace QmlDesigner { namespace QmlDesigner {
static TypeName qmlTypeInQtContainer(const TypeName &qtContainerType)
{
TypeName typeName = qtContainerType;
if (typeName.startsWith("QDeclarativeListProperty<")
&& typeName.endsWith('>')) {
typeName.remove(0, 25);
typeName.chop(1);
}
if (typeName.endsWith('*'))
typeName.chop(1);
return typeName;
}
static PropertyNameList visibleProperties(const ModelNode &node) static PropertyNameList visibleProperties(const ModelNode &node)
{ {
PropertyNameList propertyList; PropertyNameList propertyList;
...@@ -79,7 +63,7 @@ static PropertyNameList visibleProperties(const ModelNode &node) ...@@ -79,7 +63,7 @@ static PropertyNameList visibleProperties(const ModelNode &node)
&& !node.metaInfo().propertyIsPrivate(propertyName) //Do not show private properties && !node.metaInfo().propertyIsPrivate(propertyName) //Do not show private properties
&& propertyName != node.metaInfo().defaultPropertyName()) { // TODO: ask the node instances && propertyName != node.metaInfo().defaultPropertyName()) { // TODO: ask the node instances
TypeName qmlType = qmlTypeInQtContainer(node.metaInfo().propertyTypeName(propertyName)); TypeName qmlType = node.metaInfo().propertyTypeName(propertyName);
if (node.model()->metaInfo(qmlType).isValid() && if (node.model()->metaInfo(qmlType).isValid() &&
node.model()->metaInfo(qmlType).isSubclassOf("QtQuick.Item", -1, -1)) { node.model()->metaInfo(qmlType).isSubclassOf("QtQuick.Item", -1, -1)) {
propertyList.append(propertyName); propertyList.append(propertyName);
...@@ -542,7 +526,7 @@ static void setScenePosition(const QmlDesigner::ModelNode &modelNode,const QPoin ...@@ -542,7 +526,7 @@ static void setScenePosition(const QmlDesigner::ModelNode &modelNode,const QPoin
void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty parentProperty, const QList<ModelNode> &modelNodes, int targetIndex) void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty parentProperty, const QList<ModelNode> &modelNodes, int targetIndex)
{ {
try { try {
TypeName propertyQmlType = qmlTypeInQtContainer(parentProperty.parentModelNode().metaInfo().propertyTypeName(parentProperty.name())); TypeName propertyQmlType = parentProperty.parentModelNode().metaInfo().propertyTypeName(parentProperty.name());
RewriterTransaction transaction = m_view->beginRewriterTransaction(QByteArrayLiteral("NavigatorTreeModel::moveNodesInteractive")); RewriterTransaction transaction = m_view->beginRewriterTransaction(QByteArrayLiteral("NavigatorTreeModel::moveNodesInteractive"));
foreach (const ModelNode &node, modelNodes) { foreach (const ModelNode &node, modelNodes) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment