forked from enlightenment/efl
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
This commit is contained in:
parent
77112d59fd
commit
3cc5c60d17
|
@ -41,26 +41,26 @@ main(int argc, char *argv[])
|
||||||
|
|
||||||
fail_if(cb_count != 3);
|
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(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(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);
|
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(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(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);
|
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(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);
|
fail_if(pd->cb_count != 0);
|
||||||
|
|
||||||
eobj_unref(obj);
|
eobj_unref(obj);
|
||||||
|
|
|
@ -812,9 +812,9 @@ EAPI Eina_Bool eobj_event_callback_priority_add(Eobj *obj, const Eobj_Event_Desc
|
||||||
* @param func the callback to delete.
|
* @param func the callback to delete.
|
||||||
* @return The additional data that was set to be passed to the callback.
|
* @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.
|
* @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.
|
* @param user_data The data to compare.
|
||||||
* @return The additional data that was set to be passed to the callback.
|
* @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.
|
* @brief Call the callbacks for an event of an object.
|
||||||
|
|
|
@ -1124,7 +1124,7 @@ eobj_weak_ref_del(Eobj **wref)
|
||||||
{
|
{
|
||||||
if (*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);
|
wref);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1449,7 +1449,7 @@ eobj_event_callback_priority_add(Eobj *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void *
|
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);
|
EOBJ_MAGIC_RETURN_VAL(obj, EOBJ_EINA_MAGIC, NULL);
|
||||||
|
|
||||||
|
@ -1477,7 +1477,7 @@ found:
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void *
|
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);
|
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(obj, EOBJ_EINA_MAGIC, EINA_FALSE);
|
||||||
EOBJ_MAGIC_RETURN_VAL(new_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;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -306,8 +306,8 @@ START_TEST(eobj_magic_checks)
|
||||||
eobj_composite_is((Eobj *) buf);
|
eobj_composite_is((Eobj *) buf);
|
||||||
|
|
||||||
fail_if(eobj_event_callback_add((Eobj *) buf, NULL, NULL, NULL));
|
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_lazy((Eobj *) buf, NULL, NULL));
|
||||||
fail_if(eobj_event_callback_del_full((Eobj *) buf, NULL, 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_call((Eobj *) buf, NULL, NULL));
|
||||||
|
|
||||||
fail_if(eobj_event_callback_forwarder_add((Eobj *) buf, NULL, obj));
|
fail_if(eobj_event_callback_forwarder_add((Eobj *) buf, NULL, obj));
|
||||||
|
|
Loading…
Reference in New Issue