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>

1 files changed, 9 insertions, 9 deletions

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