diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-05-13 16:04:10 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-05-13 14:20:10 +0000 |
commit | bef11b6fb4457d1913bf82d06a336fde18b73ac7 (patch) | |
tree | fc842c567a958e3532c3b19c217d505a1702c80e /plugins/haskell/haskellbuildconfiguration.cpp | |
parent | 1f0b6252f52d40305c9a1e0cdf72429448fdab2d (diff) |
Adapt to 4.94.9
Change-Id: I649fd586c31149153a501d011bcd95e3452404e8
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'plugins/haskell/haskellbuildconfiguration.cpp')
-rw-r--r-- | plugins/haskell/haskellbuildconfiguration.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/plugins/haskell/haskellbuildconfiguration.cpp b/plugins/haskell/haskellbuildconfiguration.cpp index 314a4e8..b09c7b4 100644 --- a/plugins/haskell/haskellbuildconfiguration.cpp +++ b/plugins/haskell/haskellbuildconfiguration.cpp @@ -58,33 +58,32 @@ HaskellBuildConfigurationFactory::HaskellBuildConfigurationFactory() setSupportedProjectMimeTypeName(Constants::C_HASKELL_PROJECT_MIMETYPE); } -static QList<BuildInfo *> createInfos(const HaskellBuildConfigurationFactory *factory, - const Kit *k, - const Utils::FileName &projectFilePath) +static QList<BuildInfo> createInfos(const HaskellBuildConfigurationFactory *factory, + const Kit *k, + const Utils::FileName &projectFilePath) { - auto info = new BuildInfo(factory); - info->typeName = HaskellBuildConfigurationFactory::tr("Release"); - info->displayName = info->typeName; - info->buildDirectory = projectFilePath.parentDir().appendPath(".stack-work"); - info->kitId = k->id(); - info->buildType = BuildConfiguration::BuildType::Release; + BuildInfo info(factory); + info.typeName = HaskellBuildConfigurationFactory::tr("Release"); + info.displayName = info.typeName; + info.buildDirectory = projectFilePath.parentDir().appendPath(".stack-work"); + info.kitId = k->id(); + info.buildType = BuildConfiguration::BuildType::Release; return {info}; } -QList<BuildInfo *> HaskellBuildConfigurationFactory::availableBuilds(const Target *parent) const +QList<BuildInfo> HaskellBuildConfigurationFactory::availableBuilds(const Target *parent) const { // Entries that are available in add build configuration dropdown return Utils::transform(createInfos(this, parent->kit(), parent->project()->projectFilePath()), - [](BuildInfo *info) { - info->displayName.clear(); + [](BuildInfo info) { + info.displayName.clear(); return info; }); } -QList<BuildInfo *> HaskellBuildConfigurationFactory::availableSetups( +QList<BuildInfo> HaskellBuildConfigurationFactory::availableSetups( const Kit *k, const QString &projectPath) const { - QTC_ASSERT(priority(k, projectPath) > -1, return {}); return createInfos(this, k, Utils::FileName::fromString(projectPath)); } @@ -107,12 +106,12 @@ void HaskellBuildConfiguration::setBuildType(BuildConfiguration::BuildType type) m_buildType = type; } -void HaskellBuildConfiguration::initialize(const BuildInfo *info) +void HaskellBuildConfiguration::initialize(const BuildInfo &info) { BuildConfiguration::initialize(info); - setBuildDirectory(info->buildDirectory); - setBuildType(info->buildType); - setDisplayName(info->displayName); + setBuildDirectory(info.buildDirectory); + setBuildType(info.buildType); + setDisplayName(info.displayName); BuildStepList *buildSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); auto stackBuildStep = new StackBuildStep(buildSteps); |