From 6615e52e4308962a7d10d606eead188fbfe198f3 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Tue, 19 Feb 2019 22:57:10 +0300 Subject: Use 'const auto' keywords more at objects allocations Change-Id: I592d433e7c473ae9f27ca08e701516efe53650ba Reviewed-by: Ivan Komissarov Reviewed-by: Christian Kandeler --- .../generator/visualstudio/msbuildfiltersproject.cpp | 4 ++-- .../visualstudio/msbuildqbsgenerateproject.cpp | 8 ++++---- .../visualstudio/msbuildqbsproductproject.cpp | 20 ++++++++++---------- .../msbuildsharedsolutionpropertiesproject.cpp | 2 +- .../msbuildsolutionpropertiesproject.cpp | 2 +- .../generator/visualstudio/msbuildtargetproject.cpp | 6 +++--- .../generator/visualstudio/visualstudiogenerator.cpp | 12 ++++++------ 7 files changed, 27 insertions(+), 27 deletions(-) (limited to 'src/plugins/generator/visualstudio') diff --git a/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp b/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp index 0897c929e..98ada0e01 100644 --- a/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp @@ -113,10 +113,10 @@ MSBuildFiltersProject::MSBuildFiltersProject(const GeneratableProductData &produ // filters projects are always v4.0 setToolsVersion(QStringLiteral("4.0")); - auto itemGroup = new MSBuildItemGroup(this); + const auto itemGroup = new MSBuildItemGroup(this); const auto filterOptions = defaultItemGroupFilters(); for (const auto options : filterOptions) { - auto filter = new MSBuildFilter(options->include(), options->extensions(), itemGroup); + const auto filter = new MSBuildFilter(options->include(), options->extensions(), itemGroup); filter->appendProperty(QStringLiteral("ParseFiles"), options->parseFiles()); filter->appendProperty(QStringLiteral("SourceControlFiles"), options->sourceControlFiles()); } diff --git a/src/plugins/generator/visualstudio/msbuildqbsgenerateproject.cpp b/src/plugins/generator/visualstudio/msbuildqbsgenerateproject.cpp index 51c72ecd3..24fc991ae 100644 --- a/src/plugins/generator/visualstudio/msbuildqbsgenerateproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildqbsgenerateproject.cpp @@ -46,10 +46,10 @@ MSBuildQbsGenerateProject::MSBuildQbsGenerateProject( VisualStudioGenerator *parent) : MSBuildTargetProject(project, versionInfo, parent) { - auto cppDefaultProps = new MSBuildImport(this); + const auto cppDefaultProps = new MSBuildImport(this); cppDefaultProps->setProject(QStringLiteral("$(VCTargetsPath)\\Microsoft.Cpp.Default.props")); - auto group = new MSBuildPropertyGroup(this); + const auto group = new MSBuildPropertyGroup(this); group->setLabel(QStringLiteral("Configuration")); group->appendProperty(QStringLiteral("PlatformToolset"), versionInfo.platformToolsetVersion()); @@ -60,10 +60,10 @@ MSBuildQbsGenerateProject::MSBuildQbsGenerateProject( group->appendProperty(QStringLiteral("NMakeBuildCommandLine"), QStringLiteral("$(QbsGenerateCommandLine) ") + params); - auto cppProps = new MSBuildImport(this); + const auto cppProps = new MSBuildImport(this); cppProps->setProject(QStringLiteral("$(VCTargetsPath)\\Microsoft.Cpp.props")); - auto import = new MSBuildImport(this); + const auto import = new MSBuildImport(this); import->setProject(QStringLiteral("$(VCTargetsPath)\\Microsoft.Cpp.targets")); } diff --git a/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp b/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp index 4dde9ac78..f9bfaab98 100644 --- a/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp @@ -72,7 +72,7 @@ MSBuildQbsProductProject::MSBuildQbsProductProject( globalsPropertyGroup()->appendProperty(QStringLiteral("QbsProductName"), product.name()); - auto cppDefaultProps = new MSBuildImport(this); + const auto cppDefaultProps = new MSBuildImport(this); cppDefaultProps->setProject(QStringLiteral("$(VCTargetsPath)\\Microsoft.Cpp.Default.props")); for (int i = 0; i < count; ++i) { @@ -83,7 +83,7 @@ MSBuildQbsProductProject::MSBuildQbsProductProject( project.commandLines.values().at(i)); } - auto cppProps = new MSBuildImport(this); + const auto cppProps = new MSBuildImport(this); cppProps->setProject(QStringLiteral("$(VCTargetsPath)\\Microsoft.Cpp.props")); for (int i = 0; i < count; ++i) @@ -142,7 +142,7 @@ void MSBuildQbsProductProject::addConfiguration(const GeneratableProject &projec const auto sep = Internal::HostOsInfo::pathListSeparator(Internal::HostOsInfo::HostOsWindows); - auto propertyGroup1 = new MSBuildPropertyGroup(this); + const auto propertyGroup1 = new MSBuildPropertyGroup(this); propertyGroup1->setCondition(MSBuildUtils::buildTaskCondition(buildTask)); propertyGroup1->setLabel(QStringLiteral("Configuration")); propertyGroup1->appendProperty(QStringLiteral("UseDebugLibraries"), @@ -271,10 +271,10 @@ void MSBuildQbsProductProject::addItemDefGroup(const Project &project, const auto sep = Internal::HostOsInfo::pathListSeparator(Internal::HostOsInfo::HostOsWindows); - auto itemDefGroup = new MSBuildItemDefinitionGroup(this); + const auto itemDefGroup = new MSBuildItemDefinitionGroup(this); itemDefGroup->setCondition(MSBuildUtils::buildTaskCondition(project)); - auto compile = new MSBuildClCompile(itemDefGroup); + const auto compile = new MSBuildClCompile(itemDefGroup); // C++ - General compile->appendProperty(QStringLiteral("AdditionalIncludeDirectories"), @@ -308,7 +308,7 @@ void MSBuildQbsProductProject::addItemDefGroup(const Project &project, ? QStringLiteral("MultiThreadedDebugDLL") : QStringLiteral("MultiThreadedDLL")); - auto link = new MSBuildLink(itemDefGroup); + const auto link = new MSBuildLink(itemDefGroup); // Linker - General link->appendProperty(QStringLiteral("AdditionalLibraryDirectories"), @@ -352,7 +352,7 @@ static MSBuildFileItem *fileItemForFileTags(const QList &fileTags, void MSBuildQbsProductProject::addFiles(const GeneratableProject &project, const GeneratableProductData &product) { - auto itemGroup = new MSBuildItemGroup(this); + const auto itemGroup = new MSBuildItemGroup(this); addQbsFile(project, product, itemGroup); @@ -393,7 +393,7 @@ void MSBuildQbsProductProject::addFiles(const GeneratableProject &project, while (projIt.hasNext()) { projIt.next(); if (!sourceFileEnabledConfigurations[sourceFileNode.first].contains(projIt.key())) { - auto metadata = new MSBuildItemMetadata( + const auto metadata = new MSBuildItemMetadata( QStringLiteral("ExcludedFromBuild"), QStringLiteral("true"), sourceFileNode.second); @@ -404,7 +404,7 @@ void MSBuildQbsProductProject::addFiles(const GeneratableProject &project, } } - auto import = new MSBuildImport(this); + const auto import = new MSBuildImport(this); import->setProject(QStringLiteral("$(VCTargetsPath)\\Microsoft.Cpp.targets")); } @@ -412,7 +412,7 @@ void MSBuildQbsProductProject::addQbsFile(const GeneratableProject &project, const GeneratableProductData &product, MSBuildItemGroup *itemGroup) { - auto fileItem = new MSBuildNone(itemGroup); + const auto fileItem = new MSBuildNone(itemGroup); QString path = project.baseBuildDirectory().relativeFilePath(product.location().filePath()); // The path still might not be relative (for example if the file item is // located on a different drive) diff --git a/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp b/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp index fbefccc08..b87c842fa 100644 --- a/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp @@ -108,7 +108,7 @@ MSBuildSharedSolutionPropertiesProject::MSBuildSharedSolutionPropertiesProject( setDefaultTargets(QStringLiteral("Build")); setToolsVersion(versionInfo.toolsVersion()); - auto group = new MSBuildPropertyGroup(this); + const auto group = new MSBuildPropertyGroup(this); group->setLabel(QStringLiteral("UserMacros")); // Order's important here... a variable must be listed before one that uses it diff --git a/src/plugins/generator/visualstudio/msbuildsolutionpropertiesproject.cpp b/src/plugins/generator/visualstudio/msbuildsolutionpropertiesproject.cpp index b0572e2e0..ea5546c73 100644 --- a/src/plugins/generator/visualstudio/msbuildsolutionpropertiesproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildsolutionpropertiesproject.cpp @@ -47,7 +47,7 @@ MSBuildSolutionPropertiesProject::MSBuildSolutionPropertiesProject( setDefaultTargets(QStringLiteral("Build")); setToolsVersion(versionInfo.toolsVersion()); - auto group = new MSBuildPropertyGroup(this); + const auto group = new MSBuildPropertyGroup(this); group->setLabel(QStringLiteral("UserMacros")); static const auto win = Internal::HostOsInfo::HostOsWindows; diff --git a/src/plugins/generator/visualstudio/msbuildtargetproject.cpp b/src/plugins/generator/visualstudio/msbuildtargetproject.cpp index 9a1d00476..8e3eb4e5a 100644 --- a/src/plugins/generator/visualstudio/msbuildtargetproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildtargetproject.cpp @@ -60,13 +60,13 @@ MSBuildTargetProject::MSBuildTargetProject(const GeneratableProject &project, setDefaultTargets(QStringLiteral("Build")); setToolsVersion(versionInfo.toolsVersion()); - auto projectConfigurationsGroup = new MSBuildItemGroup(this); + const auto projectConfigurationsGroup = new MSBuildItemGroup(this); projectConfigurationsGroup->setLabel(QStringLiteral("ProjectConfigurations")); QMapIterator it(project.projects); while (it.hasNext()) { it.next(); - auto item = new MSBuildItem(QStringLiteral("ProjectConfiguration"), + const auto item = new MSBuildItem(QStringLiteral("ProjectConfiguration"), projectConfigurationsGroup); item->setInclude(MSBuildUtils::fullName(it.value())); item->appendProperty(QStringLiteral("Configuration"), it.key()); @@ -129,7 +129,7 @@ MSBuildImportGroup *MSBuildTargetProject::propertySheetsImportGroup() void MSBuildTargetProject::appendPropertySheet(const QString &path, bool optional) { - auto import = new MSBuildImport(propertySheetsImportGroup()); + const auto import = new MSBuildImport(propertySheetsImportGroup()); import->setProject(path); if (optional) import->setCondition(QStringLiteral("Exists('%1')").arg(path)); diff --git a/src/plugins/generator/visualstudio/visualstudiogenerator.cpp b/src/plugins/generator/visualstudio/visualstudiogenerator.cpp index 4bdb08b59..47f0363a6 100644 --- a/src/plugins/generator/visualstudio/visualstudiogenerator.cpp +++ b/src/plugins/generator/visualstudio/visualstudiogenerator.cpp @@ -210,14 +210,14 @@ static QString targetFilePath(const GeneratableProductData &product, static void addDefaultGlobalSections(const GeneratableProject &topLevelProject, VisualStudioSolution *solution) { - auto configurationPlatformsSection = new VisualStudioSolutionGlobalSection( + const auto configurationPlatformsSection = new VisualStudioSolutionGlobalSection( QStringLiteral("SolutionConfigurationPlatforms"), solution); solution->appendGlobalSection(configurationPlatformsSection); for (const auto &qbsProject : topLevelProject.projects) configurationPlatformsSection->appendProperty(MSBuildUtils::fullName(qbsProject), MSBuildUtils::fullName(qbsProject)); - auto projectConfigurationPlatformsSection = new VisualStudioSolutionGlobalSection( + const auto projectConfigurationPlatformsSection = new VisualStudioSolutionGlobalSection( QStringLiteral("ProjectConfigurationPlatforms"), solution); solution->appendGlobalSection(projectConfigurationPlatformsSection); projectConfigurationPlatformsSection->setPost(true); @@ -236,7 +236,7 @@ static void addDefaultGlobalSections(const GeneratableProject &topLevelProject, } } - auto solutionPropsSection = new VisualStudioSolutionGlobalSection( + const auto solutionPropsSection = new VisualStudioSolutionGlobalSection( QStringLiteral("SolutionProperties"), solution); solution->appendGlobalSection(solutionPropsSection); solutionPropsSection->appendProperty(QStringLiteral("HideSolutionNode"), @@ -318,7 +318,7 @@ void VisualStudioGenerator::visitProject(const GeneratableProject &project) addPropertySheets(targetProject); - auto solutionProject = new VisualStudioSolutionFileProject( + const auto solutionProject = new VisualStudioSolutionFileProject( targetFilePath(qbsGenerate, project.baseBuildDirectory().absolutePath()), d->solution.get()); solutionProject->setGuid(targetProject->guid()); @@ -330,7 +330,7 @@ void VisualStudioGenerator::visitProjectData(const GeneratableProject &project, const GeneratableProjectData &projectData) { Q_UNUSED(project); - auto solutionFolder = new VisualStudioSolutionFolderProject(d->solution.get()); + const auto solutionFolder = new VisualStudioSolutionFolderProject(d->solution.get()); solutionFolder->setName(projectData.name()); d->solution->appendProject(solutionFolder); QBS_CHECK(!d->solutionFolders.contains(projectData.uniqueName())); @@ -356,7 +356,7 @@ void VisualStudioGenerator::visitProduct(const GeneratableProject &project, d->msbuildProjects.insert(projectFilePath + QStringLiteral(".filters"), std::make_shared(productData)); - auto solutionProject = new VisualStudioSolutionFileProject( + const auto solutionProject = new VisualStudioSolutionFileProject( targetFilePath(productData, project.baseBuildDirectory().absolutePath()), d->solution.get()); solutionProject->setGuid(targetProject->guid()); -- cgit v1.2.3