diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index 7162f2102ef..c1ae139b101 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -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) } /*! - 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 FolderNode::takeNode(Node *node) { return Utils::takeOrDefault(m_nodes, node); diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index 8f990aae8eb..036af4c84e3 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -279,7 +279,6 @@ public: void addNode(Node *node); void addNode(std::unique_ptr &&node); - void removeNode(Node *node); std::unique_ptr takeNode(Node *node); bool isEmpty() const;