From 13daf11d03086ddb9047426bcab18ae0a24fe170 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Fri, 3 Apr 2020 10:20:05 +0200
Subject: [PATCH] CMake: Simplify BuildDirParameters

Remove some useless bool, Creator would crash if that was ever set.

Change-Id: I148cad6b6139332a6010698f075b584c87dec338
Reviewed-by: hjk <hjk@qt.io>
---
 .../cmakeprojectmanager/builddirparameters.cpp    | 15 ++++++++++-----
 .../cmakeprojectmanager/builddirparameters.h      |  1 -
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
index 8c54186271b..2d3e21502b1 100644
--- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp
+++ b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
@@ -47,13 +47,15 @@ BuildDirParameters::BuildDirParameters() = default;
 
 BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc)
 {
-    initialized = bc != nullptr;
+    QTC_ASSERT(bc, return );
 
-    const Kit *k = bc->target()->kit();
+    const Target *t = bc->target();
+    const Kit *k = t->kit();
+    const Project *p = t->project();
 
-    projectName = bc->target()->project()->displayName();
+    projectName = p->displayName();
 
-    sourceDirectory = bc->target()->project()->projectDirectory();
+    sourceDirectory = p->projectDirectory();
     buildDirectory = bc->buildDirectory();
 
     environment = bc->environment();
@@ -87,7 +89,10 @@ BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc)
     generatorArguments = CMakeGeneratorKitAspect::generatorArguments(k);
 }
 
-bool BuildDirParameters::isValid() const { return initialized && cmakeTool(); }
+bool BuildDirParameters::isValid() const
+{
+    return cmakeTool();
+}
 
 CMakeTool *BuildDirParameters::cmakeTool() const
 {
diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.h b/src/plugins/cmakeprojectmanager/builddirparameters.h
index 159ab902a88..7318ef03d86 100644
--- a/src/plugins/cmakeprojectmanager/builddirparameters.h
+++ b/src/plugins/cmakeprojectmanager/builddirparameters.h
@@ -49,7 +49,6 @@ public:
     bool isValid() const;
     CMakeTool *cmakeTool() const;
 
-    bool initialized = false;
     QString projectName;
 
     Utils::FilePath sourceDirectory;