Refactor: BKE: Move icon header to C++

Was trying to use a C++ type (`blender::Span`) in the header but couldn't. I would rather not use a less safe raw pointer to a buffer. Pull Request: https://projects.blender.org/blender/blender/pulls/148214
2025-10-16 17:45:26 +02:00
parent 6521b448c3
commit 2e76bb47bb
31 changed files with 46 additions and 48 deletions
--- a/source/blender/asset_system/intern/asset_representation.cc
+++ b/source/blender/asset_system/intern/asset_representation.cc
@@ -11,7 +11,7 @@
 #include "BLI_path_utils.hh"

 #include "BKE_blendfile.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_preview_image.hh"

 #include "DNA_ID.h"
--- a/source/blender/blenkernel/BKE_icons.hh
+++ b/source/blender/blenkernel/BKE_icons.hh
@@ -78,41 +78,41 @@ void BKE_icons_init(int first_dyn_id);
 /**
 * Return icon id for library object or create new icon if not found.
 */
-int BKE_icon_id_ensure(struct ID *id);
+int BKE_icon_id_ensure(ID *id);

 /**
 * Return icon id for Grease Pencil layer (color preview) or create new icon if not found.
 */
-int BKE_icon_gplayer_color_ensure(struct bGPDlayer *gpl);
+int BKE_icon_gplayer_color_ensure(bGPDlayer *gpl);

 /**
 * Return icon id of given preview, or create new icon if not found.
 */
-int BKE_icon_preview_ensure(struct ID *id, struct PreviewImage *preview);
+int BKE_icon_preview_ensure(ID *id, PreviewImage *preview);

 /**
 * Create an icon as owner or \a ibuf. The icon-ID is not stored in \a ibuf,
 * it needs to be stored separately.
 * \note Transforms ownership of \a ibuf to the newly created icon.
 */
-int BKE_icon_imbuf_create(struct ImBuf *ibuf) ATTR_WARN_UNUSED_RESULT;
-struct ImBuf *BKE_icon_imbuf_get_buffer(int icon_id) ATTR_WARN_UNUSED_RESULT;
+int BKE_icon_imbuf_create(ImBuf *ibuf) ATTR_WARN_UNUSED_RESULT;
+ImBuf *BKE_icon_imbuf_get_buffer(int icon_id) ATTR_WARN_UNUSED_RESULT;

 /**
 * Retrieve icon for id.
 */
-struct Icon *BKE_icon_get(int icon_id);
+Icon *BKE_icon_get(int icon_id);

 /**
 * Set icon for id if not already defined.
 * Used for inserting the internal icons.
 */
-void BKE_icon_set(int icon_id, struct Icon *icon);
+void BKE_icon_set(int icon_id, Icon *icon);

 /**
 * Remove icon and free data if library object becomes invalid.
 */
-void BKE_icon_id_delete(struct ID *id);
+void BKE_icon_id_delete(ID *id);

 /**
 * Remove icon and free data.
@@ -128,22 +128,20 @@ void BKE_icon_changed(int icon_id);
 /**
 * Free all icons.
 */
-void BKE_icons_free(void);
+void BKE_icons_free();

 /**
 * Free all icons marked for deferred deletion.
 */
-void BKE_icons_deferred_free(void);
+void BKE_icons_deferred_free();

-int BKE_icon_geom_ensure(struct Icon_Geom *geom);
-struct Icon_Geom *BKE_icon_geom_from_memory(uchar *data, size_t data_len);
-struct Icon_Geom *BKE_icon_geom_from_file(const char *filename);
+int BKE_icon_geom_ensure(Icon_Geom *geom);
+Icon_Geom *BKE_icon_geom_from_memory(uchar *data, size_t data_len);
+Icon_Geom *BKE_icon_geom_from_file(const char *filename);

-struct ImBuf *BKE_icon_geom_rasterize(const struct Icon_Geom *geom,
-                                      unsigned int size_x,
-                                      unsigned int size_y);
-void BKE_icon_geom_invert_lightness(struct Icon_Geom *geom);
+ImBuf *BKE_icon_geom_rasterize(const Icon_Geom *geom, unsigned int size_x, unsigned int size_y);
+void BKE_icon_geom_invert_lightness(Icon_Geom *geom);

-int BKE_icon_ensure_studio_light(struct StudioLight *sl, int id_type);
+int BKE_icon_ensure_studio_light(StudioLight *sl, int id_type);

 #define ICON_RENDER_DEFAULT_HEIGHT 32
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -419,7 +419,7 @@ set(SRC
  BKE_grease_pencil.hh
  BKE_grease_pencil_legacy_convert.hh
  BKE_grease_pencil_vertex_groups.hh
-  BKE_icons.h
+  BKE_icons.hh
  BKE_id_hash.hh
  BKE_idprop.hh
  BKE_idtype.hh
--- a/source/blender/blenkernel/intern/gpencil_legacy.cc
+++ b/source/blender/blenkernel/intern/gpencil_legacy.cc
@@ -41,7 +41,7 @@
 #include "BKE_colortools.hh"
 #include "BKE_deform.hh"
 #include "BKE_gpencil_legacy.h"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_idtype.hh"
 #include "BKE_image.hh"
 #include "BKE_lib_id.hh"
--- a/source/blender/blenkernel/intern/icons.cc
+++ b/source/blender/blenkernel/intern/icons.cc
@@ -25,7 +25,7 @@
 #include "BLI_utildefines.h"

 #include "BKE_global.hh" /* only for G.background test */
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_preview_image.hh"
 #include "BKE_studiolight.h"

--- a/source/blender/blenkernel/intern/icons_rasterize.cc
+++ b/source/blender/blenkernel/intern/icons_rasterize.cc
@@ -14,7 +14,7 @@
 #include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"

-#include "BKE_icons.h"
+#include "BKE_icons.hh"

 #include "BLI_strict_flags.h" /* IWYU pragma: keep. Keep last. */

--- a/source/blender/blenkernel/intern/image.cc
+++ b/source/blender/blenkernel/intern/image.cc
@@ -76,7 +76,7 @@
 #include "BKE_bpath.hh"
 #include "BKE_colortools.hh"
 #include "BKE_global.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_idtype.hh"
 #include "BKE_image.hh"
 #include "BKE_image_format.hh"
--- a/source/blender/blenkernel/intern/light.cc
+++ b/source/blender/blenkernel/intern/light.cc
@@ -24,7 +24,7 @@
 #include "BLI_math_matrix_types.hh"
 #include "BLI_utildefines.h"

-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
--- a/source/blender/blenkernel/intern/material.cc
+++ b/source/blender/blenkernel/intern/material.cc
@@ -52,7 +52,7 @@
 #include "BKE_displist.h"
 #include "BKE_editmesh.hh"
 #include "BKE_grease_pencil.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_idtype.hh"
 #include "BKE_image.hh"
 #include "BKE_lib_id.hh"
--- a/source/blender/blenkernel/intern/preview_image.cc
+++ b/source/blender/blenkernel/intern/preview_image.cc
@@ -20,7 +20,7 @@
 #include "DNA_texture_types.h"
 #include "DNA_world_types.h"

-#include "BKE_icons.h"
+#include "BKE_icons.hh"

 #include "BLI_ghash.h"
 #include "BLI_string.h"
--- a/source/blender/blenkernel/intern/studiolight.cc
+++ b/source/blender/blenkernel/intern/studiolight.cc
@@ -9,7 +9,7 @@
 #include "BKE_studiolight.h"

 #include "BKE_appdir.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"

 #include "BLI_dynstr.h"
 #include "BLI_fileops.h"
--- a/source/blender/blenkernel/intern/texture.cc
+++ b/source/blender/blenkernel/intern/texture.cc
@@ -39,7 +39,7 @@
 #include "BKE_brush.hh"
 #include "BKE_colorband.hh"
 #include "BKE_colortools.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_idtype.hh"
 #include "BKE_image.hh"
 #include "BKE_lib_id.hh"
--- a/source/blender/blenkernel/intern/world.cc
+++ b/source/blender/blenkernel/intern/world.cc
@@ -23,7 +23,7 @@
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"

-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_idtype.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_lib_query.hh"
--- a/source/blender/editors/animation/anim_asset_ops.cc
+++ b/source/blender/editors/animation/anim_asset_ops.cc
@@ -9,7 +9,7 @@
 #include "BKE_context.hh"
 #include "BKE_fcurve.hh"
 #include "BKE_global.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_preferences.h"
 #include "BKE_report.hh"
--- a/source/blender/editors/asset/intern/asset_ops.cc
+++ b/source/blender/editors/asset/intern/asset_ops.cc
@@ -14,7 +14,7 @@
 #include "BKE_bpath.hh"
 #include "BKE_context.hh"
 #include "BKE_global.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_main.hh"
 #include "BKE_preferences.h"
--- a/source/blender/editors/interface/interface_icons.cc
+++ b/source/blender/editors/interface/interface_icons.cc
@@ -31,7 +31,7 @@

 #include "BKE_context.hh"
 #include "BKE_global.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_paint.hh"
 #include "BKE_preview_image.hh"
 #include "BKE_studiolight.h"
--- a/source/blender/editors/interface/views/grid_view.cc
+++ b/source/blender/editors/interface/views/grid_view.cc
@@ -13,7 +13,7 @@
 #include <stdexcept>

 #include "BKE_context.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"

 #include "BLI_index_range.hh"

--- a/source/blender/editors/render/render_preview.cc
+++ b/source/blender/editors/render/render_preview.cc
@@ -53,7 +53,7 @@
 #include "BKE_colortools.hh"
 #include "BKE_context.hh"
 #include "BKE_global.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_idprop.hh"
 #include "BKE_image.hh"
 #include "BKE_layer.hh"
--- a/source/blender/editors/render/render_update.cc
+++ b/source/blender/editors/render/render_update.cc
@@ -30,7 +30,7 @@

 #include "BKE_brush.hh"
 #include "BKE_context.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_main.hh"
 #include "BKE_main_invariants.hh"
 #include "BKE_material.hh"
--- a/source/blender/editors/screen/screen_edit.cc
+++ b/source/blender/editors/screen/screen_edit.cc
@@ -23,7 +23,7 @@

 #include "BKE_context.hh"
 #include "BKE_global.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_image.hh"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
--- a/source/blender/editors/screen/screen_ops.cc
+++ b/source/blender/editors/screen/screen_ops.cc
@@ -37,7 +37,7 @@
 #include "BKE_editmesh.hh"
 #include "BKE_fcurve.hh"
 #include "BKE_global.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_layer.hh"
 #include "BKE_lib_id.hh"
 #include "BKE_library.hh"
--- a/source/blender/editors/space_file/filelist/filelist.cc
+++ b/source/blender/editors/space_file/filelist/filelist.cc
@@ -52,7 +52,7 @@
 #include "BKE_blendfile.hh"
 #include "BKE_context.hh"
 #include "BKE_global.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_idtype.hh"
 #include "BKE_main.hh"
 #include "BKE_preferences.h"
--- a/source/blender/editors/space_image/image_ops.cc
+++ b/source/blender/editors/space_image/image_ops.cc
@@ -39,7 +39,7 @@
 #include "BKE_colortools.hh"
 #include "BKE_context.hh"
 #include "BKE_global.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_image.hh"
 #include "BKE_image_format.hh"
 #include "BKE_image_save.hh"
--- a/source/blender/makesrna/intern/rna_ID.cc
+++ b/source/blender/makesrna/intern/rna_ID.cc
@@ -218,7 +218,7 @@ const IDFilterEnumPropertyItem rna_enum_id_type_filter_items[] = {

 #  include "BKE_anim_data.hh"
 #  include "BKE_global.hh" /* XXX, remove me */
-#  include "BKE_icons.h"
+#  include "BKE_icons.hh"
 #  include "BKE_idprop.hh"
 #  include "BKE_idtype.hh"
 #  include "BKE_lib_override.hh"
--- a/source/blender/makesrna/intern/rna_annotations.cc
+++ b/source/blender/makesrna/intern/rna_annotations.cc
@@ -29,7 +29,7 @@

 #  include "BKE_animsys.h"
 #  include "BKE_gpencil_legacy.h"
-#  include "BKE_icons.h"
+#  include "BKE_icons.hh"
 #  include "BKE_report.hh"

 #  include "DEG_depsgraph.hh"
--- a/source/blender/makesrna/intern/rna_brush.cc
+++ b/source/blender/makesrna/intern/rna_brush.cc
@@ -372,7 +372,7 @@ static EnumPropertyItem rna_enum_gpencil_brush_modes_items[] = {
 #  include "BKE_colorband.hh"
 #  include "BKE_context.hh"
 #  include "BKE_gpencil_legacy.h"
-#  include "BKE_icons.h"
+#  include "BKE_icons.hh"
 #  include "BKE_layer.hh"
 #  include "BKE_material.hh"
 #  include "BKE_paint.hh"
--- a/source/blender/makesrna/intern/rna_main_api.cc
+++ b/source/blender/makesrna/intern/rna_main_api.cc
@@ -29,7 +29,7 @@
 #  include "BKE_displist.h"
 #  include "BKE_gpencil_legacy.h"
 #  include "BKE_grease_pencil.hh"
-#  include "BKE_icons.h"
+#  include "BKE_icons.hh"
 #  include "BKE_idtype.hh"
 #  include "BKE_image.hh"
 #  include "BKE_lattice.hh"
--- a/source/blender/makesrna/intern/rna_space.cc
+++ b/source/blender/makesrna/intern/rna_space.cc
@@ -634,7 +634,7 @@ static const EnumPropertyItem spreadsheet_table_id_type_items[] = {
 #  include "BKE_brush.hh"
 #  include "BKE_context.hh"
 #  include "BKE_global.hh"
-#  include "BKE_icons.h"
+#  include "BKE_icons.hh"
 #  include "BKE_idprop.hh"
 #  include "BKE_image.hh"
 #  include "BKE_key.hh"
--- a/source/blender/python/intern/bpy_app_icons.cc
+++ b/source/blender/python/intern/bpy_app_icons.cc
@@ -12,7 +12,7 @@

 #include "MEM_guardedalloc.h"

-#include "BKE_icons.h"
+#include "BKE_icons.hh"

 #include "../generic/py_capi_utils.hh"
 #include "../generic/python_compat.hh" /* IWYU pragma: keep. */
--- a/source/blender/windowmanager/intern/wm_init_exit.cc
+++ b/source/blender/windowmanager/intern/wm_init_exit.cc
@@ -36,7 +36,7 @@
 #include "BKE_blendfile.hh"
 #include "BKE_context.hh"
 #include "BKE_global.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_image.hh"
 #include "BKE_keyconfig.h"
 #include "BKE_lib_remap.hh"
--- a/source/blender/windowmanager/intern/wm_window.cc
+++ b/source/blender/windowmanager/intern/wm_window.cc
@@ -45,7 +45,7 @@
 #include "BKE_blender_version.h"
 #include "BKE_context.hh"
 #include "BKE_global.hh"
-#include "BKE_icons.h"
+#include "BKE_icons.hh"
 #include "BKE_layer.hh"
 #include "BKE_main.hh"
 #include "BKE_report.hh"