Brayns 543 upgrade clang format (#1177)

BlueBrain · May 2, 2023 · 81ab66f · 81ab66f
1 parent 199980f
commit 81ab66f
Show file tree

Hide file tree

Showing 261 changed files with 1,057 additions and 978 deletions.
diff --git a/.clang-format b/.clang-format
@@ -2,7 +2,7 @@
 BasedOnStyle: Google
 AccessModifierOffset: -4
 AlignAfterOpenBracket: AlwaysBreak
-# AlignArrayOfStructures: None
+AlignArrayOfStructures: None
 AlignConsecutiveAssignments: None
 AlignConsecutiveBitFields: None
 AlignConsecutiveDeclarations: None
@@ -28,45 +28,54 @@ BinPackParameters: false
 BitFieldColonSpacing: Both
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Allman
-# BreakBeforeConceptDeclarations: true
+BreakBeforeConceptDeclarations: true
 BreakBeforeTernaryOperators: true
-BreakConstructorInitializers: BeforeComma
-BreakInheritanceList: BeforeComma
+BreakConstructorInitializers: AfterColon
+BreakInheritanceList: AfterColon
 BreakStringLiterals: true
 ColumnLimit: 120
 CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false # Deprecated
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DeriveLineEnding: false
 DerivePointerAlignment: false
-# EmptyLineAfterAccessModifier: Never
-# EmptyLineBeforeAccessModifier: Always
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: Always
 FixNamespaceComments: false
 IncludeBlocks: Preserve
-# IndentAccessModifiers: false
+IndentAccessModifiers: false
 IndentCaseBlocks: false
 IndentCaseLabels: false
 IndentExternBlock: true
 IndentGotoLabels: false
 IndentPPDirectives: BeforeHash
-# IndentRequires: true
+IndentRequires: true
 IndentWidth: 4
 IndentWrappedFunctionNames: true
 KeepEmptyLinesAtTheStartOfBlocks: false
-# LambdaBodyIndentation: OuterScope
+LambdaBodyIndentation: Signature
 Language: Cpp
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
-# PackConstructorInitializers: Never
+PackConstructorInitializers: Never
+PenaltyBreakAssignment: 1
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 1
+PenaltyBreakFirstLessLess: 1
+PenaltyBreakOpenParenthesis: 1
+PenaltyBreakString: 2
+PenaltyBreakTemplateDeclaration: 1
+PenaltyExcessCharacter: 100
+PenaltyIndentedWhitespace: 0
+PenaltyReturnTypeOnItsOwnLine: 100000
 PointerAlignment: Right
-# QualifierAlignment: Leave
-# QualifierOrder: ['static', 'inline', 'const', 'volatile', 'type']
-# ReferenceAlignment: Right
+QualifierAlignment: Custom
+QualifierOrder: ["static", "inline", "const", "volatile", "type"]
+ReferenceAlignment: Right
 ReflowComments: true
-# SeparateDefinitionBlocks: true
-# ShortNamespaceLines: 1
+SeparateDefinitionBlocks: Always
+ShortNamespaceLines: 1
 SortIncludes: true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
@@ -76,21 +85,21 @@ SpaceAroundPointerQualifiers: Default
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeCaseColon: false
 SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
+SpaceBeforeCtorInitializerColon: false
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
 SpaceBeforeRangeBasedForLoopColon: true
 SpaceBeforeSquareBrackets: false
 SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
-# SpacesInAngles: false
+SpacesInAngles: false
 SpacesInCStyleCastParentheses: false
 SpacesInConditionalStatement: false
 SpacesInContainerLiterals: false
-# SpacesInLineCommentPrefix:
-#     Minimum: 1
-#     Maximum: 1
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: 1
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard: c++17

diff --git a/.gitlab-ci.viz.yml b/.gitlab-ci.viz.yml
@@ -9,16 +9,16 @@ include:
 ubuntu-clangformat-check:
   stage: test
   image:
-    name: ubuntu:20.04
+    name: ubuntu:22.04
     entrypoint: [""]
   script:
-    - apt update && apt install -y git clang-format-12
+    - apt update && apt install -y git clang-format-15
     - cd $CI_PROJECT_DIR
     - CLANG_FORMAT_EXTENSIONS="\.[cmh]$|\.[chi]pp$"
     - if [ -f .clang-format ]; then
-    - if find . | grep -E "$CLANG_FORMAT_EXTENSIONS" | xargs -n1 clang-format-12 -style=file -fallback-style=none -output-replacements-xml | grep "<replacement " >/dev/null ; then
+    - if find . | grep -E "$CLANG_FORMAT_EXTENSIONS" | xargs -n1 clang-format-15 -style=file -fallback-style=none -output-replacements-xml | grep "<replacement " >/dev/null ; then
     - echo "clang-format check failed - commit does not match coding style"
-    - find . | grep -E "$CLANG_FORMAT_EXTENSIONS" | xargs -n1 clang-format-12 -i -style=file -fallback-style=none
+    - find . | grep -E "$CLANG_FORMAT_EXTENSIONS" | xargs -n1 clang-format-15 -i -style=file -fallback-style=none
     - git diff
     - exit 1
     - else
@@ -119,7 +119,7 @@ ubuntu-cpp-release-build:
   stage: test
   variables:
     CMAKE_BUILD_TYPE: Release
-    
+
 ubuntu-cpp-debug-build:
   extends: .ubuntu-cpp-build
   stage: test

diff --git a/brayns/Brayns.cpp b/brayns/Brayns.cpp
@@ -87,8 +87,8 @@ class NetworkStartup
 class RateLimiter
 {
 public:
-    explicit RateLimiter(brayns::Duration period)
-        : _period(period)
+    explicit RateLimiter(brayns::Duration period):
+        _period(period)
     {
     }
 
@@ -112,10 +112,10 @@ class RateLimiter
 
 namespace brayns
 {
-Brayns::Brayns(int argc, const char **argv)
-    : _parametersManager(argc, argv)
-    , _engine(_parametersManager)
-    , _pluginManager(*this)
+Brayns::Brayns(int argc, const char **argv):
+    _parametersManager(argc, argv),
+    _engine(_parametersManager),
+    _pluginManager(*this)
 {
     LoggingStartup::run(_parametersManager);
 

diff --git a/brayns/CommandLine.cpp b/brayns/CommandLine.cpp
@@ -175,9 +175,9 @@ std::string CommandLine::getVersion()
     return VersionFormatter::format();
 }
 
-CommandLine::CommandLine(int argc, const char **argv)
-    : _argc(argc)
-    , _argv(argv)
+CommandLine::CommandLine(int argc, const char **argv):
+    _argc(argc),
+    _argv(argv)
 {
 }
 

diff --git a/brayns/PluginManager.cpp b/brayns/PluginManager.cpp
@@ -75,8 +75,8 @@ class PluginLoader
 
 namespace brayns
 {
-PluginManager::PluginManager(PluginAPI &api)
-    : _api(api)
+PluginManager::PluginManager(PluginAPI &api):
+    _api(api)
 {
 }
 

diff --git a/brayns/engine/camera/Camera.cpp b/brayns/engine/camera/Camera.cpp
@@ -26,12 +26,12 @@ namespace
 {
 struct CameraParameters
 {
-    inline static const std::string position = "position";
-    inline static const std::string direction = "direction";
-    inline static const std::string up = "up";
-    inline static const std::string aspect = "aspect";
-    inline static const std::string imageStart = "imageStart";
-    inline static const std::string imageEnd = "imageEnd";
+    static inline const std::string position = "position";
+    static inline const std::string direction = "direction";
+    static inline const std::string up = "up";
+    static inline const std::string aspect = "aspect";
+    static inline const std::string imageStart = "imageStart";
+    static inline const std::string imageEnd = "imageEnd";
 };
 
 class ViewIntegrity

diff --git a/brayns/engine/camera/ProjectionTraits.h b/brayns/engine/camera/ProjectionTraits.h
@@ -33,7 +33,7 @@ template<typename T>
 class ProjectionTraits
 {
 public:
-    inline static const std::string name;
+    static inline const std::string name;
 
     static void checkParameters(const T &data)
     {

diff --git a/brayns/engine/camera/projections/Orthographic.cpp b/brayns/engine/camera/projections/Orthographic.cpp
@@ -24,7 +24,7 @@ namespace
 {
 struct OrhtographicParameters
 {
-    inline static const std::string height = "height";
+    static inline const std::string height = "height";
 };
 }
 

diff --git a/brayns/engine/camera/projections/Orthographic.h b/brayns/engine/camera/projections/Orthographic.h
@@ -33,7 +33,7 @@ template<>
 class ProjectionTraits<Orthographic>
 {
 public:
-    inline static const std::string name = "orthographic";
+    static inline const std::string name = "orthographic";
 
     static void checkParameters(const Orthographic &data);
     static void updateData(ospray::cpp::Camera &handle, Orthographic &data);

diff --git a/brayns/engine/camera/projections/Perspective.cpp b/brayns/engine/camera/projections/Perspective.cpp
@@ -24,9 +24,9 @@ namespace
 {
 struct PerspectiveParameters
 {
-    inline static const std::string fovy = "fovy";
-    inline static const std::string aperture = "apertureRadius";
-    inline static const std::string focus = "focusDistance";
+    static inline const std::string fovy = "fovy";
+    static inline const std::string aperture = "apertureRadius";
+    static inline const std::string focus = "focusDistance";
 };
 }
 

diff --git a/brayns/engine/colormethods/PrimitiveColorMethod.cpp b/brayns/engine/colormethods/PrimitiveColorMethod.cpp
@@ -80,9 +80,9 @@ class Painter
 
 namespace brayns
 {
-PrimitiveColorMethod::PrimitiveColorMethod(std::string name, size_t primitiveCount)
-    : _name(std::move(name))
-    , _primitiveCount(primitiveCount)
+PrimitiveColorMethod::PrimitiveColorMethod(std::string name, size_t primitiveCount):
+    _name(std::move(name)),
+    _primitiveCount(primitiveCount)
 {
     assert(_primitiveCount > 0);
 }

diff --git a/brayns/engine/colormethods/SolidColorMethod.cpp b/brayns/engine/colormethods/SolidColorMethod.cpp
@@ -31,8 +31,8 @@ namespace
 {
 struct SolidMethodNames
 {
-    inline static const std::string name = "solid";
-    inline static const std::string value = "color";
+    static inline const std::string name = "solid";
+    static inline const std::string value = "color";
 };
 
 class ColorFiller

diff --git a/brayns/engine/common/DataWrapper.h b/brayns/engine/common/DataWrapper.h
@@ -39,8 +39,8 @@ template<typename DataType, typename OsprayHandle, template<typename> typename T
 class DataWrapper final : public IDataWrapper<OsprayHandle>
 {
 public:
-    explicit DataWrapper(DataType value)
-        : data(std::move(value))
+    explicit DataWrapper(DataType value):
+        data(std::move(value))
     {
     }
 
@@ -73,8 +73,8 @@ class SpatialDataWrapper final : public ISpatialDataWrapper<OsprayHandle>
 public:
     using Type = std::decay_t<DataType>;
 
-    explicit SpatialDataWrapper(Type value)
-        : data(std::move(value))
+    explicit SpatialDataWrapper(Type value):
+        data(std::move(value))
     {
     }
 

diff --git a/brayns/engine/components/Bounds.cpp b/brayns/engine/components/Bounds.cpp
@@ -22,9 +22,9 @@
 
 namespace brayns
 {
-Bounds::Bounds(const Vector3f &minB, const Vector3f &maxB)
-    : _min(minB)
-    , _max(maxB)
+Bounds::Bounds(const Vector3f &minB, const Vector3f &maxB):
+    _min(minB),
+    _max(maxB)
 {
     if (glm::min(_min, _max) != _min)
     {

diff --git a/brayns/engine/components/ColorRamp.cpp b/brayns/engine/components/ColorRamp.cpp
@@ -26,9 +26,9 @@
 
 namespace brayns
 {
-ColorRamp::ColorRamp()
-    : _colors({{0, 0, 0, 0}, {1, 1, 1, 1}})
-    , _valuesRange({0, 255})
+ColorRamp::ColorRamp():
+    _colors({{0, 0, 0, 0}, {1, 1, 1, 1}}),
+    _valuesRange({0, 255})
 {
 }
 

diff --git a/brayns/engine/core/Engine.cpp b/brayns/engine/core/Engine.cpp
@@ -114,12 +114,12 @@ Engine::OsprayModuleHandler::~OsprayModuleHandler()
     ospShutdown();
 }
 
-Engine::Engine(ParametersManager &parameters)
-    : _params(parameters)
-    , _osprayDevice(OsprayDeviceInitializer::init(parameters))
-    , _frameBuffer(std::make_unique<StaticFrameHandler>())
-    , _camera(Perspective())
-    , _renderer(Interactive())
+Engine::Engine(ParametersManager &parameters):
+    _params(parameters),
+    _osprayDevice(OsprayDeviceInitializer::init(parameters)),
+    _frameBuffer(std::make_unique<StaticFrameHandler>()),
+    _camera(Perspective()),
+    _renderer(Interactive())
 {
     EngineFactoriesInitializer::init(_factories);
 }

diff --git a/brayns/engine/core/FrameRenderer.h b/brayns/engine/core/FrameRenderer.h
@@ -37,8 +37,11 @@ class FrameRenderer
      * @param renderer
      * @param scene
      */
-    static void
-        synchronous(const Camera &camera, const Framebuffer &framebuffer, const Renderer &renderer, const Scene &scene);
+    static void synchronous(
+        const Camera &camera,
+        const Framebuffer &framebuffer,
+        const Renderer &renderer,
+        const Scene &scene);
 
     /**
      * @brief Renders a frame asynchronously. The function returns inmediatly with an OSPFuture, which can be used

diff --git a/brayns/engine/framebuffer/ToneMapping.cpp b/brayns/engine/framebuffer/ToneMapping.cpp
@@ -24,14 +24,14 @@ namespace
 {
 struct ToneMappingParameters
 {
-    inline static const std::string osprayName = "tonemapper";
-    inline static const std::string exposure = "exposure";
-    inline static const std::string contrast = "contrast";
-    inline static const std::string shoulder = "shoulder";
-    inline static const std::string midIn = "midIn";
-    inline static const std::string midOut = "midOut";
-    inline static const std::string hdrMax = "hdrMax";
-    inline static const std::string acesColor = "acesColor";
+    static inline const std::string osprayName = "tonemapper";
+    static inline const std::string exposure = "exposure";
+    static inline const std::string contrast = "contrast";
+    static inline const std::string shoulder = "shoulder";
+    static inline const std::string midIn = "midIn";
+    static inline const std::string midOut = "midOut";
+    static inline const std::string hdrMax = "hdrMax";
+    static inline const std::string acesColor = "acesColor";
 };
 }
 

diff --git a/brayns/engine/framebuffer/types/ProgressiveFrameHandler.cpp b/brayns/engine/framebuffer/types/ProgressiveFrameHandler.cpp
@@ -36,8 +36,8 @@ class FrameSizeScaler
 
 namespace brayns
 {
-ProgressiveFrameHandler::ProgressiveFrameHandler(uint32_t scale)
-    : _scale(scale)
+ProgressiveFrameHandler::ProgressiveFrameHandler(uint32_t scale):
+    _scale(scale)
 {
     if (_scale == 0)
     {