From f43da6fc4c7c4031cba0bded7733f0888d46b5fd Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 20 Sep 2024 16:03:37 +1000 Subject: [PATCH] Cleanup: format all of ./intern, use .clang-format to exclude paths Directories in intern/ were selectively formatted based on paths in `tools/utils_maintenance/clang_format_paths.py`. This had the following problems: - Editing files inside intern/ would auto-format on save with editors setup to auto-format as there was nothing to disable formatting. - Some directories were missing (by accident it seems). Resolve by formatting all of `./intern/` exclude except for `./intern/itasc/` which includes ITASC & KDL versions we might want to sync with upstream. --- intern/quadriflow/quadriflow_capi.cpp | 4 +--- intern/sky/source/sky_float3.h | 20 +++++------------- .../intern/wayland_dynload_client.c | 3 ++- .../intern/wayland_dynload_cursor.c | 3 ++- .../intern/wayland_dynload_egl.c | 3 ++- .../intern/wayland_dynload_libdecor.c | 3 ++- tools/utils_maintenance/clang_format_paths.py | 21 +------------------ 7 files changed, 15 insertions(+), 42 deletions(-) diff --git a/intern/quadriflow/quadriflow_capi.cpp b/intern/quadriflow/quadriflow_capi.cpp index 7ac4dabc682..fad604f679a 100644 --- a/intern/quadriflow/quadriflow_capi.cpp +++ b/intern/quadriflow/quadriflow_capi.cpp @@ -20,9 +20,7 @@ struct ObjVertex { uint32_t n = (uint32_t)-1; uint32_t uv = (uint32_t)-1; - ObjVertex() - { - } + ObjVertex() {} ObjVertex(uint32_t pi) { diff --git a/intern/sky/source/sky_float3.h b/intern/sky/source/sky_float3.h index 72b5f7c0058..f300f64e4a8 100644 --- a/intern/sky/source/sky_float3.h +++ b/intern/sky/source/sky_float3.h @@ -28,25 +28,15 @@ struct float3 { float3() = default; - float3(const float *ptr) : x{ptr[0]}, y{ptr[1]}, z{ptr[2]} - { - } + float3(const float *ptr) : x{ptr[0]}, y{ptr[1]}, z{ptr[2]} {} - float3(const float (*ptr)[3]) : float3((const float *)ptr) - { - } + float3(const float (*ptr)[3]) : float3((const float *)ptr) {} - explicit float3(float value) : x(value), y(value), z(value) - { - } + explicit float3(float value) : x(value), y(value), z(value) {} - explicit float3(int value) : x(value), y(value), z(value) - { - } + explicit float3(int value) : x(value), y(value), z(value) {} - float3(float x, float y, float z) : x{x}, y{y}, z{z} - { - } + float3(float x, float y, float z) : x{x}, y{y}, z{z} {} operator const float *() const { diff --git a/intern/wayland_dynload/intern/wayland_dynload_client.c b/intern/wayland_dynload/intern/wayland_dynload_client.c index a5204375eff..34bef9dc8b3 100644 --- a/intern/wayland_dynload/intern/wayland_dynload_client.c +++ b/intern/wayland_dynload/intern/wayland_dynload_client.c @@ -57,7 +57,8 @@ bool wayland_dynload_client_init(const bool verbose) #define WAYLAND_DYNLOAD_FN(symbol) \ if (!(wayland_dynload_client.symbol = dynamic_library_find_with_error( \ - lib, #symbol, paths[path_found], verbose))) { \ + lib, #symbol, paths[path_found], verbose))) \ + { \ return false; \ } #include "wayland_dynload_client.h" diff --git a/intern/wayland_dynload/intern/wayland_dynload_cursor.c b/intern/wayland_dynload/intern/wayland_dynload_cursor.c index 27aa484bc43..ff377170c1a 100644 --- a/intern/wayland_dynload/intern/wayland_dynload_cursor.c +++ b/intern/wayland_dynload/intern/wayland_dynload_cursor.c @@ -38,7 +38,8 @@ bool wayland_dynload_cursor_init(const bool verbose) #define WAYLAND_DYNLOAD_FN(symbol) \ if (!(wayland_dynload_cursor.symbol = dynamic_library_find_with_error( \ - lib, #symbol, paths[path_index], verbose))) { \ + lib, #symbol, paths[path_index], verbose))) \ + { \ return false; \ } #include "wayland_dynload_cursor.h" diff --git a/intern/wayland_dynload/intern/wayland_dynload_egl.c b/intern/wayland_dynload/intern/wayland_dynload_egl.c index 00717f136f8..83ec1cfcda4 100644 --- a/intern/wayland_dynload/intern/wayland_dynload_egl.c +++ b/intern/wayland_dynload/intern/wayland_dynload_egl.c @@ -38,7 +38,8 @@ bool wayland_dynload_egl_init(const bool verbose) #define WAYLAND_DYNLOAD_FN(symbol) \ if (!(wayland_dynload_egl.symbol = dynamic_library_find_with_error( \ - lib, #symbol, paths[path_found], verbose))) { \ + lib, #symbol, paths[path_found], verbose))) \ + { \ return false; \ } #include "wayland_dynload_egl.h" diff --git a/intern/wayland_dynload/intern/wayland_dynload_libdecor.c b/intern/wayland_dynload/intern/wayland_dynload_libdecor.c index bd8fcd5a57e..4fc6272cbc2 100644 --- a/intern/wayland_dynload/intern/wayland_dynload_libdecor.c +++ b/intern/wayland_dynload/intern/wayland_dynload_libdecor.c @@ -38,7 +38,8 @@ bool wayland_dynload_libdecor_init(const bool verbose) #define WAYLAND_DYNLOAD_FN(symbol) \ if (!(wayland_dynload_libdecor.symbol = dynamic_library_find_with_error( \ - lib, #symbol, paths[path_index], verbose))) { \ + lib, #symbol, paths[path_index], verbose))) \ + { \ return false; \ } #include "wayland_dynload_libdecor.h" diff --git a/tools/utils_maintenance/clang_format_paths.py b/tools/utils_maintenance/clang_format_paths.py index 8026141f572..8f529ce3aab 100755 --- a/tools/utils_maintenance/clang_format_paths.py +++ b/tools/utils_maintenance/clang_format_paths.py @@ -56,26 +56,7 @@ def compute_paths(paths: List[str], use_default_paths: bool) -> List[str]: # Optionally pass in files to operate on. if use_default_paths: paths = [ - "intern/atomic", - "intern/audaspace", - "intern/clog", - "intern/cycles", - "intern/dualcon", - "intern/eigen", - "intern/ffmpeg", - "intern/ghost", - "intern/glew-mx", - "intern/guardedalloc", - "intern/iksolver", - "intern/libmv", - "intern/locale", - "intern/memutil", - "intern/mikktspace", - "intern/opencolorio", - "intern/opensubdiv", - "intern/openvdb", - "intern/rigidbody", - "intern/utfconv", + "intern", "source", "tests/gtests", ]