[Bf-blender-cvs] [dc5c616ccae] master: Cleanup: use _fn for outliner callback functions
Nathan Craddock
noreply at git.blender.org
Fri Aug 7 19:58:37 CEST 2020
Commit: dc5c616ccae292c5643e57f74c98ea7f5b5002d7
Author: Nathan Craddock
Date: Fri Aug 7 10:27:53 2020 -0600
Branches: master
https://developer.blender.org/rBdc5c616ccae292c5643e57f74c98ea7f5b5002d7
Cleanup: use _fn for outliner callback functions
No functional changes.
===================================================================
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_outliner/outliner_tools.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c
index 4fe3d5b0df7..0fbcee12207 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -312,7 +312,7 @@ static void item_object_mode_enter_exit(bContext *C, ReportList *reports, Object
outliner_object_mode_toggle(C, scene, view_layer, base);
}
-void item_object_mode_enter_cb(bContext *C,
+void item_object_mode_enter_fn(bContext *C,
ReportList *reports,
Scene *UNUSED(scene),
TreeElement *UNUSED(te),
@@ -324,7 +324,7 @@ void item_object_mode_enter_cb(bContext *C,
item_object_mode_enter_exit(C, reports, ob, true);
}
-void item_object_mode_exit_cb(bContext *C,
+void item_object_mode_exit_fn(bContext *C,
ReportList *reports,
Scene *UNUSED(scene),
TreeElement *UNUSED(te),
@@ -404,7 +404,7 @@ static void do_item_rename(ARegion *region,
}
}
-void item_rename_cb(bContext *C,
+void item_rename_fn(bContext *C,
ReportList *reports,
Scene *UNUSED(scene),
TreeElement *te,
@@ -521,7 +521,7 @@ static void id_delete(bContext *C, ReportList *reports, TreeElement *te, TreeSto
WM_event_add_notifier(C, NC_WINDOW, NULL);
}
-void id_delete_cb(bContext *C,
+void id_delete_fn(bContext *C,
ReportList *reports,
Scene *UNUSED(scene),
TreeElement *te,
@@ -754,7 +754,7 @@ void OUTLINER_OT_id_remap(wmOperatorType *ot)
RNA_def_property_flag(ot->prop, PROP_ENUM_NO_TRANSLATE);
}
-void id_remap_cb(bContext *C,
+void id_remap_fn(bContext *C,
ReportList *UNUSED(reports),
Scene *UNUSED(scene),
TreeElement *UNUSED(te),
@@ -1003,7 +1003,7 @@ void OUTLINER_OT_lib_relocate(wmOperatorType *ot)
/* XXX This does not work with several items
* (it is only called once in the end, due to the 'deferred'
* filebrowser invocation through event system...). */
-void lib_relocate_cb(bContext *C,
+void lib_relocate_fn(bContext *C,
ReportList *UNUSED(reports),
Scene *UNUSED(scene),
TreeElement *te,
@@ -1057,7 +1057,7 @@ void OUTLINER_OT_lib_reload(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
-void lib_reload_cb(bContext *C,
+void lib_reload_fn(bContext *C,
ReportList *UNUSED(reports),
Scene *UNUSED(scene),
TreeElement *te,
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 05729414f91..1aac0721390 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -290,7 +290,7 @@ bool outliner_item_is_co_over_name_icons(const TreeElement *te, float view_co_x)
bool outliner_item_is_co_within_close_toggle(const TreeElement *te, float view_co_x);
/* outliner_edit.c ---------------------------------------------- */
-typedef void (*outliner_operation_cb)(struct bContext *C,
+typedef void (*outliner_operation_fn)(struct bContext *C,
struct ReportList *,
struct Scene *scene,
struct TreeElement *,
@@ -303,7 +303,7 @@ void outliner_do_object_operation_ex(struct bContext *C,
struct Scene *scene,
struct SpaceOutliner *soops,
struct ListBase *lb,
- outliner_operation_cb operation_cb,
+ outliner_operation_fn operation_fn,
void *user_data,
bool recurse_selected);
void outliner_do_object_operation(struct bContext *C,
@@ -311,7 +311,7 @@ void outliner_do_object_operation(struct bContext *C,
struct Scene *scene,
struct SpaceOutliner *soops,
struct ListBase *lb,
- outliner_operation_cb operation_cb);
+ outliner_operation_fn operation_fn);
int common_restrict_check(struct bContext *C, struct Object *ob);
@@ -319,21 +319,21 @@ int outliner_flag_is_any_test(ListBase *lb, short flag, const int curlevel);
bool outliner_flag_set(ListBase *lb, short flag, short set);
bool outliner_flag_flip(ListBase *lb, short flag);
-void item_rename_cb(struct bContext *C,
+void item_rename_fn(struct bContext *C,
struct ReportList *reports,
struct Scene *scene,
TreeElement *te,
struct TreeStoreElem *tsep,
struct TreeStoreElem *tselem,
void *user_data);
-void lib_relocate_cb(struct bContext *C,
+void lib_relocate_fn(struct bContext *C,
struct ReportList *reports,
struct Scene *scene,
struct TreeElement *te,
struct TreeStoreElem *tsep,
struct TreeStoreElem *tselem,
void *user_data);
-void lib_reload_cb(struct bContext *C,
+void lib_reload_fn(struct bContext *C,
struct ReportList *reports,
struct Scene *scene,
struct TreeElement *te,
@@ -341,14 +341,14 @@ void lib_reload_cb(struct bContext *C,
struct TreeStoreElem *tselem,
void *user_data);
-void id_delete_cb(struct bContext *C,
+void id_delete_fn(struct bContext *C,
struct ReportList *reports,
struct Scene *scene,
struct TreeElement *te,
struct TreeStoreElem *tsep,
struct TreeStoreElem *tselem,
void *user_data);
-void id_remap_cb(struct bContext *C,
+void id_remap_fn(struct bContext *C,
struct ReportList *reports,
struct Scene *scene,
struct TreeElement *te,
@@ -356,14 +356,14 @@ void id_remap_cb(struct bContext *C,
struct TreeStoreElem *tselem,
void *user_data);
-void item_object_mode_enter_cb(struct bContext *C,
+void item_object_mode_enter_fn(struct bContext *C,
struct ReportList *reports,
struct Scene *scene,
TreeElement *te,
struct TreeStoreElem *tsep,
struct TreeStoreElem *tselem,
void *user_data);
-void item_object_mode_exit_cb(struct bContext *C,
+void item_object_mode_exit_fn(struct bContext *C,
struct ReportList *reports,
struct Scene *scene,
TreeElement *te,
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index dae2ba32f09..3233529e2d1 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -198,7 +198,7 @@ static void set_operation_types(SpaceOutliner *soops,
}
}
-static void unlink_action_cb(bContext *C,
+static void unlink_action_fn(bContext *C,
ReportList *UNUSED(reports),
Scene *UNUSED(scene),
TreeElement *UNUSED(te),
@@ -210,7 +210,7 @@ static void unlink_action_cb(bContext *C,
BKE_animdata_set_action(CTX_wm_reports(C), tsep->id, NULL);
}
-static void unlink_material_cb(bContext *UNUSED(C),
+static void unlink_material_fn(bContext *UNUSED(C),
ReportList *UNUSED(reports),
Scene *UNUSED(scene),
TreeElement *te,
@@ -270,7 +270,7 @@ static void unlink_material_cb(bContext *UNUSED(C),
}
}
-static void unlink_texture_cb(bContext *UNUSED(C),
+static void unlink_texture_fn(bContext *UNUSED(C),
ReportList *UNUSED(reports),
Scene *UNUSED(scene),
TreeElement *te,
@@ -299,7 +299,7 @@ static void unlink_texture_cb(bContext *UNUSED(C),
}
}
-static void unlink_collection_cb(bContext *C,
+static void unlink_collection_fn(bContext *C,
ReportList *UNUSED(reports),
Scene *UNUSED(scene),
TreeElement *UNUSED(te),
@@ -335,7 +335,7 @@ static void unlink_collection_cb(bContext *C,
}
}
-static void unlink_object_cb(bContext *C,
+static void unlink_object_fn(bContext *C,
ReportList *UNUSED(reports),
Scene *UNUSED(scene),
TreeElement *te,
@@ -374,7 +374,7 @@ static void unlink_object_cb(bContext *C,
}
}
-static void unlink_world_cb(bContext *UNUSED(C),
+static void unlink_world_fn(bContext *UNUSED(C),
ReportList *UNUSED(reports),
Scene *UNUSED(scene),
TreeElement *UNUSED(te),
@@ -395,7 +395,7 @@ static void outliner_do_libdata_operation(bContext *C,
Scene *scene,
SpaceOutliner *soops,
ListBase *lb,
- outliner_operation_cb operation_cb,
+ outliner_operation_fn operation_fn,
void *user_data)
{
TreeElement *te;
@@ -406,12 +406,12 @@ static void outliner_d
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list