From a1706833346739fd409a61b315b0100e880b3c62 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Mon, 18 Mar 2013 15:33:54 +0000 Subject: [PATCH] Change usage of eo_do_super to the new prototype. --- src/examples/eo/evas/evas_elw_box.c | 2 +- src/examples/eo/evas/evas_elw_boxedbutton.c | 2 +- src/examples/eo/evas/evas_elw_button.c | 6 +++--- src/examples/eo/evas/evas_elw_win.c | 2 +- src/examples/eo/evas/evas_evas_obj.c | 4 ++-- src/lib/ecore/ecore_anim.c | 4 ++-- src/lib/ecore/ecore_idle_enterer.c | 4 ++-- src/lib/ecore/ecore_idle_exiter.c | 4 ++-- src/lib/ecore/ecore_idler.c | 4 ++-- src/lib/ecore/ecore_job.c | 4 ++-- src/lib/ecore/ecore_poll.c | 4 ++-- src/lib/ecore/ecore_timer.c | 4 ++-- src/lib/edje/edje_edit.c | 6 +++--- src/lib/edje/edje_smart.c | 8 ++++---- src/lib/evas/canvas/evas_events.c | 4 ++-- src/lib/evas/canvas/evas_main.c | 4 ++-- src/lib/evas/canvas/evas_object_box.c | 6 +++--- src/lib/evas/canvas/evas_object_grid.c | 2 +- src/lib/evas/canvas/evas_object_image.c | 6 +++--- src/lib/evas/canvas/evas_object_line.c | 4 ++-- src/lib/evas/canvas/evas_object_main.c | 6 +++--- src/lib/evas/canvas/evas_object_polygon.c | 4 ++-- src/lib/evas/canvas/evas_object_rectangle.c | 4 ++-- src/lib/evas/canvas/evas_object_smart.c | 2 +- src/lib/evas/canvas/evas_object_smart_clipped.c | 6 +++--- src/lib/evas/canvas/evas_object_table.c | 6 +++--- src/lib/evas/canvas/evas_object_text.c | 6 +++--- src/lib/evas/canvas/evas_object_textblock.c | 6 +++--- src/lib/evas/canvas/evas_object_textgrid.c | 4 ++-- .../eo/composite_objects/composite_objects_comp.c | 4 ++-- src/tests/eo/constructors/constructors_mixin.c | 4 ++-- src/tests/eo/constructors/constructors_simple.c | 6 +++--- src/tests/eo/constructors/constructors_simple2.c | 2 +- src/tests/eo/constructors/constructors_simple6.c | 2 +- src/tests/eo/constructors/constructors_simple7.c | 2 +- .../function_overrides/function_overrides_inherit2.c | 10 +++++----- .../function_overrides/function_overrides_inherit3.c | 2 +- .../eo/function_overrides/function_overrides_main.c | 6 ++---- .../eo/function_overrides/function_overrides_simple.c | 4 ++-- src/tests/eo/mixin/mixin_inherit.c | 2 +- src/tests/eo/mixin/mixin_mixin.c | 4 ++-- src/tests/eo/mixin/mixin_mixin2.c | 6 +++--- src/tests/eo/mixin/mixin_mixin3.c | 6 +++--- src/tests/eo/signals/signals_simple.c | 2 +- 44 files changed, 94 insertions(+), 96 deletions(-) diff --git a/src/examples/eo/evas/evas_elw_box.c b/src/examples/eo/evas/evas_elw_box.c index 3efaded84d..96df326e99 100644 --- a/src/examples/eo/evas/evas_elw_box.c +++ b/src/examples/eo/evas/evas_elw_box.c @@ -30,7 +30,7 @@ _pack_end(Eo *obj EINA_UNUSED, void *class_data, va_list *list) static void _constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); Widget_Data *wd = class_data; diff --git a/src/examples/eo/evas/evas_elw_boxedbutton.c b/src/examples/eo/evas/evas_elw_boxedbutton.c index f6a14640f1..43fe6f9a6b 100644 --- a/src/examples/eo/evas/evas_elw_boxedbutton.c +++ b/src/examples/eo/evas/evas_elw_boxedbutton.c @@ -20,7 +20,7 @@ typedef struct static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); Eo *bt = eo_add(ELW_BUTTON_CLASS, obj); eo_composite_attach(bt, obj); diff --git a/src/examples/eo/evas/evas_elw_button.c b/src/examples/eo/evas/evas_elw_button.c index 6ee294f988..2618a4bd8a 100644 --- a/src/examples/eo/evas/evas_elw_button.c +++ b/src/examples/eo/evas/evas_elw_button.c @@ -28,7 +28,7 @@ _position_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list) x = va_arg(*list, Evas_Coord); y = va_arg(*list, Evas_Coord); printf("But set position %d,%d\n", x, y); - eo_do_super(obj, exevas_obj_position_set(x, y)); + eo_do_super(obj, MY_CLASS, exevas_obj_position_set(x, y)); } static void @@ -52,7 +52,7 @@ _btn_clicked(void *data, Evas_Object *evas_obj, void *event_info) static void _constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); Widget_Data *wd = class_data; @@ -68,7 +68,7 @@ _constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) static void _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); //Widget_Data *wd = class_data; /* FIXME: Commented out because it's automatically done because our tree diff --git a/src/examples/eo/evas/evas_elw_win.c b/src/examples/eo/evas/evas_elw_win.c index 25065212e3..e5a917d781 100644 --- a/src/examples/eo/evas/evas_elw_win.c +++ b/src/examples/eo/evas/evas_elw_win.c @@ -29,7 +29,7 @@ my_win_del(void *data, Evas_Object *obj, void *event_info) static void _constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); Widget_Data *wd = class_data; diff --git a/src/examples/eo/evas/evas_evas_obj.c b/src/examples/eo/evas/evas_evas_obj.c index 3d5a1834a9..01f48a544b 100644 --- a/src/examples/eo/evas/evas_evas_obj.c +++ b/src/examples/eo/evas/evas_evas_obj.c @@ -82,7 +82,7 @@ _child_add(Eo *obj, void *class_data, va_list *list) static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); /* Add type check. */ Eo *parent = eo_parent_get(obj); @@ -93,7 +93,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) static void _destructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); Widget_Data *wd = class_data; diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c index f15509091c..a3797f08b4 100644 --- a/src/lib/ecore/ecore_anim.c +++ b/src/lib/ecore/ecore_anim.c @@ -175,7 +175,7 @@ _ecore_animator_add(Ecore_Animator *obj, } animator->obj = obj; - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_manual_free_set(obj, EINA_TRUE); if (!func) @@ -428,7 +428,7 @@ _destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) pd->delete_me = EINA_TRUE; animators_delete_me++; - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); } EAPI void diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c index ab0326a654..36ab9a6aca 100644 --- a/src/lib/ecore/ecore_idle_enterer.c +++ b/src/lib/ecore/ecore_idle_enterer.c @@ -52,7 +52,7 @@ _ecore_idle_enterer_add(Ecore_Idle_Enterer *obj, } ie->obj = obj; - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_manual_free_set(obj, EINA_TRUE); if (!func) @@ -191,7 +191,7 @@ _destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) idle_enterer->delete_me = 1; idle_enterers_delete_me = 1; - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); } void diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c index ac19dac31d..fa93d1ca2e 100644 --- a/src/lib/ecore/ecore_idle_exiter.c +++ b/src/lib/ecore/ecore_idle_exiter.c @@ -75,7 +75,7 @@ _idle_exiter_constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) Ecore_Idle_Exiter_Private_Data *ie = _pd; ie->obj = obj; - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_manual_free_set(obj, EINA_TRUE); if (!func) @@ -141,7 +141,7 @@ _destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) idle_exiter->delete_me = 1; idle_exiters_delete_me = 1; - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); } void diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c index 0f6af7d9cd..0094e238e6 100644 --- a/src/lib/ecore/ecore_idler.c +++ b/src/lib/ecore/ecore_idler.c @@ -63,7 +63,7 @@ _idler_constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) Ecore_Idler_Private_Data *ie = _pd; ie->obj = obj; - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_manual_free_set(obj, EINA_TRUE); if (!func) @@ -126,7 +126,7 @@ _destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) idler->delete_me = 1; idlers_delete_me = 1; - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); } void diff --git a/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c index b2246ddb91..e057af00e2 100644 --- a/src/lib/ecore/ecore_job.c +++ b/src/lib/ecore/ecore_job.c @@ -82,7 +82,7 @@ _job_constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_error_set(obj); EINA_MAIN_LOOP_CHECK_RETURN; } - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_manual_free_set(obj, EINA_TRUE); if (!func) @@ -135,7 +135,7 @@ static void _destructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) { /*FIXME: check if ecore_event_del should be called from here*/ - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); } /** diff --git a/src/lib/ecore/ecore_poll.c b/src/lib/ecore/ecore_poll.c index 797fe84572..9057d992a7 100644 --- a/src/lib/ecore/ecore_poll.c +++ b/src/lib/ecore/ecore_poll.c @@ -273,7 +273,7 @@ _poller_constructor(Eo *obj, void *_pd, va_list *list) EINA_MAIN_LOOP_CHECK_RETURN; } - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_manual_free_set(obj, EINA_TRUE); if (!func) @@ -429,7 +429,7 @@ _destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) poller_delete_count++; } - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); } /** diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index 7bde05561c..2ecd67af7e 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -174,7 +174,7 @@ _ecore_timer_add(Ecore_Timer *obj, } timer->obj = obj; - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_manual_free_set(obj, EINA_TRUE); if (!func) @@ -656,7 +656,7 @@ _destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) timers_delete_me++; } - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); } void diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 8641daed41..c07beea7b1 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -157,7 +157,7 @@ _edje_edit_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED) Edje_Edit *eed = _pd; _edje_edit_data_clean(eed); - eo_do_super(obj, evas_obj_smart_del()); + eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); } static void @@ -198,7 +198,7 @@ _edje_edit_smart_file_set(Eo *obj, void *_pd, va_list *list) * groups). */ Eina_Bool int_ret = EINA_FALSE; - eo_do_super(obj, edje_obj_file_set(file, group, &int_ret)); + eo_do_super(obj, MY_CLASS, edje_obj_file_set(file, group, &int_ret)); if (!int_ret) return; @@ -256,7 +256,7 @@ _edje_edit_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) Edje_Edit *eed = class_data; eed->base = eo_data_get(obj, EDJE_OBJ_CLASS); - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eina_error_set(0); if (!EDJE_EDIT_ERROR_GROUP_DOES_NOT_EXIST) diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index d31203471f..9ee44cd33b 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -31,7 +31,7 @@ _edje_smart_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED) Edje *ed = class_data; ed->base = eo_data_get(obj, EVAS_OBJ_SMART_CLIPPED_CLASS); - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); _edje_lib_ref(); } @@ -40,7 +40,7 @@ static void _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) { Eo_Dbg_Info *root = (Eo_Dbg_Info *) va_arg(*list, Eo_Dbg_Info *); - eo_do_super(eo_obj, eo_dbg_info_get(root)); + eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); const char *file, *edje_group; @@ -278,7 +278,7 @@ _edje_smart_show(Eo *obj, void *_pd, va_list *list EINA_UNUSED) { Edje *ed = _pd; - eo_do_super(obj, evas_obj_smart_show()); + eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); if (evas_object_visible_get(obj)) return; if (_edje_script_only(ed)) { @@ -298,7 +298,7 @@ _edje_smart_hide(Eo *obj, void *_pd, va_list *list EINA_UNUSED) { Edje *ed = _pd; - eo_do_super(obj, evas_obj_smart_hide()); + eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); if (!evas_object_visible_get(obj)) return; if (_edje_script_only(ed)) { diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index e5cba7cafd..e56106b857 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -999,7 +999,7 @@ evas_event_thaw(Evas *eo_e) void _canvas_event_freeze(Eo *eo_e, void *_pd, va_list *list EINA_UNUSED) { - eo_do_super(eo_e, eo_event_freeze()); + eo_do_super(eo_e, EVAS_CLASS, eo_event_freeze()); Evas_Public_Data *e = _pd; e->is_frozen = EINA_TRUE; } @@ -1008,7 +1008,7 @@ void _canvas_event_thaw(Eo *eo_e, void *_pd, va_list *list EINA_UNUSED) { int fcount = -1; - eo_do_super(eo_e, + eo_do_super(eo_e, EVAS_CLASS, eo_event_thaw(), eo_event_freeze_get(&fcount)); if (0 == fcount) diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 061318abad..bd30ee3857 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -126,7 +126,7 @@ evas_new(void) static void _constructor(Eo *eo_obj, void *class_data, va_list *list EINA_UNUSED) { - eo_do_super(eo_obj, eo_constructor()); + eo_do_super(eo_obj, MY_CLASS, eo_constructor()); Evas_Public_Data *e = class_data; e->evas = eo_obj; @@ -274,7 +274,7 @@ _destructor(Eo *eo_e, void *_pd, va_list *list EINA_UNUSED) _evas_device_cleanup(eo_e); e->magic = 0; - eo_do_super(eo_e, eo_destructor()); + eo_do_super(eo_e, MY_CLASS, eo_destructor()); } EAPI void diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index f45b31e46b..47f04e9f6c 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -431,7 +431,7 @@ _evas_object_box_remove_at_default(Eo *o, void *_pd, va_list *list) static void _smart_add(Eo *o, void *_pd, va_list *list EINA_UNUSED) { - eo_do_super(o, evas_obj_smart_add()); + eo_do_super(o, MY_CLASS, evas_obj_smart_add()); Evas_Object_Box_Data *priv = _pd; evas_object_event_callback_add @@ -466,7 +466,7 @@ _smart_del(Eo *o, void *_pd, va_list *list EINA_UNUSED) if (priv->layout.data && priv->layout.free_data) priv->layout.free_data(priv->layout.data); - eo_do_super(o, evas_obj_smart_del()); + eo_do_super(o, MY_CLASS, evas_obj_smart_del()); } static void @@ -506,7 +506,7 @@ evas_object_box_add(Evas *evas) static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, evas_obj_smart_callbacks_descriptions_set(_signals, NULL), evas_obj_type_set(MY_CLASS_NAME)); diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c index 7a440cb262..7fe2042698 100644 --- a/src/lib/evas/canvas/evas_object_grid.c +++ b/src/lib/evas/canvas/evas_object_grid.c @@ -260,7 +260,7 @@ evas_object_grid_add(Evas *evas) static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, evas_obj_smart_attach(_evas_object_grid_smart_class_new())); // return evas_object_smart_add(evas, _evas_object_grid_smart_class_new()); diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index 7a51db2107..2a0ca948c2 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -295,7 +295,7 @@ _constructor(Eo *eo_obj, void *class_data, va_list *list EINA_UNUSED) Evas *eo_e = evas_object_evas_get(eo_parent_get(eo_obj)); Evas_Colorspace cspace; - eo_do_super(eo_obj, eo_constructor()); + eo_do_super(eo_obj, MY_CLASS, eo_constructor()); evas_object_image_init(eo_obj); evas_object_inject(eo_obj, obj, eo_e); @@ -784,7 +784,7 @@ static void _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) { Eo_Dbg_Info *root = (Eo_Dbg_Info *) va_arg(*list, Eo_Dbg_Info *); - eo_do_super(eo_obj, eo_dbg_info_get(root)); + eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); const char *file, *key; @@ -3457,7 +3457,7 @@ _destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_object_image_video_surface_set(eo_obj, NULL); evas_object_image_free(eo_obj, obj); - eo_do_super(eo_obj, eo_destructor()); + eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } void diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c index 3d26765f98..344c8172fb 100644 --- a/src/lib/evas/canvas/evas_object_line.c +++ b/src/lib/evas/canvas/evas_object_line.c @@ -223,7 +223,7 @@ evas_object_line_init(Evas_Object *eo_obj) static void _constructor(Eo *eo_obj, void *class_data, va_list *list EINA_UNUSED) { - eo_do_super(eo_obj, eo_constructor()); + eo_do_super(eo_obj, MY_CLASS, eo_constructor()); Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); evas_object_line_init(eo_obj); @@ -241,7 +241,7 @@ _constructor(Eo *eo_obj, void *class_data, va_list *list EINA_UNUSED) static void _destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(eo_obj, eo_destructor()); + eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } static void diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index f74063679a..a293ad1057 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -69,7 +69,7 @@ _constructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) { Evas_Object_Protected_Data *obj; - eo_do_super(eo_obj, eo_constructor()); + eo_do_super(eo_obj, MY_CLASS, eo_constructor()); eo_do(eo_obj, evas_obj_type_set(MY_CLASS_NAME)); eo_manual_free_set(eo_obj, EINA_TRUE); @@ -650,7 +650,7 @@ _destructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) obj->delete_me = 1; evas_object_change(eo_obj, obj); end: - eo_do_super(eo_obj, eo_destructor()); + eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } @@ -1967,7 +1967,7 @@ static void _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) { Eo_Dbg_Info *root = (Eo_Dbg_Info *) va_arg(*list, Eo_Dbg_Info *); - eo_do_super(eo_obj, eo_dbg_info_get(root)); + eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); Eo_Dbg_Info *node; diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c index 2172275332..a16831a46e 100644 --- a/src/lib/evas/canvas/evas_object_polygon.c +++ b/src/lib/evas/canvas/evas_object_polygon.c @@ -89,7 +89,7 @@ evas_object_polygon_add(Evas *e) static void _constructor(Eo *eo_obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(eo_obj, eo_constructor()); + eo_do_super(eo_obj, MY_CLASS, eo_constructor()); Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); evas_object_polygon_init(eo_obj); @@ -281,7 +281,7 @@ _destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) { Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); evas_object_polygon_free(eo_obj, obj); - eo_do_super(eo_obj, eo_destructor()); + eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } static void diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c index a364da45a5..cfe736e10f 100644 --- a/src/lib/evas/canvas/evas_object_rectangle.c +++ b/src/lib/evas/canvas/evas_object_rectangle.c @@ -85,7 +85,7 @@ evas_object_rectangle_add(Evas *e) static void _constructor(Eo *eo_obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(eo_obj, eo_constructor()); + eo_do_super(eo_obj, MY_CLASS, eo_constructor()); Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); evas_object_rectangle_init(eo_obj); @@ -105,7 +105,7 @@ evas_object_rectangle_init(Evas_Object *eo_obj) static void _destructor(Eo *eo_obj, void *_obj EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(eo_obj, eo_destructor()); + eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } static void diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index 3d19e65e5a..42c2ecdbc7 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -568,7 +568,7 @@ _constructor(Eo *eo_obj, void *class_data, va_list *list EINA_UNUSED) smart = class_data; smart->object = eo_obj; - eo_do_super(eo_obj, eo_constructor()); + eo_do_super(eo_obj, MY_CLASS, eo_constructor()); evas_object_smart_init(eo_obj); Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); evas_object_inject(eo_obj, obj, evas_object_evas_get(eo_parent_get(eo_obj))); diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c index a89866fdaa..edd1339a2a 100644 --- a/src/lib/evas/canvas/evas_object_smart_clipped.c +++ b/src/lib/evas/canvas/evas_object_smart_clipped.c @@ -226,7 +226,7 @@ static void _smart_member_add(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) { Evas_Object *member = va_arg(*list, Evas_Object *); - eo_do_super(eo_obj, evas_obj_smart_member_add(member)); + eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_add(member)); evas_object_smart_clipped_smart_member_add(eo_obj, member); } @@ -246,7 +246,7 @@ _smart_member_del(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) { Evas_Object *member = va_arg(*list, Evas_Object *); evas_object_smart_clipped_smart_member_del(eo_obj, member); - eo_do_super(eo_obj, evas_obj_smart_member_del(member)); + eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_del(member)); } EAPI void @@ -285,7 +285,7 @@ evas_object_smart_clipped_class_get(void) static void _constructor(Eo *eo_obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(eo_obj, eo_constructor()); + eo_do_super(eo_obj, MY_CLASS, eo_constructor()); } static void diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index 5ece57ca5c..fcc0c95595 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -891,7 +891,7 @@ _smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->expand_h = 0; priv->expand_v = 0; - eo_do_super(obj, evas_obj_smart_add()); + eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); } static void @@ -916,7 +916,7 @@ _smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->cache = NULL; } - eo_do_super(obj, evas_obj_smart_del()); + eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); } static void @@ -959,7 +959,7 @@ evas_object_table_add(Evas *evas) static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); } diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 8232958c59..2d5722a211 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -346,7 +346,7 @@ evas_object_text_add(Evas *e) static void _constructor(Eo *eo_obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(eo_obj, eo_constructor()); + eo_do_super(eo_obj, MY_CLASS, eo_constructor()); evas_object_text_init(eo_obj); Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); evas_object_inject(eo_obj, obj, evas_object_evas_get(eo_parent_get(eo_obj))); @@ -968,7 +968,7 @@ static void _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) { Eo_Dbg_Info *root = (Eo_Dbg_Info *) va_arg(*list, Eo_Dbg_Info *); - eo_do_super(eo_obj, eo_dbg_info_get(root)); + eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); const char *text; @@ -1902,7 +1902,7 @@ _destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) { Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); evas_object_text_free(eo_obj, obj); - eo_do_super(eo_obj, eo_destructor()); + eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } static void diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index cc7e135849..02bde45656 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -5142,7 +5142,7 @@ evas_object_textblock_add(Evas *e) static void _constructor(Eo *eo_obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(eo_obj, eo_constructor()); + eo_do_super(eo_obj, MY_CLASS, eo_constructor()); Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); Evas_Object_Textblock *o = eo_data_get(eo_obj, MY_CLASS); o->cursor = calloc(1, sizeof(Evas_Textblock_Cursor)); @@ -10069,7 +10069,7 @@ static void _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) { Eo_Dbg_Info *root = (Eo_Dbg_Info *) va_arg(*list, Eo_Dbg_Info *); - eo_do_super(eo_obj, eo_dbg_info_get(root)); + eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); Eo_Dbg_Info *node; @@ -10147,7 +10147,7 @@ static void _destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) { evas_object_textblock_free(eo_obj); - eo_do_super(eo_obj, eo_destructor()); + eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } static void diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index 451cb5af90..2a630a7c1c 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -458,7 +458,7 @@ _destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) { Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); evas_object_textgrid_free(eo_obj, obj); - eo_do_super(eo_obj, eo_destructor()); + eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } static void @@ -1010,7 +1010,7 @@ evas_object_textgrid_add(Evas *e) static void _constructor(Eo *eo_obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(eo_obj, eo_constructor()); + eo_do_super(eo_obj, MY_CLASS, eo_constructor()); Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); evas_object_textgrid_init(eo_obj); diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c index b15770c9da..7d66331400 100644 --- a/src/tests/eo/composite_objects/composite_objects_comp.c +++ b/src/tests/eo/composite_objects/composite_objects_comp.c @@ -17,13 +17,13 @@ _a_get(Eo *obj, void *class_data EINA_UNUSED, va_list *list) { int *a; a = va_arg(*list, int *); - eo_do_super(obj, simple_a_get(a)); + eo_do_super(obj, MY_CLASS, simple_a_get(a)); } static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); Eo *simple = eo_add(SIMPLE_CLASS, obj); eo_composite_attach(simple, obj); diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c index 7e4be36e57..24f73643f3 100644 --- a/src/tests/eo/constructors/constructors_mixin.c +++ b/src/tests/eo/constructors/constructors_mixin.c @@ -24,7 +24,7 @@ extern int my_init_count; static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); my_init_count++; } @@ -32,7 +32,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) static void _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); my_init_count--; } diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c index b598650d73..466bd85c05 100644 --- a/src/tests/eo/constructors/constructors_simple.c +++ b/src/tests/eo/constructors/constructors_simple.c @@ -50,7 +50,7 @@ _simple_constructor(Eo *obj, void *class_data, va_list *list) int a; a = va_arg(*list, int); - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); pd->a = a; printf("%s %d\n", __func__, pd->a); @@ -61,7 +61,7 @@ _simple_constructor(Eo *obj, void *class_data, va_list *list) static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); my_init_count++; } @@ -69,7 +69,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) static void _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); my_init_count--; } diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c index 8aa771719d..b80b22b809 100644 --- a/src/tests/eo/constructors/constructors_simple2.c +++ b/src/tests/eo/constructors/constructors_simple2.c @@ -11,7 +11,7 @@ static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_error_set(obj); } diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c index 561556d4b0..c9988854df 100644 --- a/src/tests/eo/constructors/constructors_simple6.c +++ b/src/tests/eo/constructors/constructors_simple6.c @@ -11,7 +11,7 @@ static void _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); eo_error_set(obj); } diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c index de197bf4f4..20faba537e 100644 --- a/src/tests/eo/constructors/constructors_simple7.c +++ b/src/tests/eo/constructors/constructors_simple7.c @@ -14,7 +14,7 @@ static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - fail_if(eo_do_super(obj, eo_constructor())); + fail_if(eo_do_super(obj, MY_CLASS, eo_constructor())); } static void diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c index 1386759bc6..f06791b91c 100644 --- a/src/tests/eo/function_overrides/function_overrides_inherit2.c +++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c @@ -20,16 +20,16 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list) a = va_arg(*list, int); printf("%s %d\n", eo_class_name_get(MY_CLASS), a); eo_do(obj, simple_a_print()); - eo_do_super(obj, simple_a_set(a + 1)); + eo_do_super(obj, MY_CLASS, simple_a_set(a + 1)); - fail_if(!eo_do_super(obj, simple_a_print())); + fail_if(!eo_do_super(obj, MY_CLASS, simple_a_print())); } static void _print(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { printf("Hey\n"); - fail_if(eo_do_super(obj, inherit2_print())); + fail_if(eo_do_super(obj, MY_CLASS, inherit2_print())); } static void @@ -43,8 +43,8 @@ _class_print(const Eo_Class *klass, va_list *list) { (void) list; printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); - fail_if(!eo_class_do_super(klass, simple_class_print())); - fail_if(!eo_class_do_super(klass, simple_class_print2())); + fail_if(!eo_class_do_super(klass, MY_CLASS, simple_class_print())); + fail_if(!eo_class_do_super(klass, MY_CLASS, simple_class_print2())); } static void diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c index 186291328a..ba6f84a229 100644 --- a/src/tests/eo/function_overrides/function_overrides_inherit3.c +++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c @@ -15,7 +15,7 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list) int a; a = va_arg(*list, int); printf("%s %d\n", eo_class_name_get(MY_CLASS), a); - eo_do_super(obj, simple_a_set(a + 1)); + eo_do_super(obj, MY_CLASS, simple_a_set(a + 1)); } static void diff --git a/src/tests/eo/function_overrides/function_overrides_main.c b/src/tests/eo/function_overrides/function_overrides_main.c index 49a450edf8..48ab4bd1ab 100644 --- a/src/tests/eo/function_overrides/function_overrides_main.c +++ b/src/tests/eo/function_overrides/function_overrides_main.c @@ -41,8 +41,6 @@ main(int argc, char *argv[]) obj = eo_add(SIMPLE_CLASS, NULL); fail_if(eo_do(obj, inherit2_print2())); - fail_if(eo_do_super(obj, simple_a_print())); - #ifdef EO_DEBUG fail_if(eo_do(obj, simple_class_print())); #endif @@ -56,8 +54,8 @@ main(int argc, char *argv[]) fail_if(eo_class_do(SIMPLE_CLASS, simple_a_print())); #endif - eo_do_super(obj, eo_constructor()); - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, SIMPLE_CLASS, eo_constructor()); + eo_do_super(obj, SIMPLE_CLASS, eo_destructor()); eo_unref(obj); diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c index 1672943939..22e6063310 100644 --- a/src/tests/eo/function_overrides/function_overrides_simple.c +++ b/src/tests/eo/function_overrides/function_overrides_simple.c @@ -34,8 +34,8 @@ _class_print(const Eo_Class *klass, va_list *list) { (void) list; printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); - fail_if(eo_class_do_super(klass, simple_class_print())); - fail_if(eo_class_do_super(klass, simple_class_print2())); + fail_if(eo_class_do_super(klass, MY_CLASS, simple_class_print())); + fail_if(eo_class_do_super(klass, MY_CLASS, simple_class_print2())); } static void diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c index 4dc8fd9e15..8f9db135df 100644 --- a/src/tests/eo/mixin/mixin_inherit.c +++ b/src/tests/eo/mixin/mixin_inherit.c @@ -13,7 +13,7 @@ static void _a_get(Eo *obj, void *class_data EINA_UNUSED, va_list *list) { int *name = va_arg(*list, int *); - eo_do_super(obj, simple_a_get(name)); + eo_do_super(obj, MY_CLASS, simple_a_get(name)); printf("%s\n", __func__); } diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c index b6fd59e367..ee3342f00b 100644 --- a/src/tests/eo/mixin/mixin_mixin.c +++ b/src/tests/eo/mixin/mixin_mixin.c @@ -24,13 +24,13 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED, va_list *list) static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); } static void _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); } static void diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c index dbd7c97d00..451a8ec1ca 100644 --- a/src/tests/eo/mixin/mixin_mixin2.c +++ b/src/tests/eo/mixin/mixin_mixin2.c @@ -18,7 +18,7 @@ _ab_sum_get(Eo *obj, void *class_data, va_list *list) Mixin2_Public_Data *pd = (Mixin2_Public_Data *) class_data; int *sum = va_arg(*list, int *); printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); - eo_do_super(obj, mixin_ab_sum_get(sum)); + eo_do_super(obj, MY_CLASS, mixin_ab_sum_get(sum)); ++*sum; pd->count += 2; @@ -33,13 +33,13 @@ _ab_sum_get(Eo *obj, void *class_data, va_list *list) static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); } static void _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); } static void diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c index 08c2b5cc7b..6ad66e1172 100644 --- a/src/tests/eo/mixin/mixin_mixin3.c +++ b/src/tests/eo/mixin/mixin_mixin3.c @@ -18,7 +18,7 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED, va_list *list) Mixin3_Public_Data *pd = (Mixin3_Public_Data *) class_data; int *sum = va_arg(*list, int *); printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); - eo_do_super(obj, mixin_ab_sum_get(sum)); + eo_do_super(obj, MY_CLASS, mixin_ab_sum_get(sum)); ++*sum; pd->count += 3; @@ -33,13 +33,13 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED, va_list *list) static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); } static void _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_destructor()); + eo_do_super(obj, MY_CLASS, eo_destructor()); } static void diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c index 506d798138..77d15748a6 100644 --- a/src/tests/eo/signals/signals_simple.c +++ b/src/tests/eo/signals/signals_simple.c @@ -67,7 +67,7 @@ _cb_deled(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_inf static void _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - eo_do_super(obj, eo_constructor()); + eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, NULL)); eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, NULL));