From 682c69764d8f7fc984d554e5d3ba5ab82916c15b Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Fri, 27 Sep 2013 16:26:25 +0100 Subject: [PATCH] Revert "eo: libs,test,benchmarks Eo_Class -> Eo" This reverts commit 1714fe93f42d6950171d0ab9069bfb808a62fd31. We actually want this type, it makes things clearer. Conflicts: src/tests/eo/function_overrides/function_overrides_inherit2.c src/tests/eo/function_overrides/function_overrides_simple.c src/tests/eo/suite/eo_test_class_simple.c --- src/benchmarks/eo/class_simple.c | 2 +- src/benchmarks/eo/class_simple.h | 2 +- src/benchmarks/eo/eo_bench_eo_do.c | 4 +- src/lib/ecore/Ecore_Eo.h | 14 +++--- src/lib/ecore/ecore_anim.c | 2 +- src/lib/ecore/ecore_idle_enterer.c | 2 +- src/lib/ecore/ecore_idle_exiter.c | 2 +- src/lib/ecore/ecore_idler.c | 2 +- src/lib/ecore/ecore_job.c | 2 +- src/lib/ecore/ecore_poll.c | 2 +- src/lib/ecore/ecore_private.h | 2 +- src/lib/ecore/ecore_timer.c | 2 +- src/lib/ecore_audio/ecore_audio_obj.c | 2 +- src/lib/ecore_audio/ecore_audio_obj.h | 2 +- src/lib/ecore_audio/ecore_audio_obj_in.c | 2 +- src/lib/ecore_audio/ecore_audio_obj_in.h | 2 +- .../ecore_audio/ecore_audio_obj_in_sndfile.c | 2 +- .../ecore_audio/ecore_audio_obj_in_sndfile.h | 2 +- src/lib/ecore_audio/ecore_audio_obj_in_tone.c | 2 +- src/lib/ecore_audio/ecore_audio_obj_in_tone.h | 2 +- src/lib/ecore_audio/ecore_audio_obj_out.c | 2 +- src/lib/ecore_audio/ecore_audio_obj_out.h | 2 +- .../ecore_audio/ecore_audio_obj_out_pulse.c | 2 +- .../ecore_audio/ecore_audio_obj_out_pulse.h | 2 +- .../ecore_audio/ecore_audio_obj_out_sndfile.c | 2 +- .../ecore_audio/ecore_audio_obj_out_sndfile.h | 2 +- src/lib/edje/Edje_Eo.h | 4 +- src/lib/edje/edje_edit.c | 2 +- src/lib/edje/edje_smart.c | 2 +- src/lib/evas/Evas_Common.h | 2 +- src/lib/evas/Evas_Eo.h | 44 +++++++++---------- src/lib/evas/canvas/common_interfaces.c | 4 +- src/lib/evas/canvas/evas_main.c | 2 +- src/lib/evas/canvas/evas_object_box.c | 2 +- src/lib/evas/canvas/evas_object_grid.c | 2 +- src/lib/evas/canvas/evas_object_image.c | 2 +- src/lib/evas/canvas/evas_object_line.c | 2 +- src/lib/evas/canvas/evas_object_main.c | 2 +- src/lib/evas/canvas/evas_object_polygon.c | 2 +- src/lib/evas/canvas/evas_object_rectangle.c | 2 +- src/lib/evas/canvas/evas_object_smart.c | 10 ++--- .../evas/canvas/evas_object_smart_clipped.c | 2 +- src/lib/evas/canvas/evas_object_table.c | 2 +- src/lib/evas/canvas/evas_object_text.c | 2 +- src/lib/evas/canvas/evas_object_textblock.c | 2 +- src/lib/evas/canvas/evas_object_textgrid.c | 2 +- src/lib/evas/canvas/evas_out.c | 2 +- src/tests/eo/access/access_inherit.c | 2 +- src/tests/eo/access/access_inherit.h | 2 +- src/tests/eo/access/access_simple.c | 2 +- src/tests/eo/access/access_simple.h | 2 +- .../composite_objects_comp.c | 2 +- .../composite_objects_comp.h | 2 +- .../composite_objects_simple.c | 2 +- .../composite_objects_simple.h | 2 +- .../eo/constructors/constructors_mixin.c | 2 +- .../eo/constructors/constructors_mixin.h | 2 +- .../eo/constructors/constructors_simple.c | 4 +- .../eo/constructors/constructors_simple.h | 2 +- .../eo/constructors/constructors_simple2.c | 2 +- .../eo/constructors/constructors_simple2.h | 2 +- .../eo/constructors/constructors_simple3.c | 2 +- .../eo/constructors/constructors_simple3.h | 2 +- .../eo/constructors/constructors_simple4.h | 2 +- .../eo/constructors/constructors_simple5.c | 2 +- .../eo/constructors/constructors_simple5.h | 2 +- .../eo/constructors/constructors_simple6.c | 2 +- .../eo/constructors/constructors_simple6.h | 2 +- .../eo/constructors/constructors_simple7.c | 2 +- .../eo/constructors/constructors_simple7.h | 2 +- .../function_overrides_inherit.h | 2 +- .../function_overrides_inherit2.c | 4 +- .../function_overrides_inherit2.h | 2 +- .../function_overrides_inherit3.c | 2 +- .../function_overrides_inherit3.h | 2 +- .../function_overrides_simple.c | 6 +-- .../function_overrides_simple.h | 2 +- src/tests/eo/interface/interface_interface.h | 2 +- src/tests/eo/interface/interface_interface2.h | 2 +- src/tests/eo/interface/interface_simple.c | 2 +- src/tests/eo/interface/interface_simple.h | 2 +- src/tests/eo/mixin/mixin_inherit.c | 2 +- src/tests/eo/mixin/mixin_inherit.h | 2 +- src/tests/eo/mixin/mixin_mixin.c | 2 +- src/tests/eo/mixin/mixin_mixin.h | 2 +- src/tests/eo/mixin/mixin_mixin2.c | 2 +- src/tests/eo/mixin/mixin_mixin2.h | 2 +- src/tests/eo/mixin/mixin_mixin3.c | 2 +- src/tests/eo/mixin/mixin_mixin3.h | 2 +- src/tests/eo/mixin/mixin_mixin4.h | 2 +- src/tests/eo/mixin/mixin_simple.c | 2 +- src/tests/eo/mixin/mixin_simple.h | 2 +- src/tests/eo/signals/signals_simple.c | 2 +- src/tests/eo/signals/signals_simple.h | 2 +- src/tests/eo/suite/eo_test_class_errors.c | 24 +++++----- src/tests/eo/suite/eo_test_class_simple.c | 4 +- src/tests/eo/suite/eo_test_class_simple.h | 2 +- src/tests/eo/suite/eo_test_general.c | 40 ++++++++--------- 98 files changed, 167 insertions(+), 167 deletions(-) diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c index cab151c0b1..2e8dc3f621 100644 --- a/src/benchmarks/eo/class_simple.c +++ b/src/benchmarks/eo/class_simple.c @@ -20,7 +20,7 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), diff --git a/src/benchmarks/eo/class_simple.h b/src/benchmarks/eo/class_simple.h index 3e0a73c48d..b29e7987c1 100644 --- a/src/benchmarks/eo/class_simple.h +++ b/src/benchmarks/eo/class_simple.h @@ -18,6 +18,6 @@ typedef struct #define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a) #define SIMPLE_CLASS simple_class_get() -const Eo *simple_class_get(void); +const Eo_Class *simple_class_get(void); #endif diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c index 48e5eafbb5..601290e191 100644 --- a/src/benchmarks/eo/eo_bench_eo_do.c +++ b/src/benchmarks/eo/eo_bench_eo_do.c @@ -19,7 +19,7 @@ bench_eo_do_general(int request) eo_unref(obj); } -static const Eo *cur_klass; +static const Eo_Class *cur_klass; static void _a_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list) @@ -31,7 +31,7 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h index 31177fcc28..0daf06aa53 100644 --- a/src/lib/ecore/Ecore_Eo.h +++ b/src/lib/ecore/Ecore_Eo.h @@ -11,7 +11,7 @@ extern "C" { * @{ */ #define ECORE_POLLER_CLASS ecore_poller_class_get() -const Eo *ecore_poller_class_get(void) EINA_CONST; +const Eo_Class *ecore_poller_class_get(void) EINA_CONST; extern EAPI Eo_Op ECORE_POLLER_BASE_ID; enum @@ -74,7 +74,7 @@ enum */ #define ECORE_ANIMATOR_CLASS ecore_animator_class_get() -const Eo *ecore_animator_class_get(void) EINA_CONST; +const Eo_Class *ecore_animator_class_get(void) EINA_CONST; extern EAPI Eo_Op ECORE_ANIMATOR_BASE_ID; @@ -123,7 +123,7 @@ enum */ #define ECORE_TIMER_CLASS ecore_timer_class_get() -const Eo *ecore_timer_class_get(void) EINA_CONST; +const Eo_Class *ecore_timer_class_get(void) EINA_CONST; extern EAPI Eo_Op ECORE_TIMER_BASE_ID; enum @@ -235,7 +235,7 @@ enum */ #define ECORE_IDLER_CLASS ecore_idler_class_get() -const Eo *ecore_idler_class_get(void) EINA_CONST; +const Eo_Class *ecore_idler_class_get(void) EINA_CONST; extern EAPI Eo_Op ECORE_IDLER_BASE_ID; @@ -264,7 +264,7 @@ enum */ #define ECORE_IDLE_ENTERER_CLASS ecore_idle_enterer_class_get() -const Eo *ecore_idle_enterer_class_get(void) EINA_CONST; +const Eo_Class *ecore_idle_enterer_class_get(void) EINA_CONST; extern EAPI Eo_Op ECORE_IDLE_ENTERER_BASE_ID; @@ -306,7 +306,7 @@ enum */ #define ECORE_IDLE_EXITER_CLASS ecore_idle_exiter_class_get() -const Eo *ecore_idle_exiter_class_get(void) EINA_CONST; +const Eo_Class *ecore_idle_exiter_class_get(void) EINA_CONST; extern EAPI Eo_Op ECORE_IDLE_EXITER_BASE_ID; @@ -341,7 +341,7 @@ enum */ #define ECORE_JOB_CLASS ecore_job_class_get() -const Eo *ecore_job_class_get(void) EINA_CONST; +const Eo_Class *ecore_job_class_get(void) EINA_CONST; extern EAPI Eo_Op ECORE_JOB_BASE_ID; diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c index a9f8430cf2..5d32c31603 100644 --- a/src/lib/ecore/ecore_anim.c +++ b/src/lib/ecore/ecore_anim.c @@ -600,7 +600,7 @@ _ecore_animator(void *data EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c index 8d1fa57fcf..7cbabc8a52 100644 --- a/src/lib/ecore/ecore_idle_enterer.c +++ b/src/lib/ecore/ecore_idle_enterer.c @@ -282,7 +282,7 @@ _ecore_idle_enterer_exist(void) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c index b1418a0c39..da85f1dc0f 100644 --- a/src/lib/ecore/ecore_idle_exiter.c +++ b/src/lib/ecore/ecore_idle_exiter.c @@ -233,7 +233,7 @@ _ecore_idle_exiter_exist(void) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c index 8f0438222f..051c3e1e7a 100644 --- a/src/lib/ecore/ecore_idler.c +++ b/src/lib/ecore/ecore_idler.c @@ -216,7 +216,7 @@ _ecore_idler_exist(void) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c index 04cd09d352..8720a7f2ee 100644 --- a/src/lib/ecore/ecore_job.c +++ b/src/lib/ecore/ecore_job.c @@ -169,7 +169,7 @@ _ecore_job_event_free(void *data, } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/ecore/ecore_poll.c b/src/lib/ecore/ecore_poll.c index 92007bd24b..4883d7bb86 100644 --- a/src/lib/ecore/ecore_poll.c +++ b/src/lib/ecore/ecore_poll.c @@ -457,7 +457,7 @@ _ecore_poller_shutdown(void) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h index e2ad2c9aca..1c7f53e5a4 100644 --- a/src/lib/ecore/ecore_private.h +++ b/src/lib/ecore/ecore_private.h @@ -417,6 +417,6 @@ GENERIC_ALLOC_FREE_HEADER(Ecore_Win32_Handler, ecore_win32_handler); extern Eo *_ecore_parent; #define ECORE_PARENT_CLASS ecore_parent_class_get() -const Eo *ecore_parent_class_get(void) EINA_CONST; +const Eo_Class *ecore_parent_class_get(void) EINA_CONST; #endif diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index d99fed20c3..eb83321dfb 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -976,7 +976,7 @@ _ecore_timer_cmp(const void *d1, #endif static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/ecore_audio/ecore_audio_obj.c b/src/lib/ecore_audio/ecore_audio_obj.c index 9bbc1d4ce2..83ddbe95e1 100644 --- a/src/lib/ecore_audio/ecore_audio_obj.c +++ b/src/lib/ecore_audio/ecore_audio_obj.c @@ -87,7 +87,7 @@ static void _constructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) } -static void _class_constructor(Eo *klass) +static void _class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { /* Virtual functions of parent class implemented in this class */ diff --git a/src/lib/ecore_audio/ecore_audio_obj.h b/src/lib/ecore_audio/ecore_audio_obj.h index 603aa96182..fc8d8ebb2f 100644 --- a/src/lib/ecore_audio/ecore_audio_obj.h +++ b/src/lib/ecore_audio/ecore_audio_obj.h @@ -41,7 +41,7 @@ extern "C" * * @return The Eo class ID */ -const Eo *ecore_audio_obj_class_get() EINA_CONST; +const Eo_Class *ecore_audio_obj_class_get() EINA_CONST; extern EAPI Eo_Op ECORE_AUDIO_OBJ_BASE_ID; diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c index 9574cf17ef..1abaae4d09 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in.c @@ -251,7 +251,7 @@ static void _destructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } -static void _class_constructor(Eo *klass) +static void _class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { /* Virtual functions of parent class implemented in this class */ diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.h b/src/lib/ecore_audio/ecore_audio_obj_in.h index 080dac7b0f..b0b26eaafb 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in.h +++ b/src/lib/ecore_audio/ecore_audio_obj_in.h @@ -41,7 +41,7 @@ extern "C" * * @return The Eo class ID */ -const Eo *ecore_audio_obj_in_class_get() EINA_CONST; +const Eo_Class *ecore_audio_obj_in_class_get() EINA_CONST; extern EAPI Eo_Op ECORE_AUDIO_OBJ_IN_BASE_ID; diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c index a8abbb1217..4799f6d676 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c @@ -253,7 +253,7 @@ static void _destructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } -static void _class_constructor(Eo *klass) +static void _class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { /* Virtual functions of parent class implemented in this class */ diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.h b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.h index 2ac034437a..9ed5e7d209 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.h +++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.h @@ -41,7 +41,7 @@ extern "C" * * @return The Eo class ID */ -const Eo *ecore_audio_obj_in_sndfile_class_get() EINA_CONST; +const Eo_Class *ecore_audio_obj_in_sndfile_class_get() EINA_CONST; extern EAPI Eo_Op ECORE_AUDIO_OBJ_IN_SNDFILE_BASE_ID; diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c index 34a3f03992..f0fec98dcb 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c @@ -149,7 +149,7 @@ static void _constructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) obj->freq = 1000; } -static void _class_constructor(Eo *klass) +static void _class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { /* Virtual functions of parent class implemented in this class */ diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h index 059142209c..13bd01645c 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h +++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h @@ -48,7 +48,7 @@ extern "C" * * @return The Eo class ID */ -const Eo *ecore_audio_obj_in_tone_class_get() EINA_CONST; +const Eo_Class *ecore_audio_obj_in_tone_class_get() EINA_CONST; extern EAPI Eo_Op ECORE_AUDIO_OBJ_IN_TONE_BASE_ID; diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c index 4834cce0cd..e3822efca3 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out.c @@ -174,7 +174,7 @@ static void _destructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } -static void _class_constructor(Eo *klass) +static void _class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { /* Virtual functions of parent class implemented in this class */ diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.h b/src/lib/ecore_audio/ecore_audio_obj_out.h index 68fa451389..0052545306 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out.h +++ b/src/lib/ecore_audio/ecore_audio_obj_out.h @@ -41,7 +41,7 @@ extern "C" * * @return The Eo class ID */ -const Eo *ecore_audio_obj_out_class_get() EINA_CONST; +const Eo_Class *ecore_audio_obj_out_class_get() EINA_CONST; extern EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_BASE_ID; diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c index 0a504fa442..80f7fb0227 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c @@ -287,7 +287,7 @@ static void _destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UN class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj); } -static void _class_constructor(Eo *klass) +static void _class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { /* Virtual functions of parent class implemented in this class */ diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.h b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.h index a1bc110201..a0318316d1 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.h +++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.h @@ -41,7 +41,7 @@ extern "C" * * @return The Eo class ID */ -const Eo *ecore_audio_obj_out_pulse_class_get() EINA_CONST; +const Eo_Class *ecore_audio_obj_out_pulse_class_get() EINA_CONST; extern EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_PULSE_BASE_ID; diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c index 5e9664c817..445a63e484 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c @@ -214,7 +214,7 @@ static void _destructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } -static void _class_constructor(Eo *klass) +static void _class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { /* Virtual functions of parent class implemented in this class */ diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.h b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.h index d301bb45f8..818abbe646 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.h +++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.h @@ -41,7 +41,7 @@ extern "C" * * @return The Eo class ID */ -const Eo *ecore_audio_obj_out_sndfile_class_get() EINA_CONST; +const Eo_Class *ecore_audio_obj_out_sndfile_class_get() EINA_CONST; extern EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_SNDFILE_BASE_ID; diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h index 913d1d0e45..b892ac62f4 100644 --- a/src/lib/edje/Edje_Eo.h +++ b/src/lib/edje/Edje_Eo.h @@ -1,6 +1,6 @@ #define EDJE_OBJ_CLASS edje_object_class_get() -const Eo *edje_object_class_get(void) EINA_CONST; +const Eo_Class *edje_object_class_get(void) EINA_CONST; extern EAPI Eo_Op EDJE_OBJ_BASE_ID; @@ -2258,4 +2258,4 @@ enum #define EDJE_EDIT_CLASS edje_edit_class_get() -const Eo *edje_edit_class_get(void) EINA_CONST; +const Eo_Class *edje_edit_class_get(void) EINA_CONST; diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 192ef24891..dabbc4c77f 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -7844,7 +7844,7 @@ edje_edit_print_internal_status(Evas_Object *obj) } static void -_edje_edit_class_constructor(Eo *klass) +_edje_edit_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _edje_edit_constructor), diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index f5c29b1481..c5c073aff5 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -380,7 +380,7 @@ _edje_smart_mmap_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) } static void -_edje_smart_class_constructor(Eo *klass) +_edje_smart_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _edje_smart_constructor), diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index 94a02713af..77f65bd4d6 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -4436,7 +4436,7 @@ EAPI int evas_smart_usage_get(const Evas_Smart *s) * * @ingroup Evas_Smart_Object_Group */ -EAPI void evas_smart_legacy_type_register(const char *type, const Eo *klass) EINA_ARG_NONNULL(1, 2); +EAPI void evas_smart_legacy_type_register(const char *type, const Eo_Class *klass) EINA_ARG_NONNULL(1, 2); /** * @} diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 4f6c633396..232483107b 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -138,12 +138,12 @@ EAPI extern const Eo_Event_Description _DRAG_START_LEFT_EVENT; #define EVAS_SMART_DRAG_START_RIGHT_EVENT (&(_DRAG_START_RIGHT_EVENT)) #define EVAS_SMART_DRAG_START_LEFT_EVENT (&(_DRAG_START_LEFT_EVENT)) -const Eo *evas_smart_signal_interface_get(void) EINA_CONST; -const Eo *evas_smart_clickable_interface_get(void) EINA_CONST; -const Eo *evas_smart_scrollable_interface_get(void) EINA_CONST; -const Eo *evas_smart_zoomable_interface_get(void) EINA_CONST; -const Eo *evas_smart_selectable_interface_get(void) EINA_CONST; -const Eo *evas_smart_draggable_interface_get(void) EINA_CONST; +const Eo_Class *evas_smart_signal_interface_get(void) EINA_CONST; +const Eo_Class *evas_smart_clickable_interface_get(void) EINA_CONST; +const Eo_Class *evas_smart_scrollable_interface_get(void) EINA_CONST; +const Eo_Class *evas_smart_zoomable_interface_get(void) EINA_CONST; +const Eo_Class *evas_smart_selectable_interface_get(void) EINA_CONST; +const Eo_Class *evas_smart_draggable_interface_get(void) EINA_CONST; #define EVAS_SMART_SIGNAL_INTERFACE evas_smart_signal_interface_get() #define EVAS_SMART_CLICKABLE_INTERFACE evas_smart_clickable_interface_get() @@ -154,7 +154,7 @@ const Eo *evas_smart_draggable_interface_get(void) EINA_CONST; #define EVAS_CLASS evas_class_get() -const Eo *evas_class_get(void) EINA_CONST; +const Eo_Class *evas_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_CANVAS_BASE_ID; @@ -1767,7 +1767,7 @@ enum #define EVAS_OBJ_RECTANGLE_CLASS evas_object_rectangle_class_get() -const Eo *evas_object_rectangle_class_get(void) EINA_CONST; +const Eo_Class *evas_object_rectangle_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OBJ_RECTANGLE_BASE_ID; @@ -1790,7 +1790,7 @@ enum #define EVAS_OBJ_TEXT_CLASS evas_object_text_class_get() -const Eo *evas_object_text_class_get(void) EINA_CONST; +const Eo_Class *evas_object_text_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OBJ_TEXT_BASE_ID; @@ -2265,7 +2265,7 @@ enum #define EVAS_OBJ_TEXTBLOCK_CLASS evas_object_textblock_class_get() -const Eo *evas_object_textblock_class_get(void) EINA_CONST; +const Eo_Class *evas_object_textblock_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OBJ_TEXTBLOCK_BASE_ID; @@ -2640,7 +2640,7 @@ enum #define EVAS_OBJ_TEXTGRID_CLASS evas_object_textgrid_class_get() -const Eo *evas_object_textgrid_class_get(void) EINA_CONST; +const Eo_Class *evas_object_textgrid_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OBJ_TEXTGRID_BASE_ID; @@ -2864,7 +2864,7 @@ enum * @{ */ #define EVAS_OBJ_LINE_CLASS evas_object_line_class_get() -const Eo *evas_object_line_class_get(void) EINA_CONST; +const Eo_Class *evas_object_line_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OBJ_LINE_BASE_ID; @@ -2918,7 +2918,7 @@ enum * @{ */ #define EVAS_OBJ_POLYGON_CLASS evas_object_polygon_class_get() -const Eo *evas_object_polygon_class_get(void) EINA_CONST; +const Eo_Class *evas_object_polygon_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OBJ_POLYGON_BASE_ID; @@ -2967,7 +2967,7 @@ enum */ #define EVAS_OBJ_SMART_CLASS evas_object_smart_class_get() -const Eo *evas_object_smart_class_get(void) EINA_CONST; +const Eo_Class *evas_object_smart_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OBJ_SMART_BASE_ID; @@ -3333,7 +3333,7 @@ enum #define EVAS_OBJ_SMART_CLIPPED_CLASS evas_object_smart_clipped_eo_class_get() -const Eo *evas_object_smart_clipped_eo_class_get(void) EINA_CONST; +const Eo_Class *evas_object_smart_clipped_eo_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OBJ_SMART_CLIPPED_BASE_ID; @@ -3353,7 +3353,7 @@ enum */ #define EVAS_OBJ_BOX_CLASS evas_object_box_class_get() -const Eo *evas_object_box_class_get(void) EINA_CONST; +const Eo_Class *evas_object_box_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OBJ_BOX_BASE_ID; @@ -3899,7 +3899,7 @@ enum */ #define EVAS_OBJ_TABLE_CLASS evas_object_table_class_get() -const Eo *evas_object_table_class_get(void) EINA_CONST; +const Eo_Class *evas_object_table_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OBJ_TABLE_BASE_ID; @@ -4160,7 +4160,7 @@ enum */ #define EVAS_OBJ_GRID_CLASS evas_object_grid_class_get() -const Eo *evas_object_grid_class_get(void) EINA_CONST; +const Eo_Class *evas_object_grid_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OBJ_GRID_BASE_ID; @@ -4359,7 +4359,7 @@ enum #define EVAS_COMMON_CLASS evas_common_class_get() -const Eo *evas_common_class_get(void) EINA_CONST; +const Eo_Class *evas_common_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_COMMON_BASE_ID; @@ -5531,10 +5531,10 @@ enum #define EVAS_OBJ_CLASS evas_object_class_get() -const Eo *evas_object_class_get(void) EINA_CONST; +const Eo_Class *evas_object_class_get(void) EINA_CONST; #define EVAS_OBJ_IMAGE_CLASS evas_object_image_class_get() -const Eo *evas_object_image_class_get(void) EINA_CONST; +const Eo_Class *evas_object_image_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OBJ_IMAGE_BASE_ID; @@ -6542,7 +6542,7 @@ enum */ #define EVAS_OUT_CLASS evas_out_class_get() -const Eo *evas_out_class_get(void) EINA_CONST; +const Eo_Class *evas_out_class_get(void) EINA_CONST; extern EAPI Eo_Op EVAS_OUT_BASE_ID; enum diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c index b831c72d68..f608caa796 100644 --- a/src/lib/evas/canvas/common_interfaces.c +++ b/src/lib/evas/canvas/common_interfaces.c @@ -173,7 +173,7 @@ _signal_interface_del(void *data) } static void -_signal_interface_constructor(Eo *klass EINA_UNUSED) +_signal_interface_constructor(Eo_Class *klass EINA_UNUSED) { signals_hash_table = eina_hash_string_superfast_new(_signal_interface_del); ADD_INTERFACE_SIGNALS(_clickable_events_desc); @@ -186,7 +186,7 @@ _signal_interface_constructor(Eo *klass EINA_UNUSED) #undef ADD_SIGNAL static void -_signal_interface_destructor(Eo *klass EINA_UNUSED) +_signal_interface_destructor(Eo_Class *klass EINA_UNUSED) { eina_hash_free(signals_hash_table); } diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 89a72deaf2..aefdce5090 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -1000,7 +1000,7 @@ _evas_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index 8b6164fe6a..84200edf3c 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -2296,7 +2296,7 @@ _smart_data_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c index 96bb88b698..c0bbc96a83 100644 --- a/src/lib/evas/canvas/evas_object_grid.c +++ b/src/lib/evas/canvas/evas_object_grid.c @@ -625,7 +625,7 @@ _mirrored_set(Eo *o EINA_UNUSED, void *_pd, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index bc83e46525..509b10966c 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -5259,7 +5259,7 @@ _evas_object_image_video_overlay_hide(Evas_Object *eo_obj) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c index 927c2ac216..621a43e16e 100644 --- a/src/lib/evas/canvas/evas_object_line.c +++ b/src/lib/evas/canvas/evas_object_line.c @@ -481,7 +481,7 @@ evas_object_line_coords_recalc(Evas_Object *eo_obj EINA_UNUSED, } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index 0d84c71857..27fc7adfe4 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -2420,7 +2420,7 @@ _smart_type_check_ptr(Eo *eo_obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *li } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c index d2a34797ce..618a029472 100644 --- a/src/lib/evas/canvas/evas_object_polygon.c +++ b/src/lib/evas/canvas/evas_object_polygon.c @@ -593,7 +593,7 @@ evas_object_polygon_was_inside(Evas_Object *eo_obj EINA_UNUSED, } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c index ec4e6158a2..36ebb21645 100644 --- a/src/lib/evas/canvas/evas_object_rectangle.c +++ b/src/lib/evas/canvas/evas_object_rectangle.c @@ -323,7 +323,7 @@ static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index 45849487bb..b2d54c8661 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -379,7 +379,7 @@ _smart_type_check(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) *type_check = EINA_FALSE; const Evas_Smart_Class *sc; - Eo *klass; + Eo_Class *klass; Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if (!obj) return; @@ -420,7 +420,7 @@ evas_object_smart_type_check_ptr(const Evas_Object *eo_obj, const char *type) static void _smart_type_check_ptr(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) { - Eo *klass; + Eo_Class *klass; const Evas_Smart_Class *sc; const char* type = va_arg(*list, const char *); Eina_Bool *type_check = va_arg(*list, Eina_Bool *); @@ -452,7 +452,7 @@ _smart_type_check_ptr(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) } EAPI void -evas_smart_legacy_type_register(const char *type, const Eo *klass) +evas_smart_legacy_type_register(const char *type, const Eo_Class *klass) { eina_hash_set(_evas_smart_class_names_hash_table, type, klass); } @@ -1782,7 +1782,7 @@ static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), @@ -1823,7 +1823,7 @@ _class_constructor(Eo *klass) } static void -_class_destructor(Eo *klass EINA_UNUSED) +_class_destructor(Eo_Class *klass EINA_UNUSED) { eina_hash_free(_evas_smart_class_names_hash_table); } diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c index 21dbfccf88..f247f6d0e0 100644 --- a/src/lib/evas/canvas/evas_object_smart_clipped.c +++ b/src/lib/evas/canvas/evas_object_smart_clipped.c @@ -287,7 +287,7 @@ _constructor(Eo *eo_obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index cd2b5363d2..efe3240f95 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -1564,7 +1564,7 @@ _mirrored_set(Eo *o, void *_pd, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 8f7157bf31..8fae9da593 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -2481,7 +2481,7 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index e4d0966601..cf242feabf 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -11289,7 +11289,7 @@ _evas_textblock_format_offset_get(const Evas_Object_Textblock_Node_Format *n) #endif static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index f4572ce716..87634d4591 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -1666,7 +1666,7 @@ _update_add(Eo *eo_obj, void *_pd, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c index e0fe918e27..2b1bdb629a 100644 --- a/src/lib/evas/canvas/evas_out.c +++ b/src/lib/evas/canvas/evas_out.c @@ -155,7 +155,7 @@ _output_engine_info_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c index 56d0ff6dd6..b42a4a6c6e 100644 --- a/src/tests/eo/access/access_inherit.c +++ b/src/tests/eo/access/access_inherit.c @@ -20,7 +20,7 @@ _prot_print(Eo *obj, void *class_data EINA_UNUSED, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(INHERIT_ID(INHERIT_SUB_ID_PROT_PRINT), _prot_print), diff --git a/src/tests/eo/access/access_inherit.h b/src/tests/eo/access/access_inherit.h index 7fd15c330b..f701dae484 100644 --- a/src/tests/eo/access/access_inherit.h +++ b/src/tests/eo/access/access_inherit.h @@ -13,6 +13,6 @@ enum { #define inherit_prot_print() INHERIT_ID(INHERIT_SUB_ID_PROT_PRINT) #define INHERIT_CLASS inherit_class_get() -const Eo *inherit_class_get(void); +const Eo_Class *inherit_class_get(void); #endif diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c index c57c7c911e..42fa259e40 100644 --- a/src/tests/eo/access/access_simple.c +++ b/src/tests/eo/access/access_simple.c @@ -35,7 +35,7 @@ _a_set(Eo *obj, void *class_data, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), diff --git a/src/tests/eo/access/access_simple.h b/src/tests/eo/access/access_simple.h index 33ba8eee38..11624b7d20 100644 --- a/src/tests/eo/access/access_simple.h +++ b/src/tests/eo/access/access_simple.h @@ -21,6 +21,6 @@ extern const Eo_Event_Description _EV_A_CHANGED; #define EV_A_CHANGED (&(_EV_A_CHANGED)) #define SIMPLE_CLASS simple_class_get() -const Eo *simple_class_get(void); +const Eo_Class *simple_class_get(void); #endif diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c index 40a75b7ccb..7d66331400 100644 --- a/src/tests/eo/composite_objects/composite_objects_comp.c +++ b/src/tests/eo/composite_objects/composite_objects_comp.c @@ -38,7 +38,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/tests/eo/composite_objects/composite_objects_comp.h b/src/tests/eo/composite_objects/composite_objects_comp.h index 670a705986..95001b7020 100644 --- a/src/tests/eo/composite_objects/composite_objects_comp.h +++ b/src/tests/eo/composite_objects/composite_objects_comp.h @@ -2,6 +2,6 @@ #define COMP_H #define COMP_CLASS comp_class_get() -const Eo *comp_class_get(void); +const Eo_Class *comp_class_get(void); #endif diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c index 897f6b7ea5..5420ef895d 100644 --- a/src/tests/eo/composite_objects/composite_objects_simple.c +++ b/src/tests/eo/composite_objects/composite_objects_simple.c @@ -34,7 +34,7 @@ _a_get(Eo *obj EINA_UNUSED, void *class_data, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), diff --git a/src/tests/eo/composite_objects/composite_objects_simple.h b/src/tests/eo/composite_objects/composite_objects_simple.h index 6f6ce99889..32a62465b8 100644 --- a/src/tests/eo/composite_objects/composite_objects_simple.h +++ b/src/tests/eo/composite_objects/composite_objects_simple.h @@ -23,6 +23,6 @@ extern const Eo_Event_Description _EV_A_CHANGED; #define EV_A_CHANGED (&(_EV_A_CHANGED)) #define SIMPLE_CLASS simple_class_get() -const Eo *simple_class_get(void); +const Eo_Class *simple_class_get(void); #endif diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c index 9d3c919f89..24f73643f3 100644 --- a/src/tests/eo/constructors/constructors_mixin.c +++ b/src/tests/eo/constructors/constructors_mixin.c @@ -38,7 +38,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/tests/eo/constructors/constructors_mixin.h b/src/tests/eo/constructors/constructors_mixin.h index 3e1eace082..9998b274f4 100644 --- a/src/tests/eo/constructors/constructors_mixin.h +++ b/src/tests/eo/constructors/constructors_mixin.h @@ -13,6 +13,6 @@ enum { #define mixin_add_and_print(x) MIXIN_ID(MIXIN_SUB_ID_ADD_AND_SET), EO_TYPECHECK(int, x) #define MIXIN_CLASS mixin_class_get() -const Eo *mixin_class_get(void); +const Eo_Class *mixin_class_get(void); #endif diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c index fa31de0a03..466bd85c05 100644 --- a/src/tests/eo/constructors/constructors_simple.c +++ b/src/tests/eo/constructors/constructors_simple.c @@ -75,7 +75,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), @@ -94,7 +94,7 @@ _class_constructor(Eo *klass) } static void -_class_destructor(Eo *klass EINA_UNUSED) +_class_destructor(Eo_Class *klass EINA_UNUSED) { free(class_var); } diff --git a/src/tests/eo/constructors/constructors_simple.h b/src/tests/eo/constructors/constructors_simple.h index f3fd431213..7342d3402e 100644 --- a/src/tests/eo/constructors/constructors_simple.h +++ b/src/tests/eo/constructors/constructors_simple.h @@ -21,6 +21,6 @@ enum { #define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b) #define SIMPLE_CLASS simple_class_get() -const Eo *simple_class_get(void); +const Eo_Class *simple_class_get(void); #endif diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c index c324e26c08..b80b22b809 100644 --- a/src/tests/eo/constructors/constructors_simple2.c +++ b/src/tests/eo/constructors/constructors_simple2.c @@ -17,7 +17,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/tests/eo/constructors/constructors_simple2.h b/src/tests/eo/constructors/constructors_simple2.h index 4397cc1240..e6549f3d2a 100644 --- a/src/tests/eo/constructors/constructors_simple2.h +++ b/src/tests/eo/constructors/constructors_simple2.h @@ -2,6 +2,6 @@ #define SIMPLE2_H #define SIMPLE2_CLASS simple2_class_get() -const Eo *simple2_class_get(void); +const Eo_Class *simple2_class_get(void); #endif diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c index dd02fdfcfa..13453b76e3 100644 --- a/src/tests/eo/constructors/constructors_simple3.c +++ b/src/tests/eo/constructors/constructors_simple3.c @@ -15,7 +15,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/tests/eo/constructors/constructors_simple3.h b/src/tests/eo/constructors/constructors_simple3.h index 834ba6310e..e27f8f1ce4 100644 --- a/src/tests/eo/constructors/constructors_simple3.h +++ b/src/tests/eo/constructors/constructors_simple3.h @@ -2,6 +2,6 @@ #define SIMPLE3_H #define SIMPLE3_CLASS simple3_class_get() -const Eo *simple3_class_get(void); +const Eo_Class *simple3_class_get(void); #endif diff --git a/src/tests/eo/constructors/constructors_simple4.h b/src/tests/eo/constructors/constructors_simple4.h index b2feb77d29..fe8e862e6d 100644 --- a/src/tests/eo/constructors/constructors_simple4.h +++ b/src/tests/eo/constructors/constructors_simple4.h @@ -2,6 +2,6 @@ #define SIMPLE4_H #define SIMPLE4_CLASS simple4_class_get() -const Eo *simple4_class_get(void); +const Eo_Class *simple4_class_get(void); #endif diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c index 50782a18e8..bd2f1a5b3b 100644 --- a/src/tests/eo/constructors/constructors_simple5.c +++ b/src/tests/eo/constructors/constructors_simple5.c @@ -15,7 +15,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor), diff --git a/src/tests/eo/constructors/constructors_simple5.h b/src/tests/eo/constructors/constructors_simple5.h index e88b82c594..9b262d4463 100644 --- a/src/tests/eo/constructors/constructors_simple5.h +++ b/src/tests/eo/constructors/constructors_simple5.h @@ -2,6 +2,6 @@ #define SIMPLE5_H #define SIMPLE5_CLASS simple5_class_get() -const Eo *simple5_class_get(void); +const Eo_Class *simple5_class_get(void); #endif diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c index b454c70ff3..c9988854df 100644 --- a/src/tests/eo/constructors/constructors_simple6.c +++ b/src/tests/eo/constructors/constructors_simple6.c @@ -17,7 +17,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor), diff --git a/src/tests/eo/constructors/constructors_simple6.h b/src/tests/eo/constructors/constructors_simple6.h index e03272e5c6..97e7b5e360 100644 --- a/src/tests/eo/constructors/constructors_simple6.h +++ b/src/tests/eo/constructors/constructors_simple6.h @@ -2,6 +2,6 @@ #define SIMPLE6_H #define SIMPLE6_CLASS simple6_class_get() -const Eo *simple6_class_get(void); +const Eo_Class *simple6_class_get(void); #endif diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c index 778538c5b5..20faba537e 100644 --- a/src/tests/eo/constructors/constructors_simple7.c +++ b/src/tests/eo/constructors/constructors_simple7.c @@ -18,7 +18,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/tests/eo/constructors/constructors_simple7.h b/src/tests/eo/constructors/constructors_simple7.h index be765d5e6c..a9a201e447 100644 --- a/src/tests/eo/constructors/constructors_simple7.h +++ b/src/tests/eo/constructors/constructors_simple7.h @@ -2,6 +2,6 @@ #define SIMPLE7_H #define SIMPLE7_CLASS simple7_class_get() -const Eo *simple7_class_get(void); +const Eo_Class *simple7_class_get(void); #endif diff --git a/src/tests/eo/function_overrides/function_overrides_inherit.h b/src/tests/eo/function_overrides/function_overrides_inherit.h index ea334ff71f..2f33647958 100644 --- a/src/tests/eo/function_overrides/function_overrides_inherit.h +++ b/src/tests/eo/function_overrides/function_overrides_inherit.h @@ -2,6 +2,6 @@ #define INHERIT_H #define INHERIT_CLASS inherit_class_get() -const Eo *inherit_class_get(void); +const Eo_Class *inherit_class_get(void); #endif diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c index a24c31300c..0092655dfa 100644 --- a/src/tests/eo/function_overrides/function_overrides_inherit2.c +++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c @@ -39,7 +39,7 @@ _print2(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, va_list *list EINA_UN } static void -_class_print(Eo *klass, void *data EINA_UNUSED, va_list *list) +_class_print(Eo_Class *klass, void *data EINA_UNUSED, va_list *list) { (void) list; printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); @@ -48,7 +48,7 @@ _class_print(Eo *klass, void *data EINA_UNUSED, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.h b/src/tests/eo/function_overrides/function_overrides_inherit2.h index f370b9f078..2bc0b0d36a 100644 --- a/src/tests/eo/function_overrides/function_overrides_inherit2.h +++ b/src/tests/eo/function_overrides/function_overrides_inherit2.h @@ -15,6 +15,6 @@ enum { #define inherit2_print2() INHERIT2_ID(INHERIT2_SUB_ID_PRINT2) #define INHERIT2_CLASS inherit2_class_get() -const Eo *inherit2_class_get(void); +const Eo_Class *inherit2_class_get(void); #endif diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c index 45e15d2cc3..ba6f84a229 100644 --- a/src/tests/eo/function_overrides/function_overrides_inherit3.c +++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c @@ -19,7 +19,7 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.h b/src/tests/eo/function_overrides/function_overrides_inherit3.h index 7769f839be..73436ba239 100644 --- a/src/tests/eo/function_overrides/function_overrides_inherit3.h +++ b/src/tests/eo/function_overrides/function_overrides_inherit3.h @@ -2,6 +2,6 @@ #define INHERIT3_H #define INHERIT3_CLASS inherit3_class_get() -const Eo *inherit3_class_get(void); +const Eo_Class *inherit3_class_get(void); #endif diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c index 2fa046e786..ff1d5b3bc3 100644 --- a/src/tests/eo/function_overrides/function_overrides_simple.c +++ b/src/tests/eo/function_overrides/function_overrides_simple.c @@ -30,7 +30,7 @@ _a_print(Eo *obj EINA_UNUSED, void *class_data, va_list *list) } static void -_class_print(Eo *klass, void *data EINA_UNUSED, va_list *list) +_class_print(Eo_Class *klass, void *data EINA_UNUSED, va_list *list) { (void) list; printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); @@ -39,14 +39,14 @@ _class_print(Eo *klass, void *data EINA_UNUSED, va_list *list) } static void -_class_print2(Eo *klass, void *data EINA_UNUSED, va_list *list) +_class_print2(Eo_Class *klass, void *data EINA_UNUSED, va_list *list) { (void) list; printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), diff --git a/src/tests/eo/function_overrides/function_overrides_simple.h b/src/tests/eo/function_overrides/function_overrides_simple.h index 63b249a412..3a620fa611 100644 --- a/src/tests/eo/function_overrides/function_overrides_simple.h +++ b/src/tests/eo/function_overrides/function_overrides_simple.h @@ -27,6 +27,6 @@ extern const Eo_Event_Description _SIG_A_CHANGED; #define SIG_A_CHANGED (&(_SIG_A_CHANGED)) #define SIMPLE_CLASS simple_class_get() -const Eo *simple_class_get(void); +const Eo_Class *simple_class_get(void); #endif diff --git a/src/tests/eo/interface/interface_interface.h b/src/tests/eo/interface/interface_interface.h index eebd93facd..4e161b8488 100644 --- a/src/tests/eo/interface/interface_interface.h +++ b/src/tests/eo/interface/interface_interface.h @@ -19,6 +19,6 @@ enum { #define interface_ab_sum_get(sum) INTERFACE_ID(INTERFACE_SUB_ID_AB_SUM_GET), EO_TYPECHECK(int *, sum) #define INTERFACE_CLASS interface_class_get() -const Eo *interface_class_get(void); +const Eo_Class *interface_class_get(void); #endif diff --git a/src/tests/eo/interface/interface_interface2.h b/src/tests/eo/interface/interface_interface2.h index 478577dcfb..5aa91f4fdc 100644 --- a/src/tests/eo/interface/interface_interface2.h +++ b/src/tests/eo/interface/interface_interface2.h @@ -19,6 +19,6 @@ enum { #define interface2_ab_sum_get2(sum) INTERFACE2_ID(INTERFACE2_SUB_ID_AB_SUM_GET2), EO_TYPECHECK(int *, sum) #define INTERFACE2_CLASS interface2_class_get() -const Eo *interface2_class_get(void); +const Eo_Class *interface2_class_get(void); #endif diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c index 4530ecf5f7..e6f3c156b5 100644 --- a/src/tests/eo/interface/interface_simple.c +++ b/src/tests/eo/interface/interface_simple.c @@ -63,7 +63,7 @@ _ab_sum_get2(Eo *obj, void *class_data EINA_UNUSED, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), diff --git a/src/tests/eo/interface/interface_simple.h b/src/tests/eo/interface/interface_simple.h index 25de54b2bb..8df8131278 100644 --- a/src/tests/eo/interface/interface_simple.h +++ b/src/tests/eo/interface/interface_simple.h @@ -42,6 +42,6 @@ enum { #define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b) #define SIMPLE_CLASS simple_class_get() -const Eo *simple_class_get(void); +const Eo_Class *simple_class_get(void); #endif diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c index a6eb59abc7..8f9db135df 100644 --- a/src/tests/eo/mixin/mixin_inherit.c +++ b/src/tests/eo/mixin/mixin_inherit.c @@ -18,7 +18,7 @@ _a_get(Eo *obj, void *class_data EINA_UNUSED, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_GET), _a_get), diff --git a/src/tests/eo/mixin/mixin_inherit.h b/src/tests/eo/mixin/mixin_inherit.h index ea334ff71f..2f33647958 100644 --- a/src/tests/eo/mixin/mixin_inherit.h +++ b/src/tests/eo/mixin/mixin_inherit.h @@ -2,6 +2,6 @@ #define INHERIT_H #define INHERIT_CLASS inherit_class_get() -const Eo *inherit_class_get(void); +const Eo_Class *inherit_class_get(void); #endif diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c index 8632fb245b..ee3342f00b 100644 --- a/src/tests/eo/mixin/mixin_mixin.c +++ b/src/tests/eo/mixin/mixin_mixin.c @@ -34,7 +34,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/tests/eo/mixin/mixin_mixin.h b/src/tests/eo/mixin/mixin_mixin.h index 3bd08442f1..745e5c4683 100644 --- a/src/tests/eo/mixin/mixin_mixin.h +++ b/src/tests/eo/mixin/mixin_mixin.h @@ -19,6 +19,6 @@ enum { #define mixin_ab_sum_get(sum) MIXIN_ID(MIXIN_SUB_ID_AB_SUM_GET), EO_TYPECHECK(int *, sum) #define MIXIN_CLASS mixin_class_get() -const Eo *mixin_class_get(void); +const Eo_Class *mixin_class_get(void); #endif diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c index 35056cd570..451a8ec1ca 100644 --- a/src/tests/eo/mixin/mixin_mixin2.c +++ b/src/tests/eo/mixin/mixin_mixin2.c @@ -43,7 +43,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/tests/eo/mixin/mixin_mixin2.h b/src/tests/eo/mixin/mixin_mixin2.h index 97e8a8bc5a..6e4b692d41 100644 --- a/src/tests/eo/mixin/mixin_mixin2.h +++ b/src/tests/eo/mixin/mixin_mixin2.h @@ -7,6 +7,6 @@ typedef struct } Mixin2_Public_Data; #define MIXIN2_CLASS mixin2_class_get() -const Eo *mixin2_class_get(void); +const Eo_Class *mixin2_class_get(void); #endif diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c index da1df6620c..6ad66e1172 100644 --- a/src/tests/eo/mixin/mixin_mixin3.c +++ b/src/tests/eo/mixin/mixin_mixin3.c @@ -43,7 +43,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/tests/eo/mixin/mixin_mixin3.h b/src/tests/eo/mixin/mixin_mixin3.h index 80ba7ea64d..36b32c0aa8 100644 --- a/src/tests/eo/mixin/mixin_mixin3.h +++ b/src/tests/eo/mixin/mixin_mixin3.h @@ -7,6 +7,6 @@ typedef struct } Mixin3_Public_Data; #define MIXIN3_CLASS mixin3_class_get() -const Eo *mixin3_class_get(void); +const Eo_Class *mixin3_class_get(void); #endif diff --git a/src/tests/eo/mixin/mixin_mixin4.h b/src/tests/eo/mixin/mixin_mixin4.h index 29755a2d9c..7b520fad19 100644 --- a/src/tests/eo/mixin/mixin_mixin4.h +++ b/src/tests/eo/mixin/mixin_mixin4.h @@ -2,6 +2,6 @@ #define MIXIN4_H #define MIXIN4_CLASS mixin4_class_get() -const Eo *mixin4_class_get(void); +const Eo_Class *mixin4_class_get(void); #endif diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c index c71690c93c..ff4600d727 100644 --- a/src/tests/eo/mixin/mixin_simple.c +++ b/src/tests/eo/mixin/mixin_simple.c @@ -42,7 +42,7 @@ _GET_SET_FUNC(a) _GET_SET_FUNC(b) static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), diff --git a/src/tests/eo/mixin/mixin_simple.h b/src/tests/eo/mixin/mixin_simple.h index 25de54b2bb..8df8131278 100644 --- a/src/tests/eo/mixin/mixin_simple.h +++ b/src/tests/eo/mixin/mixin_simple.h @@ -42,6 +42,6 @@ enum { #define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b) #define SIMPLE_CLASS simple_class_get() -const Eo *simple_class_get(void); +const Eo_Class *simple_class_get(void); #endif diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c index 3bcabcb12d..1417988bbc 100644 --- a/src/tests/eo/signals/signals_simple.c +++ b/src/tests/eo/signals/signals_simple.c @@ -76,7 +76,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), diff --git a/src/tests/eo/signals/signals_simple.h b/src/tests/eo/signals/signals_simple.h index ffac9d792f..d1f63bdd06 100644 --- a/src/tests/eo/signals/signals_simple.h +++ b/src/tests/eo/signals/signals_simple.h @@ -26,6 +26,6 @@ extern const Eo_Event_Description _EV_A_CHANGED; #define EV_A_CHANGED (&(_EV_A_CHANGED)) #define SIMPLE_CLASS simple_class_get() -const Eo *simple_class_get(void); +const Eo_Class *simple_class_get(void); #endif diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c index ea717c174f..5b1f8e6947 100644 --- a/src/tests/eo/suite/eo_test_class_errors.c +++ b/src/tests/eo/suite/eo_test_class_errors.c @@ -83,7 +83,7 @@ START_TEST(eo_incomplete_desc) eo_init(); eina_log_print_cb_set(_eo_test_print_cb, &ctx); - const Eo *klass; + const Eo_Class *klass; static Eo_Op TMP_BASE_ID = EO_NOOP; enum { @@ -186,9 +186,9 @@ START_TEST(eo_inherit_errors) eo_init(); eina_log_print_cb_set(_eo_test_print_cb, &ctx); - const Eo *klass; - const Eo *klass_mixin; - const Eo *klass_simple; + const Eo_Class *klass; + const Eo_Class *klass_mixin; + const Eo_Class *klass_simple; static const Eo_Class_Description class_desc_simple = { EO_VERSION, @@ -253,10 +253,10 @@ START_TEST(eo_inconsistent_mro) eo_init(); eina_log_print_cb_set(_eo_test_print_cb, &ctx); - const Eo *klass; - const Eo *klass_mixin; - const Eo *klass_mixin2; - const Eo *klass_mixin3; + const Eo_Class *klass; + const Eo_Class *klass_mixin; + const Eo_Class *klass_mixin2; + const Eo_Class *klass_mixin3; static const Eo_Class_Description class_desc_simple = { EO_VERSION, @@ -328,14 +328,14 @@ START_TEST(eo_inconsistent_mro) } END_TEST -static void _stub_class_constructor(Eo *klass EINA_UNUSED) {} +static void _stub_class_constructor(Eo_Class *klass EINA_UNUSED) {} START_TEST(eo_bad_interface) { eo_init(); eina_log_print_cb_set(_eo_test_safety_print_cb, &ctx); - const Eo *klass; + const Eo_Class *klass; static Eo_Class_Description class_desc = { EO_VERSION, @@ -399,7 +399,7 @@ _const_ops_class_hi_print(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, va_ } static void -_const_ops_class_constructor(Eo *klass) +_const_ops_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _const_ops_a_set), @@ -419,7 +419,7 @@ START_TEST(eo_op_types) eo_init(); eina_log_print_cb_set(_eo_test_print_cb, &ctx); - const Eo *klass; + const Eo_Class *klass; static Eo_Class_Description class_desc = { EO_VERSION, diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c index 55e3283d94..cbeb18362a 100644 --- a/src/tests/eo/suite/eo_test_class_simple.c +++ b/src/tests/eo/suite/eo_test_class_simple.c @@ -33,7 +33,7 @@ _a_print(Eo *obj EINA_UNUSED, void *class_data, va_list *list) } static void -_class_hi_print(Eo *klass, void *data EINA_UNUSED, va_list *list) +_class_hi_print(Eo_Class *klass, void *data EINA_UNUSED, va_list *list) { (void) list; printf("Hi Print %s\n", eo_class_name_get(klass)); @@ -49,7 +49,7 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) } static void -_class_constructor(Eo *klass) +_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DBG_INFO_GET), _dbg_info_get), diff --git a/src/tests/eo/suite/eo_test_class_simple.h b/src/tests/eo/suite/eo_test_class_simple.h index 58aa98845b..699ddb8bbc 100644 --- a/src/tests/eo/suite/eo_test_class_simple.h +++ b/src/tests/eo/suite/eo_test_class_simple.h @@ -25,6 +25,6 @@ extern const Eo_Event_Description _EV_A_CHANGED; #define EV_A_CHANGED (&(_EV_A_CHANGED)) #define SIMPLE_CLASS simple_class_get() -const Eo *simple_class_get(void); +const Eo_Class *simple_class_get(void); #endif diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index 1460a2419c..b1bbdeaaf4 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -121,7 +121,7 @@ START_TEST(eo_data_fetch) NULL }; - const Eo *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); + const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); fail_if(!klass); Eo *obj = eo_add(klass, NULL); @@ -148,7 +148,7 @@ START_TEST(eo_isa_tests) { eo_init(); - const Eo *klass, *iface, *mixin; + const Eo_Class *klass, *iface, *mixin; { /* Usually should be const, not const only for the test... */ @@ -246,7 +246,7 @@ END_TEST static Eina_Bool _man_should_con = EINA_TRUE; static Eina_Bool _man_should_des = EINA_TRUE; -static const Eo *cur_klass = NULL; +static const Eo_Class *cur_klass = NULL; static void _man_con(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED) @@ -266,7 +266,7 @@ _man_des(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED) static void -_man_class_constructor(Eo *klass) +_man_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _man_con), @@ -294,7 +294,7 @@ START_TEST(eo_man_free) NULL }; - const Eo *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); + const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); fail_if(!klass); cur_klass = klass; @@ -504,7 +504,7 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, va_list *list EINA_UNU } static void -_op_errors_class_constructor(Eo *klass) +_op_errors_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_LAST), _a_set), @@ -531,7 +531,7 @@ START_TEST(eo_op_errors) NULL }; - const Eo *klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL); + const Eo_Class *klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL); fail_if(!klass); Eo *obj = eo_add(klass, NULL); @@ -658,7 +658,7 @@ START_TEST(eo_magic_checks) Eo *parent = NULL; Eo *wref = NULL; - obj = eo_add((Eo *) buf, NULL); + obj = eo_add((Eo_Class *) buf, NULL); fail_if(obj); obj = eo_add(SIMPLE_CLASS, NULL); @@ -666,15 +666,15 @@ START_TEST(eo_magic_checks) fail_if(eo_do((Eo *) buf, EO_NOOP)); fail_if(eo_do_super((Eo *) buf, SIMPLE_CLASS, EO_NOOP)); - fail_if(eo_do_super(obj, (const Eo *) buf, EO_NOOP)); + fail_if(eo_do_super(obj, (const Eo_Class *) buf, EO_NOOP)); fail_if(eo_class_get((Eo *) buf)); - fail_if(eo_class_name_get((Eo*) buf)); - eo_class_funcs_set((Eo *) buf, NULL); - eo_class_do((Eo *) buf, NULL); - eo_class_do_super((Eo *) buf, SIMPLE_CLASS, EO_NOOP); - eo_class_do_super(SIMPLE_CLASS, (Eo *) buf, EO_NOOP); + fail_if(eo_class_name_get((Eo_Class*) buf)); + eo_class_funcs_set((Eo_Class *) buf, NULL); + eo_class_do((Eo_Class *) buf, NULL); + eo_class_do_super((Eo_Class *) buf, SIMPLE_CLASS, EO_NOOP); + eo_class_do_super(SIMPLE_CLASS, (Eo_Class *) buf, EO_NOOP); - fail_if(eo_class_new(NULL, (Eo *) buf), NULL); + fail_if(eo_class_new(NULL, (Eo_Class *) buf), NULL); eo_xref(obj, (Eo *) buf); eo_xunref(obj, (Eo *) buf); @@ -686,7 +686,7 @@ START_TEST(eo_magic_checks) eo_del((Eo *) buf); eo_isa((Eo *) buf, SIMPLE_CLASS); - eo_isa(obj, (Eo *) buf); + eo_isa(obj, (Eo_Class *) buf); fail_if(0 != eo_ref_get((Eo *) buf)); @@ -738,7 +738,7 @@ _a_print(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, va_list *list EINA_U } static void -_class_hi_print(const Eo *klass EINA_UNUSED, va_list *list EINA_UNUSED) +_class_hi_print(const Eo_Class *klass EINA_UNUSED, va_list *list EINA_UNUSED) { printf("Hi\n"); } @@ -750,7 +750,7 @@ enum { }; static void -_eo_multiple_do_class_constructor(Eo *klass) +_eo_multiple_do_class_constructor(Eo_Class *klass) { const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(MULTI_ID(MULTI_SUB_ID_A_PRINT), _a_print), @@ -784,7 +784,7 @@ START_TEST(eo_multiple_do) NULL }; - const Eo *klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL); + const Eo_Class *klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL); fail_if(!klass); Eo *obj = eo_add(klass, NULL); @@ -841,7 +841,7 @@ START_TEST(eo_pointers_indirection) NULL }; - const Eo *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); + const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); fail_if(!klass); /* Check simple id validity */