Cleanup: Move BKE_undo_system.h to C++

2024-01-15 12:26:09 -05:00
parent 5c32b9ad38
commit ca560cd15e
32 changed files with 76 additions and 85 deletions
--- a/source/blender/blenkernel/BKE_blender_undo.h
+++ b/source/blender/blenkernel/BKE_blender_undo.h
@@ -7,7 +7,7 @@
 * \ingroup bke
 */

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

 #ifdef __cplusplus
 extern "C" {
--- a/source/blender/blenkernel/BKE_undo_system.hh
+++ b/source/blender/blenkernel/BKE_undo_system.hh
@@ -7,34 +7,32 @@
 * \ingroup bke
 */

+#include "BLI_utildefines.h"
 #include "DNA_ID.h"
 #include "DNA_listBase.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct Main;
 struct UndoStep;
+struct UndoType;
 struct bContext;

-/* ID's */
+/* IDs */
 struct Main;
 struct Mesh;
 struct Object;
 struct Scene;
 struct Text;

-typedef struct UndoRefID {
+struct UndoRefID {
  struct ID *ptr;
  char name[MAX_ID_NAME];
-} UndoRefID;
+};
 /* UndoRefID_Mesh & friends. */
 #define UNDO_REF_ID_TYPE(ptr_ty) \
-  typedef struct UndoRefID_##ptr_ty { \
+  struct UndoRefID_##ptr_ty { \
    struct ptr_ty *ptr; \
    char name[MAX_ID_NAME]; \
-  } UndoRefID_##ptr_ty
+  }
 UNDO_REF_ID_TYPE(Mesh);
 UNDO_REF_ID_TYPE(Object);
 UNDO_REF_ID_TYPE(Scene);
@@ -42,14 +40,14 @@ UNDO_REF_ID_TYPE(Text);
 UNDO_REF_ID_TYPE(Image);
 UNDO_REF_ID_TYPE(PaintCurve);

-typedef struct UndoStack {
+struct UndoStack {
  ListBase steps;
-  struct UndoStep *step_active;
+  UndoStep *step_active;
  /**
   * The last memfile state read, used so we can be sure the names from the
   * library state matches the state an undo step was written in.
   */
-  struct UndoStep *step_active_memfile;
+  UndoStep *step_active_memfile;

  /**
   * Some undo systems require begin/end, see: #UndoType.step_encode_init
@@ -57,19 +55,19 @@ typedef struct UndoStack {
   * \note This is not included in the 'steps' list.
   * That is done once end is called.
   */
-  struct UndoStep *step_init;
+  UndoStep *step_init;

  /**
   * Keep track of nested group begin/end calls,
   * within which all but the last undo-step is marked for skipping.
   */
  int group_level;
-} UndoStack;
+};

-typedef struct UndoStep {
-  struct UndoStep *next, *prev;
+struct UndoStep {
+  UndoStep *next, *prev;
  char name[64];
-  const struct UndoType *type;
+  const UndoType *type;
  /** Size in bytes of all data in step (not including the step). */
  size_t data_size;
  /** Users should never see this step (only use for internal consistency). */
@@ -82,25 +80,25 @@ typedef struct UndoStep {
  /** For use by undo systems that accumulate changes (mesh-sculpt & image-painting). */
  bool is_applied;
  /* Over alloc 'type->struct_size'. */
-} UndoStep;
+};

-typedef enum eUndoStepDir {
+enum eUndoStepDir {
  STEP_REDO = 1,
  STEP_UNDO = -1,
  STEP_INVALID = 0,
-} eUndoStepDir;
+};

-typedef enum eUndoPushReturn {
+enum eUndoPushReturn {
  UNDO_PUSH_RET_FAILURE = 0,
  UNDO_PUSH_RET_SUCCESS = (1 << 0),
  UNDO_PUSH_RET_OVERRIDE_CHANGED = (1 << 1),
-} eUndoPushReturn;
+};
 ENUM_OPERATORS(eUndoPushReturn, UNDO_PUSH_RET_OVERRIDE_CHANGED)

-typedef void (*UndoTypeForEachIDRefFn)(void *user_data, struct UndoRefID *id_ref);
+using UndoTypeForEachIDRefFn = void (*)(void *user_data, struct UndoRefID *id_ref);

-typedef struct UndoType {
-  struct UndoType *next, *prev;
+struct UndoType {
+  UndoType *next, *prev;
  /** Only for debugging. */
  const char *name;

@@ -142,10 +140,10 @@ typedef struct UndoType {
   * The size of the undo struct 'inherited' from #UndoStep for that specific type. Used for
   * generic allocation in BKE's `undo_system.cc`. */
  size_t step_size;
-} UndoType;
+};

 /** #UndoType.flag bitflags. */
-typedef enum eUndoTypeFlags {
+enum eUndoTypeFlags {
  /**
   * This undo type `encode` callback needs a valid context, it will fail otherwise.
   * \note Callback is still supposed to properly deal with a NULL context pointer.
@@ -158,7 +156,7 @@ typedef enum eUndoTypeFlags {
   * This is typically used for undo systems that store both before/after states.
   */
  UNDOTYPE_FLAG_DECODE_ACTIVE_STEP = 1 << 1,
-} eUndoTypeFlags;
+};

 /* -------------------------------------------------------------------- */
 /** \name Public Undo Types
@@ -177,15 +175,15 @@ extern const UndoType *BKE_UNDOSYS_TYPE_TEXT;

 #define BKE_UNDOSYS_TYPE_IS_MEMFILE_SKIP(ty) ELEM(ty, BKE_UNDOSYS_TYPE_IMAGE)

-UndoStack *BKE_undosys_stack_create(void);
+UndoStack *BKE_undosys_stack_create();
 void BKE_undosys_stack_destroy(UndoStack *ustack);
 void BKE_undosys_stack_clear(UndoStack *ustack);
 void BKE_undosys_stack_clear_active(UndoStack *ustack);
 /* name optional */
 bool BKE_undosys_stack_has_undo(const UndoStack *ustack, const char *name);
-void BKE_undosys_stack_init_from_main(UndoStack *ustack, struct Main *bmain);
+void BKE_undosys_stack_init_from_main(UndoStack *ustack, Main *bmain);
 /* called after 'BKE_undosys_stack_init_from_main' */
-void BKE_undosys_stack_init_from_context(UndoStack *ustack, struct bContext *C);
+void BKE_undosys_stack_init_from_context(UndoStack *ustack, bContext *C);
 UndoStep *BKE_undosys_stack_active_with_type(UndoStack *ustack, const UndoType *ut);
 UndoStep *BKE_undosys_stack_init_or_active_with_type(UndoStack *ustack, const UndoType *ut);
 /**
@@ -203,19 +201,19 @@ void BKE_undosys_stack_group_end(UndoStack *ustack);
 * Only some UndoType's require init.
 */
 UndoStep *BKE_undosys_step_push_init_with_type(UndoStack *ustack,
-                                               struct bContext *C,
+                                               bContext *C,
                                               const char *name,
                                               const UndoType *ut);
-UndoStep *BKE_undosys_step_push_init(UndoStack *ustack, struct bContext *C, const char *name);
+UndoStep *BKE_undosys_step_push_init(UndoStack *ustack, bContext *C, const char *name);

 /**
 * \param C: Can be NULL from some callers if their encoding function doesn't need it
 */
 eUndoPushReturn BKE_undosys_step_push_with_type(UndoStack *ustack,
-                                                struct bContext *C,
+                                                bContext *C,
                                                const char *name,
                                                const UndoType *ut);
-eUndoPushReturn BKE_undosys_step_push(UndoStack *ustack, struct bContext *C, const char *name);
+eUndoPushReturn BKE_undosys_step_push(UndoStack *ustack, bContext *C, const char *name);

 UndoStep *BKE_undosys_step_find_by_name_with_type(UndoStack *ustack,
                                                  const char *name,
@@ -248,20 +246,17 @@ eUndoStepDir BKE_undosys_step_calc_direction(const UndoStack *ustack,
 * it is assumed to match the current state, and will be used as basis for the undo/redo process
 * (i.e. all steps in-between `us_reference` and `us_target` will be processed).
 */
-bool BKE_undosys_step_load_data_ex(UndoStack *ustack,
-                                   struct bContext *C,
-                                   UndoStep *us_target,
-                                   UndoStep *us_reference,
-                                   bool use_skip);
+bool BKE_undosys_step_load_data_ex(
+    UndoStack *ustack, bContext *C, UndoStep *us_target, UndoStep *us_reference, bool use_skip);
 /**
 * Undo/Redo until the given `us_target` step becomes the active (currently loaded) one.
 */
-bool BKE_undosys_step_load_data(UndoStack *ustack, struct bContext *C, UndoStep *us_target);
+bool BKE_undosys_step_load_data(UndoStack *ustack, bContext *C, UndoStep *us_target);
 /**
 * Undo/Redo until the step matching given `index` in the undo stack becomes the active
 * (currently loaded) one.
 */
-void BKE_undosys_step_load_from_index(UndoStack *ustack, struct bContext *C, int index);
+void BKE_undosys_step_load_from_index(UndoStack *ustack, bContext *C, int index);

 /**
 * Undo until `us_target` step becomes the active (currently loaded) one.
@@ -275,7 +270,7 @@ void BKE_undosys_step_load_from_index(UndoStack *ustack, struct bContext *C, int
 * (if the given one has to be skipped).
 */
 bool BKE_undosys_step_undo_with_data_ex(UndoStack *ustack,
-                                        struct bContext *C,
+                                        bContext *C,
                                        UndoStep *us,
                                        bool use_skip);
 /**
@@ -283,11 +278,11 @@ bool BKE_undosys_step_undo_with_data_ex(UndoStack *ustack,
 *
 * \note See #BKE_undosys_step_undo_with_data_ex for details.
 */
-bool BKE_undosys_step_undo_with_data(UndoStack *ustack, struct bContext *C, UndoStep *us_target);
+bool BKE_undosys_step_undo_with_data(UndoStack *ustack, bContext *C, UndoStep *us_target);
 /**
 * Undo one step from current active (currently loaded) one.
 */
-bool BKE_undosys_step_undo(UndoStack *ustack, struct bContext *C);
+bool BKE_undosys_step_undo(UndoStack *ustack, bContext *C);

 /**
 * Redo until `us_target` step becomes the active (currently loaded) one.
@@ -301,7 +296,7 @@ bool BKE_undosys_step_undo(UndoStack *ustack, struct bContext *C);
 * (if the given one has to be skipped).
 */
 bool BKE_undosys_step_redo_with_data_ex(UndoStack *ustack,
-                                        struct bContext *C,
+                                        bContext *C,
                                        UndoStep *us,
                                        bool use_skip);
 /**
@@ -309,11 +304,11 @@ bool BKE_undosys_step_redo_with_data_ex(UndoStack *ustack,
 *
 * \note See #BKE_undosys_step_redo_with_data_ex for details.
 */
-bool BKE_undosys_step_redo_with_data(UndoStack *ustack, struct bContext *C, UndoStep *us_target);
+bool BKE_undosys_step_redo_with_data(UndoStack *ustack, bContext *C, UndoStep *us_target);
 /**
 * Redo one step from current active one.
 */
-bool BKE_undosys_step_redo(UndoStack *ustack, struct bContext *C);
+bool BKE_undosys_step_redo(UndoStack *ustack, bContext *C);

 /**
 * Useful when we want to diff against previous undo data but can't be sure the types match.
@@ -330,7 +325,7 @@ UndoStep *BKE_undosys_step_same_type_prev(UndoStep *us);
 * Similar to #WM_operatortype_append
 */
 UndoType *BKE_undosys_type_append(void (*undosys_fn)(UndoType *));
-void BKE_undosys_type_free_all(void);
+void BKE_undosys_type_free_all();

 /* ID Accessor. */

@@ -341,7 +336,3 @@ void BKE_undosys_foreach_ID_ref(UndoStack *ustack,
 #endif

 void BKE_undosys_print(UndoStack *ustack);
-
-#ifdef __cplusplus
-}
-#endif
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -504,7 +504,7 @@ set(SRC
  BKE_texture.h
  BKE_tracking.h
  BKE_type_conversions.hh
-  BKE_undo_system.h
+  BKE_undo_system.hh
  BKE_unit.hh
  BKE_vfont.hh
  BKE_vfontdata.hh
--- a/source/blender/blenkernel/intern/blender_undo.cc
+++ b/source/blender/blenkernel/intern/blender_undo.cc
@@ -36,7 +36,7 @@
 #include "BKE_context.hh"
 #include "BKE_global.h"
 #include "BKE_main.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "BLO_readfile.h"
 #include "BLO_undofile.hh"
--- a/source/blender/blenkernel/intern/blendfile.cc
+++ b/source/blender/blenkernel/intern/blendfile.cc
@@ -55,7 +55,7 @@
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
 #include "BKE_studiolight.h"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"
 #include "BKE_workspace.h"

 #include "BLO_readfile.h"
--- a/source/blender/blenkernel/intern/undo_system.cc
+++ b/source/blender/blenkernel/intern/undo_system.cc
@@ -27,7 +27,7 @@
 #include "BKE_global.h"
 #include "BKE_lib_override.hh"
 #include "BKE_main.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "RNA_access.hh"

--- a/source/blender/blenloader/intern/readfile.cc
+++ b/source/blender/blenloader/intern/readfile.cc
@@ -86,7 +86,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"
 #include "BKE_workspace.h"

 #include "DRW_engine.hh"
--- a/source/blender/blenloader/intern/undofile.cc
+++ b/source/blender/blenloader/intern/undofile.cc
@@ -32,7 +32,7 @@

 #include "BKE_lib_id.h"
 #include "BKE_main.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 /* keep last */
 #include "BLI_strict_flags.h"
--- a/source/blender/editors/armature/editarmature_undo.cc
+++ b/source/blender/editors/armature/editarmature_undo.cc
@@ -26,7 +26,7 @@
 #include "BKE_layer.h"
 #include "BKE_main.hh"
 #include "BKE_object.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "DEG_depsgraph.hh"

--- a/source/blender/editors/curve/editcurve_undo.cc
+++ b/source/blender/editors/curve/editcurve_undo.cc
@@ -25,7 +25,7 @@
 #include "BKE_layer.h"
 #include "BKE_main.hh"
 #include "BKE_object.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "DEG_depsgraph.hh"

--- a/source/blender/editors/curve/editfont_undo.cc
+++ b/source/blender/editors/curve/editfont_undo.cc
@@ -23,7 +23,7 @@
 #include "BKE_context.hh"
 #include "BKE_layer.h"
 #include "BKE_main.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"
 #include "BKE_vfont.hh"

 #include "DEG_depsgraph.hh"
--- a/source/blender/editors/curves/intern/curves_undo.cc
+++ b/source/blender/editors/curves/intern/curves_undo.cc
@@ -12,7 +12,7 @@
 #include "BKE_curves.hh"
 #include "BKE_main.hh"
 #include "BKE_object.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "CLG_log.h"

--- a/source/blender/editors/gpencil_legacy/gpencil_undo.cc
+++ b/source/blender/editors/gpencil_legacy/gpencil_undo.cc
@@ -21,7 +21,7 @@
 #include "BKE_blender_undo.h"
 #include "BKE_context.hh"
 #include "BKE_gpencil_legacy.h"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "ED_gpencil_legacy.hh"

--- a/source/blender/editors/lattice/editlattice_undo.cc
+++ b/source/blender/editors/lattice/editlattice_undo.cc
@@ -28,7 +28,7 @@
 #include "BKE_layer.h"
 #include "BKE_main.hh"
 #include "BKE_object.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "DEG_depsgraph.hh"

--- a/source/blender/editors/mesh/editmesh_undo.cc
+++ b/source/blender/editors/mesh/editmesh_undo.cc
@@ -32,7 +32,7 @@
 #include "BKE_main.hh"
 #include "BKE_mesh.hh"
 #include "BKE_object.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "DEG_depsgraph.hh"

--- a/source/blender/editors/metaball/editmball_undo.cc
+++ b/source/blender/editors/metaball/editmball_undo.cc
@@ -27,7 +27,7 @@
 #include "BKE_layer.h"
 #include "BKE_main.hh"
 #include "BKE_object.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "DEG_depsgraph.hh"

--- a/source/blender/editors/physics/particle_edit_undo.cc
+++ b/source/blender/editors/physics/particle_edit_undo.cc
@@ -25,7 +25,7 @@
 #include "BKE_layer.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "DEG_depsgraph.hh"

--- a/source/blender/editors/sculpt_paint/paint_curve_undo.cc
+++ b/source/blender/editors/sculpt_paint/paint_curve_undo.cc
@@ -14,7 +14,7 @@

 #include "BKE_context.hh"
 #include "BKE_paint.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "ED_paint.hh"
 #include "ED_undo.hh"
--- a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc
+++ b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc
@@ -18,7 +18,7 @@
 #include "BKE_context.hh"
 #include "BKE_layer.h"
 #include "BKE_paint.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "ED_paint.hh"
 #include "ED_view3d.hh"
--- a/source/blender/editors/sculpt_paint/sculpt_undo.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.cc
@@ -60,7 +60,7 @@
 #include "BKE_scene.h"
 #include "BKE_subdiv_ccg.hh"
 #include "BKE_subsurf.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 /* TODO(sergey): Ideally should be no direct call to such low level things. */
 #include "BKE_subdiv_eval.hh"
--- a/source/blender/editors/space_image/image_undo.cc
+++ b/source/blender/editors/space_image/image_undo.cc
@@ -40,7 +40,7 @@
 #include "BKE_context.hh"
 #include "BKE_image.h"
 #include "BKE_paint.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "DEG_depsgraph.hh"

--- a/source/blender/editors/space_text/text_undo.cc
+++ b/source/blender/editors/space_text/text_undo.cc
@@ -24,7 +24,7 @@
 #include "BKE_main.hh"
 #include "BKE_report.h"
 #include "BKE_text.h"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "WM_api.hh"
 #include "WM_types.hh"
--- a/source/blender/editors/space_topbar/space_topbar.cc
+++ b/source/blender/editors/space_topbar/space_topbar.cc
@@ -20,7 +20,7 @@
 #include "BKE_context.hh"
 #include "BKE_global.h"
 #include "BKE_screen.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "ED_screen.hh"
 #include "ED_space_api.hh"
--- a/source/blender/editors/undo/ed_undo.cc
+++ b/source/blender/editors/undo/ed_undo.cc
@@ -30,7 +30,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"
 #include "BKE_workspace.h"

 #include "BLO_blend_validate.hh"
--- a/source/blender/editors/undo/memfile_undo.cc
+++ b/source/blender/editors/undo/memfile_undo.cc
@@ -5,7 +5,7 @@
 /** \file
 * \ingroup edundo
 *
- * Wrapper between 'ED_undo.hh' and 'BKE_undo_system.h' API's.
+ * Wrapper between 'ED_undo.hh' and 'BKE_undo_system.hh' API's.
 */

 #include "BLI_sys_types.h"
@@ -29,7 +29,7 @@
 #include "BKE_node.hh"
 #include "BKE_preview_image.hh"
 #include "BKE_scene.h"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "../depsgraph/DEG_depsgraph.hh"

--- a/source/blender/editors/undo/undo_system_types.cc
+++ b/source/blender/editors/undo/undo_system_types.cc
@@ -24,7 +24,7 @@
 #include "undo_intern.hh"

 /* Keep last */
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 void ED_undosys_type_init()
 {
--- a/source/blender/editors/util/ed_util.cc
+++ b/source/blender/editors/util/ed_util.cc
@@ -30,7 +30,7 @@
 #include "BKE_packedFile.h"
 #include "BKE_paint.hh"
 #include "BKE_screen.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"

 #include "DEG_depsgraph.hh"

--- a/source/blender/makesrna/intern/rna_wm_api.cc
+++ b/source/blender/makesrna/intern/rna_wm_api.cc
@@ -63,7 +63,7 @@ const EnumPropertyItem rna_enum_window_cursor_items[] = {
 #ifdef RNA_RUNTIME

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

 #  include "WM_types.hh"

--- a/source/blender/windowmanager/intern/wm.cc
+++ b/source/blender/windowmanager/intern/wm.cc
@@ -50,7 +50,7 @@
 #  include "wm_xr.hh"
 #endif

-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"
 #include "ED_screen.hh"

 #ifdef WITH_PYTHON
--- a/source/blender/windowmanager/intern/wm_event_system.cc
+++ b/source/blender/windowmanager/intern/wm_event_system.cc
@@ -42,7 +42,7 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"
 #include "BKE_workspace.h"

 #include "BKE_sound.h"
--- a/source/blender/windowmanager/intern/wm_files.cc
+++ b/source/blender/windowmanager/intern/wm_files.cc
@@ -82,7 +82,7 @@
 #include "BKE_scene.h"
 #include "BKE_screen.hh"
 #include "BKE_sound.h"
-#include "BKE_undo_system.h"
+#include "BKE_undo_system.hh"
 #include "BKE_workspace.h"

 #include "BLO_undofile.hh" /* to save from an undo memfile */
--- a/source/creator/creator_signals.cc
+++ b/source/creator/creator_signals.cc
@@ -57,7 +57,7 @@

 // #define USE_WRITE_CRASH_BLEND
 #  ifdef USE_WRITE_CRASH_BLEND
-#    include "BKE_undo_system.h"
+#    include "BKE_undo_system.hh"
 #    include "BLO_undofile.hh"
 #  endif