2024-09-26 13:15:32 +02:00
190 changed files with 191 additions and 199 deletions
--- a/intern/ghost/intern/GHOST_WindowWin32.cc
+++ b/intern/ghost/intern/GHOST_WindowWin32.cc
@ -23,7 +23,7 @@
 #endif

 #ifdef WIN32
-#  include "BLI_path_util.h"
+#  include "BLI_path_utils.hh"
 #endif

 #include <Dwmapi.h>
--- a/intern/ghost/test/CMakeLists.txt
+++ b/intern/ghost/test/CMakeLists.txt
@ -179,7 +179,7 @@ add_library(bli_lib
  "../../../source/blender/blenlib/intern/task.c"
  "../../../source/blender/blenlib/intern/threads.c"
  "../../../source/blender/blenlib/intern/time.c"
-  "../../../source/blender/blenlib/intern/path_util.c"
+  "../../../source/blender/blenlib/intern/path_utils.cc"
  "../../../source/blender/blenlib/intern/BLI_dynstr.c"
  "../../../source/blender/blenlib/intern/BLI_ghash.c"
  "../../../source/blender/blenlib/intern/BLI_ghash_utils.cc"
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@ -21,7 +21,7 @@
 #include "smoke_script.h"

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_utildefines.h"

 #include "DNA_fluid_types.h"
--- a/source/blender/asset_system/intern/asset_catalog.cc
+++ b/source/blender/asset_system/intern/asset_catalog.cc
@ -16,7 +16,7 @@
 #include "asset_catalog_definition_file.hh"

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 /* For S_ISREG() and S_ISDIR() on Windows. */
 #ifdef WIN32
--- a/source/blender/asset_system/intern/asset_catalog_definition_file.cc
+++ b/source/blender/asset_system/intern/asset_catalog_definition_file.cc
@ -9,7 +9,7 @@
 #include <iostream>

 #include "BLI_fileops.hh"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 #include "CLG_log.h"

--- a/source/blender/asset_system/intern/asset_catalog_path.cc
+++ b/source/blender/asset_system/intern/asset_catalog_path.cc
@ -8,7 +8,7 @@

 #include "AS_asset_catalog_path.hh"

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 #include <sstream>

--- a/source/blender/asset_system/intern/asset_library.cc
+++ b/source/blender/asset_system/intern/asset_library.cc
@ -18,7 +18,7 @@

 #include "BLI_fileops.h"
 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "DNA_userdef_types.h"
--- a/source/blender/asset_system/intern/asset_library_service.cc
+++ b/source/blender/asset_system/intern/asset_library_service.cc
@ -9,7 +9,7 @@
 #include "BKE_blender.hh"
 #include "BKE_preferences.h"

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string_ref.hh"

 #include "DNA_asset_types.h"
--- a/source/blender/asset_system/intern/asset_representation.cc
+++ b/source/blender/asset_system/intern/asset_representation.cc
@ -8,7 +8,7 @@

 #include <stdexcept>

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 #include "BKE_blendfile.hh"

--- a/source/blender/asset_system/intern/utils.cc
+++ b/source/blender/asset_system/intern/utils.cc
@ -7,7 +7,7 @@
 */

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "utils.hh"
--- a/source/blender/asset_system/tests/asset_catalog_test.cc
+++ b/source/blender/asset_system/tests/asset_catalog_test.cc
@ -10,7 +10,7 @@
 #include "BKE_preferences.h"

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 #include "DNA_asset_types.h"
 #include "DNA_userdef_types.h"
--- a/source/blender/asset_system/tests/asset_catalog_tree_test.cc
+++ b/source/blender/asset_system/tests/asset_catalog_tree_test.cc
@ -7,7 +7,7 @@
 #include "asset_catalog_collection.hh"
 #include "asset_catalog_definition_file.hh"

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 #include "testing/testing.h"

--- a/source/blender/asset_system/tests/asset_library_service_test.cc
+++ b/source/blender/asset_system/tests/asset_library_service_test.cc
@ -5,7 +5,7 @@
 #include "asset_library_service.hh"

 #include "BLI_fileops.h" /* For PATH_MAX (at least on Windows). */
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "BKE_appdir.hh"
--- a/source/blender/asset_system/tests/asset_library_test_common.hh
+++ b/source/blender/asset_system/tests/asset_library_test_common.hh
@ -16,7 +16,7 @@
 #include "BKE_callbacks.hh"

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 #include "CLG_log.h"

--- a/source/blender/blenfont/intern/blf.cc
+++ b/source/blender/blenfont/intern/blf.cc
@ -24,7 +24,7 @@

 #include "BLI_fileops.h"
 #include "BLI_math_rotation.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_threads.h"

--- a/source/blender/blenfont/intern/blf_font.cc
+++ b/source/blender/blenfont/intern/blf_font.cc
@ -32,7 +32,7 @@
 #include "BLI_math_bits.h"
 #include "BLI_math_color_blend.h"
 #include "BLI_math_matrix.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_rect.h"
 #include "BLI_string.h"
 #include "BLI_string_cursor_utf8.h"
--- a/source/blender/blenfont/intern/blf_font_default.cc
+++ b/source/blender/blenfont/intern/blf_font_default.cc
@ -13,7 +13,7 @@
 #include "BLF_api.hh"

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 #include "BKE_appdir.hh"

--- a/source/blender/blenkernel/BKE_studiolight.h
+++ b/source/blender/blenkernel/BKE_studiolight.h
@ -12,7 +12,7 @@

 #include "BLI_sys_types.h"

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 #include "DNA_userdef_types.h" /* for #SolidLight */

--- a/source/blender/blenkernel/BKE_undo_system.hh
+++ b/source/blender/blenkernel/BKE_undo_system.hh
@ -7,7 +7,7 @@
 * \ingroup bke
 */

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_utildefines.h"
 #include "DNA_ID.h"
 #include "DNA_listBase.h"
--- a/source/blender/blenkernel/intern/appdir.cc
+++ b/source/blender/blenkernel/intern/appdir.cc
@ -15,7 +15,7 @@
 #include "BLI_fileops.h"
 #include "BLI_fileops_types.h"
 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
 #include "BLI_string_utils.hh"
--- a/source/blender/blenkernel/intern/asset_edit.cc
+++ b/source/blender/blenkernel/intern/asset_edit.cc
@ -10,7 +10,7 @@
 #include <utility>

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_vector.hh"

--- a/source/blender/blenkernel/intern/asset_weak_reference.cc
+++ b/source/blender/blenkernel/intern/asset_weak_reference.cc
@ -8,7 +8,7 @@

 #include <memory>

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "AS_asset_library.hh"
--- a/source/blender/blenkernel/intern/autoexec.cc
+++ b/source/blender/blenkernel/intern/autoexec.cc
@ -15,7 +15,7 @@
 #include "DNA_userdef_types.h"

 #include "BLI_fnmatch.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_utildefines.h"

 #ifdef WIN32
--- a/source/blender/blenkernel/intern/bake_geometry_nodes_modifier.cc
+++ b/source/blender/blenkernel/intern/bake_geometry_nodes_modifier.cc
@ -13,7 +13,7 @@

 #include "BLI_binary_search.hh"
 #include "BLI_fileops.hh"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "MOD_nodes.hh"
--- a/source/blender/blenkernel/intern/bake_geometry_nodes_modifier_pack.cc
+++ b/source/blender/blenkernel/intern/bake_geometry_nodes_modifier_pack.cc
@ -13,7 +13,7 @@
 #include "MOD_nodes.hh"

 #include "BLI_fileops.hh"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "DEG_depsgraph.hh"
--- a/source/blender/blenkernel/intern/bake_items_paths.cc
+++ b/source/blender/blenkernel/intern/bake_items_paths.cc
@ -5,7 +5,7 @@
 #include "BKE_bake_items_paths.hh"

 #include "BLI_fileops.hh"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_utils.hh"

--- a/source/blender/blenkernel/intern/bake_items_serialize.cc
+++ b/source/blender/blenkernel/intern/bake_items_serialize.cc
@ -16,7 +16,7 @@
 #include "BLI_endian_defines.h"
 #include "BLI_endian_switch.h"
 #include "BLI_math_matrix_types.hh"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 #include "DNA_material_types.h"
 #include "DNA_modifier_types.h"
--- a/source/blender/blenkernel/intern/blender_undo.cc
+++ b/source/blender/blenkernel/intern/blender_undo.cc
@ -26,7 +26,7 @@

 #include "DNA_scene_types.h"

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/blendfile.cc
+++ b/source/blender/blenkernel/intern/blendfile.cc
@ -24,7 +24,7 @@
 #include "BLI_fileops.h"
 #include "BLI_function_ref.hh"
 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_system.h"
 #include "BLI_time.h"
--- a/source/blender/blenkernel/intern/bpath.cc
+++ b/source/blender/blenkernel/intern/bpath.cc
@ -29,7 +29,7 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/bpath_test.cc
+++ b/source/blender/blenkernel/intern/bpath_test.cc
@ -17,7 +17,7 @@
 #include "DNA_text_types.h"

 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 namespace blender::bke::tests {
--- a/source/blender/blenkernel/intern/cachefile.cc
+++ b/source/blender/blenkernel/intern/cachefile.cc
@ -16,7 +16,7 @@
 #include "BLI_fileops.h"
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@ -29,7 +29,7 @@
 #include "BLI_math_vector.hh"
 #include "BLI_memory_counter.hh"
 #include "BLI_mempool.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_set.hh"
 #include "BLI_span.hh"
 #include "BLI_string.h"
--- a/source/blender/blenkernel/intern/file_handler.cc
+++ b/source/blender/blenkernel/intern/file_handler.cc
@ -6,7 +6,7 @@

 #include "BKE_file_handler.hh"

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 namespace blender::bke {
--- a/source/blender/blenkernel/intern/fluid.cc
+++ b/source/blender/blenkernel/intern/fluid.cc
@ -15,7 +15,7 @@
 #include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/image_format.cc
+++ b/source/blender/blenkernel/intern/image_format.cc
@ -11,7 +11,7 @@
 #include "DNA_defaults.h"
 #include "DNA_scene_types.h"

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/image_save.cc
+++ b/source/blender/blenkernel/intern/image_save.cc
@ -12,7 +12,7 @@
 #include "BLI_fileops.h"
 #include "BLI_index_range.hh"
 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_task.hh"
 #include "BLI_vector.hh"
--- a/source/blender/blenkernel/intern/image_test.cc
+++ b/source/blender/blenkernel/intern/image_test.cc
@ -3,7 +3,7 @@
 * SPDX-License-Identifier: GPL-2.0-or-later */

 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_ref.hh"
 #include "BLI_vector.hh"
--- a/source/blender/blenkernel/intern/main_test.cc
+++ b/source/blender/blenkernel/intern/main_test.cc
@ -8,7 +8,7 @@
 #include "CLG_log.h"

 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "BKE_collection.hh"
--- a/source/blender/blenkernel/intern/modifier.cc
+++ b/source/blender/blenkernel/intern/modifier.cc
@ -36,7 +36,7 @@

 #include "BLI_linklist.h"
 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_rand.hh"
 #include "BLI_session_uid.h"
 #include "BLI_string.h"
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@ -37,7 +37,7 @@
 #include "BLI_listbase.h"
 #include "BLI_map.hh"
 #include "BLI_math_rotation_types.hh"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_rand.hh"
 #include "BLI_set.hh"
 #include "BLI_stack.hh"
--- a/source/blender/blenkernel/intern/ocean.cc
+++ b/source/blender/blenkernel/intern/ocean.cc
@ -20,7 +20,7 @@
 #include "DNA_scene_types.h"

 #include "BLI_math_vector.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_rand.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/preferences.cc
+++ b/source/blender/blenkernel/intern/preferences.cc
@ -14,7 +14,7 @@

 #include "BLI_fileops.h"
 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
 #include "BLI_string_utils.hh"
--- a/source/blender/blenkernel/intern/studiolight.cc
+++ b/source/blender/blenkernel/intern/studiolight.cc
@ -18,7 +18,7 @@
 #include "BLI_listbase.h"
 #include "BLI_math_color.h"
 #include "BLI_math_vector.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "DNA_listBase.h"
--- a/source/blender/blenkernel/intern/text.cc
+++ b/source/blender/blenkernel/intern/text.cc
@ -17,7 +17,7 @@

 #include "BLI_fileops.h"
 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_cursor_utf8.h"
 #include "BLI_string_utf8.h"
--- a/source/blender/blenkernel/intern/vfont.cc
+++ b/source/blender/blenkernel/intern/vfont.cc
@ -23,7 +23,7 @@
 #include "BLI_math_base_safe.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_rect.h"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@ -25,7 +25,7 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_ref.hh"
 #include "BLI_task.hh"
--- a/source/blender/blenlib/BLI_blenlib.h
+++ b/source/blender/blenlib/BLI_blenlib.h
@ -42,7 +42,7 @@

 #include "BLI_string_utf8.h"

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 #include "BLI_fileops.h"

--- a/source/blender/blenlib/BLI_path_utils.hh
+++ b/source/blender/blenlib/BLI_path_utils.hh
@ -12,10 +12,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_utildefines_variadic.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* -------------------------------------------------------------------- */
 /** \name Path Queries
 * \{ */
@ -789,7 +785,3 @@ const char *BLI_getenv(const char *env) ATTR_NONNULL(1) ATTR_WARN_UNUSED_RESULT;
  (((_n)[0] == '.') && (((_n)[1] == '\0') || (((_n)[1] == '.') && ((_n)[2] == '\0'))))

 /** \} */
-
-#ifdef __cplusplus
-}
-#endif
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@ -126,7 +126,7 @@ set(SRC
  intern/noise.cc
  intern/offset_indices.cc
  intern/ordered_edge.cc
-  intern/path_util.cc
+  intern/path_utils.cc
  intern/polyfill_2d.c
  intern/polyfill_2d_beautify.c
  intern/quadric.c
@ -343,7 +343,7 @@ set(SRC
  BLI_offset_span.hh
  BLI_ordered_edge.hh
  BLI_parameter_pack_utils.hh
-  BLI_path_util.h
+  BLI_path_utils.hh
  BLI_polyfill_2d.h
  BLI_polyfill_2d_beautify.h
  BLI_pool.hh
@ -580,7 +580,7 @@ if(WITH_GTESTS)
    tests/BLI_mesh_intersect_test.cc
    tests/BLI_multi_value_map_test.cc
    tests/BLI_offset_indices_test.cc
-    tests/BLI_path_util_test.cc
+    tests/BLI_path_utils_test.cc
    tests/BLI_polyfill_2d_test.cc
    tests/BLI_pool_test.cc
    tests/BLI_random_access_iterator_mixin_test.cc
--- a/source/blender/blenlib/intern/BLI_filelist.cc
+++ b/source/blender/blenlib/intern/BLI_filelist.cc
@ -38,7 +38,7 @@
 #include "BLI_fileops.h"
 #include "BLI_fileops_types.h"
 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_utils.hh"

--- a/source/blender/blenlib/intern/BLI_subprocess.cc
+++ b/source/blender/blenlib/intern/BLI_subprocess.cc
@ -9,7 +9,7 @@
 /* Based on https://github.com/jarikomppa/ipc (Unlicense) */

 #  include "BLI_assert.h"
-#  include "BLI_path_util.h"
+#  include "BLI_path_utils.hh"
 #  include "BLI_string_utf8.h"
 #  include <iostream>

--- a/source/blender/blenlib/intern/fileops_apple.mm
+++ b/source/blender/blenlib/intern/fileops_apple.mm
@ -11,7 +11,7 @@
 #import <Foundation/Foundation.h>

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 int BLI_delete_soft(const char *filepath, const char **r_error_message)
 {
--- a/source/blender/blenlib/intern/fileops_c.cc
+++ b/source/blender/blenlib/intern/fileops_c.cc
@ -43,7 +43,7 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_utils.hh"
 #include "BLI_sys_types.h" /* For `intptr_t` support. */
--- a/source/blender/blenlib/intern/path_utils.cc
+++ b/source/blender/blenlib/intern/path_utils.cc
@ -14,7 +14,7 @@

 #include "BLI_fileops.h"
 #include "BLI_fnmatch.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_utils.hh"
 #include "BLI_utildefines.h"
--- a/source/blender/blenlib/intern/storage.cc
+++ b/source/blender/blenlib/intern/storage.cc
@ -53,7 +53,7 @@

 #include "BLI_fileops.h"
 #include "BLI_linklist.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenlib/intern/storage_apple.mm
+++ b/source/blender/blenlib/intern/storage_apple.mm
@ -13,7 +13,7 @@
 #include <sys/xattr.h>

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 /* Extended file attribute used by OneDrive to mark placeholder files. */
--- a/source/blender/blenlib/intern/tempfile.cc
+++ b/source/blender/blenlib/intern/tempfile.cc
@ -5,7 +5,7 @@
 #include "BLI_tempfile.h"

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 bool BLI_temp_directory_path_copy_if_valid(char *tempdir,
--- a/source/blender/blenlib/intern/winstuff.cc
+++ b/source/blender/blenlib/intern/winstuff.cc
@ -20,7 +20,7 @@

 #  define WIN32_SKIP_HKEY_PROTECTION /* Need to use HKEY. */
 #  include "BLI_fileops.h"
-#  include "BLI_path_util.h"
+#  include "BLI_path_utils.hh"
 #  include "BLI_string.h"
 #  include "BLI_utildefines.h"
 #  include "BLI_winstuff.h"
--- a/source/blender/blenlib/intern/winstuff_registration.cc
+++ b/source/blender/blenlib/intern/winstuff_registration.cc
@ -12,7 +12,7 @@
 #  include <shlobj_core.h>
 #  include <wrl.h>

-#  include "BLI_path_util.h"
+#  include "BLI_path_utils.hh"
 #  include "BLI_winstuff.h"
 #  include "BLI_winstuff_com.hh"

--- a/source/blender/blenlib/tests/BLI_fileops_test.cc
+++ b/source/blender/blenlib/tests/BLI_fileops_test.cc
@ -7,7 +7,7 @@
 #include "testing/testing.h"

 #include "BLI_fileops.hh"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_system.h"
 #include "BLI_tempfile.h"
--- a/source/blender/blenlib/tests/BLI_listbase_test.cc
+++ b/source/blender/blenlib/tests/BLI_listbase_test.cc
@ -8,7 +8,7 @@

 #include "BLI_array_utils.h"
 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_ressource_strings.h"
 #include "BLI_string.h"

--- a/source/blender/blenlib/tests/BLI_path_utils_test.cc
+++ b/source/blender/blenlib/tests/BLI_path_utils_test.cc
@ -7,7 +7,7 @@
 #include "IMB_imbuf.hh"

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_utils.hh"

--- a/source/blender/blenlib/tests/BLI_tempfile_test.cc
+++ b/source/blender/blenlib/tests/BLI_tempfile_test.cc
@ -5,7 +5,7 @@
 #include "BLI_tempfile.h"

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 #include "testing/testing.h"

--- a/source/blender/blenloader/intern/readblenentry.cc
+++ b/source/blender/blenloader/intern/readblenentry.cc
@ -17,7 +17,7 @@

 #include "BLI_ghash.h"
 #include "BLI_linklist.h"
-#include "BLI_path_util.h" /* Only for assertions. */
+#include "BLI_path_utils.hh" /* Only for assertions. */
 #include "BLI_string.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenloader/intern/versioning_300.cc
+++ b/source/blender/blenloader/intern/versioning_300.cc
@ -20,7 +20,7 @@
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
 #include "BLI_multi_value_map.hh"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_utils.hh"
 #include "BLI_utildefines.h"
--- a/source/blender/blenloader/tests/blendfile_load_test.cc
+++ b/source/blender/blenloader/tests/blendfile_load_test.cc
@ -3,7 +3,7 @@
 * SPDX-License-Identifier: GPL-2.0-or-later */
 #include "blendfile_loading_base_test.h"

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 class BlendfileLoadingTest : public BlendfileLoadingBaseTest {};

--- a/source/blender/blenloader/tests/blendfile_loading_base_test.cc
+++ b/source/blender/blenloader/tests/blendfile_loading_base_test.cc
@ -22,7 +22,7 @@

 #include "BLF_api.hh"

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_threads.h"

 #include "BLO_readfile.hh"
--- a/source/blender/blentranslation/intern/blt_lang.cc
+++ b/source/blender/blentranslation/intern/blt_lang.cc
@ -21,7 +21,7 @@
 #include "BLT_lang.hh" /* own include */
 #include "BLT_translation.hh"

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"

--- a/source/blender/compositor/intern/COM_Debug.cc
+++ b/source/blender/compositor/intern/COM_Debug.cc
@ -8,7 +8,7 @@

 #include "BLI_assert.h"
 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "BKE_appdir.hh"
--- a/source/blender/compositor/operations/COM_FileOutputOperation.cc
+++ b/source/blender/compositor/operations/COM_FileOutputOperation.cc
@ -7,7 +7,7 @@
 #include "BLI_assert.h"
 #include "BLI_fileops.h"
 #include "BLI_index_range.hh"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_utils.hh"
 #include "BLI_task.hh"
--- a/source/blender/editors/asset/intern/asset_indexer.cc
+++ b/source/blender/editors/asset/intern/asset_indexer.cc
@ -19,7 +19,7 @@
 #include "BLI_fileops.h"
 #include "BLI_hash.hh"
 #include "BLI_linklist.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_serialize.hh"
 #include "BLI_set.hh"
 #include "BLI_string.h"
--- a/source/blender/editors/asset/intern/asset_ops.cc
+++ b/source/blender/editors/asset/intern/asset_ops.cc
@ -17,7 +17,7 @@
 #include "BKE_report.hh"

 #include "BLI_fnmatch.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_set.hh"

 #include "ED_asset.hh"
--- a/source/blender/editors/geometry/node_group_operator.cc
+++ b/source/blender/editors/geometry/node_group_operator.cc
@ -6,7 +6,7 @@
 * \ingroup edcurves
 */

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_rect.h"
 #include "BLI_string.h"

--- a/source/blender/editors/interface/interface_context_menu.cc
+++ b/source/blender/editors/interface/interface_context_menu.cc
@ -16,7 +16,7 @@
 #include "DNA_screen_types.h"

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"

--- a/source/blender/editors/interface/interface_string_search.cc
+++ b/source/blender/editors/interface/interface_string_search.cc
@ -12,7 +12,7 @@

 #include "BLI_fileops.hh"
 #include "BLI_map.hh"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 namespace blender::ui::string_search {

--- a/source/blender/editors/interface/regions/interface_region_tooltip.cc
+++ b/source/blender/editors/interface/regions/interface_region_tooltip.cc
@ -33,7 +33,7 @@
 #include "BLI_listbase.h"
 #include "BLI_math_color.h"
 #include "BLI_math_vector.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_rect.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
--- a/source/blender/editors/interface/templates/interface_templates.cc
+++ b/source/blender/editors/interface/templates/interface_templates.cc
@ -33,7 +33,7 @@
 #include "BLI_listbase.h"
 #include "BLI_math_color.h"
 #include "BLI_math_vector.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_rect.h"
 #include "BLI_string.h"
 #include "BLI_string_ref.hh"
--- a/source/blender/editors/io/io_alembic.cc
+++ b/source/blender/editors/io/io_alembic.cc
@ -30,7 +30,7 @@
 #  include "BKE_main.hh"
 #  include "BKE_report.hh"

-#  include "BLI_path_util.h"
+#  include "BLI_path_utils.hh"
 #  include "BLI_string.h"
 #  include "BLI_utildefines.h"
 #  include "BLI_vector.hh"
--- a/source/blender/editors/io/io_cache.cc
+++ b/source/blender/editors/io/io_cache.cc
@ -12,7 +12,7 @@
 #include "DNA_space_types.h"

 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "BKE_cachefile.hh"
--- a/source/blender/editors/io/io_drop_import_file.cc
+++ b/source/blender/editors/io/io_drop_import_file.cc
@ -2,7 +2,7 @@
 *
 * SPDX-License-Identifier: GPL-2.0-or-later */

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "BLT_translation.hh"
--- a/source/blender/editors/io/io_gpencil_legacy_export.cc
+++ b/source/blender/editors/io/io_gpencil_legacy_export.cc
@ -8,7 +8,7 @@

 #ifdef WITH_IO_GREASE_PENCIL

-#  include "BLI_path_util.h"
+#  include "BLI_path_utils.hh"

 #  include "DNA_space_types.h"

--- a/source/blender/editors/io/io_gpencil_legacy_import.cc
+++ b/source/blender/editors/io/io_gpencil_legacy_import.cc
@ -8,7 +8,7 @@

 #ifdef WITH_IO_GREASE_PENCIL

-#  include "BLI_path_util.h"
+#  include "BLI_path_utils.hh"
 #  include "BLI_string.h"

 #  include "MEM_guardedalloc.h"
--- a/source/blender/editors/io/io_grease_pencil.cc
+++ b/source/blender/editors/io/io_grease_pencil.cc
@ -8,7 +8,7 @@

 #ifdef WITH_IO_GREASE_PENCIL

-#  include "BLI_path_util.h"
+#  include "BLI_path_utils.hh"
 #  include "BLI_string.h"

 #  include "DNA_space_types.h"
--- a/source/blender/editors/io/io_obj.cc
+++ b/source/blender/editors/io/io_obj.cc
@ -15,7 +15,7 @@
 #  include "BKE_main.hh"
 #  include "BKE_report.hh"

-#  include "BLI_path_util.h"
+#  include "BLI_path_utils.hh"
 #  include "BLI_string.h"
 #  include "BLI_utildefines.h"

--- a/source/blender/editors/io/io_usd.cc
+++ b/source/blender/editors/io/io_usd.cc
@ -14,7 +14,7 @@
 #  include "BKE_file_handler.hh"
 #  include "BKE_report.hh"

-#  include "BLI_path_util.h"
+#  include "BLI_path_utils.hh"
 #  include "BLI_string.h"

 #  include "BLT_translation.hh"
--- a/source/blender/editors/io/io_utils.cc
+++ b/source/blender/editors/io/io_utils.cc
@ -4,7 +4,7 @@

 #include <fmt/format.h>

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"

 #include "BLT_translation.hh"

--- a/source/blender/editors/object/object_bake_api.cc
+++ b/source/blender/editors/object/object_bake_api.cc
@ -20,7 +20,7 @@
 #include "BLI_fileops.h"
 #include "BLI_listbase.h"
 #include "BLI_math_geom.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "BLT_translation.hh"
--- a/source/blender/editors/object/object_bake_simulation.cc
+++ b/source/blender/editors/object/object_bake_simulation.cc
@ -8,7 +8,7 @@
 #include <sstream>

 #include "BLI_fileops.hh"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_serialize.hh"
 #include "BLI_string.h"
 #include "BLI_vector.hh"
--- a/source/blender/editors/object/object_collection.cc
+++ b/source/blender/editors/object/object_collection.cc
@ -8,7 +8,7 @@

 #include <cstring>

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"

--- a/source/blender/editors/object/object_modifier.cc
+++ b/source/blender/editors/object/object_modifier.cc
@ -33,7 +33,7 @@

 #include "BLI_bitmap.h"
 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
 #include "BLI_string_utils.hh"
--- a/source/blender/editors/object/object_volume.cc
+++ b/source/blender/editors/object/object_volume.cc
@ -10,7 +10,7 @@

 #include "BLI_listbase.h"
 #include "BLI_math_base.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "DNA_object_types.h"
--- a/source/blender/editors/physics/physics_fluid.cc
+++ b/source/blender/editors/physics/physics_fluid.cc
@ -18,7 +18,7 @@
 #include "DNA_object_types.h"

 #include "BLI_blenlib.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_time.h"
 #include "BLI_utildefines.h"

--- a/source/blender/editors/render/render_shading.cc
+++ b/source/blender/editors/render/render_shading.cc
@ -25,7 +25,7 @@

 #include "BLI_listbase.h"
 #include "BLI_math_vector.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_string_utils.hh"
 #include "BLI_utildefines.h"
--- a/source/blender/editors/screen/workspace_edit.cc
+++ b/source/blender/editors/screen/workspace_edit.cc
@ -11,7 +11,7 @@

 #include "BLI_fileops.h"
 #include "BLI_listbase.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_utildefines.h"

 #include "BKE_appdir.hh"
--- a/source/blender/editors/sculpt_paint/brush_asset_ops.cc
+++ b/source/blender/editors/sculpt_paint/brush_asset_ops.cc
@ -3,7 +3,7 @@
 * SPDX-License-Identifier: GPL-2.0-or-later */

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"

 #include "DNA_brush_types.h"
--- a/source/blender/editors/space_buttons/buttons_ops.cc
+++ b/source/blender/editors/space_buttons/buttons_ops.cc
@ -14,7 +14,7 @@
 #include "DNA_userdef_types.h"

 #include "BLI_fileops.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"

--- a/source/blender/editors/space_clip/clip_buttons.cc
+++ b/source/blender/editors/space_clip/clip_buttons.cc
@ -17,7 +17,7 @@

 #include "BLI_listbase.h"
 #include "BLI_math_vector.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"

--- a/source/blender/editors/space_clip/clip_ops.cc
+++ b/source/blender/editors/space_clip/clip_ops.cc
@ -24,7 +24,7 @@

 #include "BLI_fileops.h"
 #include "BLI_math_vector.h"
-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_rect.h"
 #include "BLI_string.h"
 #include "BLI_task.h"
--- a/source/blender/editors/space_file/file_utils.cc
+++ b/source/blender/editors/space_file/file_utils.cc
@ -6,7 +6,7 @@
 * \ingroup spfile
 */

-#include "BLI_path_util.h"
+#include "BLI_path_utils.hh"
 #include "BLI_rect.h"
 #include "BLI_string.h"

--- a/Show More
+++ b/Show More