From 5330502978094074ad1039b19f7a579ae4852871 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 17 Dec 2018 18:34:08 +0100
Subject: [PATCH] CMake: Simplify servermodereader.cpp:createProjectNode

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>
---
 src/plugins/cmakeprojectmanager/servermodereader.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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