summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c14
-rw-r--r--src/modules/elementary/prefs/elm_button.c2
-rw-r--r--src/modules/elementary/prefs/elm_check.c2
-rw-r--r--src/modules/elementary/prefs/elm_datetime.c2
-rw-r--r--src/modules/elementary/prefs/elm_entry.c4
-rw-r--r--src/modules/elementary/prefs/elm_slider.c2
-rw-r--r--src/modules/elementary/prefs/elm_spinner.c2
-rw-r--r--src/modules/elementary/web/none/elm_web_none.c2
-rw-r--r--src/modules/emotion/libvlc/emotion_libvlc.c2
-rw-r--r--src/modules/ethumb/emotion/emotion.c14
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c4
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.eo2
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c16
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.eo6
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c14
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.eo6
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c2
-rw-r--r--src/modules/evas/engines/software_generic/evas_ector_software_buffer.c14
-rw-r--r--src/modules/evas/engines/software_generic/evas_ector_software_buffer.eo6
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c2
20 files changed, 59 insertions, 59 deletions
diff --git a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index e526f10425..b315f3520a 100644
--- a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -94,7 +94,7 @@ _diskselector_cb(void *data EINA_UNUSED, const Eo_Event *event)
94 disk_data = (DiskItem_Data *)elm_object_item_data_get(event->info); 94 disk_data = (DiskItem_Data *)elm_object_item_data_get(event->info);
95 if (!disk_data || !(disk_data->ctx_mod)) 95 if (!disk_data || !(disk_data->ctx_mod))
96 { 96 {
97 eo_event_callback_stop(event->object); 97 efl_event_callback_stop(event->object);
98 return; 98 return;
99 } 99 }
100 100
@@ -117,7 +117,7 @@ _ampm_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
117 ctx_mod = (Ctxpopup_Module_Data *)data; 117 ctx_mod = (Ctxpopup_Module_Data *)data;
118 if (!ctx_mod) 118 if (!ctx_mod)
119 { 119 {
120 eo_event_callback_stop(event->object); 120 efl_event_callback_stop(event->object);
121 return; 121 return;
122 } 122 }
123 123
@@ -146,7 +146,7 @@ _field_clicked_cb(void *data, const Eo_Event *event)
146 ctx_mod = (Ctxpopup_Module_Data *)data; 146 ctx_mod = (Ctxpopup_Module_Data *)data;
147 if (!ctx_mod) 147 if (!ctx_mod)
148 { 148 {
149 eo_event_callback_stop(event->object); 149 efl_event_callback_stop(event->object);
150 return; 150 return;
151 } 151 }
152 152
@@ -160,12 +160,12 @@ _field_clicked_cb(void *data, const Eo_Event *event)
160 evas_object_size_hint_weight_set(ctx_mod->ctxpopup, EVAS_HINT_EXPAND, 160 evas_object_size_hint_weight_set(ctx_mod->ctxpopup, EVAS_HINT_EXPAND,
161 EVAS_HINT_EXPAND); 161 EVAS_HINT_EXPAND);
162 evas_object_size_hint_align_set(ctx_mod->ctxpopup, EVAS_HINT_FILL, 0.5); 162 evas_object_size_hint_align_set(ctx_mod->ctxpopup, EVAS_HINT_FILL, 0.5);
163 eo_event_callback_add 163 efl_event_callback_add
164 (ctx_mod->ctxpopup, ELM_CTXPOPUP_EVENT_DISMISSED, _ctxpopup_dismissed_cb, ctx_mod); 164 (ctx_mod->ctxpopup, ELM_CTXPOPUP_EVENT_DISMISSED, _ctxpopup_dismissed_cb, ctx_mod);
165 elm_ctxpopup_hover_parent_set(ctx_mod->ctxpopup, elm_widget_top_get(event->object)); 165 elm_ctxpopup_hover_parent_set(ctx_mod->ctxpopup, elm_widget_top_get(event->object));
166 166
167 diskselector = elm_diskselector_add(elm_widget_top_get(ctx_mod->mod_data.base)); 167 diskselector = elm_diskselector_add(elm_widget_top_get(ctx_mod->mod_data.base));
168 eo_event_callback_add 168 efl_event_callback_add
169 (diskselector, EFL_UI_EVENT_CLICKED, _diskselector_cb, NULL); 169 (diskselector, EFL_UI_EVENT_CLICKED, _diskselector_cb, NULL);
170 elm_object_style_set(diskselector, buf); 170 elm_object_style_set(diskselector, buf);
171 elm_object_content_set(ctx_mod->ctxpopup, diskselector); 171 elm_object_content_set(ctx_mod->ctxpopup, diskselector);
@@ -315,7 +315,7 @@ field_create(Elm_Datetime_Module_Data *module_data, Elm_Datetime_Field_Type fie
315 if (field_type == ELM_DATETIME_AMPM) 315 if (field_type == ELM_DATETIME_AMPM)
316 { 316 {
317 field_obj = elm_button_add(ctx_mod->mod_data.base); 317 field_obj = elm_button_add(ctx_mod->mod_data.base);
318 eo_event_callback_add 318 efl_event_callback_add
319 (field_obj, EFL_UI_EVENT_CLICKED, _ampm_clicked_cb, ctx_mod); 319 (field_obj, EFL_UI_EVENT_CLICKED, _ampm_clicked_cb, ctx_mod);
320 } 320 }
321 else 321 else
@@ -325,7 +325,7 @@ field_create(Elm_Datetime_Module_Data *module_data, Elm_Datetime_Field_Type fie
325 elm_entry_editable_set(field_obj, EINA_FALSE); 325 elm_entry_editable_set(field_obj, EINA_FALSE);
326 elm_entry_input_panel_enabled_set(field_obj, EINA_FALSE); 326 elm_entry_input_panel_enabled_set(field_obj, EINA_FALSE);
327 elm_entry_context_menu_disabled_set(field_obj, EINA_TRUE); 327 elm_entry_context_menu_disabled_set(field_obj, EINA_TRUE);
328 eo_event_callback_add 328 efl_event_callback_add
329 (field_obj, EFL_UI_EVENT_CLICKED, _field_clicked_cb, ctx_mod); 329 (field_obj, EFL_UI_EVENT_CLICKED, _field_clicked_cb, ctx_mod);
330 } 330 }
331 evas_object_data_set(field_obj, "_field_type", (void *)field_type); 331 evas_object_data_set(field_obj, "_field_type", (void *)field_type);
diff --git a/src/modules/elementary/prefs/elm_button.c b/src/modules/elementary/prefs/elm_button.c
index dd304ada47..52835d1213 100644
--- a/src/modules/elementary/prefs/elm_button.c
+++ b/src/modules/elementary/prefs/elm_button.c
@@ -25,7 +25,7 @@ elm_prefs_button_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
25{ 25{
26 Evas_Object *obj = elm_button_add(prefs); 26 Evas_Object *obj = elm_button_add(prefs);
27 27
28 eo_event_callback_add 28 efl_event_callback_add
29 (obj, EFL_UI_EVENT_CLICKED, _item_changed_cb, cb); 29 (obj, EFL_UI_EVENT_CLICKED, _item_changed_cb, cb);
30 30
31 return obj; 31 return obj;
diff --git a/src/modules/elementary/prefs/elm_check.c b/src/modules/elementary/prefs/elm_check.c
index 7614d2234c..a9f5b85591 100644
--- a/src/modules/elementary/prefs/elm_check.c
+++ b/src/modules/elementary/prefs/elm_check.c
@@ -23,7 +23,7 @@ elm_prefs_check_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
23{ 23{
24 Evas_Object *obj = elm_check_add(prefs); 24 Evas_Object *obj = elm_check_add(prefs);
25 25
26 eo_event_callback_add 26 efl_event_callback_add
27 (obj, EFL_UI_CHECK_EVENT_CHANGED, _item_changed_cb, cb); 27 (obj, EFL_UI_CHECK_EVENT_CHANGED, _item_changed_cb, cb);
28 elm_check_state_set(obj, spec.b.def); 28 elm_check_state_set(obj, spec.b.def);
29 29
diff --git a/src/modules/elementary/prefs/elm_datetime.c b/src/modules/elementary/prefs/elm_datetime.c
index 54728a317f..929cd9004b 100644
--- a/src/modules/elementary/prefs/elm_datetime.c
+++ b/src/modules/elementary/prefs/elm_datetime.c
@@ -30,7 +30,7 @@ elm_prefs_datetime_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
30 elm_datetime_field_visible_set(obj, ELM_DATETIME_MINUTE, EINA_FALSE); 30 elm_datetime_field_visible_set(obj, ELM_DATETIME_MINUTE, EINA_FALSE);
31 elm_datetime_field_visible_set(obj, ELM_DATETIME_AMPM, EINA_FALSE); 31 elm_datetime_field_visible_set(obj, ELM_DATETIME_AMPM, EINA_FALSE);
32 32
33 eo_event_callback_add 33 efl_event_callback_add
34 (obj, ELM_DATETIME_EVENT_CHANGED, _item_changed_cb, cb); 34 (obj, ELM_DATETIME_EVENT_CHANGED, _item_changed_cb, cb);
35 35
36 t.tm_year = spec.d.min.y - 1900; 36 t.tm_year = spec.d.min.y - 1900;
diff --git a/src/modules/elementary/prefs/elm_entry.c b/src/modules/elementary/prefs/elm_entry.c
index 99cb749aaa..525320272d 100644
--- a/src/modules/elementary/prefs/elm_entry.c
+++ b/src/modules/elementary/prefs/elm_entry.c
@@ -148,9 +148,9 @@ elm_prefs_entry_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
148 148
149 /* FIXME: is it worth to ERR with the item's name, too, here? */ 149 /* FIXME: is it worth to ERR with the item's name, too, here? */
150 150
151 eo_event_callback_add 151 efl_event_callback_add
152 (obj, ELM_ENTRY_EVENT_ACTIVATED, _item_changed_cb, cb); 152 (obj, ELM_ENTRY_EVENT_ACTIVATED, _item_changed_cb, cb);
153 eo_event_callback_add 153 efl_event_callback_add
154 (obj, ELM_WIDGET_EVENT_UNFOCUSED, _item_changed_cb, cb); 154 (obj, ELM_WIDGET_EVENT_UNFOCUSED, _item_changed_cb, cb);
155 if (spec.s.accept) 155 if (spec.s.accept)
156 { 156 {
diff --git a/src/modules/elementary/prefs/elm_slider.c b/src/modules/elementary/prefs/elm_slider.c
index cba1ed040f..36f89e1537 100644
--- a/src/modules/elementary/prefs/elm_slider.c
+++ b/src/modules/elementary/prefs/elm_slider.c
@@ -26,7 +26,7 @@ elm_prefs_slider_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
26 26
27 evas_object_data_set(obj, "prefs_type", (void *)type); 27 evas_object_data_set(obj, "prefs_type", (void *)type);
28 28
29 eo_event_callback_add 29 efl_event_callback_add
30 (obj, ELM_SLIDER_EVENT_CHANGED, _item_changed_cb, cb); 30 (obj, ELM_SLIDER_EVENT_CHANGED, _item_changed_cb, cb);
31 if (type == ELM_PREFS_TYPE_INT) 31 if (type == ELM_PREFS_TYPE_INT)
32 { 32 {
diff --git a/src/modules/elementary/prefs/elm_spinner.c b/src/modules/elementary/prefs/elm_spinner.c
index 01a7a3c275..896ea0c82d 100644
--- a/src/modules/elementary/prefs/elm_spinner.c
+++ b/src/modules/elementary/prefs/elm_spinner.c
@@ -26,7 +26,7 @@ elm_prefs_spinner_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
26 26
27 evas_object_data_set(obj, "prefs_type", (void *)type); 27 evas_object_data_set(obj, "prefs_type", (void *)type);
28 28
29 eo_event_callback_add 29 efl_event_callback_add
30 (obj, ELM_SPINNER_EVENT_CHANGED, _item_changed_cb, cb); 30 (obj, ELM_SPINNER_EVENT_CHANGED, _item_changed_cb, cb);
31 31
32 if (type == ELM_PREFS_TYPE_INT) 32 if (type == ELM_PREFS_TYPE_INT)
diff --git a/src/modules/elementary/web/none/elm_web_none.c b/src/modules/elementary/web/none/elm_web_none.c
index c2c3bd3e45..c232ecbcbe 100644
--- a/src/modules/elementary/web/none/elm_web_none.c
+++ b/src/modules/elementary/web/none/elm_web_none.c
@@ -347,7 +347,7 @@ ewm_need_web(void)
347 return EINA_TRUE; 347 return EINA_TRUE;
348} 348}
349 349
350EAPI const Eo_Class * 350EAPI const Efl_Class *
351ewm_class_get(void) 351ewm_class_get(void)
352{ 352{
353 return elm_web_none_class_get(); 353 return elm_web_none_class_get();
diff --git a/src/modules/emotion/libvlc/emotion_libvlc.c b/src/modules/emotion/libvlc/emotion_libvlc.c
index c029edf86d..83ed56815d 100644
--- a/src/modules/emotion/libvlc/emotion_libvlc.c
+++ b/src/modules/emotion/libvlc/emotion_libvlc.c
@@ -280,7 +280,7 @@ evas_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
280 280
281 evas_object_image_size_get(ev->evas_obj, &w, &h); 281 evas_object_image_size_get(ev->evas_obj, &w, &h);
282 _emotion_frame_resize(ev->obj, w, h, w / (double) h); 282 _emotion_frame_resize(ev->obj, w, h, w / (double) h);
283 eo_event_callback_call(ev->obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL); 283 efl_event_callback_call(ev->obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL);
284} 284}
285 285
286/* Fetch all libvlc tracks. */ 286/* Fetch all libvlc tracks. */
diff --git a/src/modules/ethumb/emotion/emotion.c b/src/modules/ethumb/emotion/emotion.c
index 8fe042409a..0c6f4956aa 100644
--- a/src/modules/ethumb/emotion/emotion.c
+++ b/src/modules/ethumb/emotion/emotion.c
@@ -210,9 +210,9 @@ _finish_thumb_generation(struct _emotion_plugin *_plugin, int success)
210{ 210{
211 int r = 0; 211 int r = 0;
212 212
213 eo_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin); 213 efl_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin);
214 eo_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin); 214 efl_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin);
215 eo_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin); 215 efl_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin);
216 216
217 emotion_object_play_set(_plugin->video, 0); 217 emotion_object_play_set(_plugin->video, 0);
218 218
@@ -256,7 +256,7 @@ _frame_grab_single(void *data)
256 256
257 ethumb_image_save(e); 257 ethumb_image_save(e);
258 258
259 eo_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin); 259 efl_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin);
260 260
261 emotion_object_play_set(_plugin->video, 0); 261 emotion_object_play_set(_plugin->video, 0);
262 262
@@ -399,11 +399,11 @@ _thumb_generate(Ethumb *e)
399 _plugin->pcount = 1; 399 _plugin->pcount = 1;
400 400
401 _resize_movie(_plugin); 401 _resize_movie(_plugin);
402 eo_event_callback_add 402 efl_event_callback_add
403 (o, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin); 403 (o, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin);
404 eo_event_callback_add 404 efl_event_callback_add
405 (o, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin); 405 (o, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin);
406 eo_event_callback_add 406 efl_event_callback_add
407 (o, EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin); 407 (o, EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin);
408 408
409 if (f == ETHUMB_THUMB_EET) 409 if (f == ETHUMB_THUMB_EET)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index 9857645019..1a7c4cd471 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -312,7 +312,7 @@ evas_gl_preload_target_register(Evas_GL_Texture *tex, Eo *target)
312{ 312{
313 EINA_SAFETY_ON_NULL_RETURN(tex); 313 EINA_SAFETY_ON_NULL_RETURN(tex);
314 314
315 eo_event_callback_add(target, EO_EVENT_DEL, _evas_gl_preload_target_die, tex); 315 efl_event_callback_add(target, EFL_EVENT_DEL, _evas_gl_preload_target_die, tex);
316 tex->targets = eina_list_append(tex->targets, target); 316 tex->targets = eina_list_append(tex->targets, target);
317 tex->references++; 317 tex->references++;
318} 318}
@@ -325,7 +325,7 @@ evas_gl_preload_target_unregister(Evas_GL_Texture *tex, Eo *target)
325 325
326 EINA_SAFETY_ON_NULL_RETURN(tex); 326 EINA_SAFETY_ON_NULL_RETURN(tex);
327 327
328 eo_event_callback_del(target, EO_EVENT_DEL, _evas_gl_preload_target_die, tex); 328 efl_event_callback_del(target, EFL_EVENT_DEL, _evas_gl_preload_target_die, tex);
329 329
330 EINA_LIST_FOREACH(tex->targets, l, o) 330 EINA_LIST_FOREACH(tex->targets, l, o)
331 if (o == target) 331 if (o == target)
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.eo b/src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.eo
index e36073e20f..a03cb9eb16 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.eo
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.eo
@@ -1,4 +1,4 @@
1class Evas.Ector.GL.Buffer (Eo.Base, Evas.Ector.Buffer, Ector.GL.Buffer.Base) 1class Evas.Ector.GL.Buffer (Efl.Object, Evas.Ector.Buffer, Ector.GL.Buffer.Base)
2{ 2{
3 data: null; 3 data: null;
4} 4}
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
index 0c4271eef1..930c236f42 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
@@ -230,27 +230,27 @@ _evas_ector_gl_image_buffer_ector_buffer_span_free(Eo *obj, Evas_Ector_GL_Image_
230} 230}
231 231
232 232
233EOLIAN static Eo_Base * 233EOLIAN static Efl_Object *
234_evas_ector_gl_image_buffer_eo_base_constructor(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd) 234_evas_ector_gl_image_buffer_efl_object_constructor(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd)
235{ 235{
236 obj = eo_constructor(eo_super(obj, MY_CLASS)); 236 obj = efl_constructor(eo_super(obj, MY_CLASS));
237 pd->base = eo_data_ref(obj, ECTOR_GL_BUFFER_BASE_MIXIN); 237 pd->base = eo_data_ref(obj, ECTOR_GL_BUFFER_BASE_MIXIN);
238 pd->base->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN); 238 pd->base->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN);
239 pd->base->generic->eo = obj; 239 pd->base->generic->eo = obj;
240 return obj; 240 return obj;
241} 241}
242 242
243EOLIAN static Eo_Base * 243EOLIAN static Efl_Object *
244_evas_ector_gl_image_buffer_eo_base_finalize(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd) 244_evas_ector_gl_image_buffer_efl_object_finalize(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd)
245{ 245{
246 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL); 246 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL);
247 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL); 247 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL);
248 pd->base->generic->immutable = EINA_TRUE; 248 pd->base->generic->immutable = EINA_TRUE;
249 return eo_finalize(eo_super(obj, MY_CLASS)); 249 return efl_finalize(eo_super(obj, MY_CLASS));
250} 250}
251 251
252EOLIAN static void 252EOLIAN static void
253_evas_ector_gl_image_buffer_eo_base_destructor(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd) 253_evas_ector_gl_image_buffer_efl_object_destructor(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd)
254{ 254{
255 Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); 255 Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
256 256
@@ -258,7 +258,7 @@ _evas_ector_gl_image_buffer_eo_base_destructor(Eo *obj, Evas_Ector_GL_Image_Buff
258 eo_data_unref(obj, pd->base); 258 eo_data_unref(obj, pd->base);
259 ENFN->image_free(ENDT, pd->image); 259 ENFN->image_free(ENDT, pd->image);
260 eo_xunref(pd->evas, obj); 260 eo_xunref(pd->evas, obj);
261 eo_destructor(eo_super(obj, MY_CLASS)); 261 efl_destructor(eo_super(obj, MY_CLASS));
262} 262}
263 263
264#include "evas_ector_gl_image_buffer.eo.c" 264#include "evas_ector_gl_image_buffer.eo.c"
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.eo b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.eo
index 915fcc09fe..e380414e8a 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.eo
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.eo
@@ -2,9 +2,9 @@ class Evas.Ector.GL.Image.Buffer (Evas.Ector.GL.Buffer, Evas.Ector.Buffer)
2{ 2{
3 [[An Ector GL buffer wrapping an existing Evas_GL_Image.]] 3 [[An Ector GL buffer wrapping an existing Evas_GL_Image.]]
4 implements { 4 implements {
5 Eo.Base.constructor; 5 Efl.Object.constructor;
6 Eo.Base.finalize; 6 Efl.Object.finalize;
7 Eo.Base.destructor; 7 Efl.Object.destructor;
8 Evas.Ector.Buffer.engine_image.set; 8 Evas.Ector.Buffer.engine_image.set;
9 Evas.Ector.Buffer.engine_image.get; 9 Evas.Ector.Buffer.engine_image.get;
10 Ector.Buffer.flags.get; 10 Ector.Buffer.flags.get;
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
index e39f1f1da9..90b79939a0 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
@@ -33,7 +33,7 @@ _evas_ector_gl_rgbaimage_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas
33 RGBA_Image *im = image; 33 RGBA_Image *im = image;
34 34
35 EINA_SAFETY_ON_NULL_RETURN(image); 35 EINA_SAFETY_ON_NULL_RETURN(image);
36 if (eo_finalized_get(obj)) 36 if (efl_finalized_get(obj))
37 { 37 {
38 CRI("engine_image must be set at construction time only"); 38 CRI("engine_image must be set at construction time only");
39 return; 39 return;
@@ -86,24 +86,24 @@ end:
86} 86}
87 87
88EOLIAN static Eo * 88EOLIAN static Eo *
89_evas_ector_gl_rgbaimage_buffer_eo_base_constructor(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd) 89_evas_ector_gl_rgbaimage_buffer_efl_object_constructor(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd)
90{ 90{
91 obj = eo_constructor(eo_super(obj, MY_CLASS)); 91 obj = efl_constructor(eo_super(obj, MY_CLASS));
92 pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj); 92 pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj);
93 return obj; 93 return obj;
94} 94}
95 95
96EOLIAN static Eo * 96EOLIAN static Eo *
97_evas_ector_gl_rgbaimage_buffer_eo_base_finalize(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd) 97_evas_ector_gl_rgbaimage_buffer_efl_object_finalize(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd)
98{ 98{
99 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL); 99 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL);
100 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL); 100 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL);
101 pd->base->generic->immutable = EINA_TRUE; 101 pd->base->generic->immutable = EINA_TRUE;
102 return eo_finalize(eo_super(obj, MY_CLASS)); 102 return efl_finalize(eo_super(obj, MY_CLASS));
103} 103}
104 104
105EOLIAN static void 105EOLIAN static void
106_evas_ector_gl_rgbaimage_buffer_eo_base_destructor(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd) 106_evas_ector_gl_rgbaimage_buffer_efl_object_destructor(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd)
107{ 107{
108 Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); 108 Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
109 109
@@ -111,7 +111,7 @@ _evas_ector_gl_rgbaimage_buffer_eo_base_destructor(Eo *obj, Evas_Ector_GL_RGBAIm
111 ENFN->image_free(ENDT, pd->glim); 111 ENFN->image_free(ENDT, pd->glim);
112 evas_cache_image_drop(&pd->image->cache_entry); 112 evas_cache_image_drop(&pd->image->cache_entry);
113 eo_xunref(pd->evas, obj); 113 eo_xunref(pd->evas, obj);
114 eo_destructor(eo_super(obj, MY_CLASS)); 114 efl_destructor(eo_super(obj, MY_CLASS));
115} 115}
116 116
117#include "evas_ector_gl_rgbaimage_buffer.eo.c" 117#include "evas_ector_gl_rgbaimage_buffer.eo.c"
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.eo b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.eo
index b6e07505c0..57b681afd6 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.eo
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.eo
@@ -2,9 +2,9 @@ class Evas.Ector.GL.RGBAImage.Buffer (Ector.Software.Buffer, Evas.Ector.Buffer)
2{ 2{
3 [[A buffer object wrapping an existing Evas RGBA_Image for the GL Engine.]] 3 [[A buffer object wrapping an existing Evas RGBA_Image for the GL Engine.]]
4 implements { 4 implements {
5 Eo.Base.constructor; 5 Efl.Object.constructor;
6 Eo.Base.finalize; 6 Efl.Object.finalize;
7 Eo.Base.destructor; 7 Efl.Object.destructor;
8 Evas.Ector.Buffer.engine_image.get; 8 Evas.Ector.Buffer.engine_image.get;
9 Evas.Ector.Buffer.engine_image.set; 9 Evas.Ector.Buffer.engine_image.set;
10 } 10 }
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 07771f55db..a241ea1e5d 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2503,7 +2503,7 @@ eng_ector_create(void *data EINA_UNUSED)
2503static void 2503static void
2504eng_ector_destroy(void *data EINA_UNUSED, Ector_Surface *ector) 2504eng_ector_destroy(void *data EINA_UNUSED, Ector_Surface *ector)
2505{ 2505{
2506 if (ector) eo_del(ector); 2506 if (ector) efl_del(ector);
2507} 2507}
2508 2508
2509static Ector_Buffer * 2509static Ector_Buffer *
diff --git a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
index 5096180740..1444c86b10 100644
--- a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
+++ b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
@@ -27,7 +27,7 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect
27 RGBA_Image *im = image; 27 RGBA_Image *im = image;
28 28
29 EINA_SAFETY_ON_NULL_RETURN(image); 29 EINA_SAFETY_ON_NULL_RETURN(image);
30 if (eo_finalized_get(obj)) 30 if (efl_finalized_get(obj))
31 { 31 {
32 CRI("engine_image must be set at construction time only"); 32 CRI("engine_image must be set at construction time only");
33 return; 33 return;
@@ -65,29 +65,29 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_get(Eo *obj EINA_UNUS
65} 65}
66 66
67EOLIAN static Eo * 67EOLIAN static Eo *
68_evas_ector_software_buffer_eo_base_constructor(Eo *obj, Evas_Ector_Software_Buffer_Data *pd) 68_evas_ector_software_buffer_efl_object_constructor(Eo *obj, Evas_Ector_Software_Buffer_Data *pd)
69{ 69{
70 obj = eo_constructor(eo_super(obj, MY_CLASS)); 70 obj = efl_constructor(eo_super(obj, MY_CLASS));
71 pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj); 71 pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj);
72 return obj; 72 return obj;
73} 73}
74 74
75EOLIAN static Eo * 75EOLIAN static Eo *
76_evas_ector_software_buffer_eo_base_finalize(Eo *obj, Evas_Ector_Software_Buffer_Data *pd) 76_evas_ector_software_buffer_efl_object_finalize(Eo *obj, Evas_Ector_Software_Buffer_Data *pd)
77{ 77{
78 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL); 78 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL);
79 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL); 79 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL);
80 pd->base->generic->immutable = EINA_TRUE; 80 pd->base->generic->immutable = EINA_TRUE;
81 return eo_finalize(eo_super(obj, MY_CLASS)); 81 return efl_finalize(eo_super(obj, MY_CLASS));
82} 82}
83 83
84EOLIAN static void 84EOLIAN static void
85_evas_ector_software_buffer_eo_base_destructor(Eo *obj, Evas_Ector_Software_Buffer_Data *pd) 85_evas_ector_software_buffer_efl_object_destructor(Eo *obj, Evas_Ector_Software_Buffer_Data *pd)
86{ 86{
87 eo_data_xunref(obj, pd->base, obj); 87 eo_data_xunref(obj, pd->base, obj);
88 evas_cache_image_drop(&pd->image->cache_entry); 88 evas_cache_image_drop(&pd->image->cache_entry);
89 eo_xunref(pd->evas, obj); 89 eo_xunref(pd->evas, obj);
90 eo_destructor(eo_super(obj, MY_CLASS)); 90 efl_destructor(eo_super(obj, MY_CLASS));
91} 91}
92 92
93#include "evas_ector_buffer.eo.c" 93#include "evas_ector_buffer.eo.c"
diff --git a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.eo b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.eo
index b88a889b54..0527b9c019 100644
--- a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.eo
+++ b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.eo
@@ -2,9 +2,9 @@ class Evas.Ector.Software.Buffer (Ector.Software.Buffer, Evas.Ector.Buffer)
2{ 2{
3 [[A buffer object wrapping an existing Evas Image_Entry.]] 3 [[A buffer object wrapping an existing Evas Image_Entry.]]
4 implements { 4 implements {
5 Eo.Base.constructor; 5 Efl.Object.constructor;
6 Eo.Base.finalize; 6 Efl.Object.finalize;
7 Eo.Base.destructor; 7 Efl.Object.destructor;
8 Evas.Ector.Buffer.engine_image.set; 8 Evas.Ector.Buffer.engine_image.set;
9 Evas.Ector.Buffer.engine_image.get; 9 Evas.Ector.Buffer.engine_image.get;
10 } 10 }
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 7d318598db..25f34bf66f 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -4071,7 +4071,7 @@ eng_ector_create(void *data EINA_UNUSED)
4071static void 4071static void
4072eng_ector_destroy(void *data EINA_UNUSED, Ector_Surface *ector) 4072eng_ector_destroy(void *data EINA_UNUSED, Ector_Surface *ector)
4073{ 4073{
4074 if (ector) eo_del(ector); 4074 if (ector) efl_del(ector);
4075} 4075}
4076 4076
4077static Ector_Buffer * 4077static Ector_Buffer *