diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-08-28 17:58:38 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-09-23 14:26:03 +0000 |
commit | ef540dc823b84be61562c83997eea42d0adf9cab (patch) | |
tree | 1ef4f7d2bc9a9a3681044a476344c34379d48462 /src/plugins/generator/iarew/archs/msp430 | |
parent | 9f3a9830162f379d6f856c84668c3664df6d6477 (diff) |
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 <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/generator/iarew/archs/msp430')
5 files changed, 68 insertions, 68 deletions
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 |