aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/canvas/evas_out.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/canvas/evas_out.c')
-rw-r--r--src/lib/evas/canvas/evas_out.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c
index 1558a90ed8..f06da23948 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -19,7 +19,8 @@ evas_out_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, MY_CLASS, e);
return eo_obj;
}
@@ -29,11 +30,11 @@ _evas_out_eo_base_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
Eo *eo_parent = NULL;
Evas_Public_Data *e;
- eo_do(eo_obj, eo_parent = eo_parent_get());
+ eo_do(eo_obj, eo_parent = eo_parent_get(eo_obj));
e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
evas_canvas_async_block(e);
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor( MY_CLASS, eo_obj);
if (!e) return NULL;
e->outputs = eina_list_append(e->outputs, eo_obj);
@@ -57,7 +58,7 @@ _evas_out_eo_base_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
Eo *eo_parent = NULL;
Evas_Public_Data *e;
- eo_do(eo_obj, eo_parent = eo_parent_get());
+ eo_do(eo_obj, eo_parent = eo_parent_get(eo_obj));
e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
evas_canvas_async_block(e);
if (!e) return;
@@ -66,7 +67,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_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
EOLIAN static void
@@ -74,7 +75,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_do(eo_e, eo_parent = eo_parent_get());
+ eo_do(eo_e, eo_parent = eo_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 +100,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_do(eo_e, eo_parent = eo_parent_get());
+ eo_do(eo_e, eo_parent = eo_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;