forked from qt-creator/qt-creator
ProjectExplorer: Remove FolderNode::removeNode
Use takeNode instead. Change-Id: I7e05c4ba7c18aaabcdad5160f91a2c2ad754b758 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
@@ -583,7 +583,7 @@ void FolderNode::compress()
|
||||
}
|
||||
setAbsoluteFilePathAndLine(subFolder->filePath(), -1);
|
||||
|
||||
removeNode(subFolder);
|
||||
takeNode(subFolder);
|
||||
|
||||
compress();
|
||||
} else {
|
||||
@@ -617,7 +617,7 @@ bool FolderNode::replaceSubtree(Node *oldNode, Node *newNode)
|
||||
nn->setParentFolderNode(this);
|
||||
*it = std::move(nn);
|
||||
} else {
|
||||
removeNode(oldNode); // Happens e.g. when project is shutting down
|
||||
takeNode(oldNode); // Happens e.g. when project is shutting down
|
||||
}
|
||||
QTimer::singleShot(0, [oldNode]() { delete oldNode; });
|
||||
}
|
||||
@@ -728,15 +728,9 @@ void FolderNode::addNode(std::unique_ptr<Node> &&node)
|
||||
}
|
||||
|
||||
/*!
|
||||
Removes a node specified by \a node from the internal list of nodes.
|
||||
The node object itself is not deleted.
|
||||
Return a node specified by \a node from the internal list.
|
||||
*/
|
||||
|
||||
void FolderNode::removeNode(Node *node)
|
||||
{
|
||||
takeNode(node);
|
||||
}
|
||||
|
||||
std::unique_ptr<Node> FolderNode::takeNode(Node *node)
|
||||
{
|
||||
return Utils::takeOrDefault(m_nodes, node);
|
||||
|
@@ -279,7 +279,6 @@ public:
|
||||
|
||||
void addNode(Node *node);
|
||||
void addNode(std::unique_ptr<Node> &&node);
|
||||
void removeNode(Node *node);
|
||||
std::unique_ptr<Node> takeNode(Node *node);
|
||||
|
||||
bool isEmpty() const;
|
||||
|
Reference in New Issue
Block a user