From ef540dc823b84be61562c83997eea42d0adf9cab Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Wed, 28 Aug 2019 17:58:38 +0300 Subject: baremetal: Change order for input parameters of addOptionsGroup() method ... and to make the 'version' as latest parameter with default value, that simplifies usage of that method a bit. Change-Id: Iad1e5097ee1d46d86d745c50090e2cd0e7343de9 Reviewed-by: Ivan Komissarov Reviewed-by: Christian Kandeler --- .../archs/arm/armarchiversettingsgroup_v8.cpp | 4 +- .../archs/arm/armassemblersettingsgroup_v8.cpp | 18 ++-- .../archs/arm/armcompilersettingsgroup_v8.cpp | 50 +++++------ .../iarew/archs/arm/armgeneralsettingsgroup_v8.cpp | 36 ++++---- .../iarew/archs/arm/armlinkersettingsgroup_v8.cpp | 40 ++++----- .../archs/avr/avrarchiversettingsgroup_v7.cpp | 4 +- .../archs/avr/avrassemblersettingsgroup_v7.cpp | 16 ++-- .../archs/avr/avrcompilersettingsgroup_v7.cpp | 56 ++++++------- .../iarew/archs/avr/avrgeneralsettingsgroup_v7.cpp | 30 +++---- .../iarew/archs/avr/avrlinkersettingsgroup_v7.cpp | 26 +++--- .../archs/mcs51/mcs51archiversettingsgroup_v10.cpp | 4 +- .../mcs51/mcs51assemblersettingsgroup_v10.cpp | 16 ++-- .../archs/mcs51/mcs51compilersettingsgroup_v10.cpp | 48 +++++------ .../archs/mcs51/mcs51generalsettingsgroup_v10.cpp | 96 +++++++++++----------- .../archs/mcs51/mcs51linkersettingsgroup_v10.cpp | 26 +++--- .../msp430/msp430archiversettingsgroup_v7.cpp | 4 +- .../msp430/msp430assemblersettingsgroup_v7.cpp | 16 ++-- .../msp430/msp430compilersettingsgroup_v7.cpp | 50 +++++------ .../archs/msp430/msp430generalsettingsgroup_v7.cpp | 44 +++++----- .../archs/msp430/msp430linkersettingsgroup_v7.cpp | 22 ++--- .../archs/stm8/stm8archiversettingsgroup_v3.cpp | 4 +- .../archs/stm8/stm8assemblersettingsgroup_v3.cpp | 18 ++-- .../archs/stm8/stm8compilersettingsgroup_v3.cpp | 42 +++++----- .../archs/stm8/stm8generalsettingsgroup_v3.cpp | 26 +++--- .../archs/stm8/stm8linkersettingsgroup_v3.cpp | 30 +++---- .../generator/iarew/iarewoptionpropertygroup.cpp | 5 +- .../generator/iarew/iarewoptionpropertygroup.h | 4 +- .../generator/iarew/iarewsettingspropertygroup.cpp | 6 +- .../generator/iarew/iarewsettingspropertygroup.h | 4 +- 29 files changed, 372 insertions(+), 373 deletions(-) diff --git a/src/plugins/generator/iarew/archs/arm/armarchiversettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armarchiversettingsgroup_v8.cpp index 210c757da..cc0750627 100644 --- a/src/plugins/generator/iarew/archs/arm/armarchiversettingsgroup_v8.cpp +++ b/src/plugins/generator/iarew/archs/arm/armarchiversettingsgroup_v8.cpp @@ -83,10 +83,10 @@ void ArmArchiverSettingsGroup::buildOutputPage( const OutputPageOptions opts(baseDirectory, qbsProduct); // Add 'IarchiveOverride' item (Override default). addOptionsGroup(QByteArrayLiteral("IarchiveOverride"), - {}, {1}); + {1}); // Add 'IarchiveOutput' item (Output filename). addOptionsGroup(QByteArrayLiteral("IarchiveOutput"), - {}, {opts.outputFile}); + {opts.outputFile}); } } // namespace v8 diff --git a/src/plugins/generator/iarew/archs/arm/armassemblersettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armassemblersettingsgroup_v8.cpp index b7870d626..66c4c9ee6 100644 --- a/src/plugins/generator/iarew/archs/arm/armassemblersettingsgroup_v8.cpp +++ b/src/plugins/generator/iarew/archs/arm/armassemblersettingsgroup_v8.cpp @@ -178,17 +178,17 @@ void ArmAssemblerSettingsGroup::buildLanguagePage( const LanguagePageOptions opts(qbsProduct); // Add 'ACaseSensitivity' item (User symbols are case sensitive). addOptionsGroup(QByteArrayLiteral("ACaseSensitivity"), - {}, {opts.enableSymbolsCaseSensitive}); + {opts.enableSymbolsCaseSensitive}); // Add 'AltRegisterNames' item (Allow alternative register names, // mnemonics and operands). addOptionsGroup(QByteArrayLiteral("AltRegisterNames"), - {}, {opts.allowAlternativeRegister}); + {opts.allowAlternativeRegister}); // Add 'AsmNoLiteralPool' item (No data reads in code memory). addOptionsGroup(QByteArrayLiteral("AsmNoLiteralPool"), - {}, {opts.disableCodeMemoryDataReads}); + {opts.disableCodeMemoryDataReads}); // Add 'MacroChars' item (Macro quote characters: ()/[]/{}/<>). addOptionsGroup(QByteArrayLiteral("MacroChars"), - {0}, {opts.macroQuoteCharacter}); + {opts.macroQuoteCharacter}, 0); } void ArmAssemblerSettingsGroup::buildOutputPage( const ProductData &qbsProduct) @@ -196,7 +196,7 @@ void ArmAssemblerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'ADebug' item (Generate debug information). addOptionsGroup(QByteArrayLiteral("ADebug"), - {}, {opts.debugInfo}); + {opts.debugInfo}); } void ArmAssemblerSettingsGroup::buildPreprocessorPage( @@ -206,10 +206,10 @@ void ArmAssemblerSettingsGroup::buildPreprocessorPage( const PreprocessorPageOptions opts(baseDirectory, qbsProduct); // Add 'ADefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("ADefines"), - {}, opts.defineSymbols); + opts.defineSymbols); // Add 'AUserIncludes' item (Additional include directories). addOptionsGroup(QByteArrayLiteral("AUserIncludes"), - {}, opts.includePaths); + opts.includePaths); } void ArmAssemblerSettingsGroup::buildDiagnosticsPage( @@ -218,10 +218,10 @@ void ArmAssemblerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'AWarnEnable' item (Enable/disable warnings). addOptionsGroup(QByteArrayLiteral("AWarnEnable"), - {}, {opts.enableWarnings}); + {opts.enableWarnings}); // Add 'AWarnWhat' item (Enable/disable all warnings). addOptionsGroup(QByteArrayLiteral("AWarnWhat"), - {}, {opts.enableAllWarnings}); + {opts.enableAllWarnings}); } } // namespace v8 diff --git a/src/plugins/generator/iarew/archs/arm/armcompilersettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armcompilersettingsgroup_v8.cpp index bbe5b1758..0981fade4 100644 --- a/src/plugins/generator/iarew/archs/arm/armcompilersettingsgroup_v8.cpp +++ b/src/plugins/generator/iarew/archs/arm/armcompilersettingsgroup_v8.cpp @@ -350,7 +350,7 @@ void ArmCompilerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'CCDebugInfo' item (Generate debug info). addOptionsGroup(QByteArrayLiteral("CCDebugInfo"), - {}, {opts.debugInfo}); + {opts.debugInfo}); } void ArmCompilerSettingsGroup::buildLanguageOnePage( @@ -360,31 +360,31 @@ void ArmCompilerSettingsGroup::buildLanguageOnePage( // Add 'IccLang' item with 'auto-extension based' // value (Language: C/C++/Auto). addOptionsGroup(QByteArrayLiteral("IccLang"), - {}, {opts.languageExtension}); + {opts.languageExtension}); // Add 'IccCDialect' item (C dialect: c89/99/11). addOptionsGroup(QByteArrayLiteral("IccCDialect"), - {}, {opts.cLanguageDialect}); + {opts.cLanguageDialect}); // Add 'CCExt' item (Language conformance: IAR/relaxed/strict). addOptionsGroup(QByteArrayLiteral("CCLangConformance"), - {}, {opts.languageConformance}); + {opts.languageConformance}); // Add 'IccExceptions2' item (Enable exceptions). addOptionsGroup(QByteArrayLiteral("IccExceptions2"), - {}, {opts.enableExceptions}); + {opts.enableExceptions}); // Add 'IccRTTI2' item (Enable RTTI). addOptionsGroup(QByteArrayLiteral("IccRTTI2"), - {}, {opts.enableRtti}); + {opts.enableRtti}); // Add 'IccStaticDestr' item (Destroy static objects). addOptionsGroup(QByteArrayLiteral("IccStaticDestr"), - {}, {opts.destroyStaticObjects}); + {opts.destroyStaticObjects}); // Add 'IccAllowVLA' item (Allow VLA). addOptionsGroup(QByteArrayLiteral("IccAllowVLA"), - {}, {opts.allowVla}); + {opts.allowVla}); // Add 'IccCppInlineSemantics' item (C++ inline semantics). addOptionsGroup(QByteArrayLiteral("IccCppInlineSemantics"), - {}, {opts.enableInlineSemantics}); + {opts.enableInlineSemantics}); // Add 'CCRequirePrototypes' item (Require prototypes). addOptionsGroup(QByteArrayLiteral("CCRequirePrototypes"), - {}, {opts.requirePrototypes}); + {opts.requirePrototypes}); } void ArmCompilerSettingsGroup::buildLanguageTwoPage( @@ -393,11 +393,11 @@ void ArmCompilerSettingsGroup::buildLanguageTwoPage( const LanguageTwoPageOptions opts(qbsProduct); // Add 'CCSignedPlainChar' item (Plain char is: signed/unsigned). addOptionsGroup(QByteArrayLiteral("CCSignedPlainChar"), - {}, {opts.plainCharacter}); + {opts.plainCharacter}); // Add 'IccFloatSemantics' item // (Floating-point semantic: strict/relaxed). addOptionsGroup(QByteArrayLiteral("IccFloatSemantics"), - {}, {opts.floatingPointSemantic}); + {opts.floatingPointSemantic}); } void ArmCompilerSettingsGroup::buildOptimizationsPage( @@ -407,11 +407,11 @@ void ArmCompilerSettingsGroup::buildOptimizationsPage( // Add 'CCOptStrategy', 'CCOptLevel' // and 'CCOptLevelSlave' items (Level). addOptionsGroup(QByteArrayLiteral("CCOptStrategy"), - {}, {opts.optimizationStrategy}); + {opts.optimizationStrategy}); addOptionsGroup(QByteArrayLiteral("CCOptLevel"), - {}, {opts.optimizationLevel}); + {opts.optimizationLevel}); addOptionsGroup(QByteArrayLiteral("CCOptLevelSlave"), - {}, {opts.optimizationLevelSlave}); + {opts.optimizationLevelSlave}); // Add 'CCAllowList' item (Enabled optimizations: 6 check boxes). const QString transformations = QStringLiteral("%1%2%3%4%5%6%7%8") .arg(opts.enableCommonSubexpressionElimination) @@ -423,10 +423,10 @@ void ArmCompilerSettingsGroup::buildOptimizationsPage( .arg(opts.enableInstructionScheduling) .arg(opts.enableVectorization); addOptionsGroup(QByteArrayLiteral("CCAllowList"), - {}, {transformations}); + {transformations}); // Add 'CCOptimizationNoSizeConstraints' item (No size constraints). addOptionsGroup(QByteArrayLiteral("CCOptimizationNoSizeConstraints"), - {}, {opts.disableSizeConstraints}); + {opts.disableSizeConstraints}); } void ArmCompilerSettingsGroup::buildPreprocessorPage( @@ -436,10 +436,10 @@ void ArmCompilerSettingsGroup::buildPreprocessorPage( const PreprocessorPageOptions opts(baseDirectory, qbsProduct); // Add 'CCDefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("CCDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); // Add 'CCIncludePath2' item (Additional include directories). addOptionsGroup(QByteArrayLiteral("CCIncludePath2"), - {}, opts.includePaths); + opts.includePaths); } void ArmCompilerSettingsGroup::buildDiagnosticsPage( @@ -448,7 +448,7 @@ void ArmCompilerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'CCDiagWarnAreErr' item (Treat all warnings as errors). addOptionsGroup(QByteArrayLiteral("CCDiagWarnAreErr"), - {}, {opts.treatWarningsAsErrors}); + {opts.treatWarningsAsErrors}); } void ArmCompilerSettingsGroup::buildCodePage( @@ -457,19 +457,19 @@ void ArmCompilerSettingsGroup::buildCodePage( const CodePageOptions opts(qbsProduct); // Add 'IProcessorMode2' item (Processor mode: arm/thumb). addOptionsGroup(QByteArrayLiteral("IProcessorMode2"), - {}, {opts.cpuMode}); + {opts.cpuMode}); // Add 'CCPosIndRopi' item (Code and read-only data "ropi"). addOptionsGroup(QByteArrayLiteral("CCPosIndRopi"), - {}, {opts.generateReadOnlyPosIndependentCode}); + {opts.generateReadOnlyPosIndependentCode}); // Add 'CCPosIndRwpi' item (Read/write data "rwpi"). - addOptionsGroup(QByteArrayLiteral("CCPosIndRwpi"), {}, + addOptionsGroup(QByteArrayLiteral("CCPosIndRwpi"), {opts.generateReadWritePosIndependentCode}); // Add 'CCPosIndNoDynInit' item (No dynamic read/write initialization). addOptionsGroup(QByteArrayLiteral("CCPosIndNoDynInit"), - {}, {opts.disableDynamicReadWriteInitialization}); + {opts.disableDynamicReadWriteInitialization}); // Add 'CCNoLiteralPool' item (No data reads in code memory). addOptionsGroup(QByteArrayLiteral("CCNoLiteralPool"), - {}, {opts.disableCodeMemoryDataReads}); + {opts.disableCodeMemoryDataReads}); } } // namespace v8 diff --git a/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp index d98dd0ebf..911873cf4 100644 --- a/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp +++ b/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp @@ -461,19 +461,19 @@ void ArmGeneralSettingsGroup::buildTargetPage( // Add 'GBECoreSlave', 'CoreVariant', 'GFPUCoreSlave2' items // (Processor variant chooser). addOptionsGroup(QByteArrayLiteral("GBECoreSlave"), - {26}, {opts.targetCpu}); + {opts.targetCpu}, 26); addOptionsGroup(QByteArrayLiteral("CoreVariant"), - {26}, {opts.targetCpu}); + {opts.targetCpu}, 26); addOptionsGroup(QByteArrayLiteral("GFPUCoreSlave2"), - {26}, {opts.targetCpu}); + {opts.targetCpu}, 26); // Add 'FPU2', 'NrRegs' item (Floating point settings chooser). addOptionsGroup(QByteArrayLiteral("FPU2"), - {0}, {opts.targetFpu}); + {opts.targetFpu}, 0); addOptionsGroup(QByteArrayLiteral("NrRegs"), - {0}, {opts.targetFpuRegs}); + {opts.targetFpuRegs}, 0); // Add 'GEndianMode' item (Endian mode chooser). addOptionsGroup(QByteArrayLiteral("GEndianMode"), - {}, {opts.endianness}); + {opts.endianness}); } void ArmGeneralSettingsGroup::buildLibraryOptionsOnePage( @@ -482,10 +482,10 @@ void ArmGeneralSettingsGroup::buildLibraryOptionsOnePage( const LibraryOnePageOptions opts(qbsProduct); // Add 'OGPrintfVariant' item (Printf formatter). addOptionsGroup(QByteArrayLiteral("OGPrintfVariant"), - {}, {opts.printfFormatter}); + {opts.printfFormatter}); // Add 'OGScanfVariant' item (Printf formatter). addOptionsGroup(QByteArrayLiteral("OGScanfVariant"), - {}, {opts.scanfFormatter}); + {opts.scanfFormatter}); } void ArmGeneralSettingsGroup::buildLibraryOptionsTwoPage( @@ -495,7 +495,7 @@ void ArmGeneralSettingsGroup::buildLibraryOptionsTwoPage( // Add 'OgLibHeap' item (Heap selection: // auto/advanced/basic/nofree). addOptionsGroup(QByteArrayLiteral("OgLibHeap"), - {}, {opts.heapType}); + {opts.heapType}); } void ArmGeneralSettingsGroup::buildLibraryConfigPage( @@ -507,19 +507,19 @@ void ArmGeneralSettingsGroup::buildLibraryConfigPage( // and 'RTConfigPath2' items // (Link with runtime: none/normal/full/custom). addOptionsGroup(QByteArrayLiteral("GRuntimeLibSelect"), - {}, {opts.dlibType}); + {opts.dlibType}); addOptionsGroup(QByteArrayLiteral("GRuntimeLibSelectSlave"), - {}, {opts.dlibType}); + {opts.dlibType}); addOptionsGroup(QByteArrayLiteral("RTConfigPath2"), - {}, {opts.dlibConfigPath}); + {opts.dlibConfigPath}); // Add 'GRuntimeLibThreads'item // (Enable thread support in library). addOptionsGroup(QByteArrayLiteral("GRuntimeLibThreads"), - {}, {opts.threadSupport}); + {opts.threadSupport}); // Add 'GenLowLevelInterface' item (Library low-level // interface: none/semihosted/breakpoint). addOptionsGroup(QByteArrayLiteral("GenLowLevelInterface"), - {}, {opts.lowLevelInterface}); + {opts.lowLevelInterface}); } void ArmGeneralSettingsGroup::buildOutputPage( @@ -530,19 +530,19 @@ void ArmGeneralSettingsGroup::buildOutputPage( // Add 'GOutputBinary' item // (Output file: executable/library). addOptionsGroup(QByteArrayLiteral("GOutputBinary"), - {}, {opts.binaryType}); + {opts.binaryType}); // Add 'ExePath' item // (Executable/binaries output directory). addOptionsGroup(QByteArrayLiteral("ExePath"), - {}, {opts.binaryDirectory}); + {opts.binaryDirectory}); // Add 'ObjPath' item // (Object files output directory). addOptionsGroup(QByteArrayLiteral("ObjPath"), - {}, {opts.objectDirectory}); + {opts.objectDirectory}); // Add 'ListPath' item // (List files output directory). addOptionsGroup(QByteArrayLiteral("ListPath"), - {}, {opts.listingDirectory}); + {opts.listingDirectory}); } } // namespace v8 diff --git a/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp index 1fdbce5ce..b6b755b70 100644 --- a/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp +++ b/src/plugins/generator/iarew/archs/arm/armlinkersettingsgroup_v8.cpp @@ -332,7 +332,7 @@ void ArmLinkerSettingsGroup::buildConfigPage( // Add 'IlinkConfigDefines' item // (Configuration file symbol definitions). addOptionsGroup(QByteArrayLiteral("IlinkConfigDefines"), - {}, opts.configDefines); + opts.configDefines); if (opts.configFilePaths.count() > 0) { // Note: IAR IDE does not allow to specify a multiple config files, @@ -342,10 +342,10 @@ void ArmLinkerSettingsGroup::buildConfigPage( const QVariant configPath = opts.configFilePaths.takeFirst(); // Add 'IlinkIcfOverride' item (Override default). addOptionsGroup(QByteArrayLiteral("IlinkIcfOverride"), - {}, {1}); + {1}); // Add 'IlinkIcfFile' item (Linker configuration file). addOptionsGroup(QByteArrayLiteral("IlinkIcfFile"), - {}, {configPath}); + {configPath}); // Add remainder configuration files to the "Extra options page". if (!opts.configFilePaths.isEmpty()) { @@ -367,24 +367,24 @@ void ArmLinkerSettingsGroup::buildLibraryPage( // Add 'IlinkOverrideProgramEntryLabel' item // (Override default program entry). addOptionsGroup(QByteArrayLiteral("IlinkOverrideProgramEntryLabel"), - {}, {1}); + {1}); const int select = opts.entryPoint.isEmpty() ? 1 : 0; addOptionsGroup(QByteArrayLiteral("IlinkProgramEntryLabelSelect"), - {}, {select}); + {select}); // Add 'IlinkProgramEntryLabel' item (Entry point name). addOptionsGroup(QByteArrayLiteral("IlinkProgramEntryLabel"), - {}, {opts.entryPoint}); + {opts.entryPoint}); if (!opts.staticLibraries.isEmpty()) { // Add 'IlinkAdditionalLibs' item (Additional libraries). addOptionsGroup(QByteArrayLiteral("IlinkAdditionalLibs"), - {}, opts.staticLibraries); + opts.staticLibraries); } // Add 'IlinkAutoLibEnable' item // (Automatic runtime library selection). addOptionsGroup(QByteArrayLiteral("IlinkAutoLibEnable"), - {}, {opts.enableRuntimeLibsSearch}); + {opts.enableRuntimeLibsSearch}); // Add library searh directories to the // "Extra options page", because IAR IDE @@ -402,10 +402,10 @@ void ArmLinkerSettingsGroup::buildOutputPage( // Add 'IlinkDebugInfoEnable' item // (Include debug information in output). addOptionsGroup(QByteArrayLiteral("IlinkDebugInfoEnable"), - {}, {opts.debugInfo}); + {opts.debugInfo}); // Add 'IlinkOutputFile' item (Output filename). addOptionsGroup(QByteArrayLiteral("IlinkOutputFile"), - {}, {opts.outputFile}); + {opts.outputFile}); } void ArmLinkerSettingsGroup::buildInputPage( @@ -414,7 +414,7 @@ void ArmLinkerSettingsGroup::buildInputPage( const InputPageOptions opts(qbsProduct); // Add 'IlinkKeepSymbols' item (). addOptionsGroup(QByteArrayLiteral("IlinkKeepSymbols"), - {}, opts.keepSymbols); + opts.keepSymbols); } void ArmLinkerSettingsGroup::buildListPage( @@ -423,7 +423,7 @@ void ArmLinkerSettingsGroup::buildListPage( const ListPageOptions opts(qbsProduct); // Add 'IlinkMapFile' item (Generate linker map file). addOptionsGroup(QByteArrayLiteral("IlinkMapFile"), - {}, {opts.generateMap}); + {opts.generateMap}); } void ArmLinkerSettingsGroup::buildOptimizationsPage( @@ -432,15 +432,15 @@ void ArmLinkerSettingsGroup::buildOptimizationsPage( const OptimizationsPageOptions opts(qbsProduct); // Add 'IlinkOptInline' item (Inline small routines). addOptionsGroup(QByteArrayLiteral("IlinkOptInline"), - {}, {opts.inlineSmallRoutines}); + {opts.inlineSmallRoutines}); // Add 'IlinkOptMergeDuplSections'item // (Merge duplicate sections). addOptionsGroup(QByteArrayLiteral("IlinkOptMergeDuplSections"), - {}, {opts.mergeDuplicateSections}); + {opts.mergeDuplicateSections}); // Add 'IlinkOptUseVfe' item // (Perform C++ virtual functions elimination). addOptionsGroup(QByteArrayLiteral("IlinkOptUseVfe"), - {}, {opts.virtualFuncElimination}); + {opts.virtualFuncElimination}); } void ArmLinkerSettingsGroup::buildAdvancedPage( @@ -449,7 +449,7 @@ void ArmLinkerSettingsGroup::buildAdvancedPage( const AdvancedPageOptions opts(qbsProduct); // Add 'IlinkOptExceptionsAllow' item (Allow C++ exceptions). addOptionsGroup(QByteArrayLiteral("IlinkOptExceptionsAllow"), - {}, {opts.allowExceptions}); + {opts.allowExceptions}); } void ArmLinkerSettingsGroup::buildDefinesPage( @@ -458,7 +458,7 @@ void ArmLinkerSettingsGroup::buildDefinesPage( const DefinesPageOptions opts(qbsProduct); // Add 'IlinkDefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("IlinkDefines"), - {}, {opts.defineSymbols}); + {opts.defineSymbols}); } void ArmLinkerSettingsGroup::buildDiagnosticsPage( @@ -468,7 +468,7 @@ void ArmLinkerSettingsGroup::buildDiagnosticsPage( // Add 'IlinkWarningsAreErrors' item // (Treat all warnings as errors). addOptionsGroup(QByteArrayLiteral("IlinkWarningsAreErrors"), - {}, {opts.treatWarningsAsErrors}); + {opts.treatWarningsAsErrors}); } void ArmLinkerSettingsGroup::buildExtraOptionsPage( @@ -478,9 +478,9 @@ void ArmLinkerSettingsGroup::buildExtraOptionsPage( // Add 'IlinkUseExtraOptions' and 'IlinkExtraOptions' items. addOptionsGroup(QByteArrayLiteral("IlinkUseExtraOptions"), - {}, {1}); + {1}); addOptionsGroup(QByteArrayLiteral("IlinkExtraOptions"), - {}, m_extraOptions); + m_extraOptions); } } // namespace v8 diff --git a/src/plugins/generator/iarew/archs/avr/avrarchiversettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrarchiversettingsgroup_v7.cpp index a3babc1d1..4e002d13f 100644 --- a/src/plugins/generator/iarew/archs/avr/avrarchiversettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/avr/avrarchiversettingsgroup_v7.cpp @@ -82,10 +82,10 @@ void AvrArchiverSettingsGroup::buildOutputPage(const QString &baseDirectory, const OutputPageOptions opts(baseDirectory, qbsProduct); // Add 'XAROutOverride' item (Override default). addOptionsGroup(QByteArrayLiteral("XAROutOverride"), - {}, {1}); + {1}); // Add 'OutputFile' item (Output filename). addOptionsGroup(QByteArrayLiteral("OutputFile"), - {}, {opts.outputFile}); + {opts.outputFile}); } } // namespace v7 diff --git a/src/plugins/generator/iarew/archs/avr/avrassemblersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrassemblersettingsgroup_v7.cpp index ecb5400ea..08e86be53 100644 --- a/src/plugins/generator/iarew/archs/avr/avrassemblersettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/avr/avrassemblersettingsgroup_v7.cpp @@ -177,13 +177,13 @@ void AvrAssemblerSettingsGroup::buildLanguagePage( const LanguagePageOptions opts(qbsProduct); // Add 'ACaseSensitivity' item (User symbols are case sensitive). addOptionsGroup(QByteArrayLiteral("ACaseSensitivity"), - {}, {opts.enableSymbolsCaseSensitive}); + {opts.enableSymbolsCaseSensitive}); // Add 'AsmMultiByteSupport' item (Enable multibyte support). addOptionsGroup(QByteArrayLiteral("AsmMultiByteSupport"), - {}, {opts.enableMultibyteSupport}); + {opts.enableMultibyteSupport}); // Add 'MacroChars' item (Macro quote characters: ()/[]/{}/<>). addOptionsGroup(QByteArrayLiteral("MacroChars"), - {0}, {opts.macroQuoteCharacter}); + {opts.macroQuoteCharacter}, 0); } void AvrAssemblerSettingsGroup::buildOutputPage( @@ -192,7 +192,7 @@ void AvrAssemblerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'CDebug' item (Generate debug information). addOptionsGroup(QByteArrayLiteral("CDebug"), - {}, {opts.debugInfo}); + {opts.debugInfo}); } void AvrAssemblerSettingsGroup::buildPreprocessorPage( @@ -202,10 +202,10 @@ void AvrAssemblerSettingsGroup::buildPreprocessorPage( const PreprocessorPageOptions opts(baseDirectory, qbsProduct); // Add 'ADefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("ADefines"), - {}, opts.defineSymbols); + opts.defineSymbols); // Add 'AUserIncludes' item (Additional include directories). addOptionsGroup(QByteArrayLiteral("ANewIncludes"), - {}, opts.includePaths); + opts.includePaths); } void AvrAssemblerSettingsGroup::buildDiagnosticsPage( @@ -214,10 +214,10 @@ void AvrAssemblerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'AWarnEnable' item (Enable/disable warnings). addOptionsGroup(QByteArrayLiteral("AWarnEnable"), - {}, {opts.enableWarnings}); + {opts.enableWarnings}); // Add 'AWarnWhat' item (Enable/disable all warnings). addOptionsGroup(QByteArrayLiteral("AWarnWhat"), - {}, {opts.enableAllWarnings}); + {opts.enableAllWarnings}); } } // namespace v7 diff --git a/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.cpp index 5c89c2d88..26b6858f1 100644 --- a/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.cpp @@ -348,17 +348,17 @@ void AvrCompilerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'CCDebugInfo' item (Generate debug info). addOptionsGroup(QByteArrayLiteral("CCDebugInfo"), - {}, {opts.debugInfo}); + {opts.debugInfo}); // Add 'CCNoErrorMsg' item (No error messages in output files). addOptionsGroup(QByteArrayLiteral("CCNoErrorMsg"), - {}, {opts.disableErrorMessages}); + {opts.disableErrorMessages}); // Add 'CCOverrideModuleTypeDefault' item // (Override default module type). addOptionsGroup(QByteArrayLiteral("CCOverrideModuleTypeDefault"), - {}, {1}); + {1}); // Add 'CCRadioModuleType' item (Module type: program/library). addOptionsGroup(QByteArrayLiteral("CCRadioModuleType"), - {}, {opts.moduleType}); + {opts.moduleType}); } void AvrCompilerSettingsGroup::buildLanguageOnePage( @@ -368,28 +368,28 @@ void AvrCompilerSettingsGroup::buildLanguageOnePage( // Add 'IccLang' item with 'auto-extension based' // value (Language: C/C++/Auto). addOptionsGroup(QByteArrayLiteral("IccLang"), - {}, {opts.languageExtension}); + {opts.languageExtension}); // Add 'IccCDialect' item (C dialect: c89/99/11). addOptionsGroup(QByteArrayLiteral("IccCDialect"), - {}, {opts.cLanguageDialect}); + {opts.cLanguageDialect}); // Add 'IccCppDialect' item (C++ dialect: embedded/extended). addOptionsGroup(QByteArrayLiteral("IccCppDialect"), - {}, {opts.cxxLanguageDialect}); + {opts.cxxLanguageDialect}); // Add 'CCExt' item (Language conformance: IAR/relaxed/strict). addOptionsGroup(QByteArrayLiteral("CCExt"), - {}, {opts.languageConformance}); + {opts.languageConformance}); // Add 'IccAllowVLA' item (Allow VLA). addOptionsGroup(QByteArrayLiteral("IccAllowVLA"), - {}, {opts.allowVla}); + {opts.allowVla}); // Add 'IccCppInlineSemantics' item (C++ inline semantics). addOptionsGroup(QByteArrayLiteral("IccCppInlineSemantics"), - {}, {opts.useCppInlineSemantics}); + {opts.useCppInlineSemantics}); // Add 'CCRequirePrototypes' item (Require prototypes). addOptionsGroup(QByteArrayLiteral("CCRequirePrototypes"), - {}, {opts.requirePrototypes}); + {opts.requirePrototypes}); // Add 'IccStaticDestr' item (Destroy static objects). addOptionsGroup(QByteArrayLiteral("IccStaticDestr"), - {}, {opts.destroyStaticObjects}); + {opts.destroyStaticObjects}); } void AvrCompilerSettingsGroup::buildLanguageTwoPage( @@ -398,14 +398,14 @@ void AvrCompilerSettingsGroup::buildLanguageTwoPage( const LanguageTwoPageOptions opts(qbsProduct); // Add 'CCCharIs' item (Plain char is: signed/unsigned). addOptionsGroup(QByteArrayLiteral("CCCharIs"), - {}, {opts.plainCharacter}); + {opts.plainCharacter}); // Add 'IccFloatSemantics' item (Floatic-point // semantics: strict/relaxed conformance). addOptionsGroup(QByteArrayLiteral("IccFloatSemantics"), - {}, {opts.floatingPointSemantic}); + {opts.floatingPointSemantic}); // Add 'CCMultibyteSupport' item (Enable multibyte support). addOptionsGroup(QByteArrayLiteral("CCMultibyteSupport"), - {}, {opts.enableMultibyteSupport}); + {opts.enableMultibyteSupport}); } void AvrCompilerSettingsGroup::buildOptimizationsPage( @@ -415,11 +415,11 @@ void AvrCompilerSettingsGroup::buildOptimizationsPage( // Add 'CCOptStrategy', 'CCOptLevel' and // 'CCOptLevelSlave' items (Level). addOptionsGroup(QByteArrayLiteral("CCOptStrategy"), - {}, {opts.optimizationStrategy}); + {opts.optimizationStrategy}); addOptionsGroup(QByteArrayLiteral("CCOptLevel"), - {}, {opts.optimizationLevel}); + {opts.optimizationLevel}); addOptionsGroup(QByteArrayLiteral("CCOptLevelSlave"), - {}, {opts.optimizationLevelSlave}); + {opts.optimizationLevelSlave}); // Add 'CCAllowList' item // (Enabled optimizations: 6 check boxes). const QString bitflags = QStringLiteral("%1%2%3%4%5%6") @@ -430,11 +430,11 @@ void AvrCompilerSettingsGroup::buildOptimizationsPage( .arg(opts.enableVariableClustering) .arg(opts.enableTypeBasedAliasAnalysis); addOptionsGroup(QByteArrayLiteral("CCAllowList"), - {}, {bitflags}); + {bitflags}); // Add 'CCOptForceCrossCall' item // (Always do cross call optimization). addOptionsGroup(QByteArrayLiteral("CCOptForceCrossCall"), - {}, {opts.enableForceCrossCall}); + {opts.enableForceCrossCall}); } void AvrCompilerSettingsGroup::buildPreprocessorPage( @@ -444,11 +444,11 @@ void AvrCompilerSettingsGroup::buildPreprocessorPage( const PreprocessorPageOptions opts(baseDirectory, qbsProduct); // Add 'CCDefines' item (Defines symbols). addOptionsGroup(QByteArrayLiteral("CCDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); // Add 'newCCIncludePaths' item // (Additional include directories). addOptionsGroup(QByteArrayLiteral("newCCIncludePaths"), - {}, opts.includePaths); + opts.includePaths); } void AvrCompilerSettingsGroup::buildDiagnosticsPage( @@ -457,7 +457,7 @@ void AvrCompilerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'CCWarnAsError' item (Treat all warnings as errors). addOptionsGroup(QByteArrayLiteral("CCWarnAsError"), - {}, {opts.warningsAsErrors}); + {opts.warningsAsErrors}); } void AvrCompilerSettingsGroup::buildCodePage( @@ -467,23 +467,23 @@ void AvrCompilerSettingsGroup::buildCodePage( // Add 'CCConstInRAM' item (Place string literals // and constants in initialized RAM). addOptionsGroup(QByteArrayLiteral("CCConstInRAM"), - {}, {opts.placeConstantsInRam}); + {opts.placeConstantsInRam}); // Add 'CCInitInFlash' item (Place aggregate // initializiers in flash memory). addOptionsGroup(QByteArrayLiteral("CCInitInFlash"), - {}, {opts.placeInitializiersInFlash}); + {opts.placeInitializiersInFlash}); // Add 'CCForceVariables' item (Force generation of // all global and static variables). addOptionsGroup(QByteArrayLiteral("CCForceVariables"), - {}, {opts.forceVariablesGeneration}); + {opts.forceVariablesGeneration}); // Add 'CCOldCallConv' item (Use ICCA90 1.x // calling convention). addOptionsGroup(QByteArrayLiteral("CCOldCallConv"), - {}, {opts.useIccA90CallingConvention}); + {opts.useIccA90CallingConvention}); // Add 'CCLockRegs' item (Number of registers to // lock for global variables). addOptionsGroup(QByteArrayLiteral("CCLockRegs"), - {}, {opts.lockRegistersCount}); + {opts.lockRegistersCount}); } } // namespace v7 diff --git a/src/plugins/generator/iarew/archs/avr/avrgeneralsettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrgeneralsettingsgroup_v7.cpp index ff2f303c5..a4819a90d 100644 --- a/src/plugins/generator/iarew/archs/avr/avrgeneralsettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/avr/avrgeneralsettingsgroup_v7.cpp @@ -693,15 +693,15 @@ void AvrGeneralSettingsGroup::buildTargetPage( // Add 'GenDeviceSelectMenu' item // (Processor configuration chooser). addOptionsGroup(QByteArrayLiteral("GenDeviceSelectMenu"), - {}, {opts.targetMcu}); + {opts.targetMcu}); // Add 'Variant Memory' item // (Memory model: tiny/small/large/huge). addOptionsGroup(QByteArrayLiteral("Variant Memory"), - {}, {opts.memoryModel}); + {opts.memoryModel}); // Add 'GGEepromUtilSize' item // (Utilize inbuilt EEPROM size, in bytes). addOptionsGroup(QByteArrayLiteral("GGEepromUtilSize"), - {}, {opts.eepromUtilSize}); + {opts.eepromUtilSize}); } void AvrGeneralSettingsGroup::buildSystemPage( @@ -711,11 +711,11 @@ void AvrGeneralSettingsGroup::buildSystemPage( // Add 'SCCStackSize' item (Data stack // - CSTACK size in bytes). addOptionsGroup(QByteArrayLiteral("SCCStackSize"), - {}, {opts.cstackSize}); + {opts.cstackSize}); // Add 'SCRStackSize' item (Return address stack // - RSTACK depth in bytes). addOptionsGroup(QByteArrayLiteral("SCRStackSize"), - {}, {opts.rstackSize}); + {opts.rstackSize}); } void AvrGeneralSettingsGroup::buildLibraryOptionsPage( @@ -724,10 +724,10 @@ void AvrGeneralSettingsGroup::buildLibraryOptionsPage( const LibraryOptionsPageOptions opts(qbsProduct); // Add 'Output variant' item (Printf formatter). addOptionsGroup(QByteArrayLiteral("Output variant"), - {}, {opts.printfFormatter}); + {opts.printfFormatter}); // Add 'Input variant' item (Printf formatter). addOptionsGroup(QByteArrayLiteral("Input variant"), - {}, {opts.scanfFormatter}); + {opts.scanfFormatter}); } void AvrGeneralSettingsGroup::buildLibraryConfigPage( @@ -738,15 +738,15 @@ void AvrGeneralSettingsGroup::buildLibraryConfigPage( // Add 'GRuntimeLibSelect' and 'GRuntimeLibSelectSlave' items // (Link with runtime: none/dlib/clib/etc). addOptionsGroup(QByteArrayLiteral("GRuntimeLibSelect"), - {}, {opts.libraryType}); + {opts.libraryType}); addOptionsGroup(QByteArrayLiteral("GRuntimeLibSelectSlave"), - {}, {opts.libraryType}); + {opts.libraryType}); // Add 'RTConfigPath' item (Runtime configuration file). addOptionsGroup(QByteArrayLiteral("RTConfigPath"), - {}, {opts.configPath}); + {opts.configPath}); // Add 'RTLibraryPath' item (Runtime library file). addOptionsGroup(QByteArrayLiteral("RTLibraryPath"), - {}, {opts.libraryPath}); + {opts.libraryPath}); } void AvrGeneralSettingsGroup::buildOutputPage( @@ -756,16 +756,16 @@ void AvrGeneralSettingsGroup::buildOutputPage( const OutputPageOptions opts(baseDirectory, qbsProduct); // Add 'GOutputBinary' item (Output file: executable/library). addOptionsGroup(QByteArrayLiteral("GOutputBinary"), - {}, {opts.binaryType}); + {opts.binaryType}); // Add 'ExePath' item (Executable/binaries output directory). addOptionsGroup(QByteArrayLiteral("ExePath"), - {}, {opts.binaryDirectory}); + {opts.binaryDirectory}); // Add 'ObjPath' item (Object files output directory). addOptionsGroup(QByteArrayLiteral("ObjPath"), - {}, {opts.objectDirectory}); + {opts.objectDirectory}); // Add 'ListPath' item (List files output directory). addOptionsGroup(QByteArrayLiteral("ListPath"), - {}, {opts.listingDirectory}); + {opts.listingDirectory}); } } // namespace v7 diff --git a/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp index 9b86a860e..9fdb57a5a 100644 --- a/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp @@ -294,10 +294,10 @@ void AvrLinkerSettingsGroup::buildConfigPage( const QVariant configPath = opts.configFilePaths.takeFirst(); // Add 'XclOverride' item (Override default). addOptionsGroup(QByteArrayLiteral("XclOverride"), - {}, {1}); + {1}); // Add 'XclFile' item (Linke configuration file). addOptionsGroup(QByteArrayLiteral("XclFile"), - {}, {configPath}); + {configPath}); // Add remainder configuration files to the "Extra options page". if (!opts.configFilePaths.isEmpty()) { @@ -314,19 +314,19 @@ void AvrLinkerSettingsGroup::buildConfigPage( if (!opts.entryPoint.isEmpty()) { // Add 'xcProgramEntryLabel' item (Entry symbol). addOptionsGroup(QByteArrayLiteral("xcProgramEntryLabel"), - {}, {opts.entryPoint}); + {opts.entryPoint}); // Add 'xcOverrideProgramEntryLabel' item // (Override default program entry). addOptionsGroup(QByteArrayLiteral("xcOverrideProgramEntryLabel"), - {}, {1}); + {1}); // Add 'xcProgramEntryLabelSelect' item. addOptionsGroup(QByteArrayLiteral("xcProgramEntryLabelSelect"), - {}, {0}); + {0}); } // Add 'XIncludes' item (Libraries search paths). addOptionsGroup(QByteArrayLiteral("XIncludes"), - {}, opts.librarySearchPaths); + opts.librarySearchPaths); } void AvrLinkerSettingsGroup::buildOutputPage( @@ -335,10 +335,10 @@ void AvrLinkerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'XOutOverride' item (Override default output file). addOptionsGroup(QByteArrayLiteral("XOutOverride"), - {}, {1}); + {1}); // Add 'OutputFile' item (Output file name). addOptionsGroup(QByteArrayLiteral("OutputFile"), - {}, {opts.outputFile}); + {opts.outputFile}); } void AvrLinkerSettingsGroup::buildListPage( @@ -347,7 +347,7 @@ void AvrLinkerSettingsGroup::buildListPage( const ListPageOptions opts(qbsProduct); // Add 'XList' item (Generate linker listing). addOptionsGroup(QByteArrayLiteral("XList"), - {}, {opts.generateMap}); + {opts.generateMap}); } void AvrLinkerSettingsGroup::buildDefinePage( @@ -356,7 +356,7 @@ void AvrLinkerSettingsGroup::buildDefinePage( const DefinePageOptions opts(qbsProduct); // Add 'XDefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("XDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); } void AvrLinkerSettingsGroup::buildDiagnosticsPage( @@ -365,7 +365,7 @@ void AvrLinkerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'SuppressAllWarn' item (Suppress all warnings). addOptionsGroup(QByteArrayLiteral("SuppressAllWarn"), - {}, {opts.suppressAllWarnings}); + {opts.suppressAllWarnings}); } void AvrLinkerSettingsGroup::buildExtraOptionsPage(const ProductData &qbsProduct) @@ -375,10 +375,10 @@ void AvrLinkerSettingsGroup::buildExtraOptionsPage(const ProductData &qbsProduct if (!m_extraOptions.isEmpty()) { // Add 'XExtraOptionsCheck' (Use command line options). addOptionsGroup(QByteArrayLiteral("XExtraOptionsCheck"), - {}, {1}); + {1}); // Add 'XExtraOptions' item (Command line options). addOptionsGroup(QByteArrayLiteral("XExtraOptions"), - {}, m_extraOptions); + m_extraOptions); } } diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51archiversettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51archiversettingsgroup_v10.cpp index 36978bd15..38264c653 100644 --- a/src/plugins/generator/iarew/archs/mcs51/mcs51archiversettingsgroup_v10.cpp +++ b/src/plugins/generator/iarew/archs/mcs51/mcs51archiversettingsgroup_v10.cpp @@ -83,10 +83,10 @@ void Mcs51ArchiverSettingsGroup::buildOutputPage( const OutputPageOptions opts(baseDirectory, qbsProduct); // Add 'XAROverride' item (Override default). addOptionsGroup(QByteArrayLiteral("XAROverride"), - {}, {1}); + {1}); // Add 'XAROutput2' item (Output filename). addOptionsGroup(QByteArrayLiteral("XAROutput2"), - {}, {opts.outputFile}); + {opts.outputFile}); } } // namespace v10 diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp index 5f72f20e4..a840b29c6 100644 --- a/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp +++ b/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp @@ -179,13 +179,13 @@ void Mcs51AssemblerSettingsGroup::buildLanguagePage( const LanguagePageOptions opts(qbsProduct); // Add 'ACaseSensitivity' item (User symbols are case sensitive). addOptionsGroup(QByteArrayLiteral("ACaseSensitivity"), - {}, {opts.enableSymbolsCaseSensitive}); + {opts.enableSymbolsCaseSensitive}); // Add 'Asm multibyte support' item (Enable multibyte support). addOptionsGroup(QByteArrayLiteral("Asm multibyte support"), - {}, {opts.enableMultibyteSupport}); + {opts.enableMultibyteSupport}); // Add 'MacroChars' item (Macro quote characters: ()/[]/{}/<>). addOptionsGroup(QByteArrayLiteral("MacroChars"), - {0}, {!opts.macroQuoteCharacter}); + {!opts.macroQuoteCharacter}, 0); } void Mcs51AssemblerSettingsGroup::buildOutputPage( @@ -194,7 +194,7 @@ void Mcs51AssemblerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'Debug' item (Generate debug information). addOptionsGroup(QByteArrayLiteral("Debug"), - {}, {opts.debugInfo}); + {opts.debugInfo}); } void Mcs51AssemblerSettingsGroup::buildPreprocessorPage( @@ -204,10 +204,10 @@ void Mcs51AssemblerSettingsGroup::buildPreprocessorPage( const PreprocessorPageOptions opts(baseDirectory, qbsProduct); // Add 'ADefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("ADefines"), - {}, opts.defineSymbols); + opts.defineSymbols); // Add 'Include directories' item (Additional include directories). addOptionsGroup(QByteArrayLiteral("Include directories"), - {}, opts.includePaths); + opts.includePaths); } void Mcs51AssemblerSettingsGroup::buildDiagnosticsPage( @@ -216,10 +216,10 @@ void Mcs51AssemblerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'AWarnEnable' item (Enable/disable warnings). addOptionsGroup(QByteArrayLiteral("AWarnEnable"), - {}, {opts.enableWarnings}); + {opts.enableWarnings}); // Add 'AWarnWhat' item (Enable/disable all warnings). addOptionsGroup(QByteArrayLiteral("AWarnWhat"), - {}, {opts.enableAllWarnings}); + {opts.enableAllWarnings}); } } // namespace v10 diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51compilersettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51compilersettingsgroup_v10.cpp index bda3d090b..649350a98 100644 --- a/src/plugins/generator/iarew/archs/mcs51/mcs51compilersettingsgroup_v10.cpp +++ b/src/plugins/generator/iarew/archs/mcs51/mcs51compilersettingsgroup_v10.cpp @@ -351,14 +351,14 @@ void Mcs51CompilerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'CCDebugInfo' item (Generate debug info). addOptionsGroup(QByteArrayLiteral("CCDebugInfo"), - {}, {opts.debugInfo}); + {opts.debugInfo}); // Add 'CCOverrideModuleTypeDefault' item // (Override default module type). addOptionsGroup(QByteArrayLiteral("CCOverrideModuleTypeDefault"), - {}, {1}); + {1}); // Add 'CCRadioModuleType' item (Module type: program/library). addOptionsGroup(QByteArrayLiteral("CCRadioModuleType"), - {}, {opts.moduleType}); + {opts.moduleType}); } void Mcs51CompilerSettingsGroup::buildLanguageOnePage( @@ -368,28 +368,28 @@ void Mcs51CompilerSettingsGroup::buildLanguageOnePage( // Add 'IccLang' item with 'auto-extension based' // value (Language: C/C++/Auto). addOptionsGroup(QByteArrayLiteral("IccLang"), - {}, {opts.languageExtension}); + {opts.languageExtension}); // Add 'IccCDialect' item (C dialect: c89/99/11). addOptionsGroup(QByteArrayLiteral("IccCDialect"), - {}, {opts.cLanguageDialect}); + {opts.cLanguageDialect}); // Add 'IccCppDialect' item (C++ dialect: embedded/extended). addOptionsGroup(QByteArrayLiteral("IccCppDialect"), - {}, {opts.cxxLanguageDialect}); + {opts.cxxLanguageDialect}); // Add 'CCExt' item (Language conformance: IAR/relaxed/strict). addOptionsGroup(QByteArrayLiteral("LangConform"), - {}, {opts.languageConformance}); + {opts.languageConformance}); // Add 'IccAllowVLA' item (Allow VLA). addOptionsGroup(QByteArrayLiteral("IccAllowVLA"), - {}, {opts.allowVla}); + {opts.allowVla}); // Add 'IccCppInlineSemantics' item (C++ inline semantics). addOptionsGroup(QByteArrayLiteral("IccCppInlineSemantics"), - {}, {opts.useCppInlineSemantics}); + {opts.useCppInlineSemantics}); // Add 'CCRequirePrototypes' item (Require prototypes). addOptionsGroup(QByteArrayLiteral("CCRequirePrototypes"), - {}, {opts.requirePrototypes}); + {opts.requirePrototypes}); // Add 'IccStaticDestr' item (Destroy static objects). addOptionsGroup(QByteArrayLiteral("IccStaticDestr"), - {}, {opts.destroyStaticObjects}); + {opts.destroyStaticObjects}); } void Mcs51CompilerSettingsGroup::buildLanguageTwoPage( @@ -398,14 +398,14 @@ void Mcs51CompilerSettingsGroup::buildLanguageTwoPage( const LanguageTwoPageOptions opts(qbsProduct); // Add 'CharIs' item (Plain char is: signed/unsigned). addOptionsGroup(QByteArrayLiteral("CharIs"), - {}, {opts.plainCharacter}); + {opts.plainCharacter}); // Add 'IccFloatSemantics' item // (Floatic-point semantics: strict/relaxed conformance). addOptionsGroup(QByteArrayLiteral("IccFloatSemantics"), - {}, {opts.floatingPointSemantic}); + {opts.floatingPointSemantic}); // Add 'CCMultibyteSupport' item (Enable multibyte support). addOptionsGroup(QByteArrayLiteral("CCMultibyteSupport"), - {}, {opts.enableMultibyteSupport}); + {opts.enableMultibyteSupport}); } void Mcs51CompilerSettingsGroup::buildOptimizationsPage( @@ -415,11 +415,11 @@ void Mcs51CompilerSettingsGroup::buildOptimizationsPage( // Add 'CCOptStrategy', 'CCOptLevel' and // 'CCOptLevelSlave' items (Level). addOptionsGroup(QByteArrayLiteral("CCOptStrategy"), - {}, {opts.optimizationStrategy}); + {opts.optimizationStrategy}); addOptionsGroup(QByteArrayLiteral("CCOptLevel"), - {}, {opts.optimizationLevel}); + {opts.optimizationLevel}); addOptionsGroup(QByteArrayLiteral("CCOptLevelSlave"), - {}, {opts.optimizationLevelSlave}); + {opts.optimizationLevelSlave}); // Add 'CCAllowList2' item (Enabled transformations: 7 check boxes). const QString transformations = QStringLiteral("%1%2%3%4%5%6%7") .arg(opts.enableCommonSubexpressionElimination) @@ -430,10 +430,10 @@ void Mcs51CompilerSettingsGroup::buildOptimizationsPage( .arg(opts.enableCrossCall) .arg(opts.disableRegisterBanks); addOptionsGroup(QByteArrayLiteral("CCAllowList2"), - {}, {transformations}); + {transformations}); // Add 'NoSizeConstraints' item (No size constraints). addOptionsGroup(QByteArrayLiteral("NoSizeConstraints"), - {}, {opts.disableSizeConstrains}); + {opts.disableSizeConstrains}); } void Mcs51CompilerSettingsGroup::buildPreprocessorPage( @@ -443,10 +443,10 @@ void Mcs51CompilerSettingsGroup::buildPreprocessorPage( const PreprocessorPageOptions opts(baseDirectory, qbsProduct); // Add 'CCDefines' item (Defines symbols). addOptionsGroup(QByteArrayLiteral("CCDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); // Add 'CCIncludePath2' item (Additional include directories). addOptionsGroup(QByteArrayLiteral("CCIncludePath2"), - {}, opts.includePaths); + opts.includePaths); } void Mcs51CompilerSettingsGroup::buildDiagnosticsPage( @@ -455,7 +455,7 @@ void Mcs51CompilerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'CCDiagWarnAreErr' item (Treat all warnings as errors). addOptionsGroup(QByteArrayLiteral("CCDiagWarnAreErr"), - {}, {opts.warningsAsErrors}); + {opts.warningsAsErrors}); } void Mcs51CompilerSettingsGroup::buildCodePage( @@ -464,10 +464,10 @@ void Mcs51CompilerSettingsGroup::buildCodePage( const CodePageOptions opts(qbsProduct); // Add 'RomMonBpPadding' item (Padding for ROM-monitor breakpoints). addOptionsGroup(QByteArrayLiteral("RomMonBpPadding"), - {}, {opts.paddingForRomMonitorBreakpoints}); + {opts.paddingForRomMonitorBreakpoints}); // Add 'NoUBROFMessages' item (No UBROF messages in output files). addOptionsGroup(QByteArrayLiteral("NoUBROFMessages"), - {}, {opts.excludeUbrofMessagesInOutput}); + {opts.excludeUbrofMessagesInOutput}); } } // namespace v10 diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp index 28e051489..43c160045 100644 --- a/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp +++ b/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp @@ -817,42 +817,42 @@ void Mcs51GeneralSettingsGroup::buildTargetPage( const TargetPageOptions opts(qbsProduct); // Add 'OGChipConfigPath' item (Device: ). addOptionsGroup(QByteArrayLiteral("OGChipConfigPath"), - {}, {opts.chipInfoPath}); + {opts.chipInfoPath}); // Add 'CPU Core' and 'CPU Core Slave' items // (CPU core: plain/extended{1|2}). addOptionsGroup(QByteArrayLiteral("CPU Core"), - {}, {opts.cpuCore}); + {opts.cpuCore}); addOptionsGroup(QByteArrayLiteral("CPU Core Slave"), - {}, {opts.cpuCore}); + {opts.cpuCore}); // Add 'Code Memory Model' and 'Code Memory Model slave' items // (Code model: near/banked/far/banked extended). addOptionsGroup(QByteArrayLiteral("Code Memory Model"), - {}, {opts.codeModel}); + {opts.codeModel}); addOptionsGroup(QByteArrayLiteral("Code Memory Model slave"), - {}, {opts.codeModel}); + {opts.codeModel}); // Add 'Data Memory Model' and 'Data Memory Model slave' items // (Data model: tiny/small/large/generic/far). addOptionsGroup(QByteArrayLiteral("Data Memory Model"), - {}, {opts.dataModel}); + {opts.dataModel}); addOptionsGroup(QByteArrayLiteral("Data Memory Model slave"), - {}, {opts.dataModel}); + {opts.dataModel}); // Add 'Use extended stack' and 'Use extended stack slave' items // (Use extended stack). addOptionsGroup(QByteArrayLiteral("Use extended stack"), - {}, {opts.useExtendedStack}); + {opts.useExtendedStack}); addOptionsGroup(QByteArrayLiteral("Use extended stack slave"), - {}, {opts.useExtendedStack}); + {opts.useExtendedStack}); // Add 'Workseg Size' item (Number of virtual registers: 8...32). addOptionsGroup(QByteArrayLiteral("Workseg Size"), - {}, {opts.virtualRegisters}); + {opts.virtualRegisters}); // Add 'Constant Placement' item // (Location of constants and strings: ram/rom/code memories). addOptionsGroup(QByteArrayLiteral("Constant Placement"), - {}, {opts.constPlacement}); + {opts.constPlacement}); // Add 'Calling convention' item (Calling convention). addOptionsGroup(QByteArrayLiteral("Calling convention"), - {}, {opts.callingConvention}); + {opts.callingConvention}); } void Mcs51GeneralSettingsGroup::buildStackHeapPage( @@ -861,41 +861,41 @@ void Mcs51GeneralSettingsGroup::buildStackHeapPage( const StackHeapPageOptions opts(qbsProduct); // Add 'General Idata Stack Size' item (Stack size: IDATA). addOptionsGroup(QByteArrayLiteral("General Idata Stack Size"), - {}, {opts.idataStack}); + {opts.idataStack}); // Add 'General Pdata Stack Size' item (Stack size: PDATA). addOptionsGroup(QByteArrayLiteral("General Pdata Stack Size"), - {}, {opts.pdataStack}); + {opts.pdataStack}); // Add 'General Xdata Stack Size' item (Stack size: XDATA). addOptionsGroup(QByteArrayLiteral("General Xdata Stack Size"), - {}, {opts.xdataStack}); + {opts.xdataStack}); // Add 'General Ext Stack Size' item (Stack size: Extended). addOptionsGroup(QByteArrayLiteral("General Ext Stack Size"), - {}, {opts.extendedStack}); + {opts.extendedStack}); // Add 'General Xdata Heap Size' item (Heap size: XDATA). addOptionsGroup(QByteArrayLiteral("General Xdata Heap Size"), - {}, {opts.xdataHeap}); + {opts.xdataHeap}); // Add 'General Far Heap Size' item (Heap size: Far). addOptionsGroup(QByteArrayLiteral("General Far Heap Size"), - {}, {opts.farHeap}); + {opts.farHeap}); // Add 'General Far22 Heap Size' item (Heap size: Far22). addOptionsGroup(QByteArrayLiteral("General Far22 Heap Size"), - {}, {opts.far22Heap}); + {opts.far22Heap}); // Add 'General Huge Heap Size' item (Heap size: Huge). addOptionsGroup(QByteArrayLiteral("General Huge Heap Size"), - {}, {opts.hugeHeap}); + {opts.hugeHeap}); // Add 'Extended stack address' item // (Extended stack pointer address). addOptionsGroup(QByteArrayLiteral("Extended stack address"), - {}, {opts.extStackAddress}); + {opts.extStackAddress}); // Add 'Extended stack mask' item (Extended stack pointer mask). addOptionsGroup(QByteArrayLiteral("Extended stack mask"), - {}, {opts.extStackMask}); + {opts.extStackMask}); // Add 'Extended stack is offset' item // (Extended stack pointer is an offset). addOptionsGroup(QByteArrayLiteral("Extended stack is offset"), - {}, {opts.extStackOffset}); + {opts.extStackOffset}); } void Mcs51GeneralSettingsGroup::buildDataPointerPage( @@ -904,37 +904,37 @@ void Mcs51GeneralSettingsGroup::buildDataPointerPage( const DptrPageOptions opts(qbsProduct); // Add 'Nr of Datapointers' item (Number of DPTRs: 1...8). addOptionsGroup(QByteArrayLiteral("Nr of Datapointers"), - {}, {opts.dptrsCountIndex}); + {opts.dptrsCountIndex}); // Add 'Datapointer Size' item (DPTR size: 16/24). addOptionsGroup(QByteArrayLiteral("Datapointer Size"), - {}, {opts.dptrSize}); + {opts.dptrSize}); // Add 'Sfr Visibility' item (DPTR address: shadowed/separate). addOptionsGroup(QByteArrayLiteral("Sfr Visibility"), - {}, {opts.dptrVisibility}); + {opts.dptrVisibility}); // Add 'Switch Method' item (Switch method: inc/mask). addOptionsGroup(QByteArrayLiteral("Switch Method"), - {}, {opts.dptrSwitchMethod}); + {opts.dptrSwitchMethod}); // Add 'Mask Value' item (Switch method mask). addOptionsGroup(QByteArrayLiteral("Mask Value"), - {}, {opts.dptrMask}); + {opts.dptrMask}); // Add 'PDATA 8-15 register address' item (Page register // address (for bits 8-15). addOptionsGroup(QByteArrayLiteral("PDATA 8-15 register address"), - {}, {opts.dptrPbank}); + {opts.dptrPbank}); // Add 'PDATA 16-31 register address' item (Page register // address (for bits 16-31). addOptionsGroup(QByteArrayLiteral("PDATA 16-31 register address"), - {}, {opts.dptrPbankExt}); + {opts.dptrPbankExt}); // Add 'DPS Address' item (Selected DPTR register). addOptionsGroup(QByteArrayLiteral("DPS Address"), - {}, {opts.dpsAddress}); + {opts.dpsAddress}); // Add 'DPC Address' item (Separate DPTR control register). addOptionsGroup(QByteArrayLiteral("DPC Address"), - {}, {opts.dpcAddress}); + {opts.dpcAddress}); // Add 'DPTR Addresses' item (DPTR addresses: Low/High/Ext). const QString dptrAddresses = opts.dptrAddresses.join(QLatin1Char(' ')); addOptionsGroup(QByteArrayLiteral("DPTR Addresses"), - {}, {dptrAddresses}); + {dptrAddresses}); } void Mcs51GeneralSettingsGroup::buildCodeBankPage( @@ -943,19 +943,19 @@ void Mcs51GeneralSettingsGroup::buildCodeBankPage( const CodeBankPageOptions opts(qbsProduct); // Add 'CodeBankReg' item (Register address). addOptionsGroup(QByteArrayLiteral("CodeBankReg"), - {}, {opts.registerAddress}); + {opts.registerAddress}); // Add 'CodeBankRegMask' item (Register mask). addOptionsGroup(QByteArrayLiteral("CodeBankRegMask"), - {}, {opts.registerMask}); + {opts.registerMask}); // Add 'CodeBankNrOfs' item (Number of banks). addOptionsGroup(QByteArrayLiteral("CodeBankNrOfs"), - {}, {opts.banksCount}); + {opts.banksCount}); // Add 'CodeBankStart' item (Bank start). addOptionsGroup(QByteArrayLiteral("CodeBankStart"), - {}, {opts.bankStart}); + {opts.bankStart}); // Add 'CodeBankSize' item (Bank end). addOptionsGroup(QByteArrayLiteral("CodeBankSize"), - {}, {opts.bankEnd}); + {opts.bankEnd}); } void Mcs51GeneralSettingsGroup::buildLibraryOptionsPage( @@ -964,10 +964,10 @@ void Mcs51GeneralSettingsGroup::buildLibraryOptionsPage( const LibraryOptionsPageOptions opts(qbsProduct); // Add 'Output variant' item (Printf formatter). addOptionsGroup(QByteArrayLiteral("Output variant"), - {}, {opts.printfFormatter}); + {opts.printfFormatter}); // Add 'Input variant' item (Printf formatter). addOptionsGroup(QByteArrayLiteral("Input variant"), - {}, {opts.scanfFormatter}); + {opts.scanfFormatter}); } void Mcs51GeneralSettingsGroup::buildLibraryConfigPage( @@ -978,15 +978,15 @@ void Mcs51GeneralSettingsGroup::buildLibraryConfigPage( // Add 'GRuntimeLibSelect2' and 'GRuntimeLibSelectSlave2' items // (Link with runtime: none/dlib/clib/etc). addOptionsGroup(QByteArrayLiteral("GRuntimeLibSelect2"), - {}, {opts.libraryType}); + {opts.libraryType}); addOptionsGroup(QByteArrayLiteral("GRuntimeLibSelectSlave2"), - {}, {opts.libraryType}); + {opts.libraryType}); // Add 'RTConfigPath' item (Runtime configuration file). addOptionsGroup(QByteArrayLiteral("RTConfigPath"), - {}, {opts.configPath}); + {opts.configPath}); // Add 'RTLibraryPath' item (Runtime library file). addOptionsGroup(QByteArrayLiteral("RTLibraryPath"), - {}, {opts.libraryPath}); + {opts.libraryPath}); } void Mcs51GeneralSettingsGroup::buildOutputPage( @@ -996,16 +996,16 @@ void Mcs51GeneralSettingsGroup::buildOutputPage( const OutputPageOptions opts(baseDirectory, qbsProduct); // Add 'GOutputBinary' item (Output file: executable/library). addOptionsGroup(QByteArrayLiteral("GOutputBinary"), - {}, {opts.binaryType}); + {opts.binaryType}); // Add 'ExePath' item (Executable/binaries output directory). addOptionsGroup(QByteArrayLiteral("ExePath"), - {}, {opts.binaryDirectory}); + {opts.binaryDirectory}); // Add 'ObjPath' item (Object files output directory). addOptionsGroup(QByteArrayLiteral("ObjPath"), - {}, {opts.objectDirectory}); + {opts.objectDirectory}); // Add 'ListPath' item (List files output directory). addOptionsGroup(QByteArrayLiteral("ListPath"), - {}, {opts.listingDirectory}); + {opts.listingDirectory}); } } // namespace v10 diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp index c27fa51f2..32b734d4a 100644 --- a/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp +++ b/src/plugins/generator/iarew/archs/mcs51/mcs51linkersettingsgroup_v10.cpp @@ -241,10 +241,10 @@ void Mcs51LinkerSettingsGroup::buildConfigPage( const QVariant configPath = opts.configFilePaths.takeFirst(); // Add 'XclOverride' item (Override default). addOptionsGroup(QByteArrayLiteral("XclOverride"), - {}, {1}); + {1}); // Add 'XclFile' item (Linke configuration file). addOptionsGroup(QByteArrayLiteral("XclFile"), - {}, {configPath}); + {configPath}); // Add remainder configuration files to the "Extra options page". if (!opts.configFilePaths.isEmpty()) { @@ -257,18 +257,18 @@ void Mcs51LinkerSettingsGroup::buildConfigPage( // Add 'xcProgramEntryLabel' item (Entry symbol). addOptionsGroup(QByteArrayLiteral("xcProgramEntryLabel"), - {}, {opts.entryPoint}); + {opts.entryPoint}); // Add 'xcOverrideProgramEntryLabel' item // (Override default program entry). addOptionsGroup(QByteArrayLiteral("xcOverrideProgramEntryLabel"), - {}, {1}); + {1}); // Add 'xcProgramEntryLabelSelect' item. addOptionsGroup(QByteArrayLiteral("xcProgramEntryLabelSelect"), - {}, {0}); + {0}); // Add 'XIncludes' item (Libraries search paths). addOptionsGroup(QByteArrayLiteral("XIncludes"), - {}, opts.librarySearchPaths); + opts.librarySearchPaths); } void Mcs51LinkerSettingsGroup::buildOutputPage( @@ -277,10 +277,10 @@ void Mcs51LinkerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'XOutOverride' item (Override default output file). addOptionsGroup(QByteArrayLiteral("XOutOverride"), - {}, {1}); + {1}); // Add 'OutputFile' item (Output file name). addOptionsGroup(QByteArrayLiteral("OutputFile"), - {}, {opts.outputFile}); + {opts.outputFile}); } void Mcs51LinkerSettingsGroup::buildListPage( @@ -289,7 +289,7 @@ void Mcs51LinkerSettingsGroup::buildListPage( const ListPageOptions opts(qbsProduct); // Add 'XList' item (Generate linker listing). addOptionsGroup(QByteArrayLiteral("XList"), - {}, {opts.generateMap}); + {opts.generateMap}); } void Mcs51LinkerSettingsGroup::buildDefinePage( @@ -298,7 +298,7 @@ void Mcs51LinkerSettingsGroup::buildDefinePage( const DefinePageOptions opts(qbsProduct); // Add 'XDefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("XDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); } void Mcs51LinkerSettingsGroup::buildDiagnosticsPage( @@ -307,7 +307,7 @@ void Mcs51LinkerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'SuppressAllWarn' item (Suppress all warnings). addOptionsGroup(QByteArrayLiteral("SuppressAllWarn"), - {}, {opts.suppressAllWarnings}); + {opts.suppressAllWarnings}); } void Mcs51LinkerSettingsGroup::buildExtraOptionsPage( @@ -323,10 +323,10 @@ void Mcs51LinkerSettingsGroup::buildExtraOptionsPage( if (!m_extraOptions.isEmpty()) { // Add 'Linker Extra Options Check' (Use command line options). addOptionsGroup(QByteArrayLiteral("Linker Extra Options Check"), - {}, {1}); + {1}); // Add 'Linker Extra Options Edit' item (Command line options). addOptionsGroup(QByteArrayLiteral("Linker Extra Options Edit"), - {}, m_extraOptions); + m_extraOptions); } } diff --git a/src/plugins/generator/iarew/archs/msp430/msp430archiversettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/msp430/msp430archiversettingsgroup_v7.cpp index ac5174000..1258412d8 100644 --- a/src/plugins/generator/iarew/archs/msp430/msp430archiversettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/msp430/msp430archiversettingsgroup_v7.cpp @@ -82,10 +82,10 @@ void Msp430ArchiverSettingsGroup::buildOutputPage(const QString &baseDirectory, const OutputPageOptions opts(baseDirectory, qbsProduct); // Add 'XAROutOverride' item (Override default). addOptionsGroup(QByteArrayLiteral("XAROutOverride"), - {}, {1}); + {1}); // Add 'OutputFile' item (Output filename). addOptionsGroup(QByteArrayLiteral("OutputFile"), - {}, {opts.outputFile}); + {opts.outputFile}); } } // namespace v7 diff --git a/src/plugins/generator/iarew/archs/msp430/msp430assemblersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/msp430/msp430assemblersettingsgroup_v7.cpp index d87368076..51108e63c 100644 --- a/src/plugins/generator/iarew/archs/msp430/msp430assemblersettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/msp430/msp430assemblersettingsgroup_v7.cpp @@ -180,13 +180,13 @@ void Msp430AssemblerSettingsGroup::buildLanguagePage( const LanguagePageOptions opts(qbsProduct); // Add 'ACaseSensitivity' item (User symbols are case sensitive). addOptionsGroup(QByteArrayLiteral("ACaseSensitivity"), - {}, {opts.enableSymbolsCaseSensitive}); + {opts.enableSymbolsCaseSensitive}); // Add 'AMultibyteSupport' item (Enable multibyte support). addOptionsGroup(QByteArrayLiteral("AMultibyteSupport"), - {}, {opts.enableMultibyteSupport}); + {opts.enableMultibyteSupport}); // Add 'MacroChars' item (Macro quote characters: ()/[]/{}/<>). addOptionsGroup(QByteArrayLiteral("MacroChars"), - {0}, {opts.macroQuoteCharacter}); + {opts.macroQuoteCharacter}); } void Msp430AssemblerSettingsGroup::buildOutputPage( @@ -195,7 +195,7 @@ void Msp430AssemblerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'ADebug' item (Generate debug information). addOptionsGroup(QByteArrayLiteral("ADebug"), - {}, {opts.debugInfo}); + {opts.debugInfo}); } void Msp430AssemblerSettingsGroup::buildPreprocessorPage( @@ -205,10 +205,10 @@ void Msp430AssemblerSettingsGroup::buildPreprocessorPage( const PreprocessorPageOptions opts(baseDirectory, qbsProduct); // Add 'ADefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("ADefines"), - {}, opts.defineSymbols); + opts.defineSymbols); // Add 'AUserIncludes' item (Additional include directories). addOptionsGroup(QByteArrayLiteral("AUserIncludes"), - {}, opts.includePaths); + opts.includePaths); } void Msp430AssemblerSettingsGroup::buildDiagnosticsPage( @@ -217,10 +217,10 @@ void Msp430AssemblerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'AWarnEnable' item (Enable/disable warnings). addOptionsGroup(QByteArrayLiteral("AWarnEnable"), - {}, {opts.enableWarnings}); + {opts.enableWarnings}); // Add 'AWarnWhat' item (Enable/disable all warnings). addOptionsGroup(QByteArrayLiteral("AWarnWhat"), - {}, {opts.enableAllWarnings}); + {opts.enableAllWarnings}); } } // namespace v7 diff --git a/src/plugins/generator/iarew/archs/msp430/msp430compilersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/msp430/msp430compilersettingsgroup_v7.cpp index 214b51437..5728578b9 100644 --- a/src/plugins/generator/iarew/archs/msp430/msp430compilersettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/msp430/msp430compilersettingsgroup_v7.cpp @@ -352,7 +352,7 @@ void Msp430CompilerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'CCDebugInfo' item (Generate debug info). addOptionsGroup(QByteArrayLiteral("CCDebugInfo"), - {}, {opts.debugInfo}); + {opts.debugInfo}); } void Msp430CompilerSettingsGroup::buildLanguageOnePage( @@ -362,29 +362,29 @@ void Msp430CompilerSettingsGroup::buildLanguageOnePage( // Add 'IccLang' item with 'auto-extension based' // value (Language: C/C++/Auto). addOptionsGroup(QByteArrayLiteral("IccLang"), - {}, {opts.languageExtension}); + {opts.languageExtension}); // Add 'IccCDialect' item (C dialect: c89/99/11). addOptionsGroup(QByteArrayLiteral("IccCDialect"), - {}, {opts.cLanguageDialect}); + {opts.cLanguageDialect}); // Add 'IccCppDialect' item (C++ dialect: embedded/extended). addOptionsGroup(QByteArrayLiteral("IccCppDialect"), - {}, {opts.cxxLanguageDialect}); + {opts.cxxLanguageDialect}); // Add 'CCExt' item // (Language conformance: IAR/relaxed/strict). addOptionsGroup(QByteArrayLiteral("CCExt"), - {}, {opts.languageConformance}); + {opts.languageConformance}); // Add 'IccAllowVLA' item (Allow VLA). addOptionsGroup(QByteArrayLiteral("IccAllowVLA"), - {}, {opts.allowVla}); + {opts.allowVla}); // Add 'IccCppInlineSemantics' item (C++ inline semantics). addOptionsGroup(QByteArrayLiteral("IccCppInlineSemantics"), - {}, {opts.useCppInlineSemantics}); + {opts.useCppInlineSemantics}); // Add 'IccRequirePrototypes' item (Require prototypes). addOptionsGroup(QByteArrayLiteral("CCRequirePrototypes"), - {}, {opts.requirePrototypes}); + {opts.requirePrototypes}); // Add 'IccStaticDestr' item (Destroy static objects). addOptionsGroup(QByteArrayLiteral("IccStaticDestr"), - {}, {opts.destroyStaticObjects}); + {opts.destroyStaticObjects}); } void Msp430CompilerSettingsGroup::buildLanguageTwoPage( @@ -393,17 +393,17 @@ void Msp430CompilerSettingsGroup::buildLanguageTwoPage( const LanguageTwoPageOptions opts(qbsProduct); // Add 'IccCharIs' item (Plain char is: signed/unsigned). addOptionsGroup(QByteArrayLiteral("CCCharIs"), - {}, {opts.plainCharacter}); + {opts.plainCharacter}); // Add 'IccFloatSemantics' item (Floatic-point // semantics: strict/relaxed conformance). addOptionsGroup(QByteArrayLiteral("IccFloatSemantics"), - {}, {opts.floatingPointSemantic}); + {opts.floatingPointSemantic}); // Add 'IccMultibyteSupport' item (Enable multibyte support). addOptionsGroup(QByteArrayLiteral("CCMultibyteSupport"), - {}, {opts.enableMultibyteSupport}); + {opts.enableMultibyteSupport}); // Add 'CCGuardCalls' and 'OCGuardCallsSlave' item (Guard calls). addOptionsGroup(QByteArrayLiteral("CCGuardCalls"), - {}, {opts.guardCalls}); + {opts.guardCalls}); } void Msp430CompilerSettingsGroup::buildCodePage( @@ -413,19 +413,19 @@ void Msp430CompilerSettingsGroup::buildCodePage( // Add 'OCCR4Utilize' item // (R4 utilization: normal/regvar/disabled). addOptionsGroup(QByteArrayLiteral("OCCR4Utilize"), - {}, {opts.r4utilization}); + {opts.r4utilization}); // Add 'OCCR5Utilize' item // (R5 utilization: normal/regvar/disabled). addOptionsGroup(QByteArrayLiteral("OCCR5Utilize"), - {}, {opts.r5utilization}); + {opts.r5utilization}); // Add 'ReduceStack' item // (Reduce stack usage). addOptionsGroup(QByteArrayLiteral("ReduceStack"), - {}, {opts.reduceStackUsage}); + {opts.reduceStackUsage}); // Add 'Save20bit' item // (20-bit context save on interrupt). addOptionsGroup(QByteArrayLiteral("Save20bit"), - {}, {opts.save20BitContextOnInterrupt}); + {opts.save20BitContextOnInterrupt}); } void Msp430CompilerSettingsGroup::buildOptimizationsPage( @@ -435,15 +435,15 @@ void Msp430CompilerSettingsGroup::buildOptimizationsPage( // Add 'CCOptStrategy', 'CCOptLevel' and // 'CCOptLevelSlave' items (Level). addOptionsGroup(QByteArrayLiteral("CCOptStrategy"), - {}, {opts.optimizationStrategy}); + {opts.optimizationStrategy}); addOptionsGroup(QByteArrayLiteral("CCOptLevel"), - {}, {opts.optimizationLevel}); + {opts.optimizationLevel}); addOptionsGroup(QByteArrayLiteral("CCOptLevelSlave"), - {}, {opts.optimizationLevelSlave}); + {opts.optimizationLevelSlave}); // Add 'CCOptimizationNoSizeConstraints' item (no size constraints). addOptionsGroup(QByteArrayLiteral("CCOptimizationNoSizeConstraints"), - {}, {opts.disableSizeConstraints}); + {opts.disableSizeConstraints}); // Add 'CCAllowList' item // (Enabled transformations: 5 check boxes). @@ -454,7 +454,7 @@ void Msp430CompilerSettingsGroup::buildOptimizationsPage( .arg(opts.enableCodeMotion) .arg(opts.enableTypeBasedAliasAnalysis); addOptionsGroup(QByteArrayLiteral("CCAllowList"), - {}, {bitflags}); + {bitflags}); } void Msp430CompilerSettingsGroup::buildPreprocessorPage( @@ -464,11 +464,11 @@ void Msp430CompilerSettingsGroup::buildPreprocessorPage( const PreprocessorPageOptions opts(baseDirectory, qbsProduct); // Add 'CCDefines' item (Defines symbols). addOptionsGroup(QByteArrayLiteral("CCDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); // Add 'newCCIncludePaths' item // (Additional include directories). addOptionsGroup(QByteArrayLiteral("newCCIncludePaths"), - {}, opts.includePaths); + opts.includePaths); } void Msp430CompilerSettingsGroup::buildDiagnosticsPage( @@ -477,7 +477,7 @@ void Msp430CompilerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'CCDiagWarnAreErr' item (Treat all warnings as errors). addOptionsGroup(QByteArrayLiteral("CCDiagWarnAreErr"), - {}, {opts.warningsAsErrors}); + {opts.warningsAsErrors}); } } // namespace v7 diff --git a/src/plugins/generator/iarew/archs/msp430/msp430generalsettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/msp430/msp430generalsettingsgroup_v7.cpp index 935fc6f7a..ac1c475d1 100644 --- a/src/plugins/generator/iarew/archs/msp430/msp430generalsettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/msp430/msp430generalsettingsgroup_v7.cpp @@ -376,37 +376,37 @@ void Msp430GeneralSettingsGroup::buildTargetPage( // Add 'OGChipSelectMenu' item // (Device: xxx). addOptionsGroup(QByteArrayLiteral("OGChipSelectMenu"), - {}, {opts.deviceMenu}); + {opts.deviceMenu}); // Add 'RadioCodeModelType' item // (Code model: small/large). addOptionsGroup(QByteArrayLiteral("RadioCodeModelType"), - {}, {opts.codeModel}); + {opts.codeModel}); // Add 'RadioDataModelType' item // (Data model: small/medium/large). addOptionsGroup(QByteArrayLiteral("RadioDataModelType"), - {}, {opts.dataModel}); + {opts.dataModel}); // Add 'OGDouble' item // (Floating point double size: 32/64 bits). addOptionsGroup(QByteArrayLiteral("OGDouble"), - {}, {opts.floatingPointDoubleSize}); + {opts.floatingPointDoubleSize}); // Add 'Hardware Multiplier' item // (Hardware multiplier). addOptionsGroup(QByteArrayLiteral("Hardware Multiplier"), - {}, {opts.enableHardwareMultiplier}); + {opts.enableHardwareMultiplier}); if (opts.enableHardwareMultiplier) { // Add 'RadioHardwareMultiplierType' item. addOptionsGroup(QByteArrayLiteral("Hardware RadioHardwareMultiplierType"), - {}, {opts.hardwareMultiplierType}); + {opts.hardwareMultiplierType}); } // Add 'Ropi' item. // (Position independence: Code and read-only data). addOptionsGroup(QByteArrayLiteral("Ropi"), - {}, {opts.enableRopi}); + {opts.enableRopi}); // Add 'NoRwDynamicInit' item. // (Position independence: No dynamic read/write initialization). addOptionsGroup(QByteArrayLiteral("NoRwDynamicInit"), - {}, {opts.disableDynamicReadWriteInitialization}); + {opts.disableDynamicReadWriteInitialization}); } void Msp430GeneralSettingsGroup::buildOutputPage( @@ -416,16 +416,16 @@ void Msp430GeneralSettingsGroup::buildOutputPage( const OutputPageOptions opts(baseDirectory, qbsProduct); // Add 'GOutputBinary' item (Output file: executable/library). addOptionsGroup(QByteArrayLiteral("GOutputBinary"), - {}, {opts.binaryType}); + {opts.binaryType}); // Add 'ExePath' item (Executable/binaries output directory). addOptionsGroup(QByteArrayLiteral("ExePath"), - {}, {opts.binaryDirectory}); + {opts.binaryDirectory}); // Add 'ObjPath' item (Object files output directory). addOptionsGroup(QByteArrayLiteral("ObjPath"), - {}, {opts.objectDirectory}); + {opts.objectDirectory}); // Add 'ListPath' item (List files output directory). addOptionsGroup(QByteArrayLiteral("ListPath"), - {}, {opts.listingDirectory}); + {opts.listingDirectory}); } void Msp430GeneralSettingsGroup::buildLibraryConfigPage( @@ -436,15 +436,15 @@ void Msp430GeneralSettingsGroup::buildLibraryConfigPage( // Add 'GRuntimeLibSelect' and 'GRuntimeLibSelectSlave' items // (Link with runtime: none/normal/full/custom). addOptionsGroup(QByteArrayLiteral("GRuntimeLibSelect"), - {}, {opts.libraryType}); + {opts.libraryType}); addOptionsGroup(QByteArrayLiteral("GRuntimeLibSelectSlave"), - {}, {opts.libraryType}); + {opts.libraryType}); // Add 'RTConfigPath' item (Runtime configuration file). addOptionsGroup(QByteArrayLiteral("RTConfigPath"), - {}, {opts.configPath}); + {opts.configPath}); // Add 'RTLibraryPath' item (Runtime library file). addOptionsGroup(QByteArrayLiteral("RTLibraryPath"), - {}, {opts.libraryPath}); + {opts.libraryPath}); } void Msp430GeneralSettingsGroup::buildLibraryOptionsPage( @@ -453,10 +453,10 @@ void Msp430GeneralSettingsGroup::buildLibraryOptionsPage( const LibraryOptionsPageOptions opts(qbsProduct); // Add 'Output variant' item (Printf formatter). addOptionsGroup(QByteArrayLiteral("Output variant"), - {}, {opts.printfFormatter}); + {opts.printfFormatter}); // Add 'Input variant' item (Scanf formatter). addOptionsGroup(QByteArrayLiteral("Input variant"), - {}, {opts.scanfFormatter}); + {opts.scanfFormatter}); } void Msp430GeneralSettingsGroup::buildStackHeapPage( @@ -465,16 +465,16 @@ void Msp430GeneralSettingsGroup::buildStackHeapPage( const StackHeapPageOptions opts(qbsProduct); // Add 'GStackHeapOverride' item (Override default). addOptionsGroup(QByteArrayLiteral("GStackHeapOverride"), - {}, {1}); + {1}); // Add 'GStackSize2' item (Stack size). addOptionsGroup(QByteArrayLiteral("GStackSize2"), - {}, {opts.stackSize}); + {opts.stackSize}); // Add 'GHeapSize2' item (Heap16 size). addOptionsGroup(QByteArrayLiteral("GHeapSize2"), - {}, {opts.data16HeapSize}); + {opts.data16HeapSize}); // Add 'GHeap20Size' item (Heap16 size). addOptionsGroup(QByteArrayLiteral("GHeap20Size"), - {}, {opts.data20HeapSize}); + {opts.data20HeapSize}); } } // namespace v7 diff --git a/src/plugins/generator/iarew/archs/msp430/msp430linkersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/msp430/msp430linkersettingsgroup_v7.cpp index 3e876f9fd..c7459dc49 100644 --- a/src/plugins/generator/iarew/archs/msp430/msp430linkersettingsgroup_v7.cpp +++ b/src/plugins/generator/iarew/archs/msp430/msp430linkersettingsgroup_v7.cpp @@ -210,10 +210,10 @@ void Msp430LinkerSettingsGroup::buildConfigPage( const QVariant configPath = opts.configFilePaths.takeFirst(); // Add 'XclOverride' item (Override default). addOptionsGroup(QByteArrayLiteral("XclOverride"), - {}, {1}); + {1}); // Add 'XclFile' item (Linke configuration file). addOptionsGroup(QByteArrayLiteral("XclFile"), - {}, {configPath}); + {configPath}); // Add remainder configuration files to the "Extra options page". if (!opts.configFilePaths.isEmpty()) { @@ -227,14 +227,14 @@ void Msp430LinkerSettingsGroup::buildConfigPage( // Add 'xcOverrideProgramEntryLabel' item // (Override default program entry). addOptionsGroup(QByteArrayLiteral("xcOverrideProgramEntryLabel"), - {}, {1}); + {1}); // Add 'xcProgramEntryLabel' item (Entry point name). addOptionsGroup(QByteArrayLiteral("xcProgramEntryLabel"), - {}, {opts.entryPoint}); + {opts.entryPoint}); // Add 'XIncludes' item (Entry point name). addOptionsGroup(QByteArrayLiteral("XIncludes"), - {}, {opts.librarySearchPaths}); + {opts.librarySearchPaths}); } void Msp430LinkerSettingsGroup::buildOutputPage( @@ -244,10 +244,10 @@ void Msp430LinkerSettingsGroup::buildOutputPage( // Add 'XOutOverride' item (Output file name). addOptionsGroup(QByteArrayLiteral("XOutOverride"), - {}, {1}); + {1}); // Add 'OutputFile' item (Output file name). addOptionsGroup(QByteArrayLiteral("OutputFile"), - {}, {opts.outputFile}); + {opts.outputFile}); } void Msp430LinkerSettingsGroup::buildListPage( @@ -256,7 +256,7 @@ void Msp430LinkerSettingsGroup::buildListPage( const ListPageOptions opts(qbsProduct); // Add 'XList' item (Generate linker map file). addOptionsGroup(QByteArrayLiteral("XList"), - {}, {opts.generateMap}); + {opts.generateMap}); } void Msp430LinkerSettingsGroup::buildDefinePage( @@ -265,7 +265,7 @@ void Msp430LinkerSettingsGroup::buildDefinePage( const DefinePageOptions opts(qbsProduct); // Add 'XDefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("XDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); } void Msp430LinkerSettingsGroup::buildExtraOptionsPage( @@ -278,10 +278,10 @@ void Msp430LinkerSettingsGroup::buildExtraOptionsPage( // Add 'XExtraOptionsCheck' (Use command line options). addOptionsGroup(QByteArrayLiteral("XExtraOptionsCheck"), - {}, {1}); + {1}); // Add 'XExtraOptions' item (Command line options). addOptionsGroup(QByteArrayLiteral("XExtraOptions"), - {}, m_extraOptions); + m_extraOptions); } } // namespace v7 diff --git a/src/plugins/generator/iarew/archs/stm8/stm8archiversettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8archiversettingsgroup_v3.cpp index 8a2ab0011..b08b70bc5 100644 --- a/src/plugins/generator/iarew/archs/stm8/stm8archiversettingsgroup_v3.cpp +++ b/src/plugins/generator/iarew/archs/stm8/stm8archiversettingsgroup_v3.cpp @@ -82,10 +82,10 @@ void Stm8ArchiverSettingsGroup::buildOutputPage(const QString &baseDirectory, const OutputPageOptions opts(baseDirectory, qbsProduct); // Add 'IarchiveOverride' item (Override default). addOptionsGroup(QByteArrayLiteral("IarchiveOverride"), - {}, {1}); + {1}); // Add 'IarchiveOutput' item (Output filename). addOptionsGroup(QByteArrayLiteral("IarchiveOutput"), - {}, {opts.outputFile}); + {opts.outputFile}); } } // namespace v3 diff --git a/src/plugins/generator/iarew/archs/stm8/stm8assemblersettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8assemblersettingsgroup_v3.cpp index 1e4e93706..396ee7db2 100644 --- a/src/plugins/generator/iarew/archs/stm8/stm8assemblersettingsgroup_v3.cpp +++ b/src/plugins/generator/iarew/archs/stm8/stm8assemblersettingsgroup_v3.cpp @@ -175,20 +175,20 @@ void Stm8AssemblerSettingsGroup::buildLanguagePage( const LanguagePageOptions opts(qbsProduct); // Add 'AsmCaseSensitivity' item (User symbols are case sensitive). addOptionsGroup(QByteArrayLiteral("AsmCaseSensitivity"), - {}, {opts.enableSymbolsCaseSensitive}); + {opts.enableSymbolsCaseSensitive}); // Add 'AsmMultibyteSupport' item (Enable multibyte support). addOptionsGroup(QByteArrayLiteral("AsmMultibyteSupport"), - {}, {opts.enableMultibyteSupport}); + {opts.enableMultibyteSupport}); // Add 'AsmAllowMnemonics' item (Allow mnemonics in first column). addOptionsGroup(QByteArrayLiteral("AsmAllowMnemonics"), - {}, {opts.allowFirstColumnMnemonics}); + {opts.allowFirstColumnMnemonics}); // Add 'AsmAllowDirectives' item (Allow directives in first column). addOptionsGroup(QByteArrayLiteral("AsmAllowDirectives"), - {}, {opts.allowFirstColumnDirectives}); + {opts.allowFirstColumnDirectives}); // Add 'AsmMacroChars' item (Macro quote characters: ()/[]/{}/<>). addOptionsGroup(QByteArrayLiteral("AsmMacroChars"), - {0}, {opts.macroQuoteCharacter}); + {opts.macroQuoteCharacter}); } void Stm8AssemblerSettingsGroup::buildOutputPage( @@ -197,7 +197,7 @@ void Stm8AssemblerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'AsmDebugInfo' item (Generate debug information). addOptionsGroup(QByteArrayLiteral("AsmDebugInfo"), - {}, {opts.debugInfo}); + {opts.debugInfo}); } void Stm8AssemblerSettingsGroup::buildPreprocessorPage( @@ -207,10 +207,10 @@ void Stm8AssemblerSettingsGroup::buildPreprocessorPage( const PreprocessorPageOptions opts(baseDirectory, qbsProduct); // Add 'AsmDefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("AsmDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); // Add 'AsmIncludePath' item (Additional include directories). addOptionsGroup(QByteArrayLiteral("AsmIncludePath"), - {}, opts.includePaths); + opts.includePaths); } void Stm8AssemblerSettingsGroup::buildDiagnosticsPage( @@ -220,7 +220,7 @@ void Stm8AssemblerSettingsGroup::buildDiagnosticsPage( // Add 'AsmDiagnosticsWarningsAreErrors' item. // (Treat all warnings as errors). addOptionsGroup(QByteArrayLiteral("AsmDiagnosticsWarningsAreErrors"), - {}, {opts.warningsAsErrors}); + {opts.warningsAsErrors}); } } // namespace v3 diff --git a/src/plugins/generator/iarew/archs/stm8/stm8compilersettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8compilersettingsgroup_v3.cpp index 23cb059a4..912d94bd0 100644 --- a/src/plugins/generator/iarew/archs/stm8/stm8compilersettingsgroup_v3.cpp +++ b/src/plugins/generator/iarew/archs/stm8/stm8compilersettingsgroup_v3.cpp @@ -327,7 +327,7 @@ void Stm8CompilerSettingsGroup::buildOutputPage( const OutputPageOptions opts(qbsProduct); // Add 'IccGenerateDebugInfo' item (Generate debug info). addOptionsGroup(QByteArrayLiteral("IccGenerateDebugInfo"), - {}, {opts.debugInfo}); + {opts.debugInfo}); } void Stm8CompilerSettingsGroup::buildLanguageOnePage( @@ -337,29 +337,29 @@ void Stm8CompilerSettingsGroup::buildLanguageOnePage( // Add 'IccLang' item with 'auto-extension based' // value (Language: C/C++/Auto). addOptionsGroup(QByteArrayLiteral("IccLang"), - {}, {opts.languageExtension}); + {opts.languageExtension}); // Add 'IccCDialect' item (C dialect: c89/99/11). addOptionsGroup(QByteArrayLiteral("IccCDialect"), - {}, {opts.cLanguageDialect}); + {opts.cLanguageDialect}); // Add 'IccCppDialect' item (C++ dialect: embedded/extended). addOptionsGroup(QByteArrayLiteral("IccCppDialect"), - {}, {opts.cxxLanguageDialect}); + {opts.cxxLanguageDialect}); // Add 'IccLanguageConformance' item // (Language conformance: IAR/relaxed/strict). addOptionsGroup(QByteArrayLiteral("IccLanguageConformance"), - {}, {opts.languageConformance}); + {opts.languageConformance}); // Add 'IccAllowVLA' item (Allow VLA). addOptionsGroup(QByteArrayLiteral("IccAllowVLA"), - {}, {opts.allowVla}); + {opts.allowVla}); // Add 'IccCppInlineSemantics' item (C++ inline semantics). addOptionsGroup(QByteArrayLiteral("IccCppInlineSemantics"), - {}, {opts.useCppInlineSemantics}); + {opts.useCppInlineSemantics}); // Add 'IccRequirePrototypes' item (Require prototypes). addOptionsGroup(QByteArrayLiteral("IccRequirePrototypes"), - {}, {opts.requirePrototypes}); + {opts.requirePrototypes}); // Add 'IccStaticDestr' item (Destroy static objects). addOptionsGroup(QByteArrayLiteral("IccStaticDestr"), - {}, {opts.destroyStaticObjects}); + {opts.destroyStaticObjects}); } void Stm8CompilerSettingsGroup::buildLanguageTwoPage( @@ -368,14 +368,14 @@ void Stm8CompilerSettingsGroup::buildLanguageTwoPage( const LanguageTwoPageOptions opts(qbsProduct); // Add 'IccCharIs' item (Plain char is: signed/unsigned). addOptionsGroup(QByteArrayLiteral("IccCharIs"), - {}, {opts.plainCharacter}); + {opts.plainCharacter}); // Add 'IccFloatSemantics' item (Floatic-point // semantics: strict/relaxed conformance). addOptionsGroup(QByteArrayLiteral("IccFloatSemantics"), - {}, {opts.floatingPointSemantic}); + {opts.floatingPointSemantic}); // Add 'IccMultibyteSupport' item (Enable multibyte support). addOptionsGroup(QByteArrayLiteral("IccMultibyteSupport"), - {}, {opts.enableMultibyteSupport}); + {opts.enableMultibyteSupport}); } void Stm8CompilerSettingsGroup::buildOptimizationsPage( @@ -385,15 +385,15 @@ void Stm8CompilerSettingsGroup::buildOptimizationsPage( // Add 'IccOptStrategy', 'IccOptLevel' and // 'CCOptLevelSlave' items (Level). addOptionsGroup(QByteArrayLiteral("IccOptStrategy"), - {}, {opts.optimizationStrategy}); + {opts.optimizationStrategy}); addOptionsGroup(QByteArrayLiteral("IccOptLevel"), - {}, {opts.optimizationLevel}); + {opts.optimizationLevel}); addOptionsGroup(QByteArrayLiteral("IccOptLevelSlave"), - {}, {opts.optimizationLevelSlave}); + {opts.optimizationLevelSlave}); // Add 'IccOptNoSizeConstraints' iten (no size constraints). addOptionsGroup(QByteArrayLiteral("IccOptNoSizeConstraints"), - {}, {opts.disableSizeConstraints}); + {opts.disableSizeConstraints}); // Add 'IccOptAllowList' item // (Enabled optimizations: 6 check boxes). @@ -405,12 +405,12 @@ void Stm8CompilerSettingsGroup::buildOptimizationsPage( .arg(opts.enableTypeBasedAliasAnalysis) .arg(opts.enableCrossCall); addOptionsGroup(QByteArrayLiteral("IccOptAllowList"), - {}, {bitflags}); + {bitflags}); // Add 'IccNoVregs' item // (Number of virtual registers (12/16). addOptionsGroup(QByteArrayLiteral("IccNoVregs"), - {}, {opts.vregsNumber}); + {opts.vregsNumber}); } void Stm8CompilerSettingsGroup::buildPreprocessorPage( @@ -420,11 +420,11 @@ void Stm8CompilerSettingsGroup::buildPreprocessorPage( const PreprocessorPageOptions opts(baseDirectory, qbsProduct); // Add 'CCDefines' item (Defines symbols). addOptionsGroup(QByteArrayLiteral("CCDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); // Add 'CCIncludePath2' item // (Additional include directories). addOptionsGroup(QByteArrayLiteral("CCIncludePath2"), - {}, opts.includePaths); + opts.includePaths); } void Stm8CompilerSettingsGroup::buildDiagnosticsPage( @@ -433,7 +433,7 @@ void Stm8CompilerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'CCDiagWarnAreErr' item (Treat all warnings as errors). addOptionsGroup(QByteArrayLiteral("CCDiagWarnAreErr"), - {}, {opts.warningsAsErrors}); + {opts.warningsAsErrors}); } } // namespace v3 diff --git a/src/plugins/generator/iarew/archs/stm8/stm8generalsettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8generalsettingsgroup_v3.cpp index d94c504c0..9477bc36e 100644 --- a/src/plugins/generator/iarew/archs/stm8/stm8generalsettingsgroup_v3.cpp +++ b/src/plugins/generator/iarew/archs/stm8/stm8generalsettingsgroup_v3.cpp @@ -294,11 +294,11 @@ void Stm8GeneralSettingsGroup::buildTargetPage( // Add 'GenCodeModel' item // (Code model: small/medium/large). addOptionsGroup(QByteArrayLiteral("GenCodeModel"), - {}, {opts.codeModel}); + {opts.codeModel}); // Add 'GenDataModel' item // (Data model: small/medium/large). addOptionsGroup(QByteArrayLiteral("GenDataModel"), - {}, {opts.dataModel}); + {opts.dataModel}); } void Stm8GeneralSettingsGroup::buildOutputPage( @@ -308,16 +308,16 @@ void Stm8GeneralSettingsGroup::buildOutputPage( const OutputPageOptions opts(baseDirectory, qbsProduct); // Add 'GOutputBinary' item (Output file: executable/library). addOptionsGroup(QByteArrayLiteral("GOutputBinary"), - {}, {opts.binaryType}); + {opts.binaryType}); // Add 'ExePath' item (Executable/binaries output directory). addOptionsGroup(QByteArrayLiteral("ExePath"), - {}, {opts.binaryDirectory}); + {opts.binaryDirectory}); // Add 'ObjPath' item (Object files output directory). addOptionsGroup(QByteArrayLiteral("ObjPath"), - {}, {opts.objectDirectory}); + {opts.objectDirectory}); // Add 'ListPath' item (List files output directory). addOptionsGroup(QByteArrayLiteral("ListPath"), - {}, {opts.listingDirectory}); + {opts.listingDirectory}); } void Stm8GeneralSettingsGroup::buildLibraryConfigPage( @@ -328,12 +328,12 @@ void Stm8GeneralSettingsGroup::buildLibraryConfigPage( // Add 'GenRuntimeLibSelect' and 'GenRuntimeLibSelectSlave' items // (Link with runtime: none/normal/full/custom). addOptionsGroup(QByteArrayLiteral("GenRuntimeLibSelect"), - {}, {opts.libraryType}); + {opts.libraryType}); addOptionsGroup(QByteArrayLiteral("GenRuntimeLibSelectSlave"), - {}, {opts.libraryType}); + {opts.libraryType}); // Add 'GenRTConfigPath' item (Runtime configuration file). addOptionsGroup(QByteArrayLiteral("GenRTConfigPath"), - {}, {opts.configPath}); + {opts.configPath}); } void Stm8GeneralSettingsGroup::buildLibraryOptionsPage( @@ -342,10 +342,10 @@ void Stm8GeneralSettingsGroup::buildLibraryOptionsPage( const LibraryOptionsPageOptions opts(qbsProduct); // Add 'GenLibOutFormatter' item (Printf formatter). addOptionsGroup(QByteArrayLiteral("GenLibOutFormatter"), - {}, {opts.printfFormatter}); + {opts.printfFormatter}); // Add 'GenLibInFormatter' item (Scanf formatter). addOptionsGroup(QByteArrayLiteral("GenLibInFormatter"), - {}, {opts.scanfFormatter}); + {opts.scanfFormatter}); } void Stm8GeneralSettingsGroup::buildStackHeapPage( @@ -354,10 +354,10 @@ void Stm8GeneralSettingsGroup::buildStackHeapPage( const StackHeapPageOptions opts(qbsProduct); // Add 'GenStackSize' item (Stack size). addOptionsGroup(QByteArrayLiteral("GenStackSize"), - {}, {opts.stackSize}); + {opts.stackSize}); // Add 'GenHeapSize' item (Heap size). addOptionsGroup(QByteArrayLiteral("GenHeapSize"), - {}, {opts.heapSize}); + {opts.heapSize}); } } // namespace v3 diff --git a/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp index dc74587d4..731c8d91e 100644 --- a/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp +++ b/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp @@ -288,10 +288,10 @@ void Stm8LinkerSettingsGroup::buildConfigPage( const QVariant configPath = opts.configFilePaths.takeFirst(); // Add 'IlinkIcfOverride' item (Override default). addOptionsGroup(QByteArrayLiteral("IlinkIcfOverride"), - {}, {1}); + {1}); // Add 'IlinkIcfFile' item (Linke configuration file). addOptionsGroup(QByteArrayLiteral("IlinkIcfFile"), - {}, {configPath}); + {configPath}); // Add remainder configuration files to the "Extra options page". if (!opts.configFilePaths.isEmpty()) { @@ -305,7 +305,7 @@ void Stm8LinkerSettingsGroup::buildConfigPage( // Add 'IlinkConfigDefines' item (Configuration file // symbol definitions). addOptionsGroup(QByteArrayLiteral("IlinkConfigDefines"), - {}, opts.configDefinitions); + opts.configDefinitions); } void Stm8LinkerSettingsGroup::buildLibraryPage( @@ -318,23 +318,23 @@ void Stm8LinkerSettingsGroup::buildLibraryPage( // Add 'IlinkOverrideProgramEntryLabel' item // (Override default program entry). addOptionsGroup(QByteArrayLiteral("IlinkOverrideProgramEntryLabel"), - {}, {1}); + {1}); if (opts.entryPoint.isEmpty()) { // Add 'IlinkProgramEntryLabelSelect' item // (Defined by application). addOptionsGroup(QByteArrayLiteral("IlinkProgramEntryLabelSelect"), - {}, {1}); + {1}); } else { // Add 'IlinkProgramEntryLabel' item // (Entry symbol). addOptionsGroup(QByteArrayLiteral("IlinkProgramEntryLabel"), - {}, {opts.entryPoint}); + {opts.entryPoint}); } // Add 'IlinkAdditionalLibs' item (Additional libraries). addOptionsGroup(QByteArrayLiteral("IlinkAdditionalLibs"), - {}, {opts.staticLibraries}); + {opts.staticLibraries}); } void Stm8LinkerSettingsGroup::buildOptimizationsPage( @@ -345,7 +345,7 @@ void Stm8LinkerSettingsGroup::buildOptimizationsPage( // Add 'IlinkOptMergeDuplSections' item // (Merge duplicate sections). addOptionsGroup(QByteArrayLiteral("IlinkOptMergeDuplSections"), - {}, {opts.mergeDuplicateSections}); + {opts.mergeDuplicateSections}); } void Stm8LinkerSettingsGroup::buildOutputPage( @@ -355,11 +355,11 @@ void Stm8LinkerSettingsGroup::buildOutputPage( // Add 'IlinkOutputFile' item (Output file name). addOptionsGroup(QByteArrayLiteral("IlinkOutputFile"), - {}, {opts.outputFile}); + {opts.outputFile}); // Add 'IlinkDebugInfoEnable' item // (Include debug information in output). addOptionsGroup(QByteArrayLiteral("IlinkDebugInfoEnable"), - {}, {opts.enableDebugInfo}); + {opts.enableDebugInfo}); } void Stm8LinkerSettingsGroup::buildListPage( @@ -368,7 +368,7 @@ void Stm8LinkerSettingsGroup::buildListPage( const ListPageOptions opts(qbsProduct); // Add 'IlinkMapFile' item (Generate linker map file). addOptionsGroup(QByteArrayLiteral("IlinkMapFile"), - {}, {opts.generateMap}); + {opts.generateMap}); } void Stm8LinkerSettingsGroup::buildDefinePage( @@ -377,7 +377,7 @@ void Stm8LinkerSettingsGroup::buildDefinePage( const DefinePageOptions opts(qbsProduct); // Add 'IlinkDefines' item (Defined symbols). addOptionsGroup(QByteArrayLiteral("IlinkDefines"), - {}, opts.defineSymbols); + opts.defineSymbols); } void Stm8LinkerSettingsGroup::buildDiagnosticsPage( @@ -386,7 +386,7 @@ void Stm8LinkerSettingsGroup::buildDiagnosticsPage( const DiagnosticsPageOptions opts(qbsProduct); // Add 'IlinkWarningsAreErrors' item (Treat all warnings as errors). addOptionsGroup(QByteArrayLiteral("IlinkWarningsAreErrors"), - {}, {opts.warningsAsErrors}); + {opts.warningsAsErrors}); } void Stm8LinkerSettingsGroup::buildExtraOptionsPage( @@ -399,10 +399,10 @@ void Stm8LinkerSettingsGroup::buildExtraOptionsPage( // Add 'IlinkUseExtraOptions' (Use command line options). addOptionsGroup(QByteArrayLiteral("IlinkUseExtraOptions"), - {}, {1}); + {1}); // Add 'IlinkExtraOptions' item (Command line options). addOptionsGroup(QByteArrayLiteral("IlinkExtraOptions"), - {}, m_extraOptions); + m_extraOptions); } } // namespace v3 diff --git a/src/plugins/generator/iarew/iarewoptionpropertygroup.cpp b/src/plugins/generator/iarew/iarewoptionpropertygroup.cpp index 86f12016b..8b9f79f1c 100644 --- a/src/plugins/generator/iarew/iarewoptionpropertygroup.cpp +++ b/src/plugins/generator/iarew/iarewoptionpropertygroup.cpp @@ -33,8 +33,7 @@ namespace qbs { IarewOptionPropertyGroup::IarewOptionPropertyGroup( - QByteArray name, QVariant version, - const QVariantList &states) + QByteArray name, const QVariantList &states, int version) : gen::xml::PropertyGroup(QByteArrayLiteral("option")) { // Append name property item. @@ -42,7 +41,7 @@ IarewOptionPropertyGroup::IarewOptionPropertyGroup( std::move(name)); // Append version property item. - if (!version.isNull()) + if (version >= 0) appendChild(QByteArrayLiteral("version"), std::move(version)); diff --git a/src/plugins/generator/iarew/iarewoptionpropertygroup.h b/src/plugins/generator/iarew/iarewoptionpropertygroup.h index 272ee57e4..d24fe3a9d 100644 --- a/src/plugins/generator/iarew/iarewoptionpropertygroup.h +++ b/src/plugins/generator/iarew/iarewoptionpropertygroup.h @@ -42,8 +42,8 @@ class IarewOptionPropertyGroup final { public: explicit IarewOptionPropertyGroup( - QByteArray name, QVariant version, - const QVariantList &states); + QByteArray name, const QVariantList &states, + int version = -1); }; } // namespace qbs diff --git a/src/plugins/generator/iarew/iarewsettingspropertygroup.cpp b/src/plugins/generator/iarew/iarewsettingspropertygroup.cpp index de6fae45a..3e7b6dae7 100644 --- a/src/plugins/generator/iarew/iarewsettingspropertygroup.cpp +++ b/src/plugins/generator/iarew/iarewsettingspropertygroup.cpp @@ -96,11 +96,11 @@ void IarewSettingsPropertyGroup::setDataDebugInfo(int debugInfo) void IarewSettingsPropertyGroup::addOptionsGroup( QByteArray name, - QVariant version, - const QVariantList &states) + const QVariantList &states, + int version) { m_dataPropertyGroup->appendChild( - std::move(name), std::move(version), states); + std::move(name), states, std::move(version)); } } // namespace qbs diff --git a/src/plugins/generator/iarew/iarewsettingspropertygroup.h b/src/plugins/generator/iarew/iarewsettingspropertygroup.h index 79de48018..4dea76f1a 100644 --- a/src/plugins/generator/iarew/iarewsettingspropertygroup.h +++ b/src/plugins/generator/iarew/iarewsettingspropertygroup.h @@ -50,8 +50,8 @@ protected: void setDataVersion(int dataVersion); void setDataDebugInfo(int debugInfo); - void addOptionsGroup(QByteArray name, QVariant version, - const QVariantList &states); + void addOptionsGroup(QByteArray name, const QVariantList &states, + int version = -1); private: // Don't delete all this RAW pointers explicitly! -- cgit v1.2.3