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

QmlDesigner: Optimize deleting nodes

Browse Source 
- remove unnecessary call to directSubModelNodes()
- replace foreach with for (avoid unnecessary copies)

Change-Id: I42721a4c4e69f320664af8364f8baa0df0d11459
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Mahmoud Badri
2020-10-23 22:12:52 +03:00
parent 4a3bd72db8
commit 98d7b5b6e5
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/qmldesigner/designercore/model/modelnode.cpp
View File

@@ -693,35 +693,33 @@ void ModelNode::removeProperty(const PropertyName &name) const
model()->d->removeProperty(internalNode()->property(name)); model()->d->removeProperty(internalNode()->property(name));
} }
/*! \brief removes this node from the node tree /*! \brief removes this node from the node tree
*/ */
static QList<ModelNode> descendantNodes(const ModelNode &node)
static QList<ModelNode> descendantNodes(const ModelNode &parent)
{ {
QList<ModelNode> descendants(parent.directSubModelNodes()); const QList<ModelNode> children = node.directSubModelNodes();
foreach (const ModelNode &child, parent.directSubModelNodes()) { QList<ModelNode> descendants = children;
for (const ModelNode &child : children)
descendants += descendantNodes(child); descendants += descendantNodes(child);
}
return descendants; return descendants;
} }
static void removeModelNodeFromSelection(const ModelNode &node) static void removeModelNodeFromSelection(const ModelNode &node)
{ {
{ // remove nodes from the active selection: // remove nodes from the active selection
QList<ModelNode> selectedList = node.view()->selectedModelNodes(); QList<ModelNode> selectedList = node.view()->selectedModelNodes();
foreach (const ModelNode &childModelNode, descendantNodes(node)) const QList<ModelNode> descendants = descendantNodes(node);
selectedList.removeAll(childModelNode); for (const ModelNode &descendantNode : descendants)
selectedList.removeAll(node); selectedList.removeAll(descendantNode);
node.view()->setSelectedModelNodes(selectedList); selectedList.removeAll(node);
}
node.view()->setSelectedModelNodes(selectedList);
} }
/*! \brief complete removes this ModelNode from the Model /*! \brief complete removes this ModelNode from the Model
*/ */
void ModelNode::destroy() void ModelNode::destroy()
{ {