From b21ceece05596e2193a14a4322f7db68f6111c86 Mon Sep 17 00:00:00 2001
From: Bastien Montagne <bastien@blender.org>
Date: Fri, 9 Feb 2024 19:12:23 +0100
Subject: [PATCH] Cleanup: Move `BKE_blender.h` to CPP header.

Also fix comment in `build_files/cmake/macros.cmake`, CMake blender version
parsing depends in the (still C) `BKE_blender_version.h` header now.
---
 build_files/cmake/macros.cmake                |  2 +-
 .../intern/asset_library_service.cc           |  2 +-
 .../{BKE_blender.h => BKE_blender.hh}         | 27 +++++++------------
 source/blender/blenkernel/CMakeLists.txt      |  2 +-
 source/blender/blenkernel/intern/blender.cc   |  2 +-
 source/blender/blenkernel/intern/blendfile.cc |  2 +-
 .../blender/blenkernel/intern/lib_override.cc |  2 +-
 .../blenloader/intern/versioning_280.cc       |  2 +-
 .../tests/blendfile_loading_base_test.cc      |  2 +-
 source/blender/editors/object/object_bake.cc  |  2 +-
 .../blender/editors/screen/screen_context.cc  |  2 +-
 source/blender/makesrna/intern/rna_userdef.cc |  2 +-
 .../blender/windowmanager/intern/wm_files.cc  |  2 +-
 .../windowmanager/intern/wm_init_exit.cc      |  2 +-
 source/creator/creator.cc                     |  2 +-
 15 files changed, 23 insertions(+), 32 deletions(-)
 rename source/blender/blenkernel/{BKE_blender.h => BKE_blender.hh} (61%)

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 4ffeb6b316f..7737e4989fd 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -849,7 +849,7 @@ function(get_blender_version)
   # - BLENDER_VERSION_PATCH
   # - BLENDER_VERSION_CYCLE (alpha, beta, rc, release)
 
-  # So CMAKE depends on `BKE_blender.h`, beware of infinite-loops!
+  # So CMAKE depends on `BKE_blender_version.h`, beware of infinite-loops!
   configure_file(
     ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender_version.h
     ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender_version.h.done
diff --git a/source/blender/asset_system/intern/asset_library_service.cc b/source/blender/asset_system/intern/asset_library_service.cc
index 675b1f2c160..aa03edd37af 100644
--- a/source/blender/asset_system/intern/asset_library_service.cc
+++ b/source/blender/asset_system/intern/asset_library_service.cc
@@ -6,7 +6,7 @@
  * \ingroup asset_system
  */
 
-#include "BKE_blender.h"
+#include "BKE_blender.hh"
 #include "BKE_preferences.h"
 
 #include "BLI_path_util.h"
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.hh
similarity index 61%
rename from source/blender/blenkernel/BKE_blender.h
rename to source/blender/blenkernel/BKE_blender.hh
index 2ac27710922..e5f6dd11c14 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.hh
@@ -8,10 +8,6 @@
  * \brief Blender util stuff
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "BLI_compiler_attrs.h"
 
 struct Main;
@@ -26,40 +22,35 @@ void BKE_blender_globals_init(void);
 void BKE_blender_globals_clear(void);
 
 /** Replace current global Main by the given one, freeing existing one. */
-void BKE_blender_globals_main_replace(struct Main *bmain);
+void BKE_blender_globals_main_replace(Main *bmain);
 /**
  * Replace current global Main by the given one, returning the old one.
  *
  * \warning Advanced, risky workaround addressing the issue that current RNA is not able to process
  * correctly non-G_MAIN data, use with (a lot of) care.
  */
-struct Main *BKE_blender_globals_main_swap(struct Main *new_gmain);
+Main *BKE_blender_globals_main_swap(Main *new_gmain);
 
-void BKE_blender_userdef_data_swap(struct UserDef *userdef_a, struct UserDef *userdef_b);
-void BKE_blender_userdef_data_set(struct UserDef *userdef);
-void BKE_blender_userdef_data_set_and_free(struct UserDef *userdef);
+void BKE_blender_userdef_data_swap(UserDef *userdef_a, UserDef *userdef_b);
+void BKE_blender_userdef_data_set(UserDef *userdef);
+void BKE_blender_userdef_data_set_and_free(UserDef *userdef);
 
 /**
  * This function defines which settings a template will override for the user preferences.
  *
  * \note the order of `userdef_a` & `userdef_b` isn't important as values are simply swapped.
  */
-void BKE_blender_userdef_app_template_data_swap(struct UserDef *userdef_a,
-                                                struct UserDef *userdef_b);
-void BKE_blender_userdef_app_template_data_set(struct UserDef *userdef);
-void BKE_blender_userdef_app_template_data_set_and_free(struct UserDef *userdef);
+void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *userdef_b);
+void BKE_blender_userdef_app_template_data_set(UserDef *userdef);
+void BKE_blender_userdef_app_template_data_set_and_free(UserDef *userdef);
 
 /**
  * When loading a new userdef from file,
  * or when exiting Blender.
  */
-void BKE_blender_userdef_data_free(struct UserDef *userdef, bool clear_fonts);
+void BKE_blender_userdef_data_free(UserDef *userdef, bool clear_fonts);
 
 /* Blenders' own atexit (avoids leaking) */
 void BKE_blender_atexit_register(void (*func)(void *user_data), void *user_data);
 void BKE_blender_atexit_unregister(void (*func)(void *user_data), const void *user_data);
 void BKE_blender_atexit(void);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index afb7d1e4301..c49c3ced01b 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -341,7 +341,7 @@ set(SRC
   BKE_bake_items_paths.hh
   BKE_bake_items_serialize.hh
   BKE_bake_items_socket.hh
-  BKE_blender.h
+  BKE_blender.hh
   BKE_blender_copybuffer.hh
   BKE_blender_undo.hh
   BKE_blender_user_menu.hh
diff --git a/source/blender/blenkernel/intern/blender.cc b/source/blender/blenkernel/intern/blender.cc
index a94244eee6c..a30560f977c 100644
--- a/source/blender/blenkernel/intern/blender.cc
+++ b/source/blender/blenkernel/intern/blender.cc
@@ -22,7 +22,7 @@
 #include "IMB_moviecache.hh"
 
 #include "BKE_addon.h"
-#include "BKE_blender.h"            /* own include */
+#include "BKE_blender.hh"            /* own include */
 #include "BKE_blender_user_menu.hh" /* own include */
 #include "BKE_blender_version.h"    /* own include */
 #include "BKE_blendfile.hh"
diff --git a/source/blender/blenkernel/intern/blendfile.cc b/source/blender/blenkernel/intern/blendfile.cc
index 6e7fa75b741..a3c924380f6 100644
--- a/source/blender/blenkernel/intern/blendfile.cc
+++ b/source/blender/blenkernel/intern/blendfile.cc
@@ -31,7 +31,7 @@
 
 #include "BKE_addon.h"
 #include "BKE_appdir.hh"
-#include "BKE_blender.h"
+#include "BKE_blender.hh"
 #include "BKE_blender_version.h"
 #include "BKE_blendfile.hh"
 #include "BKE_bpath.h"
diff --git a/source/blender/blenkernel/intern/lib_override.cc b/source/blender/blenkernel/intern/lib_override.cc
index 2b424063c63..ea0641d9cef 100644
--- a/source/blender/blenkernel/intern/lib_override.cc
+++ b/source/blender/blenkernel/intern/lib_override.cc
@@ -27,7 +27,7 @@
 
 #include "BKE_anim_data.h"
 #include "BKE_armature.hh"
-#include "BKE_blender.h"
+#include "BKE_blender.hh"
 #include "BKE_collection.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
diff --git a/source/blender/blenloader/intern/versioning_280.cc b/source/blender/blenloader/intern/versioning_280.cc
index b81532ff275..644847a1063 100644
--- a/source/blender/blenloader/intern/versioning_280.cc
+++ b/source/blender/blenloader/intern/versioning_280.cc
@@ -62,7 +62,7 @@
 #undef DNA_GENFILE_VERSIONING_MACROS
 
 #include "BKE_animsys.h"
-#include "BKE_blender.h"
+#include "BKE_blender.hh"
 #include "BKE_brush.hh"
 #include "BKE_cloth.hh"
 #include "BKE_collection.h"
diff --git a/source/blender/blenloader/tests/blendfile_loading_base_test.cc b/source/blender/blenloader/tests/blendfile_loading_base_test.cc
index 8636890d9fc..688d7302f5b 100644
--- a/source/blender/blenloader/tests/blendfile_loading_base_test.cc
+++ b/source/blender/blenloader/tests/blendfile_loading_base_test.cc
@@ -6,7 +6,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BKE_appdir.hh"
-#include "BKE_blender.h"
+#include "BKE_blender.hh"
 #include "BKE_callbacks.h"
 #include "BKE_context.hh"
 #include "BKE_global.h"
diff --git a/source/blender/editors/object/object_bake.cc b/source/blender/editors/object/object_bake.cc
index 799bd216768..6d9616127d8 100644
--- a/source/blender/editors/object/object_bake.cc
+++ b/source/blender/editors/object/object_bake.cc
@@ -24,7 +24,7 @@
 
 #include "BKE_DerivedMesh.hh"
 #include "BKE_attribute.hh"
-#include "BKE_blender.h"
+#include "BKE_blender.hh"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_context.hh"
 #include "BKE_customdata.hh"
diff --git a/source/blender/editors/screen/screen_context.cc b/source/blender/editors/screen/screen_context.cc
index cdcf3b145d8..ad5bbd2d9a9 100644
--- a/source/blender/editors/screen/screen_context.cc
+++ b/source/blender/editors/screen/screen_context.cc
@@ -29,7 +29,7 @@
 
 #include "BKE_action.h"
 #include "BKE_armature.hh"
-#include "BKE_blender.h"
+#include "BKE_blender.hh"
 #include "BKE_context.hh"
 #include "BKE_gpencil_legacy.h"
 #include "BKE_layer.hh"
diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc
index 8892721c5a2..b8a32bb1310 100644
--- a/source/blender/makesrna/intern/rna_userdef.cc
+++ b/source/blender/makesrna/intern/rna_userdef.cc
@@ -173,7 +173,7 @@ static const EnumPropertyItem rna_enum_preference_gpu_backend_items[] = {
 #  include "DNA_object_types.h"
 #  include "DNA_screen_types.h"
 
-#  include "BKE_blender.h"
+#  include "BKE_blender.hh"
 #  include "BKE_global.h"
 #  include "BKE_idprop.h"
 #  include "BKE_image.h"
diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc
index 5de80c79966..6383f58746c 100644
--- a/source/blender/windowmanager/intern/wm_files.cc
+++ b/source/blender/windowmanager/intern/wm_files.cc
@@ -64,7 +64,7 @@
 #include "BKE_addon.h"
 #include "BKE_appdir.hh"
 #include "BKE_autoexec.hh"
-#include "BKE_blender.h"
+#include "BKE_blender.hh"
 #include "BKE_blender_version.h"
 #include "BKE_blendfile.hh"
 #include "BKE_callbacks.h"
diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc
index 6f794682184..0ae32560d7e 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.cc
+++ b/source/blender/windowmanager/intern/wm_init_exit.cc
@@ -33,7 +33,7 @@
 #include "BLO_undofile.hh"
 #include "BLO_writefile.hh"
 
-#include "BKE_blender.h"
+#include "BKE_blender.hh"
 #include "BKE_blendfile.hh"
 #include "BKE_callbacks.h"
 #include "BKE_context.hh"
diff --git a/source/creator/creator.cc b/source/creator/creator.cc
index 9390581a6f2..c49615ef130 100644
--- a/source/creator/creator.cc
+++ b/source/creator/creator.cc
@@ -33,7 +33,7 @@
 
 /* Mostly initialization functions. */
 #include "BKE_appdir.hh"
-#include "BKE_blender.h"
+#include "BKE_blender.hh"
 #include "BKE_brush.hh"
 #include "BKE_cachefile.h"
 #include "BKE_callbacks.h"