Fix style

Change-Id: I89324a1d77cdc65f916154e96ab9003f8593d7a3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

8 files changed, 62 insertions, 39 deletions

diff --git a/src/app/qbs/parser/commandlineoption.h b/src/app/qbs/parser/commandlineoption.h
index b12d96b2d..7b8baeae2 100644
--- a/src/app/qbs/parser/commandlineoption.h
+++ b/src/app/qbs/parser/commandlineoption.h
@@ -55,7 +55,9 @@ public:
     enum Type {
         FileOptionType,
         BuildDirectoryOptionType,
-        LogLevelOptionType, VerboseOptionType, QuietOptionType,
+        LogLevelOptionType,
+        VerboseOptionType,
+        QuietOptionType,
         JobsOptionType,
         KeepGoingOptionType,
         DryRunOptionType,
@@ -64,7 +66,9 @@ public:
         ChangedFilesOptionType,
         ProductsOptionType,
         NoInstallOptionType,
-        InstallRootOptionType, RemoveFirstOptionType, NoBuildOptionType,
+        InstallRootOptionType,
+        RemoveFirstOptionType,
+        NoBuildOptionType,
         ForceTimestampCheckOptionType,
         ForceOutputCheckOptionType,
         BuildNonDefaultOptionType,
diff --git a/src/app/qbs/parser/parsercommand.cpp b/src/app/qbs/parser/parsercommand.cpp
index 84eef9774..ef8da9551 100644
--- a/src/app/qbs/parser/parsercommand.cpp
+++ b/src/app/qbs/parser/parsercommand.cpp
@@ -199,17 +199,18 @@ QString ResolveCommand::representation() const
 
 static QList<CommandLineOption::Type> resolveOptions()
 {
-    return {CommandLineOption::FileOptionType,
-            CommandLineOption::BuildDirectoryOptionType,
-            CommandLineOption::LogLevelOptionType,
-            CommandLineOption::VerboseOptionType,
-            CommandLineOption::QuietOptionType,
-            CommandLineOption::ShowProgressOptionType,
-            CommandLineOption::DryRunOptionType,
-            CommandLineOption::ForceProbesOptionType,
-            CommandLineOption::LogTimeOptionType,
-            CommandLineOption::DeprecationWarningsOptionType,
-            CommandLineOption::JobsOptionType};
+    return {
+        CommandLineOption::FileOptionType,
+        CommandLineOption::BuildDirectoryOptionType,
+        CommandLineOption::LogLevelOptionType,
+        CommandLineOption::VerboseOptionType,
+        CommandLineOption::QuietOptionType,
+        CommandLineOption::ShowProgressOptionType,
+        CommandLineOption::DryRunOptionType,
+        CommandLineOption::ForceProbesOptionType,
+        CommandLineOption::LogTimeOptionType,
+        CommandLineOption::DeprecationWarningsOptionType,
+        CommandLineOption::JobsOptionType};
 }
 
 QList<CommandLineOption::Type> ResolveCommand::supportedOptions() const
diff --git a/src/lib/corelib/language/builtindeclarations.cpp b/src/lib/corelib/language/builtindeclarations.cpp
index 24e8f1cfb..44dc8a326 100644
--- a/src/lib/corelib/language/builtindeclarations.cpp
+++ b/src/lib/corelib/language/builtindeclarations.cpp
@@ -247,9 +247,11 @@ void BuiltinDeclarations::addDependsItem()
                                 PropertyDeclaration::StringList);
     item << PropertyDeclaration(StringConstants::limitToSubProjectProperty(),
                                 PropertyDeclaration::Boolean, StringConstants::falseValue());
-    item << PropertyDeclaration(StringConstants::multiplexConfigurationIdsProperty(),
-                                PropertyDeclaration::StringList, QString(),
-                                PropertyDeclaration::ReadOnlyFlag);
+    item << PropertyDeclaration(
+        StringConstants::multiplexConfigurationIdsProperty(),
+        PropertyDeclaration::StringList,
+        QString(),
+        PropertyDeclaration::ReadOnlyFlag);
     insert(item);
 }
 
diff --git a/src/lib/corelib/loader/dependenciesresolver.cpp b/src/lib/corelib/loader/dependenciesresolver.cpp
index b97580f27..059592e9c 100644
--- a/src/lib/corelib/loader/dependenciesresolver.cpp
+++ b/src/lib/corelib/loader/dependenciesresolver.cpp
@@ -873,8 +873,15 @@ std::optional<EvaluatedDependsItem> DependenciesResolver::evaluateDependsItem(It
     if (!productTypeTags.empty())
         m_product.bulkDependencies.emplace_back(productTypeTags, item->location());
     return EvaluatedDependsItem{
-        item, QualifiedId::fromString(name), submodules, productTypeTags,
-        multiplexIds, profiles, {minVersion, maxVersion}, parameters, limitToSubProject,
+        item,
+        QualifiedId::fromString(name),
+        submodules,
+        productTypeTags,
+        multiplexIds,
+        profiles,
+        {minVersion, maxVersion},
+        parameters,
+        limitToSubProject,
         required};
 }
 
@@ -1029,9 +1036,13 @@ Item::Module DependenciesResolver::createModule(
 
 FullyResolvedDependsItem::FullyResolvedDependsItem(
     ProductContext *product, const EvaluatedDependsItem &dependency)
-    : product(product), item(dependency.item), name(product->name),
-    versionRange(dependency.versionRange), parameters(dependency.parameters),
-    checkProduct(false) {}
+    : product(product)
+    , item(dependency.item)
+    , name(product->name)
+    , versionRange(dependency.versionRange)
+    , parameters(dependency.parameters)
+    , checkProduct(false)
+{}
 
 FullyResolvedDependsItem FullyResolvedDependsItem::makeBaseDependency()
 {
@@ -1042,13 +1053,16 @@ FullyResolvedDependsItem FullyResolvedDependsItem::makeBaseDependency()
 
 FullyResolvedDependsItem::FullyResolvedDependsItem(
     const EvaluatedDependsItem &dependency, QualifiedId name, QString profile, QString multiplexId)
-    : item(dependency.item), name(std::move(name)),
-      profile(std::move(profile)), multiplexId(std::move(multiplexId)),
-      versionRange(dependency.versionRange),
-      parameters(dependency.parameters),
-      limitToSubProject(dependency.limitToSubProject),
-      requiredLocally(dependency.requiredLocally),
-      requiredGlobally(dependency.requiredGlobally) {}
+    : item(dependency.item)
+    , name(std::move(name))
+    , profile(std::move(profile))
+    , multiplexId(std::move(multiplexId))
+    , versionRange(dependency.versionRange)
+    , parameters(dependency.parameters)
+    , limitToSubProject(dependency.limitToSubProject)
+    , requiredLocally(dependency.requiredLocally)
+    , requiredGlobally(dependency.requiredGlobally)
+{}
 
 QString FullyResolvedDependsItem::id() const
 {
diff --git a/src/lib/corelib/loader/moduleloader.cpp b/src/lib/corelib/loader/moduleloader.cpp
index 80956377c..d26849655 100644
--- a/src/lib/corelib/loader/moduleloader.cpp
+++ b/src/lib/corelib/loader/moduleloader.cpp
@@ -161,8 +161,8 @@ Item *ModuleLoader::load()
     if (existingPaths.isEmpty()) { // no suitable names found, try to use providers
         AccumulatingTimer providersTimer(m_loaderState.parameters().logElapsedTime()
                                          ? &m_product.timingData.moduleProviders : nullptr);
-        auto result = ModuleProviderLoader(m_loaderState).executeModuleProviders(
-                    m_product, m_dependsItemLocation, m_moduleName);
+        auto result = ModuleProviderLoader(m_loaderState)
+                          .executeModuleProviders(m_product, m_dependsItemLocation, m_moduleName);
         if (result.searchPaths) {
             qCDebug(lcModuleLoader) << "Re-checking for module" << m_moduleName.toString()
                                     << "with newly added search paths from module provider";
diff --git a/src/lib/corelib/loader/moduleloader.h b/src/lib/corelib/loader/moduleloader.h
index e9ae214b8..b07f01836 100644
--- a/src/lib/corelib/loader/moduleloader.h
+++ b/src/lib/corelib/loader/moduleloader.h
@@ -47,9 +47,11 @@ class LoaderState;
 class ProductContext;
 class QualifiedId;
 
-Item *searchAndLoadModuleFile(LoaderState &loaderState, ProductContext &product,
-                              const CodeLocation &dependsItemLocation,
-                              const QualifiedId &moduleName);
+Item *searchAndLoadModuleFile(
+    LoaderState &loaderState,
+    ProductContext &product,
+    const CodeLocation &dependsItemLocation,
+    const QualifiedId &moduleName);
 
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/loader/moduleproviderloader.cpp b/src/lib/corelib/loader/moduleproviderloader.cpp
index a8b99ca20..086448955 100644
--- a/src/lib/corelib/loader/moduleproviderloader.cpp
+++ b/src/lib/corelib/loader/moduleproviderloader.cpp
@@ -76,9 +76,9 @@ ModuleProviderLoader::ModuleProviderLoader(LoaderState &loaderState)
     : m_loaderState(loaderState) {}
 
 ModuleProviderLoader::ModuleProviderResult ModuleProviderLoader::executeModuleProviders(
-        ProductContext &productContext,
-        const CodeLocation &dependsItemLocation,
-        const QualifiedId &moduleName)
+    ProductContext &productContext,
+    const CodeLocation &dependsItemLocation,
+    const QualifiedId &moduleName)
 {
     ModuleProviderLoader::ModuleProviderResult result;
     try {
diff --git a/src/lib/corelib/loader/moduleproviderloader.h b/src/lib/corelib/loader/moduleproviderloader.h
index 4fe94217b..471cfbb02 100644
--- a/src/lib/corelib/loader/moduleproviderloader.h
+++ b/src/lib/corelib/loader/moduleproviderloader.h
@@ -67,9 +67,9 @@ public:
         std::optional<QStringList> searchPaths;
     };
     ModuleProviderResult executeModuleProviders(
-            ProductContext &productContext,
-            const CodeLocation &dependsItemLocation,
-            const QualifiedId &moduleName);
+        ProductContext &productContext,
+        const CodeLocation &dependsItemLocation,
+        const QualifiedId &moduleName);
 
 private:
     enum class ModuleProviderLookup { Scoped, Named };