From 13daf11d03086ddb9047426bcab18ae0a24fe170 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 3 Apr 2020 10:20:05 +0200 Subject: CMake: Simplify BuildDirParameters Remove some useless bool, Creator would crash if that was ever set. Change-Id: I148cad6b6139332a6010698f075b584c87dec338 Reviewed-by: hjk --- src/plugins/cmakeprojectmanager/builddirparameters.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/plugins/cmakeprojectmanager/builddirparameters.cpp') diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp index 8c54186271..2d3e21502b 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 { -- cgit v1.2.1