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

CMake: Simplify servermodereader.cpp:createProjectNode

Browse Source 
The return value is only used for an immediately following assert
that can never trigger.

Change-Id: I653a68292427dd5d6e2fb153ee361da1f0573737
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2018-12-17 18:34:08 +01:00
parent 57a2e849b3
commit 5330502978
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/servermodereader.cpp
View File

@@ -792,23 +792,22 @@ ServerModeReader::addCMakeLists(CMakeProjectNode *root,
return cmakeListsNodes; return cmakeListsNodes;
} }
static ProjectNode *createProjectNode(const QHash<Utils::FileName, ProjectNode *> &cmakeListsNodes, static void createProjectNode(const QHash<Utils::FileName, ProjectNode *> &cmakeListsNodes,
const Utils::FileName &dir, const QString &displayName) const Utils::FileName &dir, const QString &displayName)
{ {
ProjectNode *cmln = cmakeListsNodes.value(dir); ProjectNode *cmln = cmakeListsNodes.value(dir);
QTC_ASSERT(cmln, qDebug() << dir.toUserOutput() ; return nullptr); QTC_ASSERT(cmln, qDebug() << dir.toUserOutput(); return);
Utils::FileName projectName = dir; Utils::FileName projectName = dir;
projectName.appendPath(".project::" + displayName); projectName.appendPath(".project::" + displayName);
CMakeProjectNode *pn = static_cast<CMakeProjectNode *>(cmln->projectNode(projectName)); ProjectNode *pn = cmln->projectNode(projectName);
if (!pn) { if (!pn) {
auto newNode = std::make_unique<CMakeProjectNode>(projectName); auto newNode = std::make_unique<CMakeProjectNode>(projectName);
pn = newNode.get(); pn = newNode.get();
cmln->addNode(std::move(newNode)); cmln->addNode(std::move(newNode));
} }
pn->setDisplayName(displayName); pn->setDisplayName(displayName);
return pn;
} }
void ServerModeReader::addProjects(const QHash<Utils::FileName, ProjectNode *> &cmakeListsNodes, void ServerModeReader::addProjects(const QHash<Utils::FileName, ProjectNode *> &cmakeListsNodes,
@@ -816,8 +815,7 @@ void ServerModeReader::addProjects(const QHash<Utils::FileName, ProjectNode *> &
QList<FileNode *> &knownHeaderNodes) QList<FileNode *> &knownHeaderNodes)
{ {
for (const Project *p : projects) { for (const Project *p : projects) {
ProjectNode *pNode = createProjectNode(cmakeListsNodes, p->sourceDirectory, p->name); createProjectNode(cmakeListsNodes, p->sourceDirectory, p->name);
QTC_ASSERT(pNode, qDebug() << p->sourceDirectory.toUserOutput() ; continue);
addTargets(cmakeListsNodes, p->targets, knownHeaderNodes); addTargets(cmakeListsNodes, p->targets, knownHeaderNodes);
} }
} }