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

QmlDesigner: Remove "locked" auxiliary data instead of setting it false

Browse Source 
Since absence of locked property implies it is not locked, simplify
the auxiliary data by just removing the locked property instead of
setting it to false.

Also remove unused private method ModelNode::removeLocked().

Task-number: QDS-2915
Change-Id: I27904514f168c28138b6311278f60565fc810f00
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-10-29 14:18:50 +02:00
parent 873566d743
commit 95c27ea4c8
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/designercore/include/modelnode.h
View File

@@ -248,7 +248,6 @@ public:
private: // functions private: // functions
Internal::InternalNodePointer internalNode() const; Internal::InternalNodePointer internalNode() const;
void removeLocked();
bool hasLocked() const; bool hasLocked() const;
private: // variables private: // variables

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

@@ -1241,23 +1241,18 @@ bool ModelNode::hasLocked() const
void ModelNode::setLocked(bool value) void ModelNode::setLocked(bool value)
{ {
setAuxiliaryData(lockedProperty, value);
if (value) { if (value) {
setAuxiliaryData(lockedProperty, true);
// Remove newly locked node and all its descendants from potential selection // Remove newly locked node and all its descendants from potential selection
for (ModelNode node : allSubModelNodesAndThisNode()) { for (ModelNode node : allSubModelNodesAndThisNode()) {
node.deselectNode(); node.deselectNode();
node.removeAuxiliaryData("timeline_expanded"); node.removeAuxiliaryData("timeline_expanded");
node.removeAuxiliaryData("transition_expanded"); node.removeAuxiliaryData("transition_expanded");
} }
} } else {
}
void ModelNode::removeLocked()
{
if (hasLocked())
removeAuxiliaryData(lockedProperty); removeAuxiliaryData(lockedProperty);
} }
}
bool ModelNode::isThisOrAncestorLocked(const ModelNode &node) bool ModelNode::isThisOrAncestorLocked(const ModelNode &node)
{ {