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

CMake: Modernize CMakeBuildConfiguration

Browse Source 
Change-Id: Ie09ae7b765d6c2f72eb62b9db2937fbd68e232f5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-09-29 23:47:23 +02:00
parent 2dabdbd2fe
commit 7c94750d70
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -528,9 +528,9 @@ QList<ProjectExplorer::BuildInfo *> CMakeBuildConfigurationFactory::availableSet
ProjectExplorer::BuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer::Target *parent,
const ProjectExplorer::BuildInfo *info) const const ProjectExplorer::BuildInfo *info) const
{ {
QTC_ASSERT(info->factory() == this, return 0); QTC_ASSERT(info->factory() == this, return nullptr);
QTC_ASSERT(info->kitId == parent->kit()->id(), return 0); QTC_ASSERT(info->kitId == parent->kit()->id(), return nullptr);
QTC_ASSERT(!info->displayName.isEmpty(), return 0); QTC_ASSERT(!info->displayName.isEmpty(), return nullptr);
CMakeBuildInfo copy(*static_cast<const CMakeBuildInfo *>(info)); CMakeBuildInfo copy(*static_cast<const CMakeBuildInfo *>(info));
CMakeProject *project = static_cast<CMakeProject *>(parent->project()); CMakeProject *project = static_cast<CMakeProject *>(parent->project());
@@ -571,7 +571,7 @@ bool CMakeBuildConfigurationFactory::canClone(const ProjectExplorer::Target *par
CMakeBuildConfiguration *CMakeBuildConfigurationFactory::clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) CMakeBuildConfiguration *CMakeBuildConfigurationFactory::clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source)
{ {
if (!canClone(parent, source)) if (!canClone(parent, source))
return 0; return nullptr;
auto old = static_cast<CMakeBuildConfiguration *>(source); auto old = static_cast<CMakeBuildConfiguration *>(source);
return new CMakeBuildConfiguration(parent, old); return new CMakeBuildConfiguration(parent, old);
} }
@@ -586,12 +586,11 @@ bool CMakeBuildConfigurationFactory::canRestore(const ProjectExplorer::Target *p
CMakeBuildConfiguration *CMakeBuildConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map) CMakeBuildConfiguration *CMakeBuildConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map)
{ {
if (!canRestore(parent, map)) if (!canRestore(parent, map))
return 0; return nullptr;
auto bc = new CMakeBuildConfiguration(parent); auto bc = std::make_unique<CMakeBuildConfiguration>(parent);
if (bc->fromMap(map)) if (bc->fromMap(map))
return bc; return bc.release();
delete bc; return nullptr;
return 0;
} }
bool CMakeBuildConfigurationFactory::canHandle(const ProjectExplorer::Target *t) const bool CMakeBuildConfigurationFactory::canHandle(const ProjectExplorer::Target *t) const