1 files changed, 14 insertions, 12 deletions

diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp
index 80ca0fd50..5f72f20e4 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp
@@ -30,7 +30,7 @@
 
 #include "mcs51assemblersettingsgroup_v10.h"
 
-#include "../../iarewproperty.h"
+//#include "../../iarewproperty.h"
 #include "../../iarewutils.h"
 
 namespace qbs {
@@ -47,15 +47,17 @@ namespace {
 
 struct LanguagePageOptions final
 {
-    enum MacroQuoteCharacter { AngleBracketsQuote,
-                               RoundBracketsQuote,
-                               SquareBracketsQuote,
-                               FigureBracketsQuote };
+    enum MacroQuoteCharacter {
+        AngleBracketsQuote,
+        RoundBracketsQuote,
+        SquareBracketsQuote,
+        FigureBracketsQuote
+    };
 
     explicit LanguagePageOptions(const ProductData &qbsProduct)
     {
         const auto &qbsProps = qbsProduct.moduleProperties();
-        const QStringList flags = IarewUtils::cppStringModuleProperties(
+        const QStringList flags = gen::utils::cppStringModuleProperties(
                     qbsProps, {QStringLiteral("assemblerFlags")});
         enableSymbolsCaseSensitive = flags.contains(QLatin1String("-s+"));
         enableMultibyteSupport = flags.contains(QLatin1String("-n"));
@@ -81,7 +83,7 @@ struct OutputPageOptions final
 {
     explicit OutputPageOptions(const ProductData &qbsProduct)
     {
-        debugInfo = IarewUtils::debugInformation(qbsProduct);
+        debugInfo = gen::utils::debugInformation(qbsProduct);
     }
 
     int debugInfo = 0;
@@ -95,11 +97,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 auto &fullIncludePath : fullIncludePaths) {
@@ -128,7 +130,7 @@ struct DiagnosticsPageOptions final
     explicit DiagnosticsPageOptions(const ProductData &qbsProduct)
     {
         const auto &qbsProps = qbsProduct.moduleProperties();
-        const QString warningLevel = IarewUtils::cppStringModuleProperty(
+        const QString warningLevel = gen::utils::cppStringModuleProperty(
                     qbsProps, QStringLiteral("warningLevel"));
         if (warningLevel == QLatin1String("all")) {
             enableWarnings = 0;
@@ -161,9 +163,9 @@ Mcs51AssemblerSettingsGroup::Mcs51AssemblerSettingsGroup(
     setName(QByteArrayLiteral("A8051"));
     setArchiveVersion(kAssemblerArchiveVersion);
     setDataVersion(kAssemblerDataVersion);
-    setDataDebugInfo(IarewUtils::debugInformation(qbsProduct));
+    setDataDebugInfo(gen::utils::debugInformation(qbsProduct));
 
-    const QString buildRootDirectory = IarewUtils::buildRootPath(qbsProject);
+    const QString buildRootDirectory = gen::utils::buildRootPath(qbsProject);
 
     buildLanguagePage(qbsProduct);
     buildOutputPage(qbsProduct);