From 3cc5c60d17c6f3b212cd5d27c6472003c06cb879 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 24 Apr 2012 12:16:17 +0000 Subject: [PATCH] Eobj: eobj_event_callback_del/_full renames. eobj_event_callback_del -> eobj_event_callback_del_lazy. eobj_event_callback_del_full -> eobj_event_callback_del. Thanks to cedric for the suggestion. SVN revision: 70435 --- legacy/eobj/examples/signals/main.c | 16 ++++++++-------- legacy/eobj/lib/Eobj.h | 8 ++++---- legacy/eobj/lib/eobj.c | 8 ++++---- legacy/eobj/tests/eobj_test_general.c | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/legacy/eobj/examples/signals/main.c b/legacy/eobj/examples/signals/main.c index 311311e490..619979688a 100644 --- a/legacy/eobj/examples/signals/main.c +++ b/legacy/eobj/examples/signals/main.c @@ -41,26 +41,26 @@ main(int argc, char *argv[]) fail_if(cb_count != 3); - eobj_event_callback_del_full(obj, SIG_A_CHANGED, _a_changed_cb, (void *) 3); + eobj_event_callback_del(obj, SIG_A_CHANGED, _a_changed_cb, (void *) 3); fail_if(pd->cb_count != 3); - fail_if(eobj_event_callback_del_full(obj, SIG_A_CHANGED, _a_changed_cb, (void *) 12)); + fail_if(eobj_event_callback_del(obj, SIG_A_CHANGED, _a_changed_cb, (void *) 12)); fail_if(pd->cb_count != 3); - fail_if(4 != (int) eobj_event_callback_del_full(obj, SIG_A_CHANGED, _a_changed_cb, (void *) 4)); + fail_if(4 != (int) eobj_event_callback_del(obj, SIG_A_CHANGED, _a_changed_cb, (void *) 4)); fail_if(pd->cb_count != 2); - eobj_event_callback_del(obj, SIG_A_CHANGED, _a_changed_cb); + eobj_event_callback_del_lazy(obj, SIG_A_CHANGED, _a_changed_cb); fail_if(pd->cb_count != 1); - fail_if(eobj_event_callback_del(obj, SIG_A_CHANGED, NULL)); + fail_if(eobj_event_callback_del_lazy(obj, SIG_A_CHANGED, NULL)); fail_if(pd->cb_count != 1); - fail_if(eobj_event_callback_del_full(obj, SIG_A_CHANGED, NULL, 0)); + fail_if(eobj_event_callback_del(obj, SIG_A_CHANGED, NULL, 0)); fail_if(pd->cb_count != 1); - eobj_event_callback_del(obj, SIG_A_CHANGED, _a_changed_cb); + eobj_event_callback_del_lazy(obj, SIG_A_CHANGED, _a_changed_cb); fail_if(pd->cb_count != 0); - fail_if(eobj_event_callback_del(obj, SIG_A_CHANGED, _a_changed_cb)); + fail_if(eobj_event_callback_del_lazy(obj, SIG_A_CHANGED, _a_changed_cb)); fail_if(pd->cb_count != 0); eobj_unref(obj); diff --git a/legacy/eobj/lib/Eobj.h b/legacy/eobj/lib/Eobj.h index 9b03457816..887964eac6 100644 --- a/legacy/eobj/lib/Eobj.h +++ b/legacy/eobj/lib/Eobj.h @@ -812,9 +812,9 @@ EAPI Eina_Bool eobj_event_callback_priority_add(Eobj *obj, const Eobj_Event_Desc * @param func the callback to delete. * @return The additional data that was set to be passed to the callback. * - * @see eobj_event_callback_del_full() + * @see eobj_event_callback_del() */ -EAPI void *eobj_event_callback_del(Eobj *obj, const Eobj_Event_Description *desc, Eobj_Event_Cb func); +EAPI void *eobj_event_callback_del_lazy(Eobj *obj, const Eobj_Event_Description *desc, Eobj_Event_Cb func); /** * @brief Del a callback with a specific data associated to it for an event. @@ -824,9 +824,9 @@ EAPI void *eobj_event_callback_del(Eobj *obj, const Eobj_Event_Description *desc * @param user_data The data to compare. * @return The additional data that was set to be passed to the callback. * - * @see eobj_event_callback_del() + * @see eobj_event_callback_del_lazy() */ -EAPI void *eobj_event_callback_del_full(Eobj *obj, const Eobj_Event_Description *desc, Eobj_Event_Cb func, const void *user_data); +EAPI void *eobj_event_callback_del(Eobj *obj, const Eobj_Event_Description *desc, Eobj_Event_Cb func, const void *user_data); /** * @brief Call the callbacks for an event of an object. diff --git a/legacy/eobj/lib/eobj.c b/legacy/eobj/lib/eobj.c index 6580abbddd..b271627ee6 100644 --- a/legacy/eobj/lib/eobj.c +++ b/legacy/eobj/lib/eobj.c @@ -1124,7 +1124,7 @@ eobj_weak_ref_del(Eobj **wref) { if (*wref) { - eobj_event_callback_del_full(*wref, EOBJ_EV_DEL, _eobj_weak_ref_cb, + eobj_event_callback_del(*wref, EOBJ_EV_DEL, _eobj_weak_ref_cb, wref); } } @@ -1449,7 +1449,7 @@ eobj_event_callback_priority_add(Eobj *obj, } EAPI void * -eobj_event_callback_del(Eobj *obj, const Eobj_Event_Description *desc, Eobj_Event_Cb func) +eobj_event_callback_del_lazy(Eobj *obj, const Eobj_Event_Description *desc, Eobj_Event_Cb func) { EOBJ_MAGIC_RETURN_VAL(obj, EOBJ_EINA_MAGIC, NULL); @@ -1477,7 +1477,7 @@ found: } EAPI void * -eobj_event_callback_del_full(Eobj *obj, const Eobj_Event_Description *desc, Eobj_Event_Cb func, const void *user_data) +eobj_event_callback_del(Eobj *obj, const Eobj_Event_Description *desc, Eobj_Event_Cb func, const void *user_data) { EOBJ_MAGIC_RETURN_VAL(obj, EOBJ_EINA_MAGIC, NULL); @@ -1563,7 +1563,7 @@ eobj_event_callback_forwarder_del(Eobj *obj, const Eobj_Event_Description *desc, EOBJ_MAGIC_RETURN_VAL(obj, EOBJ_EINA_MAGIC, EINA_FALSE); EOBJ_MAGIC_RETURN_VAL(new_obj, EOBJ_EINA_MAGIC, EINA_FALSE); - eobj_event_callback_del_full(obj, desc, _eobj_event_forwarder_callback, new_obj); + eobj_event_callback_del(obj, desc, _eobj_event_forwarder_callback, new_obj); return EINA_TRUE; } diff --git a/legacy/eobj/tests/eobj_test_general.c b/legacy/eobj/tests/eobj_test_general.c index 499491ca3c..c1e5c278b4 100644 --- a/legacy/eobj/tests/eobj_test_general.c +++ b/legacy/eobj/tests/eobj_test_general.c @@ -306,8 +306,8 @@ START_TEST(eobj_magic_checks) eobj_composite_is((Eobj *) buf); fail_if(eobj_event_callback_add((Eobj *) buf, NULL, NULL, NULL)); - fail_if(eobj_event_callback_del((Eobj *) buf, NULL, NULL)); - fail_if(eobj_event_callback_del_full((Eobj *) buf, NULL, NULL, NULL)); + fail_if(eobj_event_callback_del_lazy((Eobj *) buf, NULL, NULL)); + fail_if(eobj_event_callback_del((Eobj *) buf, NULL, NULL, NULL)); fail_if(eobj_event_callback_call((Eobj *) buf, NULL, NULL)); fail_if(eobj_event_callback_forwarder_add((Eobj *) buf, NULL, obj));