diff options
Diffstat (limited to 'src/lib/evas/canvas')
92 files changed, 501 insertions, 501 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_filter_internal.eo b/src/lib/evas/canvas/efl_canvas_filter_internal.eo index 200973b487..d9ef560e58 100644 --- a/src/lib/evas/canvas/efl_canvas_filter_internal.eo +++ b/src/lib/evas/canvas/efl_canvas_filter_internal.eo @@ -1,4 +1,4 @@ -mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Eo.Base) +mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Efl.Object) { [[Evas internal implementation of filters.]] @@ -60,8 +60,8 @@ mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Eo.Base) } } implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; Efl.Gfx.Filter.filter_program.set; Efl.Gfx.Filter.filter_program.get; Efl.Gfx.Filter.filter_state.get; diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo index 1dfcf59728..da076a392e 100644 --- a/src/lib/evas/canvas/efl_canvas_group.eo +++ b/src/lib/evas/canvas/efl_canvas_group.eo @@ -72,7 +72,7 @@ class Efl.Canvas.Group (Efl.Canvas.Object) canvas objects. This returns the list of "smart" children. This might be different - from both the $Eo.Base children list as well as the $Efl.Container + from both the $Efl.Object children list as well as the $Efl.Container content list. ]] return: free(own(iterator<Efl.Gfx>), eina_iterator_free); @@ -183,7 +183,7 @@ class Efl.Canvas.Group (Efl.Canvas.Object) implements { class.constructor; class.destructor; - Eo.Base.constructor; + Efl.Object.constructor; Efl.Canvas.Object.paragraph_direction.set; Efl.Canvas.Object.paragraph_direction.get; } diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c index d492cf1a95..adfbb9938f 100644 --- a/src/lib/evas/canvas/efl_canvas_image.c +++ b/src/lib/evas/canvas/efl_canvas_image.c @@ -623,7 +623,7 @@ _image_pixels_set(Evas_Object_Protected_Data *obj, } if (o->file_obj) { - eo_del(o->file_obj); + efl_del(o->file_obj); o->file_obj = NULL; } diff --git a/src/lib/evas/canvas/efl_canvas_image_internal.eo b/src/lib/evas/canvas/efl_canvas_image_internal.eo index 4d2676bc24..18ed92ede7 100644 --- a/src/lib/evas/canvas/efl_canvas_image_internal.eo +++ b/src/lib/evas/canvas/efl_canvas_image_internal.eo @@ -6,10 +6,10 @@ abstract Efl.Canvas.Image.Internal (Efl.Canvas.Object, Efl.Canvas.Filter.Interna { data: Evas_Image_Data; implements { - Eo.Base.constructor; - Eo.Base.destructor; - Eo.Base.dbg_info_get; - Eo.Base.finalize; + Efl.Object.constructor; + Efl.Object.destructor; + Efl.Object.dbg_info_get; + Efl.Object.finalize; Efl.File.save; Efl.Orientation.orientation.get; Efl.Orientation.orientation.set; diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo index 61a5ecdd62..61da55f63f 100644 --- a/src/lib/evas/canvas/efl_canvas_object.eo +++ b/src/lib/evas/canvas/efl_canvas_object.eo @@ -1,7 +1,7 @@ import evas_types; import efl_text_types; -abstract Efl.Canvas.Object (Eo.Base, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, +abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, Efl.Input.Interface, Efl.Gfx.Size.Hint, Efl.Gfx.Map) { @@ -391,7 +391,7 @@ abstract Efl.Canvas.Object (Eo.Base, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, @property render_parent @protected { [[Gets the parent smart object of a given Evas object, if it has one. - This can be different from @Eo.Base.parent because this one is + This can be different from @Efl.Object.parent because this one is used internally for rendering and the normal parent is what the user expects to be the parent. @@ -552,10 +552,10 @@ abstract Efl.Canvas.Object (Eo.Base, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, .type; } implements { - Eo.Base.constructor; - Eo.Base.destructor; - Eo.Base.dbg_info_get; - Eo.Base.provider_find; + Efl.Object.constructor; + Efl.Object.destructor; + Efl.Object.dbg_info_get; + Efl.Object.provider_find; Efl.Gfx.visible.set; Efl.Gfx.visible.get; Efl.Gfx.color.set; diff --git a/src/lib/evas/canvas/efl_canvas_polygon.eo b/src/lib/evas/canvas/efl_canvas_polygon.eo index 41cb74e4c9..41f5d872c8 100644 --- a/src/lib/evas/canvas/efl_canvas_polygon.eo +++ b/src/lib/evas/canvas/efl_canvas_polygon.eo @@ -15,8 +15,8 @@ class Efl.Canvas.Polygon (Efl.Canvas.Object) } } implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; } } diff --git a/src/lib/evas/canvas/efl_canvas_rectangle.eo b/src/lib/evas/canvas/efl_canvas_rectangle.eo index 3e8e81ae55..a6899d8883 100644 --- a/src/lib/evas/canvas/efl_canvas_rectangle.eo +++ b/src/lib/evas/canvas/efl_canvas_rectangle.eo @@ -1,6 +1,6 @@ class Efl.Canvas.Rectangle (Efl.Canvas.Object) { implements { - Eo.Base.constructor; + Efl.Object.constructor; } } diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.c b/src/lib/evas/canvas/efl_canvas_snapshot.c index aa877c37c0..9aae7999f6 100644 --- a/src/lib/evas/canvas/efl_canvas_snapshot.c +++ b/src/lib/evas/canvas/efl_canvas_snapshot.c @@ -4,11 +4,11 @@ #define MY_CLASS EFL_CANVAS_SNAPSHOT_CLASS EOLIAN static Eo * -_efl_canvas_snapshot_eo_base_constructor(Eo *eo_obj, void *pd EINA_UNUSED) +_efl_canvas_snapshot_efl_object_constructor(Eo *eo_obj, void *pd EINA_UNUSED) { Evas_Object_Protected_Data *obj; - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); if (!eo_obj) return NULL; efl_canvas_object_pass_events_set(eo_obj, EINA_TRUE); diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.eo b/src/lib/evas/canvas/efl_canvas_snapshot.eo index b9f5c104e0..e370581685 100644 --- a/src/lib/evas/canvas/efl_canvas_snapshot.eo +++ b/src/lib/evas/canvas/efl_canvas_snapshot.eo @@ -8,6 +8,6 @@ class Efl.Canvas.Snapshot (Efl.Canvas.Image.Internal) ]] data: null; implements { - Eo.Base.constructor; + Efl.Object.constructor; } } diff --git a/src/lib/evas/canvas/efl_canvas_surface.c b/src/lib/evas/canvas/efl_canvas_surface.c index 7f52945565..13c86f0c6a 100644 --- a/src/lib/evas/canvas/efl_canvas_surface.c +++ b/src/lib/evas/canvas/efl_canvas_surface.c @@ -3,9 +3,9 @@ #define MY_CLASS EFL_CANVAS_SURFACE_MIXIN EOLIAN static Eo * -_efl_canvas_surface_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Data *pd) +_efl_canvas_surface_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Data *pd) { - eo = eo_constructor(eo_super(eo, MY_CLASS)); + eo = efl_constructor(eo_super(eo, MY_CLASS)); pd->surf.version = EVAS_NATIVE_SURFACE_VERSION; return eo; } diff --git a/src/lib/evas/canvas/efl_canvas_surface.eo b/src/lib/evas/canvas/efl_canvas_surface.eo index b973c048c0..d05bd6bbcf 100644 --- a/src/lib/evas/canvas/efl_canvas_surface.eo +++ b/src/lib/evas/canvas/efl_canvas_surface.eo @@ -1,4 +1,4 @@ -mixin Efl.Canvas.Surface (Eo.Interface, Efl.Canvas.Image.Internal) +mixin Efl.Canvas.Surface (Efl.Interface, Efl.Canvas.Image.Internal) { [[Native surfaces usually bound to an externally-managed buffer. @@ -27,6 +27,6 @@ mixin Efl.Canvas.Surface (Eo.Interface, Efl.Canvas.Image.Internal) } } implements { - Eo.Base.constructor; + Efl.Object.constructor; } } diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.c b/src/lib/evas/canvas/efl_canvas_surface_tbm.c index 9a9fd54198..116aad03ab 100644 --- a/src/lib/evas/canvas/efl_canvas_surface_tbm.c +++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.c @@ -8,11 +8,11 @@ typedef struct _Efl_Canvas_Surface_Tbm_Data } Efl_Canvas_Surface_Tbm_Data; EOLIAN static Eo * -_efl_canvas_surface_tbm_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *pd) +_efl_canvas_surface_tbm_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *pd) { Evas_Object_Protected_Data *obj; - eo = eo_constructor(eo_super(eo, MY_CLASS)); + eo = efl_constructor(eo_super(eo, MY_CLASS)); obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); if (!obj) return NULL; @@ -28,7 +28,7 @@ _efl_canvas_surface_tbm_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data } EOLIAN static void -_efl_canvas_surface_tbm_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *pd) +_efl_canvas_surface_tbm_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *pd) { Evas_Object_Protected_Data *obj; @@ -36,7 +36,7 @@ _efl_canvas_surface_tbm_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data * ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_TBM); eo_data_unref(eo, pd->base); - eo_destructor(eo); + efl_destructor(eo); } EOLIAN static Eina_Bool diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo index 0a9cd1de45..7eb3d4d074 100644 --- a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo +++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo @@ -1,10 +1,10 @@ -class Efl.Canvas.Surface.Tbm (Eo.Base, Efl.Canvas.Surface) +class Efl.Canvas.Surface.Tbm (Efl.Object, Efl.Canvas.Surface) { [[Native Tizen Buffer Manager surface for Efl canvas]] implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; Efl.Canvas.Surface.native_buffer.set; } } diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.c b/src/lib/evas/canvas/efl_canvas_surface_wayland.c index d93f439152..f15e969d1b 100644 --- a/src/lib/evas/canvas/efl_canvas_surface_wayland.c +++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.c @@ -8,11 +8,11 @@ typedef struct _Efl_Canvas_Surface_Wayland_Data } Efl_Canvas_Surface_Wayland_Data; EOLIAN static Eo * -_efl_canvas_surface_wayland_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Wayland_Data *pd) +_efl_canvas_surface_wayland_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Wayland_Data *pd) { Evas_Object_Protected_Data *obj; - eo = eo_constructor(eo_super(eo, MY_CLASS)); + eo = efl_constructor(eo_super(eo, MY_CLASS)); obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); if (!obj) return NULL; @@ -28,7 +28,7 @@ _efl_canvas_surface_wayland_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Wayla } EOLIAN static void -_efl_canvas_surface_wayland_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Wayland_Data *pd) +_efl_canvas_surface_wayland_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_Wayland_Data *pd) { Evas_Object_Protected_Data *obj; @@ -36,7 +36,7 @@ _efl_canvas_surface_wayland_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Waylan ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_WL); eo_data_unref(eo, pd->base); - eo_destructor(eo); + efl_destructor(eo); } EOLIAN static Eina_Bool diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo index b68925833a..b3bf4f51cb 100644 --- a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo +++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo @@ -1,10 +1,10 @@ -class Efl.Canvas.Surface.Wayland (Eo.Base, Efl.Canvas.Surface) +class Efl.Canvas.Surface.Wayland (Efl.Object, Efl.Canvas.Surface) { [[Native Wayland surface for Efl canvas]] implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; Efl.Canvas.Surface.native_buffer.set; } } diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.c b/src/lib/evas/canvas/efl_canvas_surface_x11.c index 3c01a2d823..c463a157d8 100644 --- a/src/lib/evas/canvas/efl_canvas_surface_x11.c +++ b/src/lib/evas/canvas/efl_canvas_surface_x11.c @@ -9,11 +9,11 @@ typedef struct _Efl_Canvas_Surface_X11_Data } Efl_Canvas_Surface_X11_Data; EOLIAN static Eo * -_efl_canvas_surface_x11_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_X11_Data *pd) +_efl_canvas_surface_x11_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_X11_Data *pd) { Evas_Object_Protected_Data *obj; - eo = eo_constructor(eo_super(eo, MY_CLASS)); + eo = efl_constructor(eo_super(eo, MY_CLASS)); obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); if (!obj) return NULL; @@ -30,7 +30,7 @@ _efl_canvas_surface_x11_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_X11_Data } EOLIAN static void -_efl_canvas_surface_x11_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_X11_Data *pd) +_efl_canvas_surface_x11_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_X11_Data *pd) { Evas_Object_Protected_Data *obj; @@ -38,7 +38,7 @@ _efl_canvas_surface_x11_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_X11_Data * ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_X11); eo_data_unref(eo, pd->base); - eo_destructor(eo); + efl_destructor(eo); } EOLIAN static Eina_Bool diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.eo b/src/lib/evas/canvas/efl_canvas_surface_x11.eo index c5ed11e3cf..892a3c5615 100644 --- a/src/lib/evas/canvas/efl_canvas_surface_x11.eo +++ b/src/lib/evas/canvas/efl_canvas_surface_x11.eo @@ -5,7 +5,7 @@ struct Efl.Canvas.Surface.X11_Pixmap pixmap: ulong; [[X11 Pixmap ID.]] } -class Efl.Canvas.Surface.X11 (Eo.Base, Efl.Canvas.Surface) +class Efl.Canvas.Surface.X11 (Efl.Object, Efl.Canvas.Surface) { [[Native X11 surface for Efl canvas]] @@ -21,8 +21,8 @@ class Efl.Canvas.Surface.X11 (Eo.Base, Efl.Canvas.Surface) } } implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; Efl.Canvas.Surface.native_buffer.set; } } diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo index a3675e93bc..78dc931aff 100644 --- a/src/lib/evas/canvas/efl_canvas_text.eo +++ b/src/lib/evas/canvas/efl_canvas_text.eo @@ -295,9 +295,9 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text) } } implements { - Eo.Base.constructor; - Eo.Base.destructor; - Eo.Base.dbg_info_get; + Efl.Object.constructor; + Efl.Object.destructor; + Efl.Object.dbg_info_get; Efl.Canvas.Object.paragraph_direction.set; Efl.Canvas.Object.paragraph_direction.get; Efl.Text.text.set; diff --git a/src/lib/evas/canvas/efl_canvas_text_cursor.eo b/src/lib/evas/canvas/efl_canvas_text_cursor.eo index dcdb1369d6..a13061666e 100644 --- a/src/lib/evas/canvas/efl_canvas_text_cursor.eo +++ b/src/lib/evas/canvas/efl_canvas_text_cursor.eo @@ -4,7 +4,7 @@ enum Efl.Canvas.Text.Cursor.Type under } -class Efl.Canvas.Text.Cursor (Eo.Base) +class Efl.Canvas.Text.Cursor (Efl.Object) { legacy_prefix: evas_textblock_cursor; methods { @@ -200,8 +200,8 @@ class Efl.Canvas.Text.Cursor (Eo.Base) } } implements { - Eo.Base.destructor; - Eo.Base.finalize; + Efl.Object.destructor; + Efl.Object.finalize; } events { changed; [[The cursor position has changed]] diff --git a/src/lib/evas/canvas/efl_event_hold.c b/src/lib/evas/canvas/efl_event_hold.c index 700d486834..95a4ae7fc0 100644 --- a/src/lib/evas/canvas/efl_event_hold.c +++ b/src/lib/evas/canvas/efl_event_hold.c @@ -61,16 +61,16 @@ _efl_event_hold_efl_event_input_event_flags_get(Eo *obj EINA_UNUSED, Efl_Event_H } EOLIAN static Eo * -_efl_event_hold_eo_base_constructor(Eo *obj, Efl_Event_Hold_Data *pd) +_efl_event_hold_efl_object_constructor(Eo *obj, Efl_Event_Hold_Data *pd) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); pd->eo = obj; return obj; } EOLIAN static Efl_Event * _efl_event_hold_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUSED, - Eo_Base *owner, void **priv) + Efl_Object *owner, void **priv) { // TODO: Implement a cache. Depends only on how many hold events we trigger. Efl_Event *evt = eo_add(MY_CLASS, owner); @@ -89,7 +89,7 @@ EOLIAN static Efl_Event * _efl_event_hold_efl_event_dup(Eo *obj, Efl_Event_Hold_Data *pd) { Efl_Event_Hold_Data *ev; - Efl_Event *evt = eo_add(EFL_EVENT_HOLD_CLASS, eo_parent_get(obj)); + Efl_Event *evt = eo_add(EFL_EVENT_HOLD_CLASS, efl_parent_get(obj)); ev = eo_data_scope_get(evt, MY_CLASS); if (ev) { diff --git a/src/lib/evas/canvas/efl_event_hold.eo b/src/lib/evas/canvas/efl_event_hold.eo index 07e8fcf50f..ddc4c3ced5 100644 --- a/src/lib/evas/canvas/efl_event_hold.eo +++ b/src/lib/evas/canvas/efl_event_hold.eo @@ -1,4 +1,4 @@ -class Efl.Event.Hold (Eo.Base, Efl.Event.Input) +class Efl.Event.Hold (Efl.Object, Efl.Event.Input) { [[Event data sent when inputs are put on hold or resumed.]] methods { @@ -10,7 +10,7 @@ class Efl.Event.Hold (Eo.Base, Efl.Event.Input) } } implements { - Eo.Base.constructor; + Efl.Object.constructor; Efl.Event.instance_get; Efl.Event.reset; Efl.Event.dup; diff --git a/src/lib/evas/canvas/efl_event_key.c b/src/lib/evas/canvas/efl_event_key.c index bce7c7cbf8..7729432167 100644 --- a/src/lib/evas/canvas/efl_event_key.c +++ b/src/lib/evas/canvas/efl_event_key.c @@ -18,17 +18,17 @@ _del_hook(Eo *evt) { if (!s_cached_event) { - if (eo_parent_get(evt)) + if (efl_parent_get(evt)) { eo_ref(evt); - eo_parent_set(evt, NULL); + efl_parent_set(evt, NULL); } s_cached_event = evt; } else { - eo_del_intercept_set(evt, NULL); - eo_del(evt); + efl_del_intercept_set(evt, NULL); + efl_del(evt); } } @@ -44,12 +44,12 @@ _efl_event_key_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUS evt = s_cached_event; s_cached_event = NULL; efl_event_reset(evt); - eo_parent_set(evt, owner); + efl_parent_set(evt, owner); } else { evt = eo_add(EFL_EVENT_KEY_CLASS, owner); - eo_del_intercept_set(evt, _del_hook); + efl_del_intercept_set(evt, _del_hook); } ev = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS); @@ -60,18 +60,18 @@ _efl_event_key_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUS } EOLIAN static void -_efl_event_key_class_destructor(Eo_Class *klass EINA_UNUSED) +_efl_event_key_class_destructor(Efl_Class *klass EINA_UNUSED) { // this is a strange situation... - eo_del_intercept_set(s_cached_event, NULL); - eo_del(s_cached_event); + efl_del_intercept_set(s_cached_event, NULL); + efl_del(s_cached_event); s_cached_event = NULL; } -EOLIAN static Eo_Base * -_efl_event_key_eo_base_constructor(Eo *obj, Efl_Event_Key_Data *pd EINA_UNUSED) +EOLIAN static Efl_Object * +_efl_event_key_efl_object_constructor(Eo *obj, Efl_Event_Key_Data *pd EINA_UNUSED) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); efl_event_reset(obj); return obj; } diff --git a/src/lib/evas/canvas/efl_event_key.eo b/src/lib/evas/canvas/efl_event_key.eo index 897dd4668f..555aadb018 100644 --- a/src/lib/evas/canvas/efl_event_key.eo +++ b/src/lib/evas/canvas/efl_event_key.eo @@ -1,4 +1,4 @@ -class Efl.Event.Key (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input) +class Efl.Event.Key (Efl.Object, Efl.Event, Efl.Input.State, Efl.Event.Input) { [[Represents a single key event from a keyboard or similar device. @@ -53,7 +53,7 @@ class Efl.Event.Key (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input) } implements { class.destructor; - Eo.Base.constructor; + Efl.Object.constructor; Efl.Event.instance_get; Efl.Event.reset; Efl.Event.dup; diff --git a/src/lib/evas/canvas/efl_event_pointer.c b/src/lib/evas/canvas/efl_event_pointer.c index 637f19f8e4..8bd45c42a8 100644 --- a/src/lib/evas/canvas/efl_event_pointer.c +++ b/src/lib/evas/canvas/efl_event_pointer.c @@ -29,17 +29,17 @@ _del_hook(Eo *evt) { if (!s_cached_event) { - if (eo_parent_get(evt)) + if (efl_parent_get(evt)) { eo_ref(evt); - eo_parent_set(evt, NULL); + efl_parent_set(evt, NULL); } s_cached_event = evt; } else { - eo_del_intercept_set(evt, NULL); - eo_del(evt); + efl_del_intercept_set(evt, NULL); + efl_del(evt); } } @@ -55,12 +55,12 @@ _efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_ evt = s_cached_event; s_cached_event = NULL; efl_event_reset(evt); - eo_parent_set(evt, owner); + efl_parent_set(evt, owner); } else { evt = eo_add(EFL_EVENT_POINTER_CLASS, owner); - eo_del_intercept_set(evt, _del_hook); + efl_del_intercept_set(evt, _del_hook); } ev = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); @@ -71,18 +71,18 @@ _efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_ } EOLIAN static void -_efl_event_pointer_class_destructor(Eo_Class *klass EINA_UNUSED) +_efl_event_pointer_class_destructor(Efl_Class *klass EINA_UNUSED) { // this is a strange situation... - eo_del_intercept_set(s_cached_event, NULL); - eo_del(s_cached_event); + efl_del_intercept_set(s_cached_event, NULL); + efl_del(s_cached_event); s_cached_event = NULL; } -EOLIAN static Eo_Base * -_efl_event_pointer_eo_base_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED) +EOLIAN static Efl_Object * +_efl_event_pointer_efl_object_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED) { - eo_constructor(eo_super(obj, MY_CLASS)); + efl_constructor(eo_super(obj, MY_CLASS)); efl_event_reset(obj); return obj; } diff --git a/src/lib/evas/canvas/efl_event_pointer.eo b/src/lib/evas/canvas/efl_event_pointer.eo index 1fbac08142..09fb1ba995 100644 --- a/src/lib/evas/canvas/efl_event_pointer.eo +++ b/src/lib/evas/canvas/efl_event_pointer.eo @@ -1,7 +1,7 @@ import efl_orientation; import efl_event_types; -class Efl.Event.Pointer (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input) +class Efl.Event.Pointer (Efl.Object, Efl.Event, Efl.Input.State, Efl.Event.Input) { [[Event data carried over with any pointer event (mouse, touch, ...) @@ -88,7 +88,7 @@ class Efl.Event.Pointer (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input) propagation or repetition of the event. ]] values { - src: Eo.Base; [[Source object: $Efl.Gfx]] + src: Efl.Object; [[Source object: $Efl.Gfx]] } } @property button_flags { @@ -127,7 +127,7 @@ class Efl.Event.Pointer (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input) } } implements { - Eo.Base.constructor; + Efl.Object.constructor; class.destructor; Efl.Event.instance_get; Efl.Event.reset; diff --git a/src/lib/evas/canvas/efl_gfx_map.eo b/src/lib/evas/canvas/efl_gfx_map.eo index 22703617b3..80d2d6f8af 100644 --- a/src/lib/evas/canvas/efl_gfx_map.eo +++ b/src/lib/evas/canvas/efl_gfx_map.eo @@ -1,4 +1,4 @@ -mixin Efl.Gfx.Map (Eo.Interface, Eo.Base) +mixin Efl.Gfx.Map (Efl.Interface, Efl.Object) { [[Texture UV mapping for all objects (rotation, perspective, 3d, ...). diff --git a/src/lib/evas/canvas/efl_vg.eo b/src/lib/evas/canvas/efl_vg.eo index 647f86aaf7..3a776e5d3e 100644 --- a/src/lib/evas/canvas/efl_vg.eo +++ b/src/lib/evas/canvas/efl_vg.eo @@ -1,6 +1,6 @@ import eina_types; -abstract Efl.VG (Eo.Base, Efl.Gfx, Efl.Gfx.Stack) +abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack) { eo_prefix: efl_vg; legacy_prefix: evas_vg_node; @@ -106,9 +106,9 @@ abstract Efl.VG (Eo.Base, Efl.Gfx, Efl.Gfx.Stack) } } implements { - Eo.Base.parent.set; - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.parent.set; + Efl.Object.constructor; + Efl.Object.destructor; Efl.Gfx.visible.set; Efl.Gfx.visible.get; Efl.Gfx.color.set; diff --git a/src/lib/evas/canvas/efl_vg_container.eo b/src/lib/evas/canvas/efl_vg_container.eo index 0b0541e6a0..931367afd6 100644 --- a/src/lib/evas/canvas/efl_vg_container.eo +++ b/src/lib/evas/canvas/efl_vg_container.eo @@ -13,8 +13,8 @@ class Efl.VG.Container (Efl.VG) } } implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; Efl.VG.bounds_get; Efl.VG.interpolate; Efl.VG.dup; diff --git a/src/lib/evas/canvas/efl_vg_gradient_linear.eo b/src/lib/evas/canvas/efl_vg_gradient_linear.eo index a29ac26242..89a7ac6424 100644 --- a/src/lib/evas/canvas/efl_vg_gradient_linear.eo +++ b/src/lib/evas/canvas/efl_vg_gradient_linear.eo @@ -9,7 +9,7 @@ class Efl.VG.Gradient.Linear (Efl.VG.Gradient, Efl.Gfx.Gradient.Linear) Efl.VG.bounds_get; Efl.VG.interpolate; Efl.VG.dup; - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; } } diff --git a/src/lib/evas/canvas/efl_vg_gradient_radial.eo b/src/lib/evas/canvas/efl_vg_gradient_radial.eo index 19ead03eaa..88706d334c 100644 --- a/src/lib/evas/canvas/efl_vg_gradient_radial.eo +++ b/src/lib/evas/canvas/efl_vg_gradient_radial.eo @@ -11,7 +11,7 @@ class Efl.VG.Gradient.Radial (Efl.VG.Gradient, Efl.Gfx.Gradient.Radial) Efl.VG.bounds_get; Efl.VG.interpolate; Efl.VG.dup; - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; } } diff --git a/src/lib/evas/canvas/efl_vg_root_node.eo b/src/lib/evas/canvas/efl_vg_root_node.eo index 685bf7e134..3855571f0e 100644 --- a/src/lib/evas/canvas/efl_vg_root_node.eo +++ b/src/lib/evas/canvas/efl_vg_root_node.eo @@ -2,7 +2,7 @@ class Efl.VG.Root_Node (Efl.VG.Container) { legacy_prefix: evas_vg_root_node; implements { - Eo.Base.parent.set; - Eo.Base.constructor; + Efl.Object.parent.set; + Efl.Object.constructor; } } diff --git a/src/lib/evas/canvas/efl_vg_shape.eo b/src/lib/evas/canvas/efl_vg_shape.eo index b8894d34e9..7b74d365dd 100644 --- a/src/lib/evas/canvas/efl_vg_shape.eo +++ b/src/lib/evas/canvas/efl_vg_shape.eo @@ -36,7 +36,7 @@ class Efl.VG.Shape (Efl.VG, Efl.Gfx.Shape) Efl.VG.bounds_get; Efl.VG.interpolate; Efl.VG.dup; - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; } } diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo index 7213736f64..26b04c39d7 100644 --- a/src/lib/evas/canvas/evas_box.eo +++ b/src/lib/evas/canvas/evas_box.eo @@ -656,7 +656,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) } implements { class.constructor; - Eo.Base.constructor; + Efl.Object.constructor; Efl.Canvas.Group.group_calculate; Efl.Canvas.Group.group_add; Efl.Canvas.Group.group_del; diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 14e303fc31..82b810518d 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -17,15 +17,15 @@ extern Eina_Hash* signals_hash_table; * Evas events descriptions for Eo. */ #define DEFINE_EVAS_CALLBACKS(LAST, ...) \ - static const Eo_Event_Description *_legacy_evas_callback_table(unsigned int index) \ + static const Efl_Event_Description *_legacy_evas_callback_table(unsigned int index) \ { \ - static const Eo_Event_Description *internals[LAST] = { NULL }; \ + static const Efl_Event_Description *internals[LAST] = { NULL }; \ \ if (internals[0] == NULL) \ { \ memcpy(internals, \ - ((const Eo_Event_Description*[]) { __VA_ARGS__ }), \ - sizeof ((const Eo_Event_Description *[]) { __VA_ARGS__ })); \ + ((const Efl_Event_Description*[]) { __VA_ARGS__ }), \ + sizeof ((const Efl_Event_Description *[]) { __VA_ARGS__ })); \ } \ return internals[index]; \ } @@ -145,7 +145,7 @@ evas_object_event_callback_all_del(Evas_Object *eo_obj) if (!obj->callbacks) return; EINA_INLIST_FOREACH_SAFE(obj->callbacks, itr, info) { - eo_event_callback_del(eo_obj, _legacy_evas_callback_table(info->type), _eo_evas_object_cb, info); + efl_event_callback_del(eo_obj, _legacy_evas_callback_table(info->type), _eo_evas_object_cb, info); obj->callbacks = eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info)); @@ -171,7 +171,7 @@ evas_event_callback_all_del(Evas *eo_e) EINA_INLIST_FOREACH_SAFE(e->callbacks, itr, info) { - eo_event_callback_del(eo_e, _legacy_evas_callback_table(info->type), _eo_evas_cb, info); + efl_event_callback_del(eo_e, _legacy_evas_callback_table(info->type), _eo_evas_cb, info); e->callbacks = eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info)); @@ -188,13 +188,13 @@ evas_event_callback_cleanup(Evas *eo_e) void evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info) { - eo_event_callback_call(eo_e, _legacy_evas_callback_table(type), event_info); + efl_event_callback_call(eo_e, _legacy_evas_callback_table(type), event_info); } void evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas_Callback_Type type, void *event_info, int event_id, - const Eo_Event_Description *eo_event_desc, Efl_Event *eo_event_info) + const Efl_Event_Description *efl_event_desc, Efl_Event *efl_event_info) { /* MEM OK */ Evas_Button_Flags flags = EVAS_BUTTON_NONE; @@ -235,9 +235,9 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data ev->flags &= ~(EVAS_BUTTON_DOUBLE_CLICK | EVAS_BUTTON_TRIPLE_CLICK); } obj->last_mouse_down_counter = e->last_mouse_down_counter; - if (eo_event_info) + if (efl_event_info) { - efl_event_pointer_button_flags_set(eo_event_info, ev->flags); + efl_event_pointer_button_flags_set(efl_event_info, ev->flags); } break; } @@ -252,9 +252,9 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data ev->flags &= ~(EVAS_BUTTON_DOUBLE_CLICK | EVAS_BUTTON_TRIPLE_CLICK); } obj->last_mouse_up_counter = e->last_mouse_up_counter; - if (eo_event_info) + if (efl_event_info) { - efl_event_pointer_button_flags_set(eo_event_info, ev->flags); + efl_event_pointer_button_flags_set(efl_event_info, ev->flags); } break; } @@ -263,10 +263,10 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data } /* legacy callbacks - relying on Efl.Canvas.Object events */ - eo_event_callback_call(eo_obj, _legacy_evas_callback_table(type), event_info); + efl_event_callback_call(eo_obj, _legacy_evas_callback_table(type), event_info); /* new input events */ - if (eo_event_desc) + if (efl_event_desc) { Efl_Event_Flags *pevflags = NULL; @@ -291,23 +291,23 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data } #undef EV_CASE - if (pevflags) efl_event_flags_set(eo_event_info, *pevflags); - eo_event_callback_call(eo_obj, eo_event_desc, eo_event_info); + if (pevflags) efl_event_flags_set(efl_event_info, *pevflags); + efl_event_callback_call(eo_obj, efl_event_desc, efl_event_info); } if (type == EVAS_CALLBACK_MOUSE_DOWN) { Evas_Event_Mouse_Down *ev = event_info; ev->flags = flags; - if (eo_event_info) - efl_event_pointer_button_flags_set(eo_event_info, ev->flags); + if (efl_event_info) + efl_event_pointer_button_flags_set(efl_event_info, ev->flags); } else if (type == EVAS_CALLBACK_MOUSE_UP) { Evas_Event_Mouse_Up *ev = event_info; ev->flags = flags; - if (eo_event_info) - efl_event_pointer_button_flags_set(eo_event_info, ev->flags); + if (efl_event_info) + efl_event_pointer_button_flags_set(efl_event_info, ev->flags); } nothing_here: @@ -317,7 +317,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data (type <= EVAS_CALLBACK_KEY_UP)) { Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); - evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id, eo_event_desc, eo_event_info); + evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id, efl_event_desc, efl_event_info); } } _evas_unwalk(e); @@ -347,8 +347,8 @@ evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type cb_info->data = (void *)data; cb_info->type = type; - const Eo_Event_Description *desc = _legacy_evas_callback_table(type); - eo_event_callback_priority_add(eo_obj, desc, priority, _eo_evas_object_cb, cb_info); + const Efl_Event_Description *desc = _legacy_evas_callback_table(type); + efl_event_callback_priority_add(eo_obj, desc, priority, _eo_evas_object_cb, cb_info); obj->callbacks = eina_inlist_append(obj->callbacks, EINA_INLIST_GET(cb_info)); @@ -374,7 +374,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva if ((info->func == func) && (info->type == type)) { void *tmp = info->data; - eo_event_callback_del(eo_obj, _legacy_evas_callback_table(type), _eo_evas_object_cb, info); + efl_event_callback_del(eo_obj, _legacy_evas_callback_table(type), _eo_evas_object_cb, info); obj->callbacks = eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info)); @@ -405,7 +405,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type if ((info->func == func) && (info->type == type) && info->data == data) { void *tmp = info->data; - eo_event_callback_del(eo_obj, _legacy_evas_callback_table(type), _eo_evas_object_cb, info); + efl_event_callback_del(eo_obj, _legacy_evas_callback_table(type), _eo_evas_object_cb, info); obj->callbacks = eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info)); @@ -439,8 +439,8 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb cb_info->data = (void *)data; cb_info->type = type; - const Eo_Event_Description *desc = _legacy_evas_callback_table(type); - eo_event_callback_priority_add(eo_e, desc, priority, _eo_evas_cb, cb_info); + const Efl_Event_Description *desc = _legacy_evas_callback_table(type); + efl_event_callback_priority_add(eo_e, desc, priority, _eo_evas_cb, cb_info); e->callbacks = eina_inlist_append(e->callbacks, EINA_INLIST_GET(cb_info)); } @@ -465,7 +465,7 @@ evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func) if ((info->func == func) && (info->type == type)) { void *tmp = info->data; - eo_event_callback_del(eo_e, _legacy_evas_callback_table(type), _eo_evas_cb, info); + efl_event_callback_del(eo_e, _legacy_evas_callback_table(type), _eo_evas_cb, info); e->callbacks = eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info)); @@ -496,7 +496,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb if ((info->func == func) && (info->type == type) && (info->data == data)) { void *tmp = info->data; - eo_event_callback_del(eo_e, _legacy_evas_callback_table(type), _eo_evas_cb, info); + efl_event_callback_del(eo_e, _legacy_evas_callback_table(type), _eo_evas_cb, info); e->callbacks = eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info)); diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo index 03a180b39a..ea75d1ec85 100644 --- a/src/lib/evas/canvas/evas_canvas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo @@ -1,7 +1,7 @@ import evas_types; import efl_event_types; -class Evas.Canvas (Eo.Base, Efl.Canvas, Efl.Animator, Efl.Input.Interface) +class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface) { legacy_prefix: evas; data: Evas_Public_Data; @@ -1190,11 +1190,11 @@ class Evas.Canvas (Eo.Base, Efl.Canvas, Efl.Animator, Efl.Input.Interface) } } implements { - Eo.Base.constructor; - Eo.Base.destructor; - Eo.Base.event_thaw; - Eo.Base.event_freeze; - Eo.Base.provider_find; + Efl.Object.constructor; + Efl.Object.destructor; + Efl.Object.event_thaw; + Efl.Object.event_freeze; + Efl.Object.provider_find; } events { render,flush,pre @beta; diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.c b/src/lib/evas/canvas/evas_canvas3d_camera.c index d631df6917..ab222e634f 100644 --- a/src/lib/evas/canvas/evas_canvas3d_camera.c +++ b/src/lib/evas/canvas/evas_canvas3d_camera.c @@ -63,17 +63,17 @@ evas_canvas3d_camera_node_del(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node * } EOLIAN static Eo * -_evas_canvas3d_camera_eo_base_constructor(Eo *obj, +_evas_canvas3d_camera_efl_object_constructor(Eo *obj, Evas_Canvas3D_Camera_Data *pd EINA_UNUSED) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_CAMERA); return obj; } EOLIAN static void -_evas_canvas3d_camera_eo_base_destructor(Eo *obj, +_evas_canvas3d_camera_efl_object_destructor(Eo *obj, Evas_Canvas3D_Camera_Data *pd) { Eina_Iterator *it = NULL; @@ -92,7 +92,7 @@ _evas_canvas3d_camera_eo_base_destructor(Eo *obj, eina_hash_free(pd->nodes); } - eo_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(eo_super(obj, MY_CLASS)); } EAPI Evas_Canvas3D_Camera * diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.eo b/src/lib/evas/canvas/evas_canvas3d_camera.eo index 4ac3b0deb9..18d22ae44e 100644 --- a/src/lib/evas/canvas/evas_canvas3d_camera.eo +++ b/src/lib/evas/canvas/evas_canvas3d_camera.eo @@ -77,8 +77,8 @@ class Evas.Canvas3D.Camera (Evas.Canvas3D.Object) } implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; Evas.Canvas3D.Object.update_notify; Evas.Canvas3D.Object.change_notify; } diff --git a/src/lib/evas/canvas/evas_canvas3d_light.c b/src/lib/evas/canvas/evas_canvas3d_light.c index 11e9c81965..77a7d49d93 100644 --- a/src/lib/evas/canvas/evas_canvas3d_light.c +++ b/src/lib/evas/canvas/evas_canvas3d_light.c @@ -77,9 +77,9 @@ evas_canvas3d_light_add(Evas *e) } EOLIAN static Eo * -_evas_canvas3d_light_eo_base_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd) +_evas_canvas3d_light_efl_object_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_LIGHT); evas_color_set(&pd->ambient, 0.0, 0.0, 0.0, 1.0); evas_color_set(&pd->diffuse, 1.0, 1.0, 1.0, 1.0); @@ -97,7 +97,7 @@ _evas_canvas3d_light_eo_base_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd) } EOLIAN static void -_evas_canvas3d_light_eo_base_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd) +_evas_canvas3d_light_efl_object_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd) { Eina_Iterator *it = NULL; void *data = NULL; @@ -115,7 +115,7 @@ _evas_canvas3d_light_eo_base_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd) eina_hash_free(pd->nodes); } - eo_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(eo_super(obj, MY_CLASS)); } diff --git a/src/lib/evas/canvas/evas_canvas3d_light.eo b/src/lib/evas/canvas/evas_canvas3d_light.eo index 464ab8ee5f..c5458d4ea1 100644 --- a/src/lib/evas/canvas/evas_canvas3d_light.eo +++ b/src/lib/evas/canvas/evas_canvas3d_light.eo @@ -248,8 +248,8 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object) } implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; Evas.Canvas3D.Object.update_notify; Evas.Canvas3D.Object.change_notify; } diff --git a/src/lib/evas/canvas/evas_canvas3d_material.c b/src/lib/evas/canvas/evas_canvas3d_material.c index 5070d44450..150f5eb810 100644 --- a/src/lib/evas/canvas/evas_canvas3d_material.c +++ b/src/lib/evas/canvas/evas_canvas3d_material.c @@ -89,9 +89,9 @@ evas_canvas3d_material_add(Evas *e) } EOLIAN static Eo * -_evas_canvas3d_material_eo_base_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd) +_evas_canvas3d_material_efl_object_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL); evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color, 0.2, 0.2, 0.2, 1.0); @@ -104,7 +104,7 @@ _evas_canvas3d_material_eo_base_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_M } EOLIAN static void -_evas_canvas3d_material_eo_base_destructor(Eo *obj, Evas_Canvas3D_Material_Data *pd) +_evas_canvas3d_material_efl_object_destructor(Eo *obj, Evas_Canvas3D_Material_Data *pd) { int i = 0; Eina_Iterator *it = NULL; @@ -136,7 +136,7 @@ _evas_canvas3d_material_eo_base_destructor(Eo *obj, Evas_Canvas3D_Material_Data evas_canvas3d_texture_material_del(pd->attribs[i].texture, obj); } } - eo_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_canvas3d_material.eo b/src/lib/evas/canvas/evas_canvas3d_material.eo index 72871fcc00..68cd4927a2 100644 --- a/src/lib/evas/canvas/evas_canvas3d_material.eo +++ b/src/lib/evas/canvas/evas_canvas3d_material.eo @@ -116,8 +116,8 @@ class Evas.Canvas3D.Material (Evas.Canvas3D.Object) } } implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; Evas.Canvas3D.Object.update_notify; Evas.Canvas3D.Object.change_notify; } diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c index 9cfc637e17..e59497f9af 100644 --- a/src/lib/evas/canvas/evas_canvas3d_mesh.c +++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c @@ -261,9 +261,9 @@ evas_canvas3d_mesh_add(Evas *e) } EOLIAN static Eo * -_evas_canvas3d_mesh_eo_base_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) +_evas_canvas3d_mesh_efl_object_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH); _mesh_init(pd); @@ -271,10 +271,10 @@ _evas_canvas3d_mesh_eo_base_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) } EOLIAN static void -_evas_canvas3d_mesh_eo_base_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) +_evas_canvas3d_mesh_efl_object_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) { _mesh_fini(pd); - eo_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo b/src/lib/evas/canvas/evas_canvas3d_mesh.eo index a15edf48f5..8fb7e531c9 100644 --- a/src/lib/evas/canvas/evas_canvas3d_mesh.eo +++ b/src/lib/evas/canvas/evas_canvas3d_mesh.eo @@ -420,8 +420,8 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Efl.File) } } implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; Evas.Canvas3D.Object.update_notify; Evas.Canvas3D.Object.change_notify; Efl.File.file.set; diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c index 31963a2473..c4f6eeedf7 100644 --- a/src/lib/evas/canvas/evas_canvas3d_node.c +++ b/src/lib/evas/canvas/evas_canvas3d_node.c @@ -56,13 +56,13 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event Eina_List *collision_list = NULL, *l = NULL; Evas_Canvas3D_Node *target_node = NULL, *n = NULL; Evas_Canvas3D_Node_Data *pd_target = NULL, *pd = NULL; - const Eo_Event_Description *eo_desc = NULL; + const Efl_Event_Description *eo_desc = NULL; Eina_Bool ret = EINA_FALSE; target_node = (Evas_Canvas3D_Node *)event->info; pd_target = eo_data_scope_get(target_node, EVAS_CANVAS3D_NODE_CLASS); collision_list = (Eina_List *)data; - eo_desc = eo_base_legacy_only_event_description_get("collision"); + eo_desc = efl_object_legacy_only_event_description_get("collision"); if (collision_list) { @@ -70,14 +70,14 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event { pd = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS); if (box_intersection_box(&pd_target->aabb, &pd->aabb)) - ret = eo_event_callback_call(target_node, eo_desc, n); + ret = efl_event_callback_call(target_node, eo_desc, n); } if (!ret) { /* XXX: Putting it like this because that's how the logic was, * but it seems absolutely wrong that it only checks the last * and decides based on that. */ - eo_event_callback_stop(event->object); + efl_event_callback_stop(event->object); } } } @@ -85,11 +85,11 @@ static void _evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Eo_Event *event) { Eina_Bool ret = EINA_FALSE; - const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get("clicked"); - ret = eo_event_callback_call((Eo *)event->info, eo_desc, event->info); + const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get("clicked"); + ret = efl_event_callback_call((Eo *)event->info, eo_desc, event->info); if (!ret) - eo_event_callback_stop(event->object); + efl_event_callback_stop(event->object); } static inline Evas_Canvas3D_Node_Mesh * @@ -205,7 +205,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_register(Eo *obj, Evas_Canvas3 GET_CALLBACK_TYPE(tcb, event) if (tcb != PRIVATE_CALLBACK_NONE) - eo_event_callback_add(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], data); + efl_event_callback_add(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], data); } @@ -218,7 +218,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_unregister(Eo *obj, Evas_Canva GET_CALLBACK_TYPE(tcb, event) if (tcb != PRIVATE_CALLBACK_NONE) - eo_event_callback_del(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], NULL); + efl_event_callback_del(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], NULL); } static Eina_Bool @@ -500,7 +500,7 @@ node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED) Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS); Eina_List *current; Evas_Canvas3D_Node *datanode; - const Eo_Event_Description *eo_desc = NULL; + const Efl_Event_Description *eo_desc = NULL; if (pd->type != EVAS_CANVAS3D_NODE_TYPE_MESH && pd->type != EVAS_CANVAS3D_NODE_TYPE_NODE) return EINA_TRUE; @@ -513,8 +513,8 @@ node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED) } evas_build_sphere(&pd->aabb, &pd->bsphere); - eo_desc = eo_base_legacy_only_event_description_get("collision,private"); - eo_event_callback_call(node, eo_desc, (void *)node); + eo_desc = efl_object_legacy_only_event_description_get("collision,private"); + efl_event_callback_call(node, eo_desc, (void *)node); return EINA_TRUE; } @@ -538,7 +538,7 @@ _evas_canvas3d_node_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D_No evas_canvas3d_node_tree_traverse(obj, EVAS_CANVAS3D_TREE_TRAVERSE_ANY_ORDER, EINA_FALSE, _node_billboard_update, NULL); /* Update AABB. */ - if(eo_base_legacy_only_event_description_get("collision,private")) + if(efl_object_legacy_only_event_description_get("collision,private")) { evas_canvas3d_node_tree_traverse(obj, EVAS_CANVAS3D_TREE_TRAVERSE_POST_ORDER, EINA_FALSE, node_aabb_update, NULL); @@ -1065,11 +1065,11 @@ _evas_canvas3d_node_constructor(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canva } EOLIAN static void -_evas_canvas3d_node_eo_base_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd EINA_UNUSED) +_evas_canvas3d_node_efl_object_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd EINA_UNUSED) { _node_free(obj); - eo_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static Evas_Canvas3D_Node_Type diff --git a/src/lib/evas/canvas/evas_canvas3d_node.eo b/src/lib/evas/canvas/evas_canvas3d_node.eo index 2ffcbac3dc..4ecb4122ba 100644 --- a/src/lib/evas/canvas/evas_canvas3d_node.eo +++ b/src/lib/evas/canvas/evas_canvas3d_node.eo @@ -382,7 +382,7 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object) } } implements { - Eo.Base.destructor; + Efl.Object.destructor; Evas.Canvas3D.Object.update_notify; Evas.Canvas3D.Object.change_notify; Evas.Canvas3D.Object.callback_register; diff --git a/src/lib/evas/canvas/evas_canvas3d_node_callback.h b/src/lib/evas/canvas/evas_canvas3d_node_callback.h index e868da5e0f..7167217077 100644 --- a/src/lib/evas/canvas/evas_canvas3d_node_callback.h +++ b/src/lib/evas/canvas/evas_canvas3d_node_callback.h @@ -16,10 +16,10 @@ typedef enum _Evas_Canvas3D_Node_Private_Callback_Type PRIVATE_CALLBACK_NONE } Evas_Canvas3D_Node_Private_Callback_Type; -const Eo_Event_Description evas_canvas3d_node_private_event_desc[] = +const Efl_Event_Description evas_canvas3d_node_private_event_desc[] = { - EO_EVENT_DESCRIPTION("clicked,private"), - EO_EVENT_DESCRIPTION("collision,private") + EFL_EVENT_DESCRIPTION("clicked,private"), + EFL_EVENT_DESCRIPTION("collision,private") }; /*Private callbacks */ @@ -28,7 +28,7 @@ _evas_canvas3d_node_private_callback_clicked(void *data, const Eo_Event *event); static void _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event); -Eo_Event_Cb evas_canvas3d_node_private_callback_functions[] = +Efl_Event_Cb evas_canvas3d_node_private_callback_functions[] = { _evas_canvas3d_node_private_callback_clicked, _evas_canvas3d_node_private_callback_collision, diff --git a/src/lib/evas/canvas/evas_canvas3d_object.c b/src/lib/evas/canvas/evas_canvas3d_object.c index b6b197dc0b..8f9911517b 100644 --- a/src/lib/evas/canvas/evas_canvas3d_object.c +++ b/src/lib/evas/canvas/evas_canvas3d_object.c @@ -4,11 +4,11 @@ #define MY_CLASS EVAS_CANVAS3D_OBJECT_CLASS EOLIAN static Eo * -_evas_canvas3d_object_eo_base_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd) +_evas_canvas3d_object_efl_object_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd) { Eo *e = NULL; - obj = eo_constructor(eo_super(obj, MY_CLASS)); - e = eo_parent_get(obj); + obj = efl_constructor(eo_super(obj, MY_CLASS)); + e = efl_parent_get(obj); pd->evas = e; pd->type = EVAS_CANVAS3D_OBJECT_TYPE_INVALID; memset(&pd->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_CANVAS3D_STATE_MAX); @@ -17,11 +17,11 @@ _evas_canvas3d_object_eo_base_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd } EOLIAN static Evas * - _evas_canvas3d_object_eo_base_provider_find(Eo *obj, Evas_Canvas3D_Object_Data *pd, const Eo_Class *klass) + _evas_canvas3d_object_efl_object_provider_find(Eo *obj, Evas_Canvas3D_Object_Data *pd, const Efl_Class *klass) { if (klass == EVAS_CANVAS_CLASS) return pd->evas; - return eo_provider_find(eo_super(obj, MY_CLASS), klass); + return efl_provider_find(eo_super(obj, MY_CLASS), klass); } EOLIAN static void @@ -67,29 +67,29 @@ _evas_canvas3d_object_update(Eo *obj, Evas_Canvas3D_Object_Data *pd) } EOLIAN static Eina_Bool -_evas_canvas3d_object_eo_base_event_callback_priority_add(Eo *obj, +_evas_canvas3d_object_efl_object_event_callback_priority_add(Eo *obj, Evas_Canvas3D_Object_Data *pd EINA_UNUSED, - const Eo_Event_Description *desc, - Eo_Callback_Priority priority, - Eo_Event_Cb func, + const Efl_Event_Description *desc, + Efl_Callback_Priority priority, + Efl_Event_Cb func, const void *user_data) { Eina_Bool r = EINA_FALSE; - r = eo_event_callback_priority_add(eo_super(obj, MY_CLASS), desc, priority, func, user_data); + r = efl_event_callback_priority_add(eo_super(obj, MY_CLASS), desc, priority, func, user_data); evas_canvas3d_object_callback_register(obj, desc->name, user_data); return r; } EOLIAN static Eina_Bool -_evas_canvas3d_object_eo_base_event_callback_del(Eo *obj, Evas_Canvas3D_Object_Data *pd EINA_UNUSED, - const Eo_Event_Description *desc, - Eo_Event_Cb func, +_evas_canvas3d_object_efl_object_event_callback_del(Eo *obj, Evas_Canvas3D_Object_Data *pd EINA_UNUSED, + const Efl_Event_Description *desc, + Efl_Event_Cb func, const void *user_data) { Eina_Bool r = EINA_FALSE; - r = eo_event_callback_del(eo_super(obj, MY_CLASS), desc, func, user_data); + r = efl_event_callback_del(eo_super(obj, MY_CLASS), desc, func, user_data); if (r) evas_canvas3d_object_callback_unregister(obj, desc->name); return r; } diff --git a/src/lib/evas/canvas/evas_canvas3d_object.eo b/src/lib/evas/canvas/evas_canvas3d_object.eo index e4db9c0e3d..204c808c75 100644 --- a/src/lib/evas/canvas/evas_canvas3d_object.eo +++ b/src/lib/evas/canvas/evas_canvas3d_object.eo @@ -1,6 +1,6 @@ import evas_types; -class Evas.Canvas3D.Object (Eo.Base) +class Evas.Canvas3D.Object (Efl.Object) { data: Evas_Canvas3D_Object_Data; methods { @@ -65,10 +65,10 @@ class Evas.Canvas3D.Object (Eo.Base) } implements { - Eo.Base.constructor; - Eo.Base.event_callback_priority_add; - Eo.Base.event_callback_del; - Eo.Base.provider_find; + Efl.Object.constructor; + Efl.Object.event_callback_priority_add; + Efl.Object.event_callback_del; + Efl.Object.provider_find; } events { clicked; [[Clicked Event.]] diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.c b/src/lib/evas/canvas/evas_canvas3d_primitive.c index 76dcdd6746..07e63a802d 100644 --- a/src/lib/evas/canvas/evas_canvas3d_primitive.c +++ b/src/lib/evas/canvas/evas_canvas3d_primitive.c @@ -25,9 +25,9 @@ evas_canvas3d_primitive_add(Evas *e) } EOLIAN static Eo * -_evas_canvas3d_primitive_eo_base_constructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd) +_evas_canvas3d_primitive_efl_object_constructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE); _primitive_init(pd); @@ -35,9 +35,9 @@ _evas_canvas3d_primitive_eo_base_constructor(Eo *obj, Evas_Canvas3D_Primitive_Da } EOLIAN static void -_evas_canvas3d_primitive_eo_base_destructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd EINA_UNUSED) +_evas_canvas3d_primitive_efl_object_destructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd EINA_UNUSED) { - eo_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.eo b/src/lib/evas/canvas/evas_canvas3d_primitive.eo index 005ff55ea4..18e43ff08c 100644 --- a/src/lib/evas/canvas/evas_canvas3d_primitive.eo +++ b/src/lib/evas/canvas/evas_canvas3d_primitive.eo @@ -134,7 +134,7 @@ class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object) } } implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; } } diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c index b67d451f52..4e5cc39b29 100644 --- a/src/lib/evas/canvas/evas_canvas3d_scene.c +++ b/src/lib/evas/canvas/evas_canvas3d_scene.c @@ -69,9 +69,9 @@ evas_canvas3d_scene_add(Evas *e) } EOLIAN static Eo * -_evas_canvas3d_scene_eo_base_constructor(Eo *obj, Evas_Canvas3D_Scene_Data *pd) +_evas_canvas3d_scene_efl_object_constructor(Eo *obj, Evas_Canvas3D_Scene_Data *pd) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_SCENE); evas_color_set(&pd->bg_color, 0.0, 0.0, 0.0, 0.0); pd->shadows_enabled = EINA_FALSE; @@ -628,7 +628,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real Eina_Array *arr = NULL; Eina_Bool update_scene = EINA_FALSE; Evas_Canvas3D_Node *picked_node = NULL; - const Eo_Event_Description *eo_desc = NULL; + const Efl_Event_Description *eo_desc = NULL; pd_parent = eo_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS); e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS); @@ -686,8 +686,8 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real eina_stringshare_del(tmp); /*Calling callback clicked*/ - eo_desc = eo_base_legacy_only_event_description_get("clicked,private"); - eo_event_callback_call(picked_node, eo_desc, picked_node); + eo_desc = efl_object_legacy_only_event_description_get("clicked,private"); + efl_event_callback_call(picked_node, eo_desc, picked_node); return EINA_TRUE; } @@ -725,8 +725,8 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real if (mesh) *mesh = data.mesh; /*Calling callback clicked*/ - eo_desc = eo_base_legacy_only_event_description_get("clicked,private"); - eo_event_callback_call(data.node, eo_desc, data.node); + eo_desc = efl_object_legacy_only_event_description_get("clicked,private"); + efl_event_callback_call(data.node, eo_desc, data.node); return EINA_TRUE; } diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.eo b/src/lib/evas/canvas/evas_canvas3d_scene.eo index 80762074eb..1bc01f2fed 100644 --- a/src/lib/evas/canvas/evas_canvas3d_scene.eo +++ b/src/lib/evas/canvas/evas_canvas3d_scene.eo @@ -161,7 +161,7 @@ class Evas.Canvas3D.Scene (Evas.Canvas3D.Object) } } implements { - Eo.Base.constructor; + Efl.Object.constructor; Evas.Canvas3D.Object.update_notify; Evas.Canvas3D.Object.change_notify; } diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.c b/src/lib/evas/canvas/evas_canvas3d_texture.c index abfc79b3cf..d27a803316 100644 --- a/src/lib/evas/canvas/evas_canvas3d_texture.c +++ b/src/lib/evas/canvas/evas_canvas3d_texture.c @@ -319,9 +319,9 @@ evas_canvas3d_texture_add(Evas *e) EOLIAN static Eo * -_evas_canvas3d_texture_eo_base_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED) +_evas_canvas3d_texture_efl_object_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); pd->atlas_enable = EINA_TRUE; evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE); @@ -330,10 +330,10 @@ _evas_canvas3d_texture_eo_base_constructor(Eo *obj, Evas_Canvas3D_Texture_Data * } EOLIAN static void -_evas_canvas3d_texture_eo_base_destructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED) +_evas_canvas3d_texture_efl_object_destructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED) { _texture_fini(obj); - eo_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(eo_super(obj, MY_CLASS)); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.eo b/src/lib/evas/canvas/evas_canvas3d_texture.eo index af187adf67..0ab00befb6 100644 --- a/src/lib/evas/canvas/evas_canvas3d_texture.eo +++ b/src/lib/evas/canvas/evas_canvas3d_texture.eo @@ -159,8 +159,8 @@ class Evas.Canvas3D.Texture (Evas.Canvas3D.Object) } implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; Evas.Canvas3D.Object.update_notify; Evas.Canvas3D.Object.change_notify; } diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c index 519ece2985..dd26c2887b 100644 --- a/src/lib/evas/canvas/evas_clip.c +++ b/src/lib/evas/canvas/evas_clip.c @@ -327,7 +327,7 @@ _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Ob state_write->clipper = NULL; EINA_COW_STATE_WRITE_END(obj, state_write, cur); if (obj->prev->clipper != old_clip) - eo_event_callback_del(old_clip->object, EO_EVENT_DEL, _clipper_del_cb, eo_obj); + efl_event_callback_del(old_clip->object, EFL_EVENT_DEL, _clipper_del_cb, eo_obj); } /* image object clipper */ @@ -359,7 +359,7 @@ _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Ob state_write->clipper = clip; EINA_COW_STATE_WRITE_END(obj, state_write, cur); if (obj->prev->clipper != clip) - eo_event_callback_add(clip->object, EO_EVENT_DEL, _clipper_del_cb, eo_obj); + efl_event_callback_add(clip->object, EFL_EVENT_DEL, _clipper_del_cb, eo_obj); clip->clip.cache_clipees_answer = eina_list_free(clip->clip.cache_clipees_answer); clip->clip.clipees = eina_list_append(clip->clip.clipees, obj); @@ -457,7 +457,7 @@ _efl_canvas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj) state_write->clipper = NULL; EINA_COW_STATE_WRITE_END(obj, state_write, cur); if (obj->prev->clipper != old_clip) - eo_event_callback_del(old_clip->object, EO_EVENT_DEL, _clipper_del_cb, eo_obj); + efl_event_callback_del(old_clip->object, EFL_EVENT_DEL, _clipper_del_cb, eo_obj); } evas_object_update_bounding_box(eo_obj, obj, NULL); @@ -510,7 +510,7 @@ _efl_canvas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cu EINA_COW_STATE_WRITE_END(obj, state_write, prev); } if (clip != obj->cur->clipper) - eo_event_callback_del(clip->object, EO_EVENT_DEL, _clipper_del_cb, obj->object); + efl_event_callback_del(clip->object, EFL_EVENT_DEL, _clipper_del_cb, obj->object); } } diff --git a/src/lib/evas/canvas/evas_data.c b/src/lib/evas/canvas/evas_data.c index b332e1669b..f76fec5868 100644 --- a/src/lib/evas/canvas/evas_data.c +++ b/src/lib/evas/canvas/evas_data.c @@ -8,7 +8,7 @@ evas_object_data_set(Evas_Object *obj, const char *key, const void *data) MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return; MAGIC_CHECK_END(); - eo_key_data_set(obj, key, data); + efl_key_data_set(obj, key, data); } EAPI void * @@ -18,7 +18,7 @@ evas_object_data_get(const Evas_Object *obj, const char *key) return NULL; MAGIC_CHECK_END(); void *data = NULL; - data = eo_key_data_get((Evas_Object *)obj, key); + data = efl_key_data_get((Evas_Object *)obj, key); return data; } @@ -29,7 +29,7 @@ evas_object_data_del(Evas_Object *obj, const char *key) return NULL; MAGIC_CHECK_END(); void *data = NULL; - data = eo_key_data_get(obj, key); - eo_key_data_set(obj, key, NULL); + data = efl_key_data_get(obj, key); + efl_key_data_set(obj, key, NULL); return data; } diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c index 0eb5511fa2..a0eb26f0ae 100644 --- a/src/lib/evas/canvas/evas_device.c +++ b/src/lib/evas/canvas/evas_device.c @@ -49,7 +49,7 @@ evas_device_add(Evas *eo_e) e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); e->devices = eina_list_append(e->devices, dev); - eo_event_callback_add(dev, EO_EVENT_DEL, _del_cb, e); + efl_event_callback_add(dev, EFL_EVENT_DEL, _del_cb, e); evas_event_callback_call(eo_e, EVAS_CALLBACK_DEVICE_CHANGED, dev); diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index 0d3c356729..67d4ed9d0c 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -95,7 +95,7 @@ _efl_event_create(Efl_Event *evt, Evas_Callback_Type type, void *ev, return evt; } -static inline const Eo_Event_Description * +static inline const Efl_Event_Description * _efl_event_desc_get(Evas_Callback_Type type) { switch (type) @@ -1232,7 +1232,7 @@ evas_event_freeze(Evas *eo_e) MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return; MAGIC_CHECK_END(); - eo_event_freeze(eo_e); + efl_event_freeze(eo_e); } EAPI void @@ -1241,22 +1241,22 @@ evas_event_thaw(Evas *eo_e) MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return; MAGIC_CHECK_END(); - eo_event_thaw(eo_e); + efl_event_thaw(eo_e); } EOLIAN void -_evas_canvas_eo_base_event_freeze(Eo *eo_e, Evas_Public_Data *e) +_evas_canvas_efl_object_event_freeze(Eo *eo_e, Evas_Public_Data *e) { - eo_event_freeze(eo_super(eo_e, EVAS_CANVAS_CLASS)); + efl_event_freeze(eo_super(eo_e, EVAS_CANVAS_CLASS)); e->is_frozen = EINA_TRUE; } EOLIAN void -_evas_canvas_eo_base_event_thaw(Eo *eo_e, Evas_Public_Data *e) +_evas_canvas_efl_object_event_thaw(Eo *eo_e, Evas_Public_Data *e) { int fcount = -1; - eo_event_thaw(eo_super(eo_e, EVAS_CANVAS_CLASS)); - fcount = eo_event_freeze_count_get(eo_super(eo_e, EVAS_CANVAS_CLASS)); + efl_event_thaw(eo_super(eo_e, EVAS_CANVAS_CLASS)); + fcount = efl_event_freeze_count_get(eo_super(eo_e, EVAS_CANVAS_CLASS)); if (0 == fcount) { Evas_Layer *lay; @@ -1284,7 +1284,7 @@ evas_event_freeze_get(const Evas *eo_e) return 0; MAGIC_CHECK_END(); int ret = 0; - ret = eo_event_freeze_count_get((Eo *)eo_e); + ret = efl_event_freeze_count_get((Eo *)eo_e); return ret; } @@ -2794,7 +2794,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e, unsigned int keycode, Efl_Event_Key_Data *ke) { - void *eo_event_info = NULL; + void *efl_event_info = NULL; Evas_Public_Data *e = _pd; int event_id = 0; @@ -2829,7 +2829,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e, ke->event_flags = ev.event_flags; ke->modifiers = ev.modifiers; ke->locks = ev.locks; - eo_event_info = ke->eo; + efl_event_info = ke->eo; } if (e->grabs) @@ -2859,7 +2859,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e, !evas_event_freezes_through(g->object, object_obj)) { EV_CALL(g->object, object_obj, EVAS_CALLBACK_KEY_DOWN, - &ev, event_id, eo_event_info, NULL); + &ev, event_id, efl_event_info, NULL); } if (g->exclusive) exclusive = EINA_TRUE; } @@ -2886,14 +2886,14 @@ _canvas_event_feed_key_down_internal(Eo *eo_e, } } } - if (!ke) EV_DEL(eo_event_info); + if (!ke) EV_DEL(efl_event_info); if ((e->focused) && (!exclusive)) { Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EFL_CANVAS_OBJECT_CLASS); if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj)) { EV_CALL(e->focused, focused_obj, EVAS_CALLBACK_KEY_DOWN, - &ev, event_id, eo_event_info, NULL); + &ev, event_id, efl_event_info, NULL); } } _evas_post_event_callback_call(eo_e, e); @@ -2908,7 +2908,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e, ke->locks = NULL; } else - EV_DEL(eo_event_info); + EV_DEL(efl_event_info); } static void @@ -2923,7 +2923,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e, unsigned int keycode, Efl_Event_Key_Data *ke) { - void *eo_event_info = NULL; + void *efl_event_info = NULL; Evas_Public_Data *e = _pd; int event_id = 0; if (!keyname) return; @@ -2957,7 +2957,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e, ke->event_flags = ev.event_flags; ke->modifiers = ev.modifiers; ke->locks = ev.locks; - eo_event_info = ke->eo; + efl_event_info = ke->eo; } if (e->grabs) @@ -2987,7 +2987,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e, { evas_object_event_callback_call (g->object, object_obj, EVAS_CALLBACK_KEY_UP, - &ev, event_id, EFL_EVENT_KEY_UP, eo_event_info); + &ev, event_id, EFL_EVENT_KEY_UP, efl_event_info); } if (g->exclusive) exclusive = EINA_TRUE; } @@ -3022,7 +3022,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e, { evas_object_event_callback_call (e->focused, focused_obj, EVAS_CALLBACK_KEY_UP, - &ev, event_id, EFL_EVENT_KEY_UP, eo_event_info); + &ev, event_id, EFL_EVENT_KEY_UP, efl_event_info); } } _evas_post_event_callback_call(eo_e, e); @@ -3539,11 +3539,11 @@ EO_CALLBACKS_ARRAY_DEFINE(_evas_canvas_event_pointer_callbacks, void _evas_canvas_event_init(Evas *eo_e, Evas_Public_Data *e) { - eo_event_callback_array_add(eo_e, _evas_canvas_event_pointer_callbacks(), e); + efl_event_callback_array_add(eo_e, _evas_canvas_event_pointer_callbacks(), e); } void _evas_canvas_event_shutdown(Evas *eo_e, Evas_Public_Data *e) { - eo_event_callback_array_del(eo_e, _evas_canvas_event_pointer_callbacks(), e); + efl_event_callback_array_del(eo_e, _evas_canvas_event_pointer_callbacks(), e); } diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c index 46ab76594a..1796bc5cbc 100644 --- a/src/lib/evas/canvas/evas_filter_mixin.c +++ b/src/lib/evas/canvas/evas_filter_mixin.c @@ -265,7 +265,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj, { // Post render callback is not required anymore Evas *e = obj->layer->evas->evas; - eo_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); + efl_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); pd->has_cb = EINA_FALSE; } @@ -325,7 +325,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj, if (do_async && !pd->has_cb) { Evas *e = obj->layer->evas->evas; - eo_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); + efl_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); pd->has_cb = EINA_TRUE; } evas_filter_context_post_run_callback_set(filter, _filter_cb, eo_obj); @@ -580,12 +580,12 @@ _efl_canvas_filter_internal_filter_invalid_set(Eo *eo_obj EINA_UNUSED, Evas_Filt } } -EOLIAN static Eo_Base * -_efl_canvas_filter_internal_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd) +EOLIAN static Efl_Object * +_efl_canvas_filter_internal_efl_object_constructor(Eo *eo_obj, Evas_Filter_Data *pd) { Eo *obj = NULL; - obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); pd->data = eina_cow_alloc(evas_object_filter_cow); SLKI(pd->lck); @@ -593,7 +593,7 @@ _efl_canvas_filter_internal_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd } EOLIAN static void -_efl_canvas_filter_internal_eo_base_destructor(Eo *eo_obj, Evas_Filter_Data *pd) +_efl_canvas_filter_internal_efl_object_destructor(Eo *eo_obj, Evas_Filter_Data *pd) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); Evas_Filter_Data_Binding *db; @@ -626,11 +626,11 @@ finish: if (pd->has_cb) { Evas *e = obj->layer->evas->evas; - eo_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); + efl_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); } SLKD(pd->lck); - eo_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(eo_super(eo_obj, MY_CLASS)); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo index 71979157b0..f8c0f2485c 100644 --- a/src/lib/evas/canvas/evas_grid.eo +++ b/src/lib/evas/canvas/evas_grid.eo @@ -135,6 +135,6 @@ class Evas.Grid (Efl.Canvas.Group.Clipped) } } implements { - Eo.Base.constructor; + Efl.Object.constructor; } } diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c index 9134a8f220..8c3abf1e09 100644 --- a/src/lib/evas/canvas/evas_image_legacy.c +++ b/src/lib/evas/canvas/evas_image_legacy.c @@ -595,7 +595,7 @@ evas_object_image_data_set(Eo *eo_obj, void *data) o->engine_data = NULL; if (o->file_obj) { - eo_del(o->file_obj); + efl_del(o->file_obj); o->file_obj = NULL; } } @@ -679,7 +679,7 @@ evas_object_image_data_copy_set(Eo *eo_obj, void *data) ENFN->image_free(ENDT, o->engine_data); if (o->file_obj) { - eo_del(o->file_obj); + efl_del(o->file_obj); o->file_obj = NULL; } o->engine_data = ENFN->image_new_from_copied_data(ENDT, diff --git a/src/lib/evas/canvas/evas_line.eo b/src/lib/evas/canvas/evas_line.eo index 3988b5a451..90a4b3f8fe 100644 --- a/src/lib/evas/canvas/evas_line.eo +++ b/src/lib/evas/canvas/evas_line.eo @@ -27,7 +27,7 @@ class Evas.Line (Efl.Canvas.Object) } } implements { - Eo.Base.constructor; + Efl.Object.constructor; } } diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 44959b3f9c..e0aa03a39b 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -169,9 +169,9 @@ evas_new(void) } EOLIAN static Eo * -_evas_canvas_eo_base_constructor(Eo *eo_obj, Evas_Public_Data *e) +_evas_canvas_efl_object_constructor(Eo *eo_obj, Evas_Public_Data *e) { - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); e->evas = eo_obj; e->output.render_method = RENDER_METHOD_INVALID; @@ -224,7 +224,7 @@ evas_free(Evas *eo_e) } EOLIAN static void -_evas_canvas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e) +_evas_canvas_efl_object_destructor(Eo *eo_e, Evas_Public_Data *e) { Eina_Rectangle *r; Evas_Coord_Touch_Point *touch_point; @@ -279,7 +279,7 @@ _evas_canvas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e) ___eo_ref2_reset(eo_obj); while (eo_ref_get(eo_obj) > 1) eo_unref(eo_obj); while (eo_ref_get(eo_obj) < 1) eo_ref(eo_obj); - eo_del(eo_obj); + efl_del(eo_obj); } } } @@ -350,7 +350,7 @@ _evas_canvas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e) eina_spinlock_free(&(e->render.lock)); e->magic = 0; - eo_destructor(eo_super(eo_e, MY_CLASS)); + efl_destructor(eo_super(eo_e, MY_CLASS)); } EOLIAN static Evas_Engine_Info* @@ -608,12 +608,12 @@ evas_data_argb_unpremul(unsigned int *data, unsigned int len) } EOLIAN static Eo * -_evas_canvas_eo_base_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, - const Eo_Class *klass) +_evas_canvas_efl_object_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, + const Efl_Class *klass) { if (klass == EVAS_CANVAS_CLASS) return eo_e; - return eo_provider_find(eo_super(eo_e, MY_CLASS), klass); + return efl_provider_find(eo_super(eo_e, MY_CLASS), klass); } Ector_Surface * diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index f39471ee62..d6c8eb96cf 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -163,14 +163,14 @@ _evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv EINA_UNUS EO_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks, { EFL_GFX_EVENT_RESIZE, _on_child_resize }, - { EO_EVENT_DEL, _on_child_del }, + { EFL_EVENT_DEL, _on_child_del }, { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed } ); static void _evas_object_box_child_callbacks_unregister(Evas_Object *obj, Evas_Object *parent) { - eo_event_callback_array_del(obj, evas_object_box_callbacks(), parent); + efl_event_callback_array_del(obj, evas_object_box_callbacks(), parent); } static Evas_Object_Box_Option * @@ -178,7 +178,7 @@ _evas_object_box_option_callbacks_register(Evas_Object *o, Evas_Object_Box_Data { Evas_Object *obj = opt->obj; - eo_event_callback_array_add(obj, evas_object_box_callbacks(), o); + efl_event_callback_array_add(obj, evas_object_box_callbacks(), o); return opt; } @@ -214,7 +214,7 @@ _evas_box_internal_append(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child) priv->children = eina_list_append(priv->children, opt); priv->children_changed = EINA_TRUE; - eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt); + efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt); return opt; } @@ -230,7 +230,7 @@ _evas_box_internal_prepend(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child priv->children = eina_list_prepend(priv->children, opt); priv->children_changed = EINA_TRUE; - eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt); + efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt); return opt; } @@ -254,7 +254,7 @@ _evas_box_internal_insert_before(Eo *o, Evas_Object_Box_Data *priv, Evas_Object priv->children = eina_list_prepend_relative (priv->children, new_opt, opt); priv->children_changed = EINA_TRUE; - eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); + efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); return new_opt; } } @@ -281,7 +281,7 @@ _evas_box_internal_insert_after(Eo *o, Evas_Object_Box_Data *priv, Evas_Object * priv->children = eina_list_append_relative (priv->children, new_opt, opt); priv->children_changed = EINA_TRUE; - eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); + efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); return new_opt; } } @@ -304,7 +304,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi priv->children = eina_list_prepend(priv->children, new_opt); priv->children_changed = EINA_TRUE; - eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); + efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); return new_opt; } @@ -323,7 +323,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi priv->children = eina_list_prepend_relative (priv->children, new_opt, opt); priv->children_changed = EINA_TRUE; - eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); + efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); return new_opt; } } @@ -345,7 +345,7 @@ _evas_box_internal_remove(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child) priv->children = eina_list_remove(priv->children, opt); evas_obj_box_internal_option_free(o, opt); priv->children_changed = EINA_TRUE; - eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj); + efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj); return obj; } @@ -373,7 +373,7 @@ _evas_box_internal_remove_at(Eo *o, Evas_Object_Box_Data *priv, unsigned int pos priv->children = eina_list_remove_list(priv->children, node); evas_obj_box_internal_option_free(o, opt); priv->children_changed = EINA_TRUE; - eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj); + efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj); return obj; } @@ -464,9 +464,9 @@ evas_object_box_add(Evas *evas) } EOLIAN static Eo * -_evas_box_eo_base_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED) +_evas_box_efl_object_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _signals); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); @@ -1972,7 +1972,7 @@ _evas_box_option_property_vget(const Eo *o EINA_UNUSED, Evas_Object_Box_Data *_p } EOLIAN static void -_evas_box_class_constructor(Eo_Class *klass) +_evas_box_class_constructor(Efl_Class *klass) { evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c index f656857b73..2077e21f63 100644 --- a/src/lib/evas/canvas/evas_object_grid.c +++ b/src/lib/evas/canvas/evas_object_grid.c @@ -270,9 +270,9 @@ evas_object_grid_add(Evas *evas) } EOLIAN static Eo * -_evas_grid_eo_base_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED) +_evas_grid_efl_object_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); evas_object_smart_attach(obj, _evas_object_grid_smart_class_new()); return obj; diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index 1eb8e9fb9e..98989eecfc 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -169,12 +169,12 @@ _init_cow(void) } EOLIAN static Eo * -_efl_canvas_image_internal_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o) +_efl_canvas_image_internal_efl_object_constructor(Eo *eo_obj, Evas_Image_Data *o) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); Evas_Colorspace cspace; - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_image_init(eo_obj); @@ -199,11 +199,11 @@ _efl_canvas_image_internal_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o) } EOLIAN static Eo * -_efl_canvas_image_internal_eo_base_finalize(Eo *eo_obj, Evas_Image_Data *o) +_efl_canvas_image_internal_efl_object_finalize(Eo *eo_obj, Evas_Image_Data *o) { if (!o->filled_set) efl_gfx_fill_auto_set(eo_obj, EINA_TRUE); - return eo_finalize(eo_super(eo_obj, MY_CLASS)); + return efl_finalize(eo_super(eo_obj, MY_CLASS)); } void @@ -262,7 +262,7 @@ _evas_image_init_set(const Eina_File *f, const char *file, const char *key, } if (o->file_obj) { - eo_del(o->file_obj); + efl_del(o->file_obj); o->file_obj = NULL; } o->load_error = EVAS_LOAD_ERROR_NONE; @@ -463,10 +463,10 @@ _efl_canvas_image_internal_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Evas_Image } EOLIAN static void -_efl_canvas_image_internal_eo_base_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, Eo_Dbg_Info *root) +_efl_canvas_image_internal_efl_object_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, Efl_Dbg_Info *root) { - eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); - Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); + efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); + Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); const char *file, *key; if (o->cur->mmaped_source) @@ -1371,14 +1371,14 @@ evas_object_image_init(Evas_Object *eo_obj) } EOLIAN static void -_efl_canvas_image_internal_eo_base_destructor(Eo *eo_obj, Evas_Image_Data *o EINA_UNUSED) +_efl_canvas_image_internal_efl_object_destructor(Eo *eo_obj, Evas_Image_Data *o EINA_UNUSED) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); if (obj->legacy) evas_object_image_video_surface_set(eo_obj, NULL); evas_object_image_free(eo_obj, obj); - eo_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(eo_super(eo_obj, MY_CLASS)); } void @@ -1435,7 +1435,7 @@ evas_object_image_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) o->engine_data = NULL; if (o->file_obj) { - eo_del(o->file_obj); + efl_del(o->file_obj); o->file_obj = NULL; } if (o->pixels->pixel_updates) @@ -3336,7 +3336,7 @@ _evas_object_image_preloading_check(Evas_Object *eo_obj) } Evas_Object * -_evas_object_image_video_parent_get(Evas_Object *eo_obj) +_evas_object_image_videfl_parent_get(Evas_Object *eo_obj) { Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); return o->video_surface ? o->pixels->video.parent : NULL; diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c index a528d08719..3597bd3a6e 100644 --- a/src/lib/evas/canvas/evas_object_line.c +++ b/src/lib/evas/canvas/evas_object_line.c @@ -216,11 +216,11 @@ evas_object_line_init(Evas_Object *eo_obj) } EOLIAN static Eo * -_evas_line_eo_base_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSED) +_evas_line_efl_object_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSED) { Evas_Line_Data *o; - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_line_init(eo_obj); diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index f1421faa90..43d3fc9519 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -91,14 +91,14 @@ _animator_repeater(void *data, const Eo_Event *event) { Evas_Object_Protected_Data *obj = data; - eo_event_callback_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info); + efl_event_callback_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info); DBG("Emitting animator tick on %p.", obj->object); } static void _check_event_catcher_add(void *data, const Eo_Event *event) { - const Eo_Callback_Array_Item *array = event->info; + const Efl_Callback_Array_Item *array = event->info; Evas_Object_Protected_Data *obj = data; int i; @@ -108,7 +108,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event) { if (obj->animator_ref++ > 0) break; - eo_event_callback_add(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj); + efl_event_callback_add(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj); INF("Registering an animator tick on canvas %p for object %p.", obj->layer->evas->evas, obj->object); } @@ -122,7 +122,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event) static void _check_event_catcher_del(void *data, const Eo_Event *event) { - const Eo_Callback_Array_Item *array = event->info; + const Efl_Callback_Array_Item *array = event->info; Evas_Object_Protected_Data *obj = data; int i; @@ -132,7 +132,7 @@ _check_event_catcher_del(void *data, const Eo_Event *event) { if ((--obj->animator_ref) > 0) break; - eo_event_callback_del(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj); + efl_event_callback_del(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj); INF("Unregistering an animator tick on canvas %p for object %p.", obj->layer->evas->evas, obj->object); } @@ -144,20 +144,20 @@ _check_event_catcher_del(void *data, const Eo_Event *event) } EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch, - { EO_EVENT_CALLBACK_ADD, _check_event_catcher_add }, - { EO_EVENT_CALLBACK_DEL, _check_event_catcher_del }); + { EFL_EVENT_CALLBACK_ADD, _check_event_catcher_add }, + { EFL_EVENT_CALLBACK_DEL, _check_event_catcher_del }); EOLIAN static Eo * -_efl_canvas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) +_efl_canvas_object_efl_object_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) { Eo *parent = NULL; Evas *evas; - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME); eo_manual_free_set(eo_obj, EINA_TRUE); - parent = eo_parent_get(eo_obj); + parent = efl_parent_get(eo_obj); evas = evas_object_evas_get(parent); if (!obj || !_init_cow() || !evas) @@ -177,7 +177,7 @@ _efl_canvas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *o evas_object_inject(eo_obj, obj, evas); - eo_event_callback_array_add(eo_obj, event_catcher_watch(), obj); + efl_event_callback_array_add(eo_obj, event_catcher_watch(), obj); return eo_obj; } @@ -727,20 +727,20 @@ evas_object_del(Evas_Object *eo_obj) if (!obj) return; evas_object_async_block(obj); - if (obj->delete_me || obj->eo_del_called) return; + if (obj->delete_me || obj->efl_del_called) return; if (obj->ref > 0) { obj->del_ref = EINA_TRUE; return; } evas_object_hide(eo_obj); - obj->eo_del_called = EINA_TRUE; + obj->efl_del_called = EINA_TRUE; - eo_del(eo_obj); + efl_del(eo_obj); } EOLIAN static void -_efl_canvas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) +_efl_canvas_object_efl_object_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) { MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return; @@ -830,7 +830,7 @@ end: evas_object_event_callback_all_del(eo_obj); evas_object_event_callback_cleanup(eo_obj); - eo_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(eo_super(eo_obj, MY_CLASS)); } EOLIAN static void @@ -1771,11 +1771,11 @@ evas_object_render_op_get(const Evas_Object *eo_obj) } EOLIAN static void -_efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Eo_Dbg_Info *root) +_efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Efl_Dbg_Info *root) { - eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); - Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); - Eo_Dbg_Info *node; + efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); + Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); + Efl_Dbg_Info *node; const char *name; double dblw, dblh; double dblx, dbly; @@ -1797,7 +1797,7 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data * visible = efl_gfx_visible_get(eo_obj); layer = efl_gfx_stack_layer_get(eo_obj); - name = eo_name_get(eo_obj); // evas_object_name_get(eo_obj); + name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj); efl_gfx_position_get(eo_obj, &x, &y); efl_gfx_size_get(eo_obj, &w, &h); scale = efl_canvas_object_scale_get(eo_obj); @@ -1895,14 +1895,14 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data * { /* Save map coords count info if object has map */ node = EO_DBG_INFO_LIST_APPEND(group, "Evas Map"); int points_count = evas_map_count_get(map); - Eo_Dbg_Info *points = EO_DBG_INFO_LIST_APPEND(node, "Points"); - Eo_Dbg_Info *pointsuv = EO_DBG_INFO_LIST_APPEND(node, "Image UV"); + Efl_Dbg_Info *points = EO_DBG_INFO_LIST_APPEND(node, "Points"); + Efl_Dbg_Info *pointsuv = EO_DBG_INFO_LIST_APPEND(node, "Image UV"); for (int i = 0 ; i < points_count; i++) { { Evas_Coord px, py, pz; evas_map_point_coord_get(map, i, &px, &py, &pz); - Eo_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(points, "Points"); + Efl_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(points, "Points"); EO_DBG_INFO_APPEND(point, "x", EINA_VALUE_TYPE_INT, px); EO_DBG_INFO_APPEND(point, "y", EINA_VALUE_TYPE_INT, py); EO_DBG_INFO_APPEND(point, "z", EINA_VALUE_TYPE_INT, pz); @@ -1911,7 +1911,7 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data * { double pu, pv; evas_map_point_image_uv_get(map, i, &pu, &pv); - Eo_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(pointsuv, "Image UV"); + Efl_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(pointsuv, "Image UV"); EO_DBG_INFO_APPEND(point, "u", EINA_VALUE_TYPE_DOUBLE, pu); EO_DBG_INFO_APPEND(point, "v", EINA_VALUE_TYPE_DOUBLE, pv); } @@ -1920,14 +1920,14 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data * } EOLIAN static Eo * -_efl_canvas_object_eo_base_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Eo_Class *klass) +_efl_canvas_object_efl_object_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Efl_Class *klass) { if (klass == EVAS_CANVAS_CLASS) { if ((obj->delete_me) || (!obj->layer)) return NULL; return obj->layer->evas->evas; } - return eo_provider_find(eo_super(eo_obj, MY_CLASS), klass); + return efl_provider_find(eo_super(eo_obj, MY_CLASS), klass); } EOLIAN Evas_Object* @@ -2106,7 +2106,7 @@ _evas_canvas_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, EOLIAN static void _efl_canvas_object_type_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *type) { - if (eo_finalized_get(eo_obj)) + if (efl_finalized_get(eo_obj)) { ERR("This function is only allowed during construction."); return; @@ -2182,7 +2182,7 @@ _efl_canvas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, Evas_Object_P EOLIAN static void _efl_canvas_object_legacy_ctor(Eo *eo_obj, Evas_Object_Protected_Data *obj) { - EINA_SAFETY_ON_FALSE_RETURN(!eo_finalized_get(eo_obj)); + EINA_SAFETY_ON_FALSE_RETURN(!efl_finalized_get(eo_obj)); obj->legacy = EINA_TRUE; } @@ -2299,7 +2299,7 @@ evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y) EAPI Evas * evas_object_evas_get(const Eo *eo_obj) { - return eo_provider_find((Eo *) eo_obj, EVAS_CANVAS_CLASS); + return efl_provider_find((Eo *) eo_obj, EVAS_CANVAS_CLASS); } EAPI void diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c index 03aa31fc5c..2f9fbc470a 100644 --- a/src/lib/evas/canvas/evas_object_polygon.c +++ b/src/lib/evas/canvas/evas_object_polygon.c @@ -88,9 +88,9 @@ evas_object_polygon_add(Evas *e) } EOLIAN static Eo * -_efl_canvas_polygon_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *class_data EINA_UNUSED) +_efl_canvas_polygon_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *class_data EINA_UNUSED) { - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_polygon_init(eo_obj); @@ -260,12 +260,12 @@ evas_object_polygon_init(Evas_Object *eo_obj) } EOLIAN static void -_efl_canvas_polygon_eo_base_destructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd EINA_UNUSED) +_efl_canvas_polygon_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd EINA_UNUSED) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_polygon_free(eo_obj, obj, obj->private_data); - eo_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(eo_super(eo_obj, MY_CLASS)); } static void diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c index d38379e0c5..956ced2039 100644 --- a/src/lib/evas/canvas/evas_object_rectangle.c +++ b/src/lib/evas/canvas/evas_object_rectangle.c @@ -100,9 +100,9 @@ evas_object_rectangle_add(Evas *e) } EOLIAN static Eo * -_efl_canvas_rectangle_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Rectangle_Data *class_data EINA_UNUSED) +_efl_canvas_rectangle_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Rectangle_Data *class_data EINA_UNUSED) { - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_rectangle_init(eo_obj); diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index a189101df7..2a77d9f5da 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -50,7 +50,7 @@ typedef struct EINA_INLIST; Evas_Smart_Cb func; void *data; - const Eo_Event_Description *event; + const Efl_Event_Description *event; } _eo_evas_smart_cb_info; @@ -350,7 +350,7 @@ EAPI Eina_Bool evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type) { const Evas_Smart_Class *sc; - Eo_Class *klass; + Efl_Class *klass; Eina_Bool type_check = EINA_FALSE; Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, EINA_FALSE); @@ -378,7 +378,7 @@ evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type) EAPI Eina_Bool evas_object_smart_type_check_ptr(const Eo *eo_obj, const char* type) { - Eo_Class *klass; + Efl_Class *klass; const Evas_Smart_Class *sc; Eina_Bool type_check = EINA_FALSE; @@ -405,7 +405,7 @@ evas_object_smart_type_check_ptr(const Eo *eo_obj, const char* type) } EAPI void -evas_smart_legacy_type_register(const char *type, const Eo_Class *klass) +evas_smart_legacy_type_register(const char *type, const Efl_Class *klass) { eina_hash_set(_evas_smart_class_names_hash_table, type, klass); } @@ -438,7 +438,7 @@ _efl_canvas_group_group_iterator_free(Evas_Object_Smart_Iterator *it) free(it); } -// Should we have an eo_children_iterator_new API and just inherit from it ? +// Should we have an efl_children_iterator_new API and just inherit from it ? EOLIAN static Eina_Iterator* _efl_canvas_group_group_children_iterate(const Eo *eo_obj, Evas_Smart_Data *priv) { @@ -580,7 +580,7 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s) } EOLIAN static Eo * -_efl_canvas_group_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED) +_efl_canvas_group_efl_object_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED) { Evas_Smart_Data *smart; @@ -588,7 +588,7 @@ _efl_canvas_group_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EI smart->object = eo_obj; smart->inherit_paragraph_direction = EINA_TRUE; - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_smart_init(eo_obj); efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME_LEGACY); @@ -753,7 +753,7 @@ evas_object_smart_callback_priority_add(Evas_Object *eo_obj, const char *event, if (!event) return; if (!func) return; - const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event); + const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event); _eo_evas_smart_cb_info *cb_info = calloc(1, sizeof(*cb_info)); cb_info->func = func; cb_info->data = (void *)data; @@ -762,7 +762,7 @@ evas_object_smart_callback_priority_add(Evas_Object *eo_obj, const char *event, o->callbacks = eina_inlist_append(o->callbacks, EINA_INLIST_GET(cb_info)); - eo_event_callback_priority_add(eo_obj, eo_desc, priority, _eo_evas_smart_cb, cb_info); + efl_event_callback_priority_add(eo_obj, eo_desc, priority, _eo_evas_smart_cb, cb_info); } EAPI void * @@ -778,14 +778,14 @@ evas_object_smart_callback_del(Evas_Object *eo_obj, const char *event, Evas_Smar if (!o) return NULL; if (!event) return NULL; - const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event); + const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event); EINA_INLIST_FOREACH(o->callbacks, info) { if ((info->func == func) && (info->event == eo_desc)) { void *tmp = info->data; - eo_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info); + efl_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info); o->callbacks = eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info)); @@ -809,14 +809,14 @@ evas_object_smart_callback_del_full(Evas_Object *eo_obj, const char *event, Evas o = eo_data_scope_get(eo_obj, MY_CLASS); if (!o) return NULL; - const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event); + const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event); EINA_INLIST_FOREACH(o->callbacks, info) { if ((info->func == func) && (info->event == eo_desc) && (info->data == data)) { void *tmp = info->data; - eo_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info); + efl_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info); o->callbacks = eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info)); @@ -835,8 +835,8 @@ evas_object_smart_callback_call(Evas_Object *eo_obj, const char *event, void *ev MAGIC_CHECK_END(); if (!event) return; - const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event); - eo_event_callback_call(eo_obj, eo_desc, event_info); + const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event); + efl_event_callback_call(eo_obj, eo_desc, event_info); } EAPI Eina_Bool @@ -1305,7 +1305,7 @@ evas_object_smart_cleanup(Evas_Object *eo_obj) while (o->callbacks) { _eo_evas_smart_cb_info *info = (_eo_evas_smart_cb_info *)o->callbacks; - eo_event_callback_del(eo_obj, info->event, _eo_evas_smart_cb, info); + efl_event_callback_del(eo_obj, info->event, _eo_evas_smart_cb, info); o->callbacks = eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info)); free(info); } @@ -1550,14 +1550,14 @@ static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj) } static void -_efl_canvas_group_class_constructor(Eo_Class *klass EINA_UNUSED) +_efl_canvas_group_class_constructor(Efl_Class *klass EINA_UNUSED) { _evas_smart_class_names_hash_table = eina_hash_string_small_new(NULL); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } static void -_efl_canvas_group_class_destructor(Eo_Class *klass EINA_UNUSED) +_efl_canvas_group_class_destructor(Efl_Class *klass EINA_UNUSED) { eina_hash_free(_evas_smart_class_names_hash_table); } diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index 478685fc6e..332a211b26 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -269,13 +269,13 @@ EO_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks, static void _evas_object_table_child_connect(Evas_Object *o, Evas_Object *child) { - eo_event_callback_array_add(child, evas_object_table_callbacks(), o); + efl_event_callback_array_add(child, evas_object_table_callbacks(), o); } static void _evas_object_table_child_disconnect(Evas_Object *o, Evas_Object *child) { - eo_event_callback_array_del(child, evas_object_table_callbacks(), o); + efl_event_callback_array_del(child, evas_object_table_callbacks(), o); } static void @@ -966,9 +966,9 @@ evas_object_table_add(Evas *evas) } EOLIAN static Eo * -_evas_table_eo_base_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED) +_evas_table_efl_object_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); return obj; @@ -1405,7 +1405,7 @@ _evas_table_mirrored_set(Eo *o, Evas_Table_Data *priv, Eina_Bool mirrored) } EOLIAN static void -_evas_table_class_constructor(Eo_Class *klass) +_evas_table_class_constructor(Efl_Class *klass) { evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index c57544d5ee..1bbbb62029 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -377,9 +377,9 @@ evas_object_text_add(Evas *e) } EOLIAN static Eo * -_evas_text_eo_base_constructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED) +_evas_text_efl_object_constructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED) { - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_text_init(eo_obj); return eo_obj; @@ -1031,10 +1031,10 @@ _evas_text_ellipsis_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o) } EOLIAN static void -_evas_text_eo_base_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Eo_Dbg_Info *root) +_evas_text_efl_object_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Efl_Dbg_Info *root) { - eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); - Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); + efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); + Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); const char *text; int size; @@ -1625,11 +1625,11 @@ evas_object_text_init(Evas_Object *eo_obj) } EOLIAN static void -_evas_text_eo_base_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED) +_evas_text_efl_object_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_text_free(eo_obj, obj); - eo_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(eo_super(eo_obj, MY_CLASS)); } static void diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index a48cda49fe..fb003ca134 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -6334,12 +6334,12 @@ evas_object_textblock_add(Evas *e) } EOLIAN static Eo * -_efl_canvas_text_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Text_Data *class_data EINA_UNUSED) +_efl_canvas_text_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Text_Data *class_data EINA_UNUSED) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); Efl_Canvas_Text_Data *o; - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); /* set up methods (compulsory) */ obj->func = &object_func; @@ -7027,7 +7027,7 @@ _cursor_emit_if_changed(Efl_Canvas_Text_Cursor *cur_obj) if (cur->changed) { cur->changed = EINA_FALSE; - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } } @@ -7081,7 +7081,7 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text) EINA_INLIST_GET(o->text_nodes), EINA_INLIST_GET(co->node))); - eo_event_freeze(o->cursor); + efl_event_freeze(o->cursor); evas_textblock_cursor_paragraph_first(o->cursor); evas_object_textblock_text_markup_prepend(o->cursor, text); @@ -7093,18 +7093,18 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text) evas_textblock_cursor_paragraph_first(o->cursor); EINA_LIST_FOREACH(o->cursors, l, data) { - eo_event_freeze(data); + efl_event_freeze(data); evas_textblock_cursor_paragraph_first(data); } EINA_LIST_FOREACH(o->cursors, l, data) { - eo_event_thaw(data); - eo_event_callback_call(data, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_thaw(data); + efl_event_callback_call(data, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } } - eo_event_thaw(o->cursor); - eo_event_callback_call(o->cursor, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_thaw(o->cursor); + efl_event_callback_call(o->cursor, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); o->markup_text = text; } @@ -7633,7 +7633,7 @@ _obstacle_del_cb(void *data, const Eo_Event *event) static void _obstacle_clear(Eo *eo_obj, Evas_Textblock_Obstacle *obs) { - eo_event_callback_del(obs->eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); + efl_event_callback_del(obs->eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); } static void @@ -7669,7 +7669,7 @@ _efl_canvas_text_obstacle_add(Eo *eo_obj, if (!obs) return EINA_FALSE; obs->eo_obs = eo_obs; - eo_event_callback_add(eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); + efl_event_callback_add(eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); obj->obstacles = eina_list_append(obj->obstacles, obs); _obstacle_update(obs, eo_obj); @@ -8051,8 +8051,8 @@ _efl_canvas_text_cursor_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o) return o->cursor; } -EOLIAN static Eo_Base * -_efl_canvas_text_cursor_eo_base_finalize(Eo *obj, Efl_Canvas_Text_Cursor_Data *pd) +EOLIAN static Efl_Object * +_efl_canvas_text_cursor_efl_object_finalize(Eo *obj, Efl_Canvas_Text_Cursor_Data *pd) { if (!pd->obj) { @@ -8075,7 +8075,7 @@ _evas_textblock_cursor_init(Efl_Canvas_Text_Cursor_Data *cur, const Evas_Object EOLIAN static void _efl_canvas_text_cursor_text_object_set(Eo *obj, Efl_Canvas_Text_Cursor_Data *pd, const Evas_Object *tb) { - if (eo_finalized_get(obj)) + if (efl_finalized_get(obj)) { ERR("Can't change the cursor's textblock after creation."); return; @@ -8102,9 +8102,9 @@ evas_object_textblock_cursor_new(const Eo *eo_obj) } EOLIAN static void -_efl_canvas_text_cursor_eo_base_destructor(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) +_efl_canvas_text_cursor_efl_object_destructor(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) { - eo_destructor(eo_super(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS)); + efl_destructor(eo_super(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS)); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); if (cur_obj == o->cursor) return; o->cursors = eina_list_remove(o->cursors, cur_obj); @@ -8113,7 +8113,7 @@ _efl_canvas_text_cursor_eo_base_destructor(Eo *cur_obj, Efl_Canvas_Text_Cursor_D EAPI void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur) { - eo_del(cur); + efl_del(cur); } EAPI Eina_Bool @@ -8301,7 +8301,7 @@ EOLIAN static void _efl_canvas_text_cursor_paragraph_first(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) { _canvas_text_cursor_paragraph_first(cur); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } @@ -8332,7 +8332,7 @@ EOLIAN static void _efl_canvas_text_cursor_paragraph_last(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) { _canvas_text_cursor_paragraph_last(cur); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } static Eina_Bool @@ -8371,7 +8371,7 @@ EOLIAN static void _efl_canvas_text_cursor_paragraph_next(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) { _evas_textblock_cursor_paragraph_next(cur); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } static Eina_Bool @@ -8414,7 +8414,7 @@ EOLIAN static void _efl_canvas_text_cursor_paragraph_prev(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) { _evas_textblock_cursor_paragraph_prev(cur); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } EAPI void @@ -8571,7 +8571,7 @@ EOLIAN static void _efl_canvas_text_cursor_word_start(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur EINA_UNUSED) { evas_textblock_cursor_word_start(cur_obj); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } EAPI Eina_Bool @@ -8633,7 +8633,7 @@ EOLIAN static void _efl_canvas_text_cursor_word_end(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur EINA_UNUSED) { evas_textblock_cursor_word_end(cur_obj); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } static Eina_Bool @@ -8688,7 +8688,7 @@ EOLIAN static void _efl_canvas_text_cursor_char_next(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) { _evas_textblock_cursor_char_next(cur); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } static Eina_Bool @@ -8718,7 +8718,7 @@ EOLIAN static void _efl_canvas_text_cursor_char_prev(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) { _evas_textblock_cursor_char_prev(cur); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } static void @@ -8734,7 +8734,7 @@ EOLIAN static void _efl_canvas_text_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) { _evas_textblock_cursor_paragraph_char_first(cur); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } static void @@ -8762,7 +8762,7 @@ EOLIAN static void _efl_canvas_text_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) { _evas_textblock_cursor_paragraph_char_last(cur); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } static void @@ -8811,7 +8811,7 @@ _efl_canvas_text_cursor_line_char_first(Evas_Textblock_Cursor *cur_obj, Efl_Canv if (!ln) return; _cursor_line_first_char_get(ln, cur, o); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } static void @@ -8866,7 +8866,7 @@ EOLIAN static void _efl_canvas_text_cursor_line_char_last(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) { _evas_textblock_cursor_line_char_last(cur); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } /** @@ -9377,7 +9377,7 @@ EOLIAN static void _efl_canvas_text_cursor_position_set(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur, int _pos) { _evas_textblock_cursor_pos_set(cur, _pos); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } EAPI Eina_Bool @@ -9447,7 +9447,7 @@ _efl_canvas_text_cursor_line_jump_by(Eo *c, Efl_Canvas_Text_Cursor_Data *pd EINA evas_textblock_cursor_line_char_last(c); } - eo_event_callback_call(c, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(c, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } static int @@ -9529,7 +9529,7 @@ _efl_canvas_text_cursor_copy(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur, if (!efl_canvas_text_cursor_equal(cur_obj, src_obj)) { _evas_textblock_cursor_copy(cur, src); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } } @@ -9909,7 +9909,7 @@ _efl_canvas_text_cursor_text_insert(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur, const char *_text) { int len = _efl_canvas_text_cursor_text_append(cur, _text); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); return len; } @@ -10336,7 +10336,7 @@ EOLIAN static void _efl_canvas_text_cursor_char_delete(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) { _evas_textblock_cursor_char_delete(cur); - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } EAPI void @@ -11533,7 +11533,7 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur_obj, Evas_Coord end: if (ret) { - eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); + efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); } return ret; } @@ -12576,12 +12576,12 @@ _efl_canvas_text_style_insets_get(Eo *eo_obj, Efl_Canvas_Text_Data *o, Evas_Coor } EOLIAN static void -_efl_canvas_text_eo_base_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Eo_Dbg_Info *root) +_efl_canvas_text_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Dbg_Info *root) { - eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); + efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); if (!root) return; - Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); - Eo_Dbg_Info *node; + Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); + Efl_Dbg_Info *node; const char *style; const char *text = NULL; @@ -12642,10 +12642,10 @@ evas_object_textblock_init(Evas_Object *eo_obj) } EOLIAN static void -_efl_canvas_text_eo_base_destructor(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_text_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED) { evas_object_textblock_free(eo_obj); - eo_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(eo_super(eo_obj, MY_CLASS)); } static void @@ -12659,14 +12659,14 @@ evas_object_textblock_free(Evas_Object *eo_obj) { evas_object_textblock_style_user_pop(eo_obj); } - eo_del(o->cursor); + efl_del(o->cursor); while (o->cursors) { Efl_Canvas_Text_Cursor *cur; cur = (Efl_Canvas_Text_Cursor *)o->cursors->data; o->cursors = eina_list_remove_list(o->cursors, o->cursors); - eo_del(cur); + efl_del(cur); } if (o->repch) eina_stringshare_del(o->repch); if (o->ellip_ti) _item_free(eo_obj, NULL, _ITEM(o->ellip_ti)); @@ -13966,7 +13966,7 @@ _efl_canvas_text_cursor_object_item_insert(Eo *cur_obj EINA_UNUSED, Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); Efl_Canvas_Text_Annotation *ret = _textblock_annotation_insert(cur->obj, o, cur, cur, format, EINA_TRUE); - eo_event_callback_call(cur->obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL); + efl_event_callback_call(cur->obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL); return ret; } diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index d5be2edad6..cb25de7cff 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -241,12 +241,12 @@ evas_object_textgrid_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) } EOLIAN static void -_evas_textgrid_eo_base_destructor(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED) +_evas_textgrid_efl_object_destructor(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_textgrid_free(eo_obj, obj); eo_data_unref(eo_obj, obj->private_data); - eo_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(eo_super(eo_obj, MY_CLASS)); } static void @@ -900,9 +900,9 @@ evas_object_textgrid_add(Evas *e) } EOLIAN static Eo * -_evas_textgrid_eo_base_constructor(Eo *eo_obj, Evas_Textgrid_Data *class_data EINA_UNUSED) +_evas_textgrid_efl_object_constructor(Eo *eo_obj, Evas_Textgrid_Data *class_data EINA_UNUSED) { - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_textgrid_init(eo_obj); @@ -1450,11 +1450,11 @@ _evas_textgrid_update_add(Eo *eo_obj, Evas_Textgrid_Data *o, int x, int y, int w } EOLIAN static void -_evas_textgrid_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED, Eo_Dbg_Info *root) +_evas_textgrid_efl_object_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED, Efl_Dbg_Info *root) { - eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); - Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); - Eo_Dbg_Info *node; + efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); + Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); + Efl_Dbg_Info *node; const char *text; int size; diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c index 9ef7b26eec..18522481e3 100644 --- a/src/lib/evas/canvas/evas_object_vg.c +++ b/src/lib/evas/canvas/evas_object_vg.c @@ -92,7 +92,7 @@ _cleanup_reference(void *data, const Eo_Event *event EINA_UNUSED) } void -_evas_vg_eo_base_destructor(Eo *eo_obj, Evas_VG_Data *pd) +_evas_vg_efl_object_destructor(Eo *eo_obj, Evas_VG_Data *pd) { Evas_Object_Protected_Data *obj; Evas *e = evas_object_evas_get(eo_obj); @@ -101,19 +101,19 @@ _evas_vg_eo_base_destructor(Eo *eo_obj, Evas_VG_Data *pd) if (pd->engine_data) obj->layer->evas->engine.func->ector_free(pd->engine_data); - eo_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd); + efl_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd); eo_unref(pd->root); pd->root = NULL; - eo_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(eo_super(eo_obj, MY_CLASS)); } Eo * -_evas_vg_eo_base_constructor(Eo *eo_obj, Evas_VG_Data *pd) +_evas_vg_efl_object_constructor(Eo *eo_obj, Evas_VG_Data *pd) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); /* set up methods (compulsory) */ obj->func = &object_func; @@ -129,14 +129,14 @@ _evas_vg_eo_base_constructor(Eo *eo_obj, Evas_VG_Data *pd) return eo_obj; } -static Eo_Base * -_evas_vg_eo_base_finalize(Eo *obj, Evas_VG_Data *pd) +static Efl_Object * +_evas_vg_efl_object_finalize(Eo *obj, Evas_VG_Data *pd) { Evas *e = evas_object_evas_get(obj); // TODO: If we start to have to many Evas_Object_VG per canvas, it may be nice // to actually have one event per canvas and one array per canvas to. - eo_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd); + efl_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd); return obj; } diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c index 73c902c20f..25931752ec 100644 --- a/src/lib/evas/canvas/evas_out.c +++ b/src/lib/evas/canvas/evas_out.c @@ -24,16 +24,16 @@ evas_out_add(Evas *e) } EOLIAN static Eo * -_evas_out_eo_base_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat) +_evas_out_efl_object_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat) { Eo *eo_parent = NULL; Evas_Public_Data *e; - eo_parent = eo_parent_get(eo_obj); + eo_parent = efl_parent_get(eo_obj); e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS); evas_canvas_async_block(e); - eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); + eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); if (!e) return NULL; e->outputs = eina_list_append(e->outputs, eo_obj); @@ -52,12 +52,12 @@ evas_output_del(Evas_Out *evo) } EOLIAN static void -_evas_out_eo_base_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat) +_evas_out_efl_object_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat) { Eo *eo_parent = NULL; Evas_Public_Data *e; - eo_parent = eo_parent_get(eo_obj); + eo_parent = efl_parent_get(eo_obj); e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS); evas_canvas_async_block(e); if (!e) return; @@ -66,7 +66,7 @@ _evas_out_eo_base_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat) // e->engine.func->output_free(eo_dat->output); e->engine.func->info_free(eo_parent, eo_dat->info); e->outputs = eina_list_remove(e->outputs, eo_obj); - eo_destructor(eo_super(eo_obj, MY_CLASS)); + efl_destructor(eo_super(eo_obj, MY_CLASS)); } EOLIAN static void @@ -74,7 +74,7 @@ _evas_out_view_set(Eo *eo_e, Evas_Out_Data *eo_dat, Evas_Coord x, Evas_Coord y, { Eo *eo_parent = NULL; Evas_Public_Data *e; - eo_parent = eo_parent_get(eo_e); + eo_parent = efl_parent_get(eo_e); e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS); evas_canvas_async_block(e); eo_dat->x = x; @@ -99,7 +99,7 @@ _evas_out_engine_info_set(Eo *eo_e, Evas_Out_Data *eo_dat, Evas_Engine_Info *inf { Eo *eo_parent = NULL; Evas_Public_Data *e; - eo_parent = eo_parent_get(eo_e); + eo_parent = efl_parent_get(eo_e); e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS); evas_canvas_async_block(e); if (eo_dat->info != info) return EINA_FALSE; diff --git a/src/lib/evas/canvas/evas_out.eo b/src/lib/evas/canvas/evas_out.eo index 731da8a156..44e00a4d04 100644 --- a/src/lib/evas/canvas/evas_out.eo +++ b/src/lib/evas/canvas/evas_out.eo @@ -1,6 +1,6 @@ import evas_types; -class Evas.Out (Eo.Base) +class Evas.Out (Efl.Object) { eo_prefix: evas_out; legacy_prefix: evas_output; @@ -37,8 +37,8 @@ class Evas.Out (Eo.Base) } } implements { - Eo.Base.constructor; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.destructor; } } diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c index 5aa5d38aca..8426ac3a0b 100644 --- a/src/lib/evas/canvas/evas_render.c +++ b/src/lib/evas/canvas/evas_render.c @@ -957,7 +957,7 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj) Eina_Bool surface_below, stacking_check, object_above = EINA_FALSE; Eina_Bool ignore_window; - video_parent = _evas_object_image_video_parent_get(eo_obj); + video_parent = _evas_object_image_videfl_parent_get(eo_obj); /* Check if any one is the stack make this object mapped */ eo_tmp = eo_obj; @@ -2225,10 +2225,10 @@ _cb_always_call(Evas *eo_e, Evas_Callback_Type type, void *event_info) { int freeze_num = 0, i; - freeze_num = eo_event_freeze_count_get(eo_e); - for (i = 0; i < freeze_num; i++) eo_event_thaw(eo_e); + freeze_num = efl_event_freeze_count_get(eo_e); + for (i = 0; i < freeze_num; i++) efl_event_thaw(eo_e); evas_event_callback_call(eo_e, type, event_info); - for (i = 0; i < freeze_num; i++) eo_event_freeze(eo_e); + for (i = 0; i < freeze_num; i++) efl_event_freeze(eo_e); } static inline Eina_Bool diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo index 087f40b99c..6fd473f7a1 100644 --- a/src/lib/evas/canvas/evas_table.eo +++ b/src/lib/evas/canvas/evas_table.eo @@ -215,7 +215,7 @@ class Evas.Table (Efl.Canvas.Group.Clipped) } implements { class.constructor; - Eo.Base.constructor; + Efl.Object.constructor; Efl.Canvas.Group.group_add; Efl.Canvas.Group.group_del; Efl.Canvas.Group.group_calculate; diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo index 068f0d6646..df995ee7ab 100644 --- a/src/lib/evas/canvas/evas_text.eo +++ b/src/lib/evas/canvas/evas_text.eo @@ -250,9 +250,9 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Fi } } implements { - Eo.Base.constructor; - Eo.Base.destructor; - Eo.Base.dbg_info_get; + Efl.Object.constructor; + Efl.Object.destructor; + Efl.Object.dbg_info_get; Efl.Gfx.size.set; Efl.Text.text.set; Efl.Text.text.get; diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo index 43af7b5066..170e880c05 100644 --- a/src/lib/evas/canvas/evas_textgrid.eo +++ b/src/lib/evas/canvas/evas_textgrid.eo @@ -196,9 +196,9 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Properties) } } implements { - Eo.Base.constructor; - Eo.Base.destructor; - Eo.Base.dbg_info_get; + Efl.Object.constructor; + Efl.Object.destructor; + Efl.Object.dbg_info_get; Efl.Text.Properties.font.get; Efl.Text.Properties.font.set; Efl.Text.Properties.font_source.get; diff --git a/src/lib/evas/canvas/evas_vg.eo b/src/lib/evas/canvas/evas_vg.eo index 55ca7b875b..4a1d8abf7d 100644 --- a/src/lib/evas/canvas/evas_vg.eo +++ b/src/lib/evas/canvas/evas_vg.eo @@ -14,14 +14,14 @@ class Evas.VG (Efl.Canvas.Object, Efl.Gfx.Fill, Efl.Gfx.View) @since 1.14]] } values { - container: Eo.Base; [[Root node of the VG canvas.]] /* FIXME: Should be Efl.VG */ + container: Efl.Object; [[Root node of the VG canvas.]] /* FIXME: Should be Efl.VG */ } } } implements { - Eo.Base.constructor; - Eo.Base.finalize; - Eo.Base.destructor; + Efl.Object.constructor; + Efl.Object.finalize; + Efl.Object.destructor; Efl.Gfx.Fill.fill.set; Efl.Gfx.Fill.fill.get; Efl.Gfx.View.view_size.set; diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c index 3374a9b751..dac9472cea 100644 --- a/src/lib/evas/canvas/evas_vg_container.c +++ b/src/lib/evas/canvas/evas_vg_container.c @@ -37,14 +37,14 @@ _efl_vg_container_render_pre(Eo *obj EINA_UNUSED, } static Eo * -_efl_vg_container_eo_base_constructor(Eo *obj, +_efl_vg_container_efl_object_constructor(Eo *obj, Efl_VG_Container_Data *pd) { Efl_VG_Data *nd; pd->names = eina_hash_stringshared_new(NULL); - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); nd = eo_data_scope_get(obj, EFL_VG_CLASS); nd->render_pre = _efl_vg_container_render_pre; @@ -55,10 +55,10 @@ _efl_vg_container_eo_base_constructor(Eo *obj, } static void -_efl_vg_container_eo_base_destructor(Eo *obj, +_efl_vg_container_efl_object_destructor(Eo *obj, Efl_VG_Container_Data *pd EINA_UNUSED) { - eo_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(eo_super(obj, MY_CLASS)); eina_hash_free(pd->names); pd->names = NULL; diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c index 11491708aa..713ceeb814 100644 --- a/src/lib/evas/canvas/evas_vg_gradient_linear.c +++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c @@ -89,12 +89,12 @@ _efl_vg_gradient_linear_render_pre(Eo *obj, } static Eo * -_efl_vg_gradient_linear_eo_base_constructor(Eo *obj, +_efl_vg_gradient_linear_efl_object_constructor(Eo *obj, Efl_VG_Gradient_Linear_Data *pd) { Efl_VG_Data *nd; - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); nd = eo_data_scope_get(obj, EFL_VG_CLASS); nd->render_pre = _efl_vg_gradient_linear_render_pre; @@ -104,9 +104,9 @@ _efl_vg_gradient_linear_eo_base_constructor(Eo *obj, } static void -_efl_vg_gradient_linear_eo_base_destructor(Eo *obj, Efl_VG_Gradient_Linear_Data *pd EINA_UNUSED) +_efl_vg_gradient_linear_efl_object_destructor(Eo *obj, Efl_VG_Gradient_Linear_Data *pd EINA_UNUSED) { - eo_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(eo_super(obj, MY_CLASS)); } static void diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c index 4a46c7a8d1..39516a8479 100644 --- a/src/lib/evas/canvas/evas_vg_gradient_radial.c +++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c @@ -106,11 +106,11 @@ _efl_vg_gradient_radial_render_pre(Eo *obj, } static Eo * -_efl_vg_gradient_radial_eo_base_constructor(Eo *obj, Efl_VG_Gradient_Radial_Data *pd) +_efl_vg_gradient_radial_efl_object_constructor(Eo *obj, Efl_VG_Gradient_Radial_Data *pd) { Efl_VG_Data *nd; - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); nd = eo_data_scope_get(obj, EFL_VG_CLASS); nd->render_pre = _efl_vg_gradient_radial_render_pre; @@ -120,10 +120,10 @@ _efl_vg_gradient_radial_eo_base_constructor(Eo *obj, Efl_VG_Gradient_Radial_Data } static void -_efl_vg_gradient_radial_eo_base_destructor(Eo *obj, +_efl_vg_gradient_radial_efl_object_destructor(Eo *obj, Efl_VG_Gradient_Radial_Data *pd EINA_UNUSED) { - eo_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(eo_super(obj, MY_CLASS)); } static void diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c index d2159a173f..b1c788290d 100644 --- a/src/lib/evas/canvas/evas_vg_node.c +++ b/src/lib/evas/canvas/evas_vg_node.c @@ -25,8 +25,8 @@ _efl_vg_property_changed(void *data, const Eo_Event *event) if (!pd->flags) pd->flags = EFL_GFX_CHANGE_FLAG_ALL; - parent = eo_parent_get(event->object); - eo_event_callback_call(parent, event->desc, event->info); + parent = efl_parent_get(event->object); + efl_event_callback_call(parent, event->desc, event->info); } static void @@ -238,7 +238,7 @@ _efl_vg_parent_checked_get(Eo *obj, Efl_VG_Container_Data **cd) { *cd = NULL; - *parent = eo_parent_get(obj); + *parent = efl_parent_get(obj); if (eo_isa(*parent, EFL_VG_CONTAINER_CLASS)) { @@ -268,20 +268,20 @@ _efl_vg_parent_checked_get(Eo *obj, } static Eo * -_efl_vg_eo_base_constructor(Eo *obj, +_efl_vg_efl_object_constructor(Eo *obj, Efl_VG_Data *pd) { Efl_VG_Container_Data *cd = NULL; Eo *parent; - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); if (!_efl_vg_parent_checked_get(obj, &parent, &cd)) { ERR("Failed"); return NULL; } - eo_event_callback_add(obj, EFL_GFX_CHANGED, _efl_vg_property_changed, pd); + efl_event_callback_add(obj, EFL_GFX_CHANGED, _efl_vg_property_changed, pd); pd->flags = EFL_GFX_CHANGE_FLAG_ALL; pd->changed = EINA_TRUE; @@ -289,7 +289,7 @@ _efl_vg_eo_base_constructor(Eo *obj, } static void -_efl_vg_eo_base_destructor(Eo *obj, Efl_VG_Data *pd) +_efl_vg_efl_object_destructor(Eo *obj, Efl_VG_Data *pd) { if (pd->m) { @@ -299,7 +299,7 @@ _efl_vg_eo_base_destructor(Eo *obj, Efl_VG_Data *pd) if (pd->renderer) { - eo_del(pd->renderer); + efl_del(pd->renderer); pd->renderer = NULL; } if (pd->intp) @@ -308,7 +308,7 @@ _efl_vg_eo_base_destructor(Eo *obj, Efl_VG_Data *pd) pd->intp = NULL; } - eo_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(eo_super(obj, MY_CLASS)); } static void @@ -355,7 +355,7 @@ _efl_vg_name_get(Eo *obj EINA_UNUSED, Efl_VG_Data *pd) } static void -_efl_vg_eo_base_parent_set(Eo *obj, +_efl_vg_efl_object_parent_set(Eo *obj, Efl_VG_Data *pd EINA_UNUSED, Eo *parent) { @@ -392,7 +392,7 @@ _efl_vg_eo_base_parent_set(Eo *obj, if (pd->name) eina_hash_del(old_cd->names, pd->name, obj); } - eo_parent_set(eo_super(obj, MY_CLASS), parent); + efl_parent_set(eo_super(obj, MY_CLASS), parent); if (cd) { cd->children = eina_list_append(cd->children, obj); @@ -417,7 +417,7 @@ _efl_vg_efl_gfx_stack_raise(Eo *obj, Efl_VG_Data *pd EINA_UNUSED) Eina_List *lookup, *next; Eo *parent; - parent = eo_parent_get(obj); + parent = efl_parent_get(obj); if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error; cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS); @@ -447,7 +447,7 @@ _efl_vg_efl_gfx_stack_stack_above(Eo *obj, Eina_List *lookup, *ref; Eo *parent; - parent = eo_parent_get(obj); + parent = efl_parent_get(obj); if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error; cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS); @@ -477,7 +477,7 @@ _efl_vg_efl_gfx_stack_stack_below(Eo *obj, Eina_List *lookup, *ref; Eo *parent; - parent = eo_parent_get(obj); + parent = efl_parent_get(obj); if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error; cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS); @@ -505,7 +505,7 @@ _efl_vg_efl_gfx_stack_lower(Eo *obj, Efl_VG_Data *pd EINA_UNUSED) Eina_List *lookup, *prev; Eo *parent; - parent = eo_parent_get(obj); + parent = efl_parent_get(obj); if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error; cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS); @@ -534,7 +534,7 @@ _efl_vg_root_parent_get(Eo *obj) if (eo_isa(obj, EFL_VG_ROOT_NODE_CLASS)) return obj; - parent = eo_parent_get(obj); + parent = efl_parent_get(obj); if (!parent) return NULL; return _efl_vg_root_parent_get(parent); @@ -682,7 +682,7 @@ _efl_vg_interpolate(Eo *obj, tod = eo_data_scope_get(to, EFL_VG_CLASS); from_map = 1.0 - pos_map; - eo_del(pd->renderer); + efl_del(pd->renderer); pd->renderer = NULL; if (fromd->m || tod->m) @@ -772,7 +772,7 @@ _efl_vg_dup(Eo *obj, Efl_VG_Data *pd, const Efl_VG *from) if (pd->renderer) { - eo_del(pd->renderer); + efl_del(pd->renderer); pd->renderer = NULL; } diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h index 711e2875ad..87f327bcd2 100644 --- a/src/lib/evas/canvas/evas_vg_private.h +++ b/src/lib/evas/canvas/evas_vg_private.h @@ -85,7 +85,7 @@ _evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m) static inline void _efl_vg_changed(Eo *obj) { - eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL); + efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL); } static inline void * diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c index f53587ea5c..9925b7963a 100644 --- a/src/lib/evas/canvas/evas_vg_root_node.c +++ b/src/lib/evas/canvas/evas_vg_root_node.c @@ -45,12 +45,12 @@ _evas_vg_root_node_changed(void *data, const Eo_Event *event) } static void -_efl_vg_root_node_eo_base_parent_set(Eo *obj, +_efl_vg_root_node_efl_object_parent_set(Eo *obj, Efl_VG_Root_Node_Data *pd, Eo *parent) { // Nice little hack, jump over parent parent_set in Efl_VG_Root - eo_parent_set(eo_super(obj, EFL_VG_CLASS), parent); + efl_parent_set(eo_super(obj, EFL_VG_CLASS), parent); if (parent && !eo_isa(parent, EVAS_VG_CLASS)) { ERR("Parent of VG_ROOT_NODE must be a VG_CLASS"); @@ -63,7 +63,7 @@ _efl_vg_root_node_eo_base_parent_set(Eo *obj, } static Eo * -_efl_vg_root_node_eo_base_constructor(Eo *obj, +_efl_vg_root_node_efl_object_constructor(Eo *obj, Efl_VG_Root_Node_Data *pd) { Efl_VG_Container_Data *cd; @@ -77,8 +77,8 @@ _efl_vg_root_node_eo_base_constructor(Eo *obj, cd->names = eina_hash_stringshared_new(NULL); // Nice little hack, jump over parent constructor in Efl_VG_Root - obj = eo_constructor(eo_super(obj, EFL_VG_CLASS)); - parent = eo_parent_get(obj); + obj = efl_constructor(eo_super(obj, EFL_VG_CLASS)); + parent = efl_parent_get(obj); efl_vg_name_set(obj, "root"); if (!eo_isa(parent, EVAS_VG_CLASS)) { ERR("Parent of VG_ROOT_NODE must be a VG_CLASS"); @@ -89,7 +89,7 @@ _efl_vg_root_node_eo_base_constructor(Eo *obj, nd->render_pre = _evas_vg_root_node_render_pre; nd->data = cd; - eo_event_callback_add(obj, EFL_GFX_CHANGED, _evas_vg_root_node_changed, pd); + efl_event_callback_add(obj, EFL_GFX_CHANGED, _evas_vg_root_node_changed, pd); return obj; } diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c index 69d9b822a6..5b0a0c8b38 100644 --- a/src/lib/evas/canvas/evas_vg_shape.c +++ b/src/lib/evas/canvas/evas_vg_shape.c @@ -151,11 +151,11 @@ _efl_vg_shape_render_pre(Eo *obj EINA_UNUSED, } static Eo * -_efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd) +_efl_vg_shape_efl_object_constructor(Eo *obj, Efl_VG_Shape_Data *pd) { Efl_VG_Data *nd; - obj = eo_constructor(eo_super(obj, MY_CLASS)); + obj = efl_constructor(eo_super(obj, MY_CLASS)); efl_gfx_shape_stroke_scale_set(obj, 1); efl_gfx_shape_stroke_location_set(obj, 0.5); @@ -170,9 +170,9 @@ _efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd) } static void -_efl_vg_shape_eo_base_destructor(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED) +_efl_vg_shape_efl_object_destructor(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED) { - eo_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(eo_super(obj, MY_CLASS)); } static Eina_Bool diff --git a/src/lib/evas/canvas/render2/evas_render2.c b/src/lib/evas/canvas/render2/evas_render2.c index 72a913291a..532718af67 100644 --- a/src/lib/evas/canvas/render2/evas_render2.c +++ b/src/lib/evas/canvas/render2/evas_render2.c @@ -32,10 +32,10 @@ _always_call(Eo *eo_e, Evas_Callback_Type type, void *event_info) { int freeze_num = 0, i; - freeze_num = eo_event_freeze_count_get(eo_e); - for (i = 0; i < freeze_num; i++) eo_event_thaw(eo_e); + freeze_num = efl_event_freeze_count_get(eo_e); + for (i = 0; i < freeze_num; i++) efl_event_thaw(eo_e); evas_event_callback_call(eo_e, type, event_info); - for (i = 0; i < freeze_num; i++) eo_event_freeze(eo_e); + for (i = 0; i < freeze_num; i++) efl_event_freeze(eo_e); } // a list of canvases currently rendering diff --git a/src/lib/evas/canvas/render2/evas_render2_old.c b/src/lib/evas/canvas/render2/evas_render2_old.c index 490399b19d..62c9b955ec 100644 --- a/src/lib/evas/canvas/render2/evas_render2_old.c +++ b/src/lib/evas/canvas/render2/evas_render2_old.c @@ -119,10 +119,10 @@ _evas_render2_always_call(Eo *eo_e, Evas_Callback_Type type, void *event_info) { int freeze_num = 0, i; - freeze_num = eo_event_freeze_count_get(eo_e); - for (i = 0; i < freeze_num; i++) eo_event_thaw(eo_e); + freeze_num = efl_event_freeze_count_get(eo_e); + for (i = 0; i < freeze_num; i++) efl_event_thaw(eo_e); evas_event_callback_call(eo_e, type, event_info); - for (i = 0; i < freeze_num; i++) eo_event_freeze(eo_e); + for (i = 0; i < freeze_num; i++) efl_event_freeze(eo_e); } static void |