diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-11-10 22:34:59 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-11-10 22:35:43 +0300 |
commit | 8c84a1873d8d4ef461bb14bbc9b180cf2d111351 (patch) | |
tree | 72721e949c6c09e50543e33fa182114e4b38ca41 /source/blender/blenkernel | |
parent | 78836c021101a59886e4881fe57dc26a9a65753d (diff) |
Cleanup: use func definitions for wm/notifiers/editors ID callbacks.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_library.h | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library.c | 12 |
2 files changed, 13 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index e27198add4c..9a961bafbf9 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -118,9 +118,13 @@ void BKE_library_make_local(struct Main *bmain, struct Library *lib, bool untagg struct ID *BKE_libblock_find_name_ex(struct Main *bmain, const short type, const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); struct ID *BKE_libblock_find_name(const short type, const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -void BKE_library_callback_free_window_manager_set(void (*func)(struct bContext *, struct wmWindowManager *)); -void BKE_library_callback_free_notifier_reference_set(void (*func)(const void *)); -void BKE_library_callback_free_editor_id_reference_set(void (*func)(const struct ID *)); +typedef void (*BKE_library_free_window_manager_cb)(struct bContext *, struct wmWindowManager *); +typedef void (*BKE_library_free_notifier_reference_cb)(const void *); +typedef void (*BKE_library_free_editor_id_reference_cb)(const struct ID *); + +void BKE_library_callback_free_window_manager_set(BKE_library_free_window_manager_cb func); +void BKE_library_callback_free_notifier_reference_set(BKE_library_free_notifier_reference_cb func); +void BKE_library_callback_free_editor_id_reference_set(BKE_library_free_editor_id_reference_cb func); /* use when "" is given to new_id() */ #define ID_FALLBACK_NAME N_("Untitled") diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 1dff424b6cc..e8f02ee8204 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1021,23 +1021,23 @@ static void BKE_library_free(Library *lib) freePackedFile(lib->packedfile); } -static void (*free_windowmanager_cb)(bContext *, wmWindowManager *) = NULL; +static BKE_library_free_window_manager_cb free_windowmanager_cb = NULL; -void BKE_library_callback_free_window_manager_set(void (*func)(bContext *C, wmWindowManager *) ) +void BKE_library_callback_free_window_manager_set(BKE_library_free_window_manager_cb func) { free_windowmanager_cb = func; } -static void (*free_notifier_reference_cb)(const void *) = NULL; +static BKE_library_free_notifier_reference_cb free_notifier_reference_cb = NULL; -void BKE_library_callback_free_notifier_reference_set(void (*func)(const void *) ) +void BKE_library_callback_free_notifier_reference_set(BKE_library_free_notifier_reference_cb func) { free_notifier_reference_cb = func; } -static void (*free_editor_id_reference_cb)(const ID *) = NULL; +static BKE_library_free_editor_id_reference_cb free_editor_id_reference_cb = NULL; -void BKE_library_callback_free_editor_id_reference_set(void (*func)(const ID *)) +void BKE_library_callback_free_editor_id_reference_set(BKE_library_free_editor_id_reference_cb func) { free_editor_id_reference_cb = func; } |