eo_do_super(obj, eo_constructor());
Eo *bt = eo_add(ELW_BUTTON_CLASS, obj);
- eo_composite_object_attach(bt, obj);
+ eo_composite_attach(bt, obj);
eo_do(bt, eo_event_callback_forwarder_add(EV_CLICKED, obj));
eo_do(bt, evas_obj_visibility_set(EINA_TRUE));
*
* This functions also sets the parent of comp_obj to parent.
*
- * @see eo_composite_object_detach()
+ * @see eo_composite_detach()
* @see eo_composite_is()
*/
-EAPI void eo_composite_object_attach(Eo *comp_obj, Eo *parent);
+EAPI void eo_composite_attach(Eo *comp_obj, Eo *parent);
/**
* @brief Detach a composite object from another object.
*
* This functions also sets the parent of comp_obj to @c NULL.
*
- * @see eo_composite_object_attach()
+ * @see eo_composite_attach()
* @see eo_composite_is()
*/
-EAPI void eo_composite_object_detach(Eo *comp_obj, Eo *parent);
+EAPI void eo_composite_detach(Eo *comp_obj, Eo *parent);
/**
* @brief Check if an object is a composite object.
* @param comp_obj the object to be checked.
* @return @c EINA_TRUE if it is, @c EINA_FALSE otherwise.
*
- * @see eo_composite_object_attach()
- * @see eo_composite_object_detach()
+ * @see eo_composite_attach()
+ * @see eo_composite_detach()
*/
EAPI Eina_Bool eo_composite_is(const Eo *comp_obj);
if (eo_composite_is(obj))
{
- eo_composite_object_detach(obj->parent, obj);
+ eo_composite_detach(obj->parent, obj);
}
if (obj->parent)
Eo *emb_obj;
EINA_LIST_FOREACH_SAFE(obj->composite_objects, itr, itr_n, emb_obj)
{
- eo_composite_object_detach(obj, emb_obj);
+ eo_composite_detach(obj, emb_obj);
}
}
}
EAPI void
-eo_composite_object_attach(Eo *comp_obj, Eo *parent)
+eo_composite_attach(Eo *comp_obj, Eo *parent)
{
EO_MAGIC_RETURN(comp_obj, EO_EINA_MAGIC);
EO_MAGIC_RETURN(parent, EO_EINA_MAGIC);
}
EAPI void
-eo_composite_object_detach(Eo *comp_obj, Eo *parent)
+eo_composite_detach(Eo *comp_obj, Eo *parent)
{
EO_MAGIC_RETURN(comp_obj, EO_EINA_MAGIC);
EO_MAGIC_RETURN(parent, EO_EINA_MAGIC);
eo_do_super(obj, eo_constructor());
Eo *simple = eo_add(SIMPLE_CLASS, obj);
- eo_composite_object_attach(simple, obj);
+ eo_composite_attach(simple, obj);
eo_do(simple, eo_event_callback_forwarder_add(EV_A_CHANGED, obj));
fail_if(eo_composite_is(obj));
fail_if(cb_called);
fail_if(!eo_composite_is(simple));
- eo_composite_object_detach(simple, obj);
+ eo_composite_detach(simple, obj);
fail_if(eo_composite_is(simple));
- eo_composite_object_attach(simple, obj);
+ eo_composite_attach(simple, obj);
fail_if(!eo_composite_is(simple));
eo_unref(simple);
Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
fail_if(!obj2);
- eo_composite_object_attach(obj2, obj);
+ eo_composite_attach(obj2, obj);
eo_parent_set(obj2, NULL);
fail_if(eo_composite_is(obj2));
fail_if(eo_data_get((Eo *) buf, SIMPLE_CLASS));
- eo_composite_object_attach((Eo *) buf, obj);
- eo_composite_object_attach(obj, (Eo *) buf);
- eo_composite_object_detach((Eo *) buf, obj);
- eo_composite_object_detach(obj, (Eo *) buf);
+ eo_composite_attach((Eo *) buf, obj);
+ eo_composite_attach(obj, (Eo *) buf);
+ eo_composite_detach((Eo *) buf, obj);
+ eo_composite_detach(obj, (Eo *) buf);
eo_composite_is((Eo *) buf);
eo_do(obj, eo_event_callback_forwarder_add(NULL, (Eo *) buf));