NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evas filter: Rename constructor/destructor to ctor/dtor 

This avoids a name clash with Eo.Base.
This commit is contained in:
Jean-Philippe Andre 2016-01-13 17:40:07 +09:00
parent 6b8351a0a0
commit c2522dd736
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/evas/canvas/evas_filter.eo
View File

@ -19,13 +19,13 @@ mixin Evas.Filter (Efl.Gfx.Filter)
val: bool;
}
}
constructor @protected {
ctor @protected {
[[Initialize the Evas.Filter mixin.
Should be called in a parent's class constructor.
]]
}
destructor @protected {
dtor @protected {
[[Release all data held by this Evas.Filter.
This may include image buffers allocated by the Evas engine.

4
src/lib/evas/canvas/evas_filter_mixin.c
View File

@ -584,14 +584,14 @@ _evas_filter_invalid_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool
}
EOLIAN static void
_evas_filter_constructor(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd)
_evas_filter_ctor(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd)
{
pd->data = eina_cow_alloc(evas_object_filter_cow);
SLKI(pd->lck);
}
EOLIAN static void
_evas_filter_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
_evas_filter_dtor(Eo *eo_obj, Evas_Filter_Data *pd)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
Evas_Filter_Data_Binding *db;

4
src/lib/evas/canvas/evas_object_image.c
View File

@ -371,7 +371,7 @@ _evas_image_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o)
EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
}
eo_do(eo_obj, evas_filter_constructor());
eo_do(eo_obj, evas_filter_ctor());
return eo_obj;
}
@ -3031,7 +3031,7 @@ evas_object_image_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
EINA_COW_PIXEL_WRITE_END(o, pixi_write);
}
eo_do(eo_obj, evas_filter_destructor());
eo_do(eo_obj, evas_filter_dtor());
}
static void

4
src/lib/evas/canvas/evas_object_text.c
View File

@ -1599,7 +1599,7 @@ evas_object_text_init(Evas_Object *eo_obj)
o->inherit_paragraph_direction = EINA_TRUE;
#endif
eo_do(eo_obj, evas_filter_constructor());
eo_do(eo_obj, evas_filter_ctor());
}
EOLIAN static void
@ -1616,7 +1616,7 @@ evas_object_text_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
/* free obj */
eo_do(eo_obj, evas_filter_destructor());
eo_do(eo_obj, evas_filter_dtor());
_evas_object_text_items_clear(o);
if (o->cur.utf8_text) eina_stringshare_del(o->cur.utf8_text);
if (o->cur.font) eina_stringshare_del(o->cur.font);