1 files changed, 13 insertions, 11 deletions
diff --git a/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp
index 1cf2e7302..9b86a860e 100644
--- a/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp
+++ b/src/plugins/generator/iarew/archs/avr/avrlinkersettingsgroup_v7.cpp
@@ -55,7 +55,7 @@ struct ConfigPageOptions final
         const auto &qbsProps = qbsProduct.moduleProperties();
         const QString toolkitPath = IarewUtils::toolkitRootPath(qbsProduct);
 
-        entryPoint = IarewUtils::cppStringModuleProperty(
+        entryPoint = gen::utils::cppStringModuleProperty(
                     qbsProps, QStringLiteral("entryPoint"));
 
         // Enumerate all product linker config files
@@ -101,7 +101,7 @@ struct ConfigPageOptions final
         }
 
         // Add libraries search paths.
-        const QStringList libraryPaths = IarewUtils::cppStringModuleProperties(
+        const QStringList libraryPaths = gen::utils::cppStringModuleProperties(
                     qbsProps, {QStringLiteral("libraryPaths")});
         for (const QString &libraryPath : libraryPaths) {
             const QFileInfo libraryPathInfo(libraryPath);
@@ -121,7 +121,7 @@ struct ConfigPageOptions final
 
         // Add static libraries paths.
         const QStringList staticLibrariesProps =
-                IarewUtils::cppStringModuleProperties(
+                gen::utils::cppStringModuleProperties(
                     qbsProps, {QStringLiteral("staticLibraries")});
         for (const QString &staticLibrary : staticLibrariesProps) {
             const QFileInfo staticLibraryInfo(staticLibrary);
@@ -146,7 +146,7 @@ struct ConfigPageOptions final
         // Add static libraries from product dependencies.
         for (const ProductData &qbsProductDep : qbsProductDeps) {
             const QString depBinaryPath = QLatin1String("$PROJ_DIR$/")
-                    + IarewUtils::targetBinaryPath(baseDirectory,
+                    + gen::utils::targetBinaryPath(baseDirectory,
                                                    qbsProductDep);
             staticLibraries.push_back(depBinaryPath);
         }
@@ -164,7 +164,7 @@ struct OutputPageOptions final
 {
     explicit OutputPageOptions(const ProductData &qbsProduct)
     {
-        outputFile = IarewUtils::targetBinary(qbsProduct);
+        outputFile = gen::utils::targetBinary(qbsProduct);
     }
 
     QString outputFile;
@@ -174,13 +174,15 @@ struct OutputPageOptions final
 
 struct ListPageOptions final
 {
-    enum ListingAction { NoListing,
-                         GenerateListing };
+    enum ListingAction {
+        NoListing,
+        GenerateListing
+    };
 
     explicit ListPageOptions(const ProductData &qbsProduct)
     {
         const auto &qbsProps = qbsProduct.moduleProperties();
-        generateMap = IarewUtils::cppBooleanModuleProperty(
+        generateMap = gen::utils::cppBooleanModuleProperty(
                     qbsProps, QStringLiteral("generateMapFile"))
                 ? ListPageOptions::GenerateListing
                 : ListPageOptions::NoListing;
@@ -243,7 +245,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"));
         suppressAllWarnings = (warningLevel == QLatin1String("none"));
     }
@@ -263,9 +265,9 @@ AvrLinkerSettingsGroup::AvrLinkerSettingsGroup(
     setName(QByteArrayLiteral("XLINK"));
     setArchiveVersion(kLinkerArchiveVersion);
     setDataVersion(kLinkerDataVersion);
-    setDataDebugInfo(IarewUtils::debugInformation(qbsProduct));
+    setDataDebugInfo(gen::utils::debugInformation(qbsProduct));
 
-    const QString buildRootDirectory = IarewUtils::buildRootPath(qbsProject);
+    const QString buildRootDirectory = gen::utils::buildRootPath(qbsProject);
 
     buildConfigPage(buildRootDirectory, qbsProduct, qbsProductDeps);
     buildOutputPage(qbsProduct);