1 files changed, 56 insertions, 38 deletions

diff --git a/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.cpp
index 03f6194f9..178eaab8c 100644
--- a/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.cpp
+++ b/src/plugins/generator/iarew/archs/avr/avrcompilersettingsgroup_v7.cpp
@@ -53,7 +53,7 @@ struct OutputPageOptions final
         moduleType = flags.contains(QLatin1String("--library_module"))
                 ? OutputPageOptions::LibraryModule
                 : OutputPageOptions::ProgramModule;
-        debugInfo = IarewUtils::debugInformation(qbsProduct);
+        debugInfo = gen::utils::debugInformation(qbsProduct);
         disableErrorMessages = flags.contains(
                     QLatin1String("--no_ubrof_messages"));
     }
@@ -68,19 +68,27 @@ struct OutputPageOptions final
 
 struct LanguageOnePageOptions final
 {
-    enum LanguageExtension { CLanguageExtension,
-                             CxxLanguageExtension,
-                             AutoLanguageExtension };
-
-    enum CLanguageDialect { C89LanguageDialect,
-                            C99LanguageDialect };
-
-    enum CxxLanguageDialect { EmbeddedCPlusPlus,
-                              ExtendedEmbeddedCPlusPlus };
-
-    enum LanguageConformance { AllowIarExtension,
-                               RelaxedStandard,
-                               StrictStandard };
+    enum LanguageExtension {
+        CLanguageExtension,
+        CxxLanguageExtension,
+        AutoLanguageExtension
+    };
+
+    enum CLanguageDialect {
+        C89LanguageDialect,
+        C99LanguageDialect
+    };
+
+    enum CxxLanguageDialect {
+        EmbeddedCPlusPlus,
+        ExtendedEmbeddedCPlusPlus
+    };
+
+    enum LanguageConformance {
+        AllowIarExtension,
+        RelaxedStandard,
+        StrictStandard
+    };
 
     explicit LanguageOnePageOptions(const ProductData &qbsProduct)
     {
@@ -89,7 +97,7 @@ struct LanguageOnePageOptions final
         // File extension based by default.
         languageExtension = LanguageOnePageOptions::AutoLanguageExtension;
         // C language dialect.
-        const QStringList cLanguageVersion = IarewUtils::cppStringModuleProperties(
+        const QStringList cLanguageVersion = gen::utils::cppStringModuleProperties(
                     qbsProps, {QStringLiteral("cLanguageVersion")});
         if (cLanguageVersion.contains(QLatin1String("c89")))
             cLanguageDialect = LanguageOnePageOptions::C89LanguageDialect;
@@ -131,11 +139,15 @@ struct LanguageOnePageOptions final
 
 struct LanguageTwoPageOptions final
 {
-    enum PlainCharacter { SignedCharacter,
-                          UnsignedCharacter };
+    enum PlainCharacter {
+        SignedCharacter,
+        UnsignedCharacter
+    };
 
-    enum FloatingPointSemantic { StrictSemantic,
-                                 RelaxedSemantic };
+    enum FloatingPointSemantic {
+        StrictSemantic,
+        RelaxedSemantic
+    };
 
     explicit LanguageTwoPageOptions(const ProductData &qbsProduct)
     {
@@ -162,24 +174,30 @@ struct OptimizationsPageOptions final
 {
     // Optimizations level radio-buttons with
     // combo-box on "level" widget.
-    enum Strategy { StrategyBalanced,
-                    StrategySize,
-                    StrategySpeed };
-
-    enum Level { LevelNone,
-                 LevelLow,
-                 LevelMedium,
-                 LevelHigh };
-
-    enum LevelSlave { LevelSlave0,
-                      LevelSlave1,
-                      LevelSlave2,
-                      LevelSlave3 };
+    enum Strategy {
+        StrategyBalanced,
+        StrategySize,
+        StrategySpeed
+    };
+
+    enum Level {
+        LevelNone,
+        LevelLow,
+        LevelMedium,
+        LevelHigh
+    };
+
+    enum LevelSlave {
+        LevelSlave0,
+        LevelSlave1,
+        LevelSlave2,
+        LevelSlave3
+    };
 
     explicit OptimizationsPageOptions(const ProductData &qbsProduct)
     {
         const auto &qbsProps = qbsProduct.moduleProperties();
-        const QString optimization = IarewUtils::cppStringModuleProperty(
+        const QString optimization = gen::utils::cppStringModuleProperty(
                     qbsProps, QStringLiteral("optimization"));
         if (optimization == QLatin1String("none")) {
             optimizationStrategy = OptimizationsPageOptions::StrategyBalanced;
@@ -231,11 +249,11 @@ struct PreprocessorPageOptions final
                                      const ProductData &qbsProduct)
     {
         const auto &qbsProps = qbsProduct.moduleProperties();
-        defineSymbols = IarewUtils::cppVariantModuleProperties(
+        defineSymbols = gen::utils::cppVariantModuleProperties(
                     qbsProps, {QStringLiteral("defines")});
 
         const QString toolkitPath = IarewUtils::toolkitRootPath(qbsProduct);
-        const QStringList fullIncludePaths = IarewUtils::cppStringModuleProperties(
+        const QStringList fullIncludePaths = gen::utils::cppStringModuleProperties(
                     qbsProps, {QStringLiteral("includePaths"),
                                QStringLiteral("systemIncludePaths")});
         for (const QString &fullIncludePath : fullIncludePaths) {
@@ -264,7 +282,7 @@ struct DiagnosticsPageOptions final
     explicit DiagnosticsPageOptions(const ProductData &qbsProduct)
     {
         const auto &qbsProps = qbsProduct.moduleProperties();
-        warningsAsErrors = IarewUtils::cppIntegerModuleProperty(
+        warningsAsErrors = gen::utils::cppIntegerModuleProperty(
                     qbsProps, QStringLiteral("treatWarningsAsErrors"));
     }
 
@@ -311,9 +329,9 @@ AvrCompilerSettingsGroup::AvrCompilerSettingsGroup(
     setName(QByteArrayLiteral("ICCAVR"));
     setArchiveVersion(kCompilerArchiveVersion);
     setDataVersion(kCompilerDataVersion);
-    setDataDebugInfo(IarewUtils::debugInformation(qbsProduct));
+    setDataDebugInfo(gen::utils::debugInformation(qbsProduct));
 
-    const QString buildRootDirectory = IarewUtils::buildRootPath(qbsProject);
+    const QString buildRootDirectory = gen::utils::buildRootPath(qbsProject);
 
     buildOutputPage(qbsProduct);
     buildLanguageOnePage(qbsProduct);