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

ProjectExplorer: Use unique_ptr for Project::setRootProjectNode

Browse Source 
Change-Id: If63a49d0eecfb93adcc6076fcb3208c87603af10
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tobias Hunger
2018-04-26 14:41:46 +02:00
parent 1f55ba9012
commit 5754d5accf
15 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/projectexplorer/project.cpp
View File

@@ -491,28 +491,26 @@ void Project::setId(Core::Id id)
d->m_id = id;
}
void Project::setRootProjectNode(ProjectNode *root)
void Project::setRootProjectNode(std::unique_ptr<ProjectNode> &&root)
{
if (d->m_rootProjectNode.get() == root)
return;
QTC_ASSERT(d->m_rootProjectNode.get() != root.get(), return);
if (root && root->isEmpty()) {
// Something went wrong with parsing: At least the project file needs to be
// shown so that the user can fix the breakage.
// Do not leak root and use default project tree in this case.
delete root;
root = nullptr;
root.reset();
}
if (root) {
ProjectTree::applyTreeManager(root);
ProjectTree::applyTreeManager(root.get());
root->setParentFolderNode(d->m_containerNode.get());
}
std::unique_ptr<ProjectNode> oldNode = std::move(d->m_rootProjectNode);
d->m_rootProjectNode.reset(root);
if (oldNode || root)
d->m_rootProjectNode = std::move(root);
if (oldNode || d->m_rootProjectNode)
handleSubTreeChanged(d->m_containerNode.get());
}
@@ -1049,13 +1047,13 @@ void ProjectExplorerPlugin::testProject_projectTree()
QCOMPARE(fileSpy.count(), 0);
QVERIFY(!project.rootProjectNode());
project.setRootProjectNode(new TestProjectNode(project.projectDirectory())); // will delete the fileNode...
project.setRootProjectNode(std::make_unique<TestProjectNode>(project.projectDirectory()));
QCOMPARE(fileSpy.count(), 0);
QVERIFY(!project.rootProjectNode());
std::unique_ptr<ProjectNode> root = createFileTree(&project);
ProjectNode *rootNode = root.get();
project.setRootProjectNode(root.release());
project.setRootProjectNode(std::move(root));
QCOMPARE(fileSpy.count(), 1);
QCOMPARE(project.rootProjectNode(), rootNode);
@@ -1077,10 +1075,6 @@ void ProjectExplorerPlugin::testProject_projectTree()
QVERIFY(sourceFiles.contains(TEST_PROJECT_PATH));
QVERIFY(sourceFiles.contains(TEST_PROJECT_CPP_FILE));
project.setRootProjectNode(rootNode);
QCOMPARE(fileSpy.count(), 1);
QCOMPARE(project.rootProjectNode(), rootNode);
project.setRootProjectNode(nullptr);
QCOMPARE(fileSpy.count(), 2);
QVERIFY(!project.rootProjectNode());