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

GenericProject: Cleanup and modernize

Browse Source 
* Use nullptr instead 0
* Remove QLatin1{String|Char} where possible
* Use C++11 list init and auto
* Add some const as drive-by-change

Change-Id: Ife4c9c7b0869bcf2c864b88b8061ac6b7c3f33c0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2016-12-25 17:59:17 +01:00
committed by André Hartmann
parent c2d25982a1
commit 70556e8495
9 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
View File

@@ -118,7 +118,7 @@ BuildConfiguration *GenericBuildConfigurationFactory::create(Target *parent, con
QTC_ASSERT(info->kitId == parent->kit()->id(), return 0);
QTC_ASSERT(!info->displayName.isEmpty(), return 0);
GenericBuildConfiguration *bc = new GenericBuildConfiguration(parent);
auto bc = new GenericBuildConfiguration(parent);
bc->setDisplayName(info->displayName);
bc->setDefaultDisplayName(info->displayName);
bc->setBuildDirectory(info->buildDirectory);
@@ -127,14 +127,14 @@ BuildConfiguration *GenericBuildConfigurationFactory::create(Target *parent, con
BuildStepList *cleanSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
Q_ASSERT(buildSteps);
GenericMakeStep *makeStep = new GenericMakeStep(buildSteps);
auto makeStep = new GenericMakeStep(buildSteps);
buildSteps->insertStep(0, makeStep);
makeStep->setBuildTarget(QLatin1String("all"), /* on = */ true);
makeStep->setBuildTarget("all", /* on = */ true);
Q_ASSERT(cleanSteps);
GenericMakeStep *cleanMakeStep = new GenericMakeStep(cleanSteps);
auto cleanMakeStep = new GenericMakeStep(cleanSteps);
cleanSteps->insertStep(0, cleanMakeStep);
cleanMakeStep->setBuildTarget(QLatin1String("clean"), /* on = */ true);
cleanMakeStep->setBuildTarget("clean", /* on = */ true);
cleanMakeStep->setClean(true);
return bc;
@@ -165,7 +165,7 @@ BuildConfiguration *GenericBuildConfigurationFactory::restore(Target *parent, co
{
if (!canRestore(parent, map))
return 0;
GenericBuildConfiguration *bc(new GenericBuildConfiguration(parent));
auto bc = new GenericBuildConfiguration(parent);
if (bc->fromMap(map))
return bc;
delete bc;
@@ -182,7 +182,7 @@ bool GenericBuildConfigurationFactory::canHandle(const Target *t) const
BuildInfo *GenericBuildConfigurationFactory::createBuildInfo(const Kit *k,
const Utils::FileName &buildDir) const
{
BuildInfo *info = new BuildInfo(this);
auto info = new BuildInfo(this);
info->typeName = tr("Build");
info->buildDirectory = buildDir;
info->kitId = k->id();
@@ -201,13 +201,13 @@ BuildConfiguration::BuildType GenericBuildConfiguration::buildType() const
GenericBuildSettingsWidget::GenericBuildSettingsWidget(GenericBuildConfiguration *bc)
: m_buildConfiguration(0)
{
QFormLayout *fl = new QFormLayout(this);
auto fl = new QFormLayout(this);
fl->setContentsMargins(0, -1, 0, -1);
fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
// build directory
m_pathChooser = new Utils::PathChooser(this);
m_pathChooser->setHistoryCompleter(QLatin1String("Generic.BuildDir.History"));
m_pathChooser->setHistoryCompleter("Generic.BuildDir.History");
m_pathChooser->setEnabled(true);
fl->addRow(tr("Build directory:"), m_pathChooser);
connect(m_pathChooser, &Utils::PathChooser::rawPathChanged,