diff options
Diffstat (limited to 'src/plugins')
15 files changed, 16 insertions, 28 deletions
diff --git a/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp b/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp index d73cd49a6..3676d079e 100644 --- a/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp +++ b/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp @@ -74,8 +74,7 @@ void ClangCompilationDatabaseGenerator::generate() const QString &buildDir = projectData.buildDirectory(); for (const ProductData &productData : projectData.allProducts()) { - const auto groups = productData.groups(); - for (const GroupData &groupData : groups) { + for (const GroupData &groupData : productData.groups()) { const auto sourceArtifacts = groupData.allSourceArtifacts(); for (const ArtifactData &sourceArtifact : sourceArtifacts) { if (!hasValidInputFileTag(sourceArtifact.fileTags())) diff --git a/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp index 7e29c2788..2cabac587 100644 --- a/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp +++ b/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp @@ -60,8 +60,7 @@ struct ConfigPageOptions final // Enumerate all product linker config files // (which are set trough 'linkerscript' tag). - const auto qbsGroups = qbsProduct.groups(); - for (const auto &qbsGroup : qbsGroups) { + for (const auto &qbsGroup : qbsProduct.groups()) { if (!qbsGroup.isEnabled()) continue; const auto qbsArtifacts = qbsGroup.sourceArtifacts(); diff --git a/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp index 59ba515d9..0af4f088b 100644 --- a/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp @@ -60,8 +60,7 @@ struct ConfigPageOptions final // Enumerate all product linker config files // (which are set trough 'linkerscript' tag). - const auto qbsGroups = qbsProduct.groups(); - for (const auto &qbsGroup : qbsGroups) { + for (const auto &qbsGroup : qbsProduct.groups()) { const auto qbsArtifacts = qbsGroup.sourceArtifacts(); for (const auto &qbsArtifact : qbsArtifacts) { const auto qbsTags = qbsArtifact.fileTags(); diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp index 43c160045..8aa87794b 100644 --- a/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp +++ b/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp @@ -222,8 +222,7 @@ struct TargetPageOptions final // Enumerate all product linker config files // (which are set trough 'linkerscript' tag). - const auto qbsGroups = qbsProduct.groups(); - for (const auto &qbsGroup : qbsGroups) { + for (const auto &qbsGroup : qbsProduct.groups()) { const auto qbsArtifacts = qbsGroup.sourceArtifacts(); for (const auto &qbsArtifact : qbsArtifacts) { const auto qbsTags = qbsArtifact.fileTags(); diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp index a88ac22e1..d2c7f3846 100644 --- a/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp +++ b/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp @@ -59,8 +59,7 @@ struct ConfigPageOptions final // Enumerate all product linker config files // (which are set trough 'linkerscript' tag). - const auto qbsGroups = qbsProduct.groups(); - for (const auto &qbsGroup : qbsGroups) { + for (const auto &qbsGroup : qbsProduct.groups()) { const auto qbsArtifacts = qbsGroup.sourceArtifacts(); for (const auto &qbsArtifact : qbsArtifacts) { const auto qbsTags = qbsArtifact.fileTags(); diff --git a/src/plugins/generator/iarew/archs/msp430/msp430generalsettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/msp430/msp430generalsettingsgroup_v7.cpp index ac1c475d1..d99e15bb2 100644 --- a/src/plugins/generator/iarew/archs/msp430/msp430generalsettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/msp430/msp430generalsettingsgroup_v7.cpp @@ -117,8 +117,7 @@ struct TargetPageOptions final // Enumerate all product linker config files // (which are set trough 'linkerscript' tag). - const auto qbsGroups = qbsProduct.groups(); - for (const auto &qbsGroup : qbsGroups) { + for (const auto &qbsGroup : qbsProduct.groups()) { const auto qbsArtifacts = qbsGroup.sourceArtifacts(); for (const auto &qbsArtifact : qbsArtifacts) { const auto qbsTags = qbsArtifact.fileTags(); diff --git a/src/plugins/generator/iarew/archs/msp430/msp430linkersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/msp430/msp430linkersettingsgroup_v7.cpp index b85edbb83..85aac7e83 100644 --- a/src/plugins/generator/iarew/archs/msp430/msp430linkersettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/msp430/msp430linkersettingsgroup_v7.cpp @@ -56,8 +56,7 @@ struct ConfigPageOptions final // Enumerate all product linker config files // (which are set trough 'linkerscript' tag). - const auto qbsGroups = qbsProduct.groups(); - for (const auto &qbsGroup : qbsGroups) { + for (const auto &qbsGroup : qbsProduct.groups()) { const auto qbsArtifacts = qbsGroup.sourceArtifacts(); for (const auto &qbsArtifact : qbsArtifacts) { const auto qbsTags = qbsArtifact.fileTags(); diff --git a/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp index 8a9d13b9b..066c47931 100644 --- a/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp +++ b/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp @@ -56,8 +56,7 @@ struct ConfigPageOptions final // Enumerate all product linker config files // (which are set trough 'linkerscript' tag). - const auto qbsGroups = qbsProduct.groups(); - for (const auto &qbsGroup : qbsGroups) { + for (const auto &qbsGroup : qbsProduct.groups()) { const auto qbsArtifacts = qbsGroup.sourceArtifacts(); for (const auto &qbsArtifact : qbsArtifacts) { const auto qbsTags = qbsArtifact.fileTags(); diff --git a/src/plugins/generator/iarew/iarewutils.cpp b/src/plugins/generator/iarew/iarewutils.cpp index f00fce026..7196a391c 100644 --- a/src/plugins/generator/iarew/iarewutils.cpp +++ b/src/plugins/generator/iarew/iarewutils.cpp @@ -76,7 +76,7 @@ QString projectRelativeFilePath(const QString &basePath, OutputBinaryType outputBinaryType(const ProductData &qbsProduct) { - const auto qbsProductType = qbsProduct.type(); + const auto &qbsProductType = qbsProduct.type(); if (qbsProductType.contains(QLatin1String("application"))) return ApplicationOutputType; if (qbsProductType.contains(QLatin1String("staticlibrary"))) diff --git a/src/plugins/generator/keiluv/archs/arm/armtargetlinkergroup_v5.cpp b/src/plugins/generator/keiluv/archs/arm/armtargetlinkergroup_v5.cpp index 930aae020..5532b58b0 100644 --- a/src/plugins/generator/keiluv/archs/arm/armtargetlinkergroup_v5.cpp +++ b/src/plugins/generator/keiluv/archs/arm/armtargetlinkergroup_v5.cpp @@ -64,8 +64,7 @@ struct LinkerPageOptions final // Enumerate all product linker config files // (which are set trough 'linkerscript' tag). - const auto qbsGroups = qbsProduct.groups(); - for (const auto &qbsGroup : qbsGroups) { + for (const auto &qbsGroup : qbsProduct.groups()) { if (!qbsGroup.isEnabled()) continue; const auto qbsArtifacts = qbsGroup.sourceArtifacts(); diff --git a/src/plugins/generator/keiluv/keiluvfilesgroupspropertygroup.cpp b/src/plugins/generator/keiluv/keiluvfilesgroupspropertygroup.cpp index b9a234d6a..d1fda9876 100644 --- a/src/plugins/generator/keiluv/keiluvfilesgroupspropertygroup.cpp +++ b/src/plugins/generator/keiluv/keiluvfilesgroupspropertygroup.cpp @@ -158,8 +158,7 @@ KeiluvFilesGroupsPropertyGroup::KeiluvFilesGroupsPropertyGroup( const auto baseDirectory = gen::utils::buildRootPath(qbsProject); // Build source items. - const auto groups = qbsProduct.groups(); - for (const auto &group : groups) { + for (const auto &group : qbsProduct.groups()) { // Ignore disabled groups (e.g. when its condition property is false). if (!group.isEnabled()) continue; diff --git a/src/plugins/generator/keiluv/keiluvutils.cpp b/src/plugins/generator/keiluv/keiluvutils.cpp index 8932f0f16..ef93b9739 100644 --- a/src/plugins/generator/keiluv/keiluvutils.cpp +++ b/src/plugins/generator/keiluv/keiluvutils.cpp @@ -37,7 +37,7 @@ namespace KeiluvUtils { OutputBinaryType outputBinaryType(const ProductData &qbsProduct) { - const auto qbsProductType = qbsProduct.type(); + const auto &qbsProductType = qbsProduct.type(); if (qbsProductType.contains(QLatin1String("application"))) return ApplicationOutputType; if (qbsProductType.contains(QLatin1String("staticlibrary"))) diff --git a/src/plugins/generator/makefilegenerator/makefilegenerator.cpp b/src/plugins/generator/makefilegenerator/makefilegenerator.cpp index a158df0ac..af798965a 100644 --- a/src/plugins/generator/makefilegenerator/makefilegenerator.cpp +++ b/src/plugins/generator/makefilegenerator/makefilegenerator.cpp @@ -319,8 +319,7 @@ void qbs::MakefileGenerator::generate() << transformedInputFilePath << ' ' << transformedOutputDir << '\n'; } stream << "clean-" << productTarget << ":\n"; - const auto generatedArtifacts = productData.generatedArtifacts(); - for (const ArtifactData &artifact : generatedArtifacts) { + for (const ArtifactData &artifact : productData.generatedArtifacts()) { const QFileInfo fileInfo(artifact.filePath()); const QString transformedFilePath = QDir::toNativeSeparators( prefixifiedBuildDirPath(fileInfo.path()) diff --git a/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp b/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp index 1cd2573c3..a15e7fef3 100644 --- a/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp @@ -108,8 +108,7 @@ MSBuildFiltersProject::MSBuildFiltersProject(const GeneratableProductData &produ Internal::Set<QString> allFiles; const auto productDatas = product.data.values(); for (const auto &productData : productDatas) { - const auto groups = productData.groups(); - for (const auto &groupData : groups) + for (const auto &groupData : productData.groups()) if (groupData.isEnabled()) allFiles.unite(Internal::Set<QString>::fromList(groupData.allFilePaths())); } diff --git a/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp b/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp index 2d679ceb1..6f77212d4 100644 --- a/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp +++ b/src/plugins/generator/visualstudio/msbuildqbsproductproject.cpp @@ -126,7 +126,7 @@ void MSBuildQbsProductProject::addConfiguration(const GeneratableProject &projec relativeTargetDir = QStringLiteral("$(SolutionDir)$(Configuration)") + relativeTargetDir.mid(configurationDir.size()); - const auto properties = productData.moduleProperties(); + const auto &properties = productData.moduleProperties(); const bool debugBuild = properties.getModuleProperty(StringConstants::qbsModule(), QStringLiteral("debugInformation")) @@ -248,7 +248,7 @@ static QString subsystemVersion(const QString &version) void MSBuildQbsProductProject::addItemDefGroup(const Project &project, const ProductData &productData) { - const auto properties = productData.moduleProperties(); + const auto &properties = productData.moduleProperties(); const bool consoleApp = productData.properties().value(QStringLiteral("consoleApplication")) .toBool(); |