From 3df7939eec967b84b386c460a5ea05127a2ea833 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sun, 21 Jan 2024 19:49:58 +0100 Subject: [PATCH] Cleanup: Move `BKE_blender_undo.h` to full Cpp header `BKE_blender_undo.hh`. --- source/blender/blenkernel/BKE_blender_undo.h | 32 ------------------- source/blender/blenkernel/BKE_blender_undo.hh | 23 +++++++++++++ source/blender/blenkernel/CMakeLists.txt | 2 +- .../blender/blenkernel/intern/blender_undo.cc | 2 +- .../editors/gpencil_legacy/gpencil_undo.cc | 2 +- .../editors/interface/interface_handlers.cc | 2 +- source/blender/editors/undo/ed_undo.cc | 2 +- source/blender/editors/undo/memfile_undo.cc | 2 +- 8 files changed, 29 insertions(+), 38 deletions(-) delete mode 100644 source/blender/blenkernel/BKE_blender_undo.h create mode 100644 source/blender/blenkernel/BKE_blender_undo.hh diff --git a/source/blender/blenkernel/BKE_blender_undo.h b/source/blender/blenkernel/BKE_blender_undo.h deleted file mode 100644 index 7c22477d43f..00000000000 --- a/source/blender/blenkernel/BKE_blender_undo.h +++ /dev/null @@ -1,32 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Blender Authors - * - * SPDX-License-Identifier: GPL-2.0-or-later */ -#pragma once - -/** \file - * \ingroup bke - */ - -#include "BKE_undo_system.hh" - -#ifdef __cplusplus -extern "C" { -#endif - -struct Main; -struct MemFileUndoData; -struct bContext; - -#define BKE_UNDO_STR_MAX 64 - -struct MemFileUndoData *BKE_memfile_undo_encode(struct Main *bmain, - struct MemFileUndoData *mfu_prev); -bool BKE_memfile_undo_decode(struct MemFileUndoData *mfu, - enum eUndoStepDir undo_direction, - bool use_old_bmain_data, - struct bContext *C); -void BKE_memfile_undo_free(struct MemFileUndoData *mfu); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_blender_undo.hh b/source/blender/blenkernel/BKE_blender_undo.hh new file mode 100644 index 00000000000..bada6b7bb28 --- /dev/null +++ b/source/blender/blenkernel/BKE_blender_undo.hh @@ -0,0 +1,23 @@ +/* SPDX-FileCopyrightText: 2023 Blender Authors + * + * SPDX-License-Identifier: GPL-2.0-or-later */ +#pragma once + +/** \file + * \ingroup bke + */ + +#include "BKE_undo_system.hh" + +struct Main; +struct MemFileUndoData; +struct bContext; + +#define BKE_UNDO_STR_MAX 64 + +MemFileUndoData *BKE_memfile_undo_encode(Main *bmain, MemFileUndoData *mfu_prev); +bool BKE_memfile_undo_decode(MemFileUndoData *mfu, + eUndoStepDir undo_direction, + bool use_old_bmain_data, + bContext *C); +void BKE_memfile_undo_free(MemFileUndoData *mfu); diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 2b4a6a4ca92..fb2377cb0b9 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -340,7 +340,7 @@ set(SRC BKE_bake_items_socket.hh BKE_blender.h BKE_blender_copybuffer.hh - BKE_blender_undo.h + BKE_blender_undo.hh BKE_blender_user_menu.hh BKE_blender_version.h BKE_blendfile.hh diff --git a/source/blender/blenkernel/intern/blender_undo.cc b/source/blender/blenkernel/intern/blender_undo.cc index 268030d3796..880a541f0ff 100644 --- a/source/blender/blenkernel/intern/blender_undo.cc +++ b/source/blender/blenkernel/intern/blender_undo.cc @@ -31,7 +31,7 @@ #include "BLI_utildefines.h" #include "BKE_appdir.hh" -#include "BKE_blender_undo.h" /* own include */ +#include "BKE_blender_undo.hh" /* own include */ #include "BKE_blendfile.hh" #include "BKE_context.hh" #include "BKE_global.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_undo.cc b/source/blender/editors/gpencil_legacy/gpencil_undo.cc index 6f55e9b5d5a..0fd0ad2186b 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_undo.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_undo.cc @@ -18,7 +18,7 @@ #include "BLI_listbase.h" -#include "BKE_blender_undo.h" +#include "BKE_blender_undo.hh" #include "BKE_context.hh" #include "BKE_gpencil_legacy.h" #include "BKE_undo_system.hh" diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc index 0c8c24b5643..d25503e46c8 100644 --- a/source/blender/editors/interface/interface_handlers.cc +++ b/source/blender/editors/interface/interface_handlers.cc @@ -34,7 +34,7 @@ #include "BLI_utildefines.h" #include "BKE_animsys.h" -#include "BKE_blender_undo.h" +#include "BKE_blender_undo.hh" #include "BKE_brush.hh" #include "BKE_colorband.hh" #include "BKE_colortools.hh" diff --git a/source/blender/editors/undo/ed_undo.cc b/source/blender/editors/undo/ed_undo.cc index 2efd234640a..cc890865f7e 100644 --- a/source/blender/editors/undo/ed_undo.cc +++ b/source/blender/editors/undo/ed_undo.cc @@ -20,7 +20,7 @@ #include "BLT_translation.h" -#include "BKE_blender_undo.h" +#include "BKE_blender_undo.hh" #include "BKE_callbacks.h" #include "BKE_context.hh" #include "BKE_global.h" diff --git a/source/blender/editors/undo/memfile_undo.cc b/source/blender/editors/undo/memfile_undo.cc index 2ffa05f3f8a..fa61e8e5d31 100644 --- a/source/blender/editors/undo/memfile_undo.cc +++ b/source/blender/editors/undo/memfile_undo.cc @@ -21,7 +21,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_blender_undo.h" +#include "BKE_blender_undo.hh" #include "BKE_context.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh"