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

Change usage of eo_do_super to the new prototype.

This commit is contained in:
Tom Hacohen 2013-03-18 15:33:54 +00:00
parent 83180acf26
commit a170683334
44 changed files with 94 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/examples/eo/evas/evas_elw_box.c
View File

@ -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;

2
src/examples/eo/evas/evas_elw_boxedbutton.c
View File

@ -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);

6
src/examples/eo/evas/evas_elw_button.c
View File

@ -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

2
src/examples/eo/evas/evas_elw_win.c
View File

@ -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;

4
src/examples/eo/evas/evas_evas_obj.c
View File

@ -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;

4
src/lib/ecore/ecore_anim.c
View File

@ -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

4
src/lib/ecore/ecore_idle_enterer.c
View File

@ -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

4
src/lib/ecore/ecore_idle_exiter.c
View File

@ -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

4
src/lib/ecore/ecore_idler.c
View File

@ -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

4
src/lib/ecore/ecore_job.c
View File

@ -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());
}
/**

4
src/lib/ecore/ecore_poll.c
View File

@ -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());
}
/**

4
src/lib/ecore/ecore_timer.c
View File

@ -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

6
src/lib/edje/edje_edit.c
View File

@ -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)

8
src/lib/edje/edje_smart.c
View File

@ -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))
{

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

@ -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)

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

@ -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

6
src/lib/evas/canvas/evas_object_box.c
View File

@ -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));

2
src/lib/evas/canvas/evas_object_grid.c
View File

@ -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());

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

@ -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

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

@ -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

6
src/lib/evas/canvas/evas_object_main.c
View File

@ -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;

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

@ -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

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

@ -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

2
src/lib/evas/canvas/evas_object_smart.c
View File

@ -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)));

6
src/lib/evas/canvas/evas_object_smart_clipped.c
View File

@ -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

6
src/lib/evas/canvas/evas_object_table.c
View File

@ -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));
}

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

@ -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

6
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -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

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

@ -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);

4
src/tests/eo/composite_objects/composite_objects_comp.c
View File

@ -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);

4
src/tests/eo/constructors/constructors_mixin.c
View File

@ -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--;
}

6
src/tests/eo/constructors/constructors_simple.c
View File

@ -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--;
}

2
src/tests/eo/constructors/constructors_simple2.c
View File

@ -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);
}

2
src/tests/eo/constructors/constructors_simple6.c
View File

@ -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);
}

2
src/tests/eo/constructors/constructors_simple7.c
View File

@ -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

10
src/tests/eo/function_overrides/function_overrides_inherit2.c
View File

@ -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

2
src/tests/eo/function_overrides/function_overrides_inherit3.c
View File

@ -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

6
src/tests/eo/function_overrides/function_overrides_main.c
View File

@ -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);

4
src/tests/eo/function_overrides/function_overrides_simple.c
View File

@ -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

2
src/tests/eo/mixin/mixin_inherit.c
View File

@ -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__);
}

4
src/tests/eo/mixin/mixin_mixin.c
View File

@ -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

6
src/tests/eo/mixin/mixin_mixin2.c
View File

@ -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

6
src/tests/eo/mixin/mixin_mixin3.c
View File

@ -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

2
src/tests/eo/signals/signals_simple.c
View File

@ -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));