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

ProjectExplorer: Remove FolderNode::removeNode

Browse Source 
Use takeNode instead.

Change-Id: I7e05c4ba7c18aaabcdad5160f91a2c2ad754b758
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tobias Hunger
2018-04-26 14:50:35 +02:00
parent 5754d5accf
commit 04057106ba
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -583,7 +583,7 @@ void FolderNode::compress()
} }
setAbsoluteFilePathAndLine(subFolder->filePath(), -1); setAbsoluteFilePathAndLine(subFolder->filePath(), -1);
removeNode(subFolder); takeNode(subFolder);
compress(); compress();
} else { } else {
@@ -617,7 +617,7 @@ bool FolderNode::replaceSubtree(Node *oldNode, Node *newNode)
nn->setParentFolderNode(this); nn->setParentFolderNode(this);
*it = std::move(nn); *it = std::move(nn);
} else { } 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; }); 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. Return a node specified by \a node from the internal list.
The node object itself is not deleted.
*/ */
void FolderNode::removeNode(Node *node)
{
takeNode(node);
}
std::unique_ptr<Node> FolderNode::takeNode(Node *node) std::unique_ptr<Node> FolderNode::takeNode(Node *node)
{ {
return Utils::takeOrDefault(m_nodes, node); return Utils::takeOrDefault(m_nodes, node);

1
src/plugins/projectexplorer/projectnodes.h
View File

@@ -279,7 +279,6 @@ public:
void addNode(Node *node); void addNode(Node *node);
void addNode(std::unique_ptr<Node> &&node); void addNode(std::unique_ptr<Node> &&node);
void removeNode(Node *node);
std::unique_ptr<Node> takeNode(Node *node); std::unique_ptr<Node> takeNode(Node *node);
bool isEmpty() const; bool isEmpty() const;