summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-09-27 16:26:25 +0100
committerTom Hacohen <tom@stosb.com>2013-09-27 16:40:32 +0100
commit682c69764d8f7fc984d554e5d3ba5ab82916c15b (patch)
treedfb872f78f637222fff1873d4bc3a52f4cc56b7b
parent832fc5b5ced1e23b30028a6c69aa9b5dbc61557f (diff)
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
-rw-r--r--src/benchmarks/eo/class_simple.c2
-rw-r--r--src/benchmarks/eo/class_simple.h2
-rw-r--r--src/benchmarks/eo/eo_bench_eo_do.c4
-rw-r--r--src/lib/ecore/Ecore_Eo.h14
-rw-r--r--src/lib/ecore/ecore_anim.c2
-rw-r--r--src/lib/ecore/ecore_idle_enterer.c2
-rw-r--r--src/lib/ecore/ecore_idle_exiter.c2
-rw-r--r--src/lib/ecore/ecore_idler.c2
-rw-r--r--src/lib/ecore/ecore_job.c2
-rw-r--r--src/lib/ecore/ecore_poll.c2
-rw-r--r--src/lib/ecore/ecore_private.h2
-rw-r--r--src/lib/ecore/ecore_timer.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_sndfile.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_sndfile.h2
-rw-r--r--src/lib/edje/Edje_Eo.h4
-rw-r--r--src/lib/edje/edje_edit.c2
-rw-r--r--src/lib/edje/edje_smart.c2
-rw-r--r--src/lib/evas/Evas_Common.h2
-rw-r--r--src/lib/evas/Evas_Eo.h44
-rw-r--r--src/lib/evas/canvas/common_interfaces.c4
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/canvas/evas_object_box.c2
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c2
-rw-r--r--src/lib/evas/canvas/evas_object_image.c2
-rw-r--r--src/lib/evas/canvas/evas_object_line.c2
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c2
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c2
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c10
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c2
-rw-r--r--src/lib/evas/canvas/evas_object_table.c2
-rw-r--r--src/lib/evas/canvas/evas_object_text.c2
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c2
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c2
-rw-r--r--src/lib/evas/canvas/evas_out.c2
-rw-r--r--src/tests/eo/access/access_inherit.c2
-rw-r--r--src/tests/eo/access/access_inherit.h2
-rw-r--r--src/tests/eo/access/access_simple.c2
-rw-r--r--src/tests/eo/access/access_simple.h2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.h2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.h2
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c2
-rw-r--r--src/tests/eo/constructors/constructors_mixin.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple.c4
-rw-r--r--src/tests/eo/constructors/constructors_simple.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple2.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple2.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple3.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple3.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple4.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple5.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple5.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple6.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple6.h2
-rw-r--r--src/tests/eo/constructors/constructors_simple7.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple7.h2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit.h2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c4
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.h2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.h2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c6
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.h2
-rw-r--r--src/tests/eo/interface/interface_interface.h2
-rw-r--r--src/tests/eo/interface/interface_interface2.h2
-rw-r--r--src/tests/eo/interface/interface_simple.c2
-rw-r--r--src/tests/eo/interface/interface_simple.h2
-rw-r--r--src/tests/eo/mixin/mixin_inherit.c2
-rw-r--r--src/tests/eo/mixin/mixin_inherit.h2
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin.h2
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.h2
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.h2
-rw-r--r--src/tests/eo/mixin/mixin_mixin4.h2
-rw-r--r--src/tests/eo/mixin/mixin_simple.c2
-rw-r--r--src/tests/eo/mixin/mixin_simple.h2
-rw-r--r--src/tests/eo/signals/signals_simple.c2
-rw-r--r--src/tests/eo/signals/signals_simple.h2
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c24
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c4
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.h2
-rw-r--r--src/tests/eo/suite/eo_test_general.c40
98 files changed, 167 insertions, 167 deletions
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index cab151c..2e8dc3f 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)
20} 20}
21 21
22static void 22static void
23_class_constructor(Eo *klass) 23_class_constructor(Eo_Class *klass)
24{ 24{
25 const Eo_Op_Func_Description func_desc[] = { 25 const Eo_Op_Func_Description func_desc[] = {
26 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), 26 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 3e0a73c..b29e798 100644
--- a/src/benchmarks/eo/class_simple.h
+++ b/src/benchmarks/eo/class_simple.h
@@ -18,6 +18,6 @@ typedef struct
18#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a) 18#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a)
19 19
20#define SIMPLE_CLASS simple_class_get() 20#define SIMPLE_CLASS simple_class_get()
21const Eo *simple_class_get(void); 21const Eo_Class *simple_class_get(void);
22 22
23#endif 23#endif
diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c
index 48e5eaf..601290e 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)
19 eo_unref(obj); 19 eo_unref(obj);
20} 20}
21 21
22static const Eo *cur_klass; 22static const Eo_Class *cur_klass;
23 23
24static void 24static void
25_a_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list) 25_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)
31} 31}
32 32
33static void 33static void
34_class_constructor(Eo *klass) 34_class_constructor(Eo_Class *klass)
35{ 35{
36 const Eo_Op_Func_Description func_desc[] = { 36 const Eo_Op_Func_Description func_desc[] = {
37 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), 37 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 31177fc..0daf06a 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -11,7 +11,7 @@ extern "C" {
11 * @{ 11 * @{
12 */ 12 */
13#define ECORE_POLLER_CLASS ecore_poller_class_get() 13#define ECORE_POLLER_CLASS ecore_poller_class_get()
14const Eo *ecore_poller_class_get(void) EINA_CONST; 14const Eo_Class *ecore_poller_class_get(void) EINA_CONST;
15extern EAPI Eo_Op ECORE_POLLER_BASE_ID; 15extern EAPI Eo_Op ECORE_POLLER_BASE_ID;
16 16
17enum 17enum
@@ -74,7 +74,7 @@ enum
74 */ 74 */
75 75
76#define ECORE_ANIMATOR_CLASS ecore_animator_class_get() 76#define ECORE_ANIMATOR_CLASS ecore_animator_class_get()
77const Eo *ecore_animator_class_get(void) EINA_CONST; 77const Eo_Class *ecore_animator_class_get(void) EINA_CONST;
78 78
79extern EAPI Eo_Op ECORE_ANIMATOR_BASE_ID; 79extern EAPI Eo_Op ECORE_ANIMATOR_BASE_ID;
80 80
@@ -123,7 +123,7 @@ enum
123 */ 123 */
124 124
125#define ECORE_TIMER_CLASS ecore_timer_class_get() 125#define ECORE_TIMER_CLASS ecore_timer_class_get()
126const Eo *ecore_timer_class_get(void) EINA_CONST; 126const Eo_Class *ecore_timer_class_get(void) EINA_CONST;
127extern EAPI Eo_Op ECORE_TIMER_BASE_ID; 127extern EAPI Eo_Op ECORE_TIMER_BASE_ID;
128 128
129enum 129enum
@@ -235,7 +235,7 @@ enum
235 */ 235 */
236 236
237#define ECORE_IDLER_CLASS ecore_idler_class_get() 237#define ECORE_IDLER_CLASS ecore_idler_class_get()
238const Eo *ecore_idler_class_get(void) EINA_CONST; 238const Eo_Class *ecore_idler_class_get(void) EINA_CONST;
239 239
240extern EAPI Eo_Op ECORE_IDLER_BASE_ID; 240extern EAPI Eo_Op ECORE_IDLER_BASE_ID;
241 241
@@ -264,7 +264,7 @@ enum
264 */ 264 */
265 265
266#define ECORE_IDLE_ENTERER_CLASS ecore_idle_enterer_class_get() 266#define ECORE_IDLE_ENTERER_CLASS ecore_idle_enterer_class_get()
267const Eo *ecore_idle_enterer_class_get(void) EINA_CONST; 267const Eo_Class *ecore_idle_enterer_class_get(void) EINA_CONST;
268 268
269extern EAPI Eo_Op ECORE_IDLE_ENTERER_BASE_ID; 269extern EAPI Eo_Op ECORE_IDLE_ENTERER_BASE_ID;
270 270
@@ -306,7 +306,7 @@ enum
306 */ 306 */
307 307
308#define ECORE_IDLE_EXITER_CLASS ecore_idle_exiter_class_get() 308#define ECORE_IDLE_EXITER_CLASS ecore_idle_exiter_class_get()
309const Eo *ecore_idle_exiter_class_get(void) EINA_CONST; 309const Eo_Class *ecore_idle_exiter_class_get(void) EINA_CONST;
310 310
311extern EAPI Eo_Op ECORE_IDLE_EXITER_BASE_ID; 311extern EAPI Eo_Op ECORE_IDLE_EXITER_BASE_ID;
312 312
@@ -341,7 +341,7 @@ enum
341 */ 341 */
342 342
343#define ECORE_JOB_CLASS ecore_job_class_get() 343#define ECORE_JOB_CLASS ecore_job_class_get()
344const Eo *ecore_job_class_get(void) EINA_CONST; 344const Eo_Class *ecore_job_class_get(void) EINA_CONST;
345 345
346extern EAPI Eo_Op ECORE_JOB_BASE_ID; 346extern EAPI Eo_Op ECORE_JOB_BASE_ID;
347 347
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index a9f8430..5d32c31 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)
600} 600}
601 601
602static void 602static void
603_class_constructor(Eo *klass) 603_class_constructor(Eo_Class *klass)
604{ 604{
605 const Eo_Op_Func_Description func_desc[] = { 605 const Eo_Op_Func_Description func_desc[] = {
606 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 606 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 8d1fa57..7cbabc8 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)
282} 282}
283 283
284static void 284static void
285_class_constructor(Eo *klass) 285_class_constructor(Eo_Class *klass)
286{ 286{
287 const Eo_Op_Func_Description func_desc[] = { 287 const Eo_Op_Func_Description func_desc[] = {
288 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 288 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 b1418a0..da85f1d 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)
233} 233}
234 234
235static void 235static void
236_class_constructor(Eo *klass) 236_class_constructor(Eo_Class *klass)
237{ 237{
238 const Eo_Op_Func_Description func_desc[] = { 238 const Eo_Op_Func_Description func_desc[] = {
239 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 239 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 8f04382..051c3e1 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -216,7 +216,7 @@ _ecore_idler_exist(void)
216} 216}
217 217
218static void 218static void
219_class_constructor(Eo *klass) 219_class_constructor(Eo_Class *klass)
220{ 220{
221 const Eo_Op_Func_Description func_desc[] = { 221 const Eo_Op_Func_Description func_desc[] = {
222 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 222 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 04cd09d..8720a7f 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,
169} 169}
170 170
171static void 171static void
172_class_constructor(Eo *klass) 172_class_constructor(Eo_Class *klass)
173{ 173{
174 const Eo_Op_Func_Description func_desc[] = { 174 const Eo_Op_Func_Description func_desc[] = {
175 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 175 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 92007bd..4883d7b 100644
--- a/src/lib/ecore/ecore_poll.c
+++ b/src/lib/ecore/ecore_poll.c
@@ -457,7 +457,7 @@ _ecore_poller_shutdown(void)
457} 457}
458 458
459static void 459static void
460_class_constructor(Eo *klass) 460_class_constructor(Eo_Class *klass)
461{ 461{
462 const Eo_Op_Func_Description func_desc[] = { 462 const Eo_Op_Func_Description func_desc[] = {
463 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 463 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 e2ad2c9..1c7f53e 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);
417 417
418extern Eo *_ecore_parent; 418extern Eo *_ecore_parent;
419#define ECORE_PARENT_CLASS ecore_parent_class_get() 419#define ECORE_PARENT_CLASS ecore_parent_class_get()
420const Eo *ecore_parent_class_get(void) EINA_CONST; 420const Eo_Class *ecore_parent_class_get(void) EINA_CONST;
421 421
422#endif 422#endif
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index d99fed2..eb83321 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,
976#endif 976#endif
977 977
978static void 978static void
979_class_constructor(Eo *klass) 979_class_constructor(Eo_Class *klass)
980{ 980{
981 const Eo_Op_Func_Description func_desc[] = { 981 const Eo_Op_Func_Description func_desc[] = {
982 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 982 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 9bbc1d4..83ddbe9 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)
87 87
88} 88}
89 89
90static void _class_constructor(Eo *klass) 90static void _class_constructor(Eo_Class *klass)
91{ 91{
92 const Eo_Op_Func_Description func_desc[] = { 92 const Eo_Op_Func_Description func_desc[] = {
93 /* Virtual functions of parent class implemented in this class */ 93 /* 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 603aa96..fc8d8eb 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"
41 * 41 *
42 * @return The Eo class ID 42 * @return The Eo class ID
43 */ 43 */
44const Eo *ecore_audio_obj_class_get() EINA_CONST; 44const Eo_Class *ecore_audio_obj_class_get() EINA_CONST;
45 45
46extern EAPI Eo_Op ECORE_AUDIO_OBJ_BASE_ID; 46extern EAPI Eo_Op ECORE_AUDIO_OBJ_BASE_ID;
47 47
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c
index 9574cf1..1abaae4 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)
251 eo_do_super(eo_obj, MY_CLASS, eo_destructor()); 251 eo_do_super(eo_obj, MY_CLASS, eo_destructor());
252} 252}
253 253
254static void _class_constructor(Eo *klass) 254static void _class_constructor(Eo_Class *klass)
255{ 255{
256 const Eo_Op_Func_Description func_desc[] = { 256 const Eo_Op_Func_Description func_desc[] = {
257 /* Virtual functions of parent class implemented in this class */ 257 /* 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 080dac7..b0b26ea 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"
41 * 41 *
42 * @return The Eo class ID 42 * @return The Eo class ID
43 */ 43 */
44const Eo *ecore_audio_obj_in_class_get() EINA_CONST; 44const Eo_Class *ecore_audio_obj_in_class_get() EINA_CONST;
45 45
46extern EAPI Eo_Op ECORE_AUDIO_OBJ_IN_BASE_ID; 46extern EAPI Eo_Op ECORE_AUDIO_OBJ_IN_BASE_ID;
47 47
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 a8abbb1..4799f6d 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)
253 eo_do_super(eo_obj, MY_CLASS, eo_destructor()); 253 eo_do_super(eo_obj, MY_CLASS, eo_destructor());
254} 254}
255 255
256static void _class_constructor(Eo *klass) 256static void _class_constructor(Eo_Class *klass)
257{ 257{
258 const Eo_Op_Func_Description func_desc[] = { 258 const Eo_Op_Func_Description func_desc[] = {
259 /* Virtual functions of parent class implemented in this class */ 259 /* 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 2ac0344..9ed5e7d 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"
41 * 41 *
42 * @return The Eo class ID 42 * @return The Eo class ID
43 */ 43 */
44const Eo *ecore_audio_obj_in_sndfile_class_get() EINA_CONST; 44const Eo_Class *ecore_audio_obj_in_sndfile_class_get() EINA_CONST;
45 45
46extern EAPI Eo_Op ECORE_AUDIO_OBJ_IN_SNDFILE_BASE_ID; 46extern EAPI Eo_Op ECORE_AUDIO_OBJ_IN_SNDFILE_BASE_ID;
47 47
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 34a3f03..f0fec98 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)
149 obj->freq = 1000; 149 obj->freq = 1000;
150} 150}
151 151
152static void _class_constructor(Eo *klass) 152static void _class_constructor(Eo_Class *klass)
153{ 153{
154 const Eo_Op_Func_Description func_desc[] = { 154 const Eo_Op_Func_Description func_desc[] = {
155 /* Virtual functions of parent class implemented in this class */ 155 /* 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 0591422..13bd016 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"
48 * 48 *
49 * @return The Eo class ID 49 * @return The Eo class ID
50 */ 50 */
51const Eo *ecore_audio_obj_in_tone_class_get() EINA_CONST; 51const Eo_Class *ecore_audio_obj_in_tone_class_get() EINA_CONST;
52 52
53extern EAPI Eo_Op ECORE_AUDIO_OBJ_IN_TONE_BASE_ID; 53extern EAPI Eo_Op ECORE_AUDIO_OBJ_IN_TONE_BASE_ID;
54 54
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c
index 4834cce..e3822ef 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)
174 eo_do_super(eo_obj, MY_CLASS, eo_destructor()); 174 eo_do_super(eo_obj, MY_CLASS, eo_destructor());
175} 175}
176 176
177static void _class_constructor(Eo *klass) 177static void _class_constructor(Eo_Class *klass)
178{ 178{
179 const Eo_Op_Func_Description func_desc[] = { 179 const Eo_Op_Func_Description func_desc[] = {
180 /* Virtual functions of parent class implemented in this class */ 180 /* 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 68fa451..0052545 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"
41 * 41 *
42 * @return The Eo class ID 42 * @return The Eo class ID
43 */ 43 */
44const Eo *ecore_audio_obj_out_class_get() EINA_CONST; 44const Eo_Class *ecore_audio_obj_out_class_get() EINA_CONST;
45 45
46extern EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_BASE_ID; 46extern EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_BASE_ID;
47 47
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 0a504fa..80f7fb0 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
287 class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj); 287 class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj);
288} 288}
289 289
290static void _class_constructor(Eo *klass) 290static void _class_constructor(Eo_Class *klass)
291{ 291{
292 const Eo_Op_Func_Description func_desc[] = { 292 const Eo_Op_Func_Description func_desc[] = {
293 /* Virtual functions of parent class implemented in this class */ 293 /* 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 a1bc110..a031831 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"
41 * 41 *
42 * @return The Eo class ID 42 * @return The Eo class ID
43 */ 43 */
44const Eo *ecore_audio_obj_out_pulse_class_get() EINA_CONST; 44const Eo_Class *ecore_audio_obj_out_pulse_class_get() EINA_CONST;
45 45
46extern EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_PULSE_BASE_ID; 46extern EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_PULSE_BASE_ID;
47 47
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 5e9664c..445a63e 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)
214 eo_do_super(eo_obj, MY_CLASS, eo_destructor()); 214 eo_do_super(eo_obj, MY_CLASS, eo_destructor());
215} 215}
216 216
217static void _class_constructor(Eo *klass) 217static void _class_constructor(Eo_Class *klass)
218{ 218{
219 const Eo_Op_Func_Description func_desc[] = { 219 const Eo_Op_Func_Description func_desc[] = {
220 /* Virtual functions of parent class implemented in this class */ 220 /* 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 d301bb4..818abbe 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"
41 * 41 *
42 * @return The Eo class ID 42 * @return The Eo class ID
43 */ 43 */
44const Eo *ecore_audio_obj_out_sndfile_class_get() EINA_CONST; 44const Eo_Class *ecore_audio_obj_out_sndfile_class_get() EINA_CONST;
45 45
46extern EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_SNDFILE_BASE_ID; 46extern EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_SNDFILE_BASE_ID;
47 47
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index 913d1d0..b892ac6 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -1,6 +1,6 @@
1#define EDJE_OBJ_CLASS edje_object_class_get() 1#define EDJE_OBJ_CLASS edje_object_class_get()
2 2
3const Eo *edje_object_class_get(void) EINA_CONST; 3const Eo_Class *edje_object_class_get(void) EINA_CONST;
4 4
5extern EAPI Eo_Op EDJE_OBJ_BASE_ID; 5extern EAPI Eo_Op EDJE_OBJ_BASE_ID;
6 6
@@ -2258,4 +2258,4 @@ enum
2258 2258
2259#define EDJE_EDIT_CLASS edje_edit_class_get() 2259#define EDJE_EDIT_CLASS edje_edit_class_get()
2260 2260
2261const Eo *edje_edit_class_get(void) EINA_CONST; 2261const 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 192ef24..dabbc4c 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)
7844} 7844}
7845 7845
7846static void 7846static void
7847_edje_edit_class_constructor(Eo *klass) 7847_edje_edit_class_constructor(Eo_Class *klass)
7848{ 7848{
7849 const Eo_Op_Func_Description func_desc[] = { 7849 const Eo_Op_Func_Description func_desc[] = {
7850 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _edje_edit_constructor), 7850 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 f5c29b1..c5c073a 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)
380} 380}
381 381
382static void 382static void
383_edje_smart_class_constructor(Eo *klass) 383_edje_smart_class_constructor(Eo_Class *klass)
384{ 384{
385 const Eo_Op_Func_Description func_desc[] = { 385 const Eo_Op_Func_Description func_desc[] = {
386 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _edje_smart_constructor), 386 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 94a0271..77f65bd 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)
4436 * 4436 *
4437 * @ingroup Evas_Smart_Object_Group 4437 * @ingroup Evas_Smart_Object_Group
4438 */ 4438 */
4439EAPI void evas_smart_legacy_type_register(const char *type, const Eo *klass) EINA_ARG_NONNULL(1, 2); 4439EAPI void evas_smart_legacy_type_register(const char *type, const Eo_Class *klass) EINA_ARG_NONNULL(1, 2);
4440 4440
4441/** 4441/**
4442 * @} 4442 * @}
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 4f6c633..2324831 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;
138#define EVAS_SMART_DRAG_START_RIGHT_EVENT (&(_DRAG_START_RIGHT_EVENT)) 138#define EVAS_SMART_DRAG_START_RIGHT_EVENT (&(_DRAG_START_RIGHT_EVENT))
139#define EVAS_SMART_DRAG_START_LEFT_EVENT (&(_DRAG_START_LEFT_EVENT)) 139#define EVAS_SMART_DRAG_START_LEFT_EVENT (&(_DRAG_START_LEFT_EVENT))
140 140
141const Eo *evas_smart_signal_interface_get(void) EINA_CONST; 141const Eo_Class *evas_smart_signal_interface_get(void) EINA_CONST;
142const Eo *evas_smart_clickable_interface_get(void) EINA_CONST; 142const Eo_Class *evas_smart_clickable_interface_get(void) EINA_CONST;
143const Eo *evas_smart_scrollable_interface_get(void) EINA_CONST; 143const Eo_Class *evas_smart_scrollable_interface_get(void) EINA_CONST;
144const Eo *evas_smart_zoomable_interface_get(void) EINA_CONST; 144const Eo_Class *evas_smart_zoomable_interface_get(void) EINA_CONST;
145const Eo *evas_smart_selectable_interface_get(void) EINA_CONST; 145const Eo_Class *evas_smart_selectable_interface_get(void) EINA_CONST;
146const Eo *evas_smart_draggable_interface_get(void) EINA_CONST; 146const Eo_Class *evas_smart_draggable_interface_get(void) EINA_CONST;
147 147
148#define EVAS_SMART_SIGNAL_INTERFACE evas_smart_signal_interface_get() 148#define EVAS_SMART_SIGNAL_INTERFACE evas_smart_signal_interface_get()
149#define EVAS_SMART_CLICKABLE_INTERFACE evas_smart_clickable_interface_get() 149#define EVAS_SMART_CLICKABLE_INTERFACE evas_smart_clickable_interface_get()
@@ -154,7 +154,7 @@ const Eo *evas_smart_draggable_interface_get(void) EINA_CONST;
154 154
155#define EVAS_CLASS evas_class_get() 155#define EVAS_CLASS evas_class_get()
156 156
157const Eo *evas_class_get(void) EINA_CONST; 157const Eo_Class *evas_class_get(void) EINA_CONST;
158 158
159extern EAPI Eo_Op EVAS_CANVAS_BASE_ID; 159extern EAPI Eo_Op EVAS_CANVAS_BASE_ID;
160 160
@@ -1767,7 +1767,7 @@ enum
1767 1767
1768#define EVAS_OBJ_RECTANGLE_CLASS evas_object_rectangle_class_get() 1768#define EVAS_OBJ_RECTANGLE_CLASS evas_object_rectangle_class_get()
1769 1769
1770const Eo *evas_object_rectangle_class_get(void) EINA_CONST; 1770const Eo_Class *evas_object_rectangle_class_get(void) EINA_CONST;
1771 1771
1772extern EAPI Eo_Op EVAS_OBJ_RECTANGLE_BASE_ID; 1772extern EAPI Eo_Op EVAS_OBJ_RECTANGLE_BASE_ID;
1773 1773
@@ -1790,7 +1790,7 @@ enum
1790 1790
1791#define EVAS_OBJ_TEXT_CLASS evas_object_text_class_get() 1791#define EVAS_OBJ_TEXT_CLASS evas_object_text_class_get()
1792 1792
1793const Eo *evas_object_text_class_get(void) EINA_CONST; 1793const Eo_Class *evas_object_text_class_get(void) EINA_CONST;
1794 1794
1795extern EAPI Eo_Op EVAS_OBJ_TEXT_BASE_ID; 1795extern EAPI Eo_Op EVAS_OBJ_TEXT_BASE_ID;
1796 1796
@@ -2265,7 +2265,7 @@ enum
2265 2265
2266#define EVAS_OBJ_TEXTBLOCK_CLASS evas_object_textblock_class_get() 2266#define EVAS_OBJ_TEXTBLOCK_CLASS evas_object_textblock_class_get()
2267 2267
2268const Eo *evas_object_textblock_class_get(void) EINA_CONST; 2268const Eo_Class *evas_object_textblock_class_get(void) EINA_CONST;
2269 2269
2270extern EAPI Eo_Op EVAS_OBJ_TEXTBLOCK_BASE_ID; 2270extern EAPI Eo_Op EVAS_OBJ_TEXTBLOCK_BASE_ID;
2271 2271
@@ -2640,7 +2640,7 @@ enum
2640 2640
2641#define EVAS_OBJ_TEXTGRID_CLASS evas_object_textgrid_class_get() 2641#define EVAS_OBJ_TEXTGRID_CLASS evas_object_textgrid_class_get()
2642 2642
2643const Eo *evas_object_textgrid_class_get(void) EINA_CONST; 2643const Eo_Class *evas_object_textgrid_class_get(void) EINA_CONST;
2644 2644
2645extern EAPI Eo_Op EVAS_OBJ_TEXTGRID_BASE_ID; 2645extern EAPI Eo_Op EVAS_OBJ_TEXTGRID_BASE_ID;
2646 2646
@@ -2864,7 +2864,7 @@ enum
2864 * @{ 2864 * @{
2865 */ 2865 */
2866#define EVAS_OBJ_LINE_CLASS evas_object_line_class_get() 2866#define EVAS_OBJ_LINE_CLASS evas_object_line_class_get()
2867const Eo *evas_object_line_class_get(void) EINA_CONST; 2867const Eo_Class *evas_object_line_class_get(void) EINA_CONST;
2868 2868
2869extern EAPI Eo_Op EVAS_OBJ_LINE_BASE_ID; 2869extern EAPI Eo_Op EVAS_OBJ_LINE_BASE_ID;
2870 2870
@@ -2918,7 +2918,7 @@ enum
2918 * @{ 2918 * @{
2919 */ 2919 */
2920#define EVAS_OBJ_POLYGON_CLASS evas_object_polygon_class_get() 2920#define EVAS_OBJ_POLYGON_CLASS evas_object_polygon_class_get()
2921const Eo *evas_object_polygon_class_get(void) EINA_CONST; 2921const Eo_Class *evas_object_polygon_class_get(void) EINA_CONST;
2922 2922
2923extern EAPI Eo_Op EVAS_OBJ_POLYGON_BASE_ID; 2923extern EAPI Eo_Op EVAS_OBJ_POLYGON_BASE_ID;
2924 2924
@@ -2967,7 +2967,7 @@ enum
2967 */ 2967 */
2968#define EVAS_OBJ_SMART_CLASS evas_object_smart_class_get() 2968#define EVAS_OBJ_SMART_CLASS evas_object_smart_class_get()
2969 2969
2970const Eo *evas_object_smart_class_get(void) EINA_CONST; 2970const Eo_Class *evas_object_smart_class_get(void) EINA_CONST;
2971 2971
2972extern EAPI Eo_Op EVAS_OBJ_SMART_BASE_ID; 2972extern EAPI Eo_Op EVAS_OBJ_SMART_BASE_ID;
2973 2973
@@ -3333,7 +3333,7 @@ enum
3333 3333
3334#define EVAS_OBJ_SMART_CLIPPED_CLASS evas_object_smart_clipped_eo_class_get() 3334#define EVAS_OBJ_SMART_CLIPPED_CLASS evas_object_smart_clipped_eo_class_get()
3335 3335
3336const Eo *evas_object_smart_clipped_eo_class_get(void) EINA_CONST; 3336const Eo_Class *evas_object_smart_clipped_eo_class_get(void) EINA_CONST;
3337 3337
3338extern EAPI Eo_Op EVAS_OBJ_SMART_CLIPPED_BASE_ID; 3338extern EAPI Eo_Op EVAS_OBJ_SMART_CLIPPED_BASE_ID;
3339 3339
@@ -3353,7 +3353,7 @@ enum
3353 */ 3353 */
3354#define EVAS_OBJ_BOX_CLASS evas_object_box_class_get() 3354#define EVAS_OBJ_BOX_CLASS evas_object_box_class_get()
3355 3355
3356const Eo *evas_object_box_class_get(void) EINA_CONST; 3356const Eo_Class *evas_object_box_class_get(void) EINA_CONST;
3357 3357
3358extern EAPI Eo_Op EVAS_OBJ_BOX_BASE_ID; 3358extern EAPI Eo_Op EVAS_OBJ_BOX_BASE_ID;
3359 3359
@@ -3899,7 +3899,7 @@ enum
3899 */ 3899 */
3900#define EVAS_OBJ_TABLE_CLASS evas_object_table_class_get() 3900#define EVAS_OBJ_TABLE_CLASS evas_object_table_class_get()
3901 3901
3902const Eo *evas_object_table_class_get(void) EINA_CONST; 3902const Eo_Class *evas_object_table_class_get(void) EINA_CONST;
3903 3903
3904extern EAPI Eo_Op EVAS_OBJ_TABLE_BASE_ID; 3904extern EAPI Eo_Op EVAS_OBJ_TABLE_BASE_ID;
3905 3905
@@ -4160,7 +4160,7 @@ enum
4160 */ 4160 */
4161#define EVAS_OBJ_GRID_CLASS evas_object_grid_class_get() 4161#define EVAS_OBJ_GRID_CLASS evas_object_grid_class_get()
4162 4162
4163const Eo *evas_object_grid_class_get(void) EINA_CONST; 4163const Eo_Class *evas_object_grid_class_get(void) EINA_CONST;
4164 4164
4165extern EAPI Eo_Op EVAS_OBJ_GRID_BASE_ID; 4165extern EAPI Eo_Op EVAS_OBJ_GRID_BASE_ID;
4166 4166
@@ -4359,7 +4359,7 @@ enum
4359 4359
4360#define EVAS_COMMON_CLASS evas_common_class_get() 4360#define EVAS_COMMON_CLASS evas_common_class_get()
4361 4361
4362const Eo *evas_common_class_get(void) EINA_CONST; 4362const Eo_Class *evas_common_class_get(void) EINA_CONST;
4363 4363
4364extern EAPI Eo_Op EVAS_COMMON_BASE_ID; 4364extern EAPI Eo_Op EVAS_COMMON_BASE_ID;
4365 4365
@@ -5531,10 +5531,10 @@ enum
5531 5531
5532#define EVAS_OBJ_CLASS evas_object_class_get() 5532#define EVAS_OBJ_CLASS evas_object_class_get()
5533 5533
5534const Eo *evas_object_class_get(void) EINA_CONST; 5534const Eo_Class *evas_object_class_get(void) EINA_CONST;
5535 5535
5536#define EVAS_OBJ_IMAGE_CLASS evas_object_image_class_get() 5536#define EVAS_OBJ_IMAGE_CLASS evas_object_image_class_get()
5537const Eo *evas_object_image_class_get(void) EINA_CONST; 5537const Eo_Class *evas_object_image_class_get(void) EINA_CONST;
5538 5538
5539extern EAPI Eo_Op EVAS_OBJ_IMAGE_BASE_ID; 5539extern EAPI Eo_Op EVAS_OBJ_IMAGE_BASE_ID;
5540 5540
@@ -6542,7 +6542,7 @@ enum
6542 */ 6542 */
6543 6543
6544#define EVAS_OUT_CLASS evas_out_class_get() 6544#define EVAS_OUT_CLASS evas_out_class_get()
6545const Eo *evas_out_class_get(void) EINA_CONST; 6545const Eo_Class *evas_out_class_get(void) EINA_CONST;
6546extern EAPI Eo_Op EVAS_OUT_BASE_ID; 6546extern EAPI Eo_Op EVAS_OUT_BASE_ID;
6547 6547
6548enum 6548enum
diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c
index b831c72..f608caa 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)
173} 173}
174 174
175static void 175static void
176_signal_interface_constructor(Eo *klass EINA_UNUSED) 176_signal_interface_constructor(Eo_Class *klass EINA_UNUSED)
177{ 177{
178 signals_hash_table = eina_hash_string_superfast_new(_signal_interface_del); 178 signals_hash_table = eina_hash_string_superfast_new(_signal_interface_del);
179 ADD_INTERFACE_SIGNALS(_clickable_events_desc); 179 ADD_INTERFACE_SIGNALS(_clickable_events_desc);
@@ -186,7 +186,7 @@ _signal_interface_constructor(Eo *klass EINA_UNUSED)
186#undef ADD_SIGNAL 186#undef ADD_SIGNAL
187 187
188static void 188static void
189_signal_interface_destructor(Eo *klass EINA_UNUSED) 189_signal_interface_destructor(Eo_Class *klass EINA_UNUSED)
190{ 190{
191 eina_hash_free(signals_hash_table); 191 eina_hash_free(signals_hash_table);
192} 192}
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 89a72de..aefdce5 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)
1000} 1000}
1001 1001
1002static void 1002static void
1003_class_constructor(Eo *klass) 1003_class_constructor(Eo_Class *klass)
1004{ 1004{
1005 const Eo_Op_Func_Description func_desc[] = { 1005 const Eo_Op_Func_Description func_desc[] = {
1006 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 1006 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 8b6164f..84200ed 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)
2296} 2296}
2297 2297
2298static void 2298static void
2299_class_constructor(Eo *klass) 2299_class_constructor(Eo_Class *klass)
2300{ 2300{
2301 const Eo_Op_Func_Description func_desc[] = { 2301 const Eo_Op_Func_Description func_desc[] = {
2302 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 2302 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 96bb88b..c0bbc96 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)
625} 625}
626 626
627static void 627static void
628_class_constructor(Eo *klass) 628_class_constructor(Eo_Class *klass)
629{ 629{
630 const Eo_Op_Func_Description func_desc[] = { 630 const Eo_Op_Func_Description func_desc[] = {
631 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 631 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 bc83e46..509b109 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)
5259} 5259}
5260 5260
5261static void 5261static void
5262_class_constructor(Eo *klass) 5262_class_constructor(Eo_Class *klass)
5263{ 5263{
5264 const Eo_Op_Func_Description func_desc[] = { 5264 const Eo_Op_Func_Description func_desc[] = {
5265 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 5265 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 927c2ac..621a43e 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,
481} 481}
482 482
483static void 483static void
484_class_constructor(Eo *klass) 484_class_constructor(Eo_Class *klass)
485{ 485{
486 const Eo_Op_Func_Description func_desc[] = { 486 const Eo_Op_Func_Description func_desc[] = {
487 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 487 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 0d84c71..27fc7ad 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
2420} 2420}
2421 2421
2422static void 2422static void
2423_class_constructor(Eo *klass) 2423_class_constructor(Eo_Class *klass)
2424{ 2424{
2425 const Eo_Op_Func_Description func_desc[] = { 2425 const Eo_Op_Func_Description func_desc[] = {
2426 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 2426 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 d2a3479..618a029 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,
593} 593}
594 594
595static void 595static void
596_class_constructor(Eo *klass) 596_class_constructor(Eo_Class *klass)
597{ 597{
598 const Eo_Op_Func_Description func_desc[] = { 598 const Eo_Op_Func_Description func_desc[] = {
599 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 599 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 ec4e615..36ebb21 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)
323} 323}
324 324
325static void 325static void
326_class_constructor(Eo *klass) 326_class_constructor(Eo_Class *klass)
327{ 327{
328 const Eo_Op_Func_Description func_desc[] = { 328 const Eo_Op_Func_Description func_desc[] = {
329 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 329 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 4584948..b2d54c8 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)
379 *type_check = EINA_FALSE; 379 *type_check = EINA_FALSE;
380 380
381 const Evas_Smart_Class *sc; 381 const Evas_Smart_Class *sc;
382 Eo *klass; 382 Eo_Class *klass;
383 383
384 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 384 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
385 if (!obj) return; 385 if (!obj) return;
@@ -420,7 +420,7 @@ evas_object_smart_type_check_ptr(const Evas_Object *eo_obj, const char *type)
420static void 420static void
421_smart_type_check_ptr(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) 421_smart_type_check_ptr(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
422{ 422{
423 Eo *klass; 423 Eo_Class *klass;
424 const Evas_Smart_Class *sc; 424 const Evas_Smart_Class *sc;
425 const char* type = va_arg(*list, const char *); 425 const char* type = va_arg(*list, const char *);
426 Eina_Bool *type_check = va_arg(*list, Eina_Bool *); 426 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)
452} 452}
453 453
454EAPI void 454EAPI void
455evas_smart_legacy_type_register(const char *type, const Eo *klass) 455evas_smart_legacy_type_register(const char *type, const Eo_Class *klass)
456{ 456{
457 eina_hash_set(_evas_smart_class_names_hash_table, type, klass); 457 eina_hash_set(_evas_smart_class_names_hash_table, type, klass);
458} 458}
@@ -1782,7 +1782,7 @@ static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj)
1782} 1782}
1783 1783
1784static void 1784static void
1785_class_constructor(Eo *klass) 1785_class_constructor(Eo_Class *klass)
1786{ 1786{
1787 const Eo_Op_Func_Description func_desc[] = { 1787 const Eo_Op_Func_Description func_desc[] = {
1788 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 1788 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
@@ -1823,7 +1823,7 @@ _class_constructor(Eo *klass)
1823} 1823}
1824 1824
1825static void 1825static void
1826_class_destructor(Eo *klass EINA_UNUSED) 1826_class_destructor(Eo_Class *klass EINA_UNUSED)
1827{ 1827{
1828 eina_hash_free(_evas_smart_class_names_hash_table); 1828 eina_hash_free(_evas_smart_class_names_hash_table);
1829} 1829}
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index 21dbfcc..f247f6d 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
287} 287}
288 288
289static void 289static void
290_class_constructor(Eo *klass) 290_class_constructor(Eo_Class *klass)
291{ 291{
292 const Eo_Op_Func_Description func_desc[] = { 292 const Eo_Op_Func_Description func_desc[] = {
293 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 293 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 cd2b536..efe3240 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)
1564} 1564}
1565 1565
1566static void 1566static void
1567_class_constructor(Eo *klass) 1567_class_constructor(Eo_Class *klass)
1568{ 1568{
1569 const Eo_Op_Func_Description func_desc[] = { 1569 const Eo_Op_Func_Description func_desc[] = {
1570 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 1570 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 8f7157b..8fae9da 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)
2481} 2481}
2482 2482
2483static void 2483static void
2484_class_constructor(Eo *klass) 2484_class_constructor(Eo_Class *klass)
2485{ 2485{
2486 const Eo_Op_Func_Description func_desc[] = { 2486 const Eo_Op_Func_Description func_desc[] = {
2487 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 2487 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 e4d0966..cf242fe 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)
11289#endif 11289#endif
11290 11290
11291static void 11291static void
11292_class_constructor(Eo *klass) 11292_class_constructor(Eo_Class *klass)
11293{ 11293{
11294 const Eo_Op_Func_Description func_desc[] = { 11294 const Eo_Op_Func_Description func_desc[] = {
11295 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 11295 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 f4572ce..87634d4 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)
1666} 1666}
1667 1667
1668static void 1668static void
1669_class_constructor(Eo *klass) 1669_class_constructor(Eo_Class *klass)
1670{ 1670{
1671 const Eo_Op_Func_Description func_desc[] = { 1671 const Eo_Op_Func_Description func_desc[] = {
1672 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 1672 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 e0fe918..2b1bdb6 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)
155} 155}
156 156
157static void 157static void
158_class_constructor(Eo *klass) 158_class_constructor(Eo_Class *klass)
159{ 159{
160 const Eo_Op_Func_Description func_desc[] = { 160 const Eo_Op_Func_Description func_desc[] = {
161 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 161 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 56d0ff6..b42a4a6 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)
20} 20}
21 21
22static void 22static void
23_class_constructor(Eo *klass) 23_class_constructor(Eo_Class *klass)
24{ 24{
25 const Eo_Op_Func_Description func_desc[] = { 25 const Eo_Op_Func_Description func_desc[] = {
26 EO_OP_FUNC(INHERIT_ID(INHERIT_SUB_ID_PROT_PRINT), _prot_print), 26 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 7fd15c3..f701dae 100644
--- a/src/tests/eo/access/access_inherit.h
+++ b/src/tests/eo/access/access_inherit.h
@@ -13,6 +13,6 @@ enum {
13#define inherit_prot_print() INHERIT_ID(INHERIT_SUB_ID_PROT_PRINT) 13#define inherit_prot_print() INHERIT_ID(INHERIT_SUB_ID_PROT_PRINT)
14 14
15#define INHERIT_CLASS inherit_class_get() 15#define INHERIT_CLASS inherit_class_get()
16const Eo *inherit_class_get(void); 16const Eo_Class *inherit_class_get(void);
17 17
18#endif 18#endif
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index c57c7c9..42fa259 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)
35} 35}
36 36
37static void 37static void
38_class_constructor(Eo *klass) 38_class_constructor(Eo_Class *klass)
39{ 39{
40 const Eo_Op_Func_Description func_desc[] = { 40 const Eo_Op_Func_Description func_desc[] = {
41 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), 41 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 33ba8ee..11624b7 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;
21#define EV_A_CHANGED (&(_EV_A_CHANGED)) 21#define EV_A_CHANGED (&(_EV_A_CHANGED))
22 22
23#define SIMPLE_CLASS simple_class_get() 23#define SIMPLE_CLASS simple_class_get()
24const Eo *simple_class_get(void); 24const Eo_Class *simple_class_get(void);
25 25
26#endif 26#endif
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index 40a75b7..7d66331 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)
38} 38}
39 39
40static void 40static void
41_class_constructor(Eo *klass) 41_class_constructor(Eo_Class *klass)
42{ 42{
43 const Eo_Op_Func_Description func_desc[] = { 43 const Eo_Op_Func_Description func_desc[] = {
44 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 44 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 670a705..95001b7 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 @@
2#define COMP_H 2#define COMP_H
3 3
4#define COMP_CLASS comp_class_get() 4#define COMP_CLASS comp_class_get()
5const Eo *comp_class_get(void); 5const Eo_Class *comp_class_get(void);
6 6
7#endif 7#endif
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index 897f6b7..5420ef8 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)
34} 34}
35 35
36static void 36static void
37_class_constructor(Eo *klass) 37_class_constructor(Eo_Class *klass)
38{ 38{
39 const Eo_Op_Func_Description func_desc[] = { 39 const Eo_Op_Func_Description func_desc[] = {
40 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), 40 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 6f6ce99..32a6246 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;
23#define EV_A_CHANGED (&(_EV_A_CHANGED)) 23#define EV_A_CHANGED (&(_EV_A_CHANGED))
24 24
25#define SIMPLE_CLASS simple_class_get() 25#define SIMPLE_CLASS simple_class_get()
26const Eo *simple_class_get(void); 26const Eo_Class *simple_class_get(void);
27 27
28#endif 28#endif
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index 9d3c919..24f7364 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)
38} 38}
39 39
40static void 40static void
41_class_constructor(Eo *klass) 41_class_constructor(Eo_Class *klass)
42{ 42{
43 const Eo_Op_Func_Description func_desc[] = { 43 const Eo_Op_Func_Description func_desc[] = {
44 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 44 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 3e1eace..9998b27 100644
--- a/src/tests/eo/constructors/constructors_mixin.h
+++ b/src/tests/eo/constructors/constructors_mixin.h
@@ -13,6 +13,6 @@ enum {
13#define mixin_add_and_print(x) MIXIN_ID(MIXIN_SUB_ID_ADD_AND_SET), EO_TYPECHECK(int, x) 13#define mixin_add_and_print(x) MIXIN_ID(MIXIN_SUB_ID_ADD_AND_SET), EO_TYPECHECK(int, x)
14 14
15#define MIXIN_CLASS mixin_class_get() 15#define MIXIN_CLASS mixin_class_get()
16const Eo *mixin_class_get(void); 16const Eo_Class *mixin_class_get(void);
17 17
18#endif 18#endif
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index fa31de0..466bd85 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)
75} 75}
76 76
77static void 77static void
78_class_constructor(Eo *klass) 78_class_constructor(Eo_Class *klass)
79{ 79{
80 const Eo_Op_Func_Description func_desc[] = { 80 const Eo_Op_Func_Description func_desc[] = {
81 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 81 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
@@ -94,7 +94,7 @@ _class_constructor(Eo *klass)
94} 94}
95 95
96static void 96static void
97_class_destructor(Eo *klass EINA_UNUSED) 97_class_destructor(Eo_Class *klass EINA_UNUSED)
98{ 98{
99 free(class_var); 99 free(class_var);
100} 100}
diff --git a/src/tests/eo/constructors/constructors_simple.h b/src/tests/eo/constructors/constructors_simple.h
index f3fd431..7342d34 100644
--- a/src/tests/eo/constructors/constructors_simple.h
+++ b/src/tests/eo/constructors/constructors_simple.h
@@ -21,6 +21,6 @@ enum {
21#define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b) 21#define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b)
22 22
23#define SIMPLE_CLASS simple_class_get() 23#define SIMPLE_CLASS simple_class_get()
24const Eo *simple_class_get(void); 24const Eo_Class *simple_class_get(void);
25 25
26#endif 26#endif
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index c324e26..b80b22b 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)
17} 17}
18 18
19static void 19static void
20_class_constructor(Eo *klass) 20_class_constructor(Eo_Class *klass)
21{ 21{
22 const Eo_Op_Func_Description func_desc[] = { 22 const Eo_Op_Func_Description func_desc[] = {
23 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 23 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 4397cc1..e6549f3 100644
--- a/src/tests/eo/constructors/constructors_simple2.h
+++ b/src/tests/eo/constructors/constructors_simple2.h
@@ -2,6 +2,6 @@
2#define SIMPLE2_H 2#define SIMPLE2_H
3 3
4#define SIMPLE2_CLASS simple2_class_get() 4#define SIMPLE2_CLASS simple2_class_get()
5const Eo *simple2_class_get(void); 5const Eo_Class *simple2_class_get(void);
6 6
7#endif 7#endif
diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c
index dd02fdf..13453b7 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)
15} 15}
16 16
17static void 17static void
18_class_constructor(Eo *klass) 18_class_constructor(Eo_Class *klass)
19{ 19{
20 const Eo_Op_Func_Description func_desc[] = { 20 const Eo_Op_Func_Description func_desc[] = {
21 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 21 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 834ba63..e27f8f1 100644
--- a/src/tests/eo/constructors/constructors_simple3.h
+++ b/src/tests/eo/constructors/constructors_simple3.h
@@ -2,6 +2,6 @@
2#define SIMPLE3_H 2#define SIMPLE3_H
3 3
4#define SIMPLE3_CLASS simple3_class_get() 4#define SIMPLE3_CLASS simple3_class_get()
5const Eo *simple3_class_get(void); 5const Eo_Class *simple3_class_get(void);
6 6
7#endif 7#endif
diff --git a/src/tests/eo/constructors/constructors_simple4.h b/src/tests/eo/constructors/constructors_simple4.h
index b2feb77..fe8e862 100644
--- a/src/tests/eo/constructors/constructors_simple4.h
+++ b/src/tests/eo/constructors/constructors_simple4.h
@@ -2,6 +2,6 @@
2#define SIMPLE4_H 2#define SIMPLE4_H
3 3
4#define SIMPLE4_CLASS simple4_class_get() 4#define SIMPLE4_CLASS simple4_class_get()
5const Eo *simple4_class_get(void); 5const Eo_Class *simple4_class_get(void);
6 6
7#endif 7#endif
diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c
index 50782a1..bd2f1a5 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)
15} 15}
16 16
17static void 17static void
18_class_constructor(Eo *klass) 18_class_constructor(Eo_Class *klass)
19{ 19{
20 const Eo_Op_Func_Description func_desc[] = { 20 const Eo_Op_Func_Description func_desc[] = {
21 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor), 21 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 e88b82c..9b262d4 100644
--- a/src/tests/eo/constructors/constructors_simple5.h
+++ b/src/tests/eo/constructors/constructors_simple5.h
@@ -2,6 +2,6 @@
2#define SIMPLE5_H 2#define SIMPLE5_H
3 3
4#define SIMPLE5_CLASS simple5_class_get() 4#define SIMPLE5_CLASS simple5_class_get()
5const Eo *simple5_class_get(void); 5const Eo_Class *simple5_class_get(void);
6 6
7#endif 7#endif
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index b454c70..c998885 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)
17} 17}
18 18
19static void 19static void
20_class_constructor(Eo *klass) 20_class_constructor(Eo_Class *klass)
21{ 21{
22 const Eo_Op_Func_Description func_desc[] = { 22 const Eo_Op_Func_Description func_desc[] = {
23 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor), 23 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 e03272e..97e7b5e 100644
--- a/src/tests/eo/constructors/constructors_simple6.h
+++ b/src/tests/eo/constructors/constructors_simple6.h
@@ -2,6 +2,6 @@
2#define SIMPLE6_H 2#define SIMPLE6_H
3 3
4#define SIMPLE6_CLASS simple6_class_get() 4#define SIMPLE6_CLASS simple6_class_get()
5const Eo *simple6_class_get(void); 5const Eo_Class *simple6_class_get(void);
6 6
7#endif 7#endif
diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c
index 778538c..20faba5 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)
18} 18}
19 19
20static void 20static void
21_class_constructor(Eo *klass) 21_class_constructor(Eo_Class *klass)
22{ 22{
23 const Eo_Op_Func_Description func_desc[] = { 23 const Eo_Op_Func_Description func_desc[] = {
24 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 24 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 be765d5..a9a201e 100644
--- a/src/tests/eo/constructors/constructors_simple7.h
+++ b/src/tests/eo/constructors/constructors_simple7.h
@@ -2,6 +2,6 @@
2#define SIMPLE7_H 2#define SIMPLE7_H
3 3
4#define SIMPLE7_CLASS simple7_class_get() 4#define SIMPLE7_CLASS simple7_class_get()
5const Eo *simple7_class_get(void); 5const Eo_Class *simple7_class_get(void);
6 6
7#endif 7#endif
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit.h b/src/tests/eo/function_overrides/function_overrides_inherit.h
index ea334ff..2f33647 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 @@
2#define INHERIT_H 2#define INHERIT_H
3 3
4#define INHERIT_CLASS inherit_class_get() 4#define INHERIT_CLASS inherit_class_get()
5const Eo *inherit_class_get(void); 5const Eo_Class *inherit_class_get(void);
6 6
7#endif 7#endif
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index a24c313..0092655 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
39} 39}
40 40
41static void 41static void
42_class_print(Eo *klass, void *data EINA_UNUSED, va_list *list) 42_class_print(Eo_Class *klass, void *data EINA_UNUSED, va_list *list)
43{ 43{
44 (void) list; 44 (void) list;
45 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 45 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)
48} 48}
49 49
50static void 50static void
51_class_constructor(Eo *klass) 51_class_constructor(Eo_Class *klass)
52{ 52{
53 const Eo_Op_Func_Description func_desc[] = { 53 const Eo_Op_Func_Description func_desc[] = {
54 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), 54 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 f370b9f..2bc0b0d 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 {
15#define inherit2_print2() INHERIT2_ID(INHERIT2_SUB_ID_PRINT2) 15#define inherit2_print2() INHERIT2_ID(INHERIT2_SUB_ID_PRINT2)
16 16
17#define INHERIT2_CLASS inherit2_class_get() 17#define INHERIT2_CLASS inherit2_class_get()
18const Eo *inherit2_class_get(void); 18const Eo_Class *inherit2_class_get(void);
19 19
20#endif 20#endif
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index 45e15d2..ba6f84a 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)
19} 19}
20 20
21static void 21static void
22_class_constructor(Eo *klass) 22_class_constructor(Eo_Class *klass)
23{ 23{
24 const Eo_Op_Func_Description func_desc[] = { 24 const Eo_Op_Func_Description func_desc[] = {
25 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), 25 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 7769f83..73436ba 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 @@
2#define INHERIT3_H 2#define INHERIT3_H
3 3
4#define INHERIT3_CLASS inherit3_class_get() 4#define INHERIT3_CLASS inherit3_class_get()
5const Eo *inherit3_class_get(void); 5const Eo_Class *inherit3_class_get(void);
6 6
7#endif 7#endif
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index 2fa046e..ff1d5b3 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)
30} 30}
31 31
32static void 32static void
33_class_print(Eo *klass, void *data EINA_UNUSED, va_list *list) 33_class_print(Eo_Class *klass, void *data EINA_UNUSED, va_list *list)
34{ 34{
35 (void) list; 35 (void) list;
36 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 36 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)
39} 39}
40 40
41static void 41static void
42_class_print2(Eo *klass, void *data EINA_UNUSED, va_list *list) 42_class_print2(Eo_Class *klass, void *data EINA_UNUSED, va_list *list)
43{ 43{
44 (void) list; 44 (void) list;
45 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 45 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
46} 46}
47 47
48static void 48static void
49_class_constructor(Eo *klass) 49_class_constructor(Eo_Class *klass)
50{ 50{
51 const Eo_Op_Func_Description func_desc[] = { 51 const Eo_Op_Func_Description func_desc[] = {
52 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), 52 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 63b249a..3a620fa 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;
27#define SIG_A_CHANGED (&(_SIG_A_CHANGED)) 27#define SIG_A_CHANGED (&(_SIG_A_CHANGED))
28 28
29#define SIMPLE_CLASS simple_class_get() 29#define SIMPLE_CLASS simple_class_get()
30const Eo *simple_class_get(void); 30const Eo_Class *simple_class_get(void);
31 31
32#endif 32#endif
diff --git a/src/tests/eo/interface/interface_interface.h b/src/tests/eo/interface/interface_interface.h
index eebd93f..4e161b8 100644
--- a/src/tests/eo/interface/interface_interface.h
+++ b/src/tests/eo/interface/interface_interface.h
@@ -19,6 +19,6 @@ enum {
19#define interface_ab_sum_get(sum) INTERFACE_ID(INTERFACE_SUB_ID_AB_SUM_GET), EO_TYPECHECK(int *, sum) 19#define interface_ab_sum_get(sum) INTERFACE_ID(INTERFACE_SUB_ID_AB_SUM_GET), EO_TYPECHECK(int *, sum)
20 20
21#define INTERFACE_CLASS interface_class_get() 21#define INTERFACE_CLASS interface_class_get()
22const Eo *interface_class_get(void); 22const Eo_Class *interface_class_get(void);
23 23
24#endif 24#endif
diff --git a/src/tests/eo/interface/interface_interface2.h b/src/tests/eo/interface/interface_interface2.h
index 478577d..5aa91f4 100644
--- a/src/tests/eo/interface/interface_interface2.h
+++ b/src/tests/eo/interface/interface_interface2.h
@@ -19,6 +19,6 @@ enum {
19#define interface2_ab_sum_get2(sum) INTERFACE2_ID(INTERFACE2_SUB_ID_AB_SUM_GET2), EO_TYPECHECK(int *, sum) 19#define interface2_ab_sum_get2(sum) INTERFACE2_ID(INTERFACE2_SUB_ID_AB_SUM_GET2), EO_TYPECHECK(int *, sum)
20 20
21#define INTERFACE2_CLASS interface2_class_get() 21#define INTERFACE2_CLASS interface2_class_get()
22const Eo *interface2_class_get(void); 22const Eo_Class *interface2_class_get(void);
23 23
24#endif 24#endif
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index 4530ecf..e6f3c15 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)
63} 63}
64 64
65static void 65static void
66_class_constructor(Eo *klass) 66_class_constructor(Eo_Class *klass)
67{ 67{
68 const Eo_Op_Func_Description func_desc[] = { 68 const Eo_Op_Func_Description func_desc[] = {
69 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), 69 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 25de54b..8df8131 100644
--- a/src/tests/eo/interface/interface_simple.h
+++ b/src/tests/eo/interface/interface_simple.h
@@ -42,6 +42,6 @@ enum {
42#define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b) 42#define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b)
43 43
44#define SIMPLE_CLASS simple_class_get() 44#define SIMPLE_CLASS simple_class_get()
45const Eo *simple_class_get(void); 45const Eo_Class *simple_class_get(void);
46 46
47#endif 47#endif
diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c
index a6eb59a..8f9db13 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)
18} 18}
19 19
20static void 20static void
21_class_constructor(Eo *klass) 21_class_constructor(Eo_Class *klass)
22{ 22{
23 const Eo_Op_Func_Description func_desc[] = { 23 const Eo_Op_Func_Description func_desc[] = {
24 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_GET), _a_get), 24 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 ea334ff..2f33647 100644
--- a/src/tests/eo/mixin/mixin_inherit.h
+++ b/src/tests/eo/mixin/mixin_inherit.h
@@ -2,6 +2,6 @@
2#define INHERIT_H 2#define INHERIT_H
3 3
4#define INHERIT_CLASS inherit_class_get() 4#define INHERIT_CLASS inherit_class_get()
5const Eo *inherit_class_get(void); 5const Eo_Class *inherit_class_get(void);
6 6
7#endif 7#endif
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index 8632fb2..ee3342f 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)
34} 34}
35 35
36static void 36static void
37_class_constructor(Eo *klass) 37_class_constructor(Eo_Class *klass)
38{ 38{
39 const Eo_Op_Func_Description func_desc[] = { 39 const Eo_Op_Func_Description func_desc[] = {
40 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 40 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 3bd0844..745e5c4 100644
--- a/src/tests/eo/mixin/mixin_mixin.h
+++ b/src/tests/eo/mixin/mixin_mixin.h
@@ -19,6 +19,6 @@ enum {
19#define mixin_ab_sum_get(sum) MIXIN_ID(MIXIN_SUB_ID_AB_SUM_GET), EO_TYPECHECK(int *, sum) 19#define mixin_ab_sum_get(sum) MIXIN_ID(MIXIN_SUB_ID_AB_SUM_GET), EO_TYPECHECK(int *, sum)
20 20
21#define MIXIN_CLASS mixin_class_get() 21#define MIXIN_CLASS mixin_class_get()
22const Eo *mixin_class_get(void); 22const Eo_Class *mixin_class_get(void);
23 23
24#endif 24#endif
diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c
index 35056cd..451a8ec 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)
43} 43}
44 44
45static void 45static void
46_class_constructor(Eo *klass) 46_class_constructor(Eo_Class *klass)
47{ 47{
48 const Eo_Op_Func_Description func_desc[] = { 48 const Eo_Op_Func_Description func_desc[] = {
49 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 49 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 97e8a8b..6e4b692 100644
--- a/src/tests/eo/mixin/mixin_mixin2.h
+++ b/src/tests/eo/mixin/mixin_mixin2.h
@@ -7,6 +7,6 @@ typedef struct
7} Mixin2_Public_Data; 7} Mixin2_Public_Data;
8 8
9#define MIXIN2_CLASS mixin2_class_get() 9#define MIXIN2_CLASS mixin2_class_get()
10const Eo *mixin2_class_get(void); 10const Eo_Class *mixin2_class_get(void);
11 11
12#endif 12#endif
diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c
index da1df66..6ad66e1 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)
43} 43}
44 44
45static void 45static void
46_class_constructor(Eo *klass) 46_class_constructor(Eo_Class *klass)
47{ 47{
48 const Eo_Op_Func_Description func_desc[] = { 48 const Eo_Op_Func_Description func_desc[] = {
49 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 49 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 80ba7ea..36b32c0 100644
--- a/src/tests/eo/mixin/mixin_mixin3.h
+++ b/src/tests/eo/mixin/mixin_mixin3.h
@@ -7,6 +7,6 @@ typedef struct
7} Mixin3_Public_Data; 7} Mixin3_Public_Data;
8 8
9#define MIXIN3_CLASS mixin3_class_get() 9#define MIXIN3_CLASS mixin3_class_get()
10const Eo *mixin3_class_get(void); 10const Eo_Class *mixin3_class_get(void);
11 11
12#endif 12#endif
diff --git a/src/tests/eo/mixin/mixin_mixin4.h b/src/tests/eo/mixin/mixin_mixin4.h
index 29755a2..7b520fa 100644
--- a/src/tests/eo/mixin/mixin_mixin4.h
+++ b/src/tests/eo/mixin/mixin_mixin4.h
@@ -2,6 +2,6 @@
2#define MIXIN4_H 2#define MIXIN4_H
3 3
4#define MIXIN4_CLASS mixin4_class_get() 4#define MIXIN4_CLASS mixin4_class_get()
5const Eo *mixin4_class_get(void); 5const Eo_Class *mixin4_class_get(void);
6 6
7#endif 7#endif
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index c71690c..ff4600d 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)
42_GET_SET_FUNC(b) 42_GET_SET_FUNC(b)
43 43
44static void 44static void
45_class_constructor(Eo *klass) 45_class_constructor(Eo_Class *klass)
46{ 46{
47 const Eo_Op_Func_Description func_desc[] = { 47 const Eo_Op_Func_Description func_desc[] = {
48 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), 48 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 25de54b..8df8131 100644
--- a/src/tests/eo/mixin/mixin_simple.h
+++ b/src/tests/eo/mixin/mixin_simple.h
@@ -42,6 +42,6 @@ enum {
42#define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b) 42#define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b)
43 43
44#define SIMPLE_CLASS simple_class_get() 44#define SIMPLE_CLASS simple_class_get()
45const Eo *simple_class_get(void); 45const Eo_Class *simple_class_get(void);
46 46
47#endif 47#endif
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 3bcabcb..1417988 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)
76} 76}
77 77
78static void 78static void
79_class_constructor(Eo *klass) 79_class_constructor(Eo_Class *klass)
80{ 80{
81 const Eo_Op_Func_Description func_desc[] = { 81 const Eo_Op_Func_Description func_desc[] = {
82 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 82 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 ffac9d7..d1f63bd 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;
26#define EV_A_CHANGED (&(_EV_A_CHANGED)) 26#define EV_A_CHANGED (&(_EV_A_CHANGED))
27 27
28#define SIMPLE_CLASS simple_class_get() 28#define SIMPLE_CLASS simple_class_get()
29const Eo *simple_class_get(void); 29const Eo_Class *simple_class_get(void);
30 30
31#endif 31#endif
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index ea717c1..5b1f8e6 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)
83 eo_init(); 83 eo_init();
84 eina_log_print_cb_set(_eo_test_print_cb, &ctx); 84 eina_log_print_cb_set(_eo_test_print_cb, &ctx);
85 85
86 const Eo *klass; 86 const Eo_Class *klass;
87 static Eo_Op TMP_BASE_ID = EO_NOOP; 87 static Eo_Op TMP_BASE_ID = EO_NOOP;
88 88
89 enum { 89 enum {
@@ -186,9 +186,9 @@ START_TEST(eo_inherit_errors)
186 eo_init(); 186 eo_init();
187 eina_log_print_cb_set(_eo_test_print_cb, &ctx); 187 eina_log_print_cb_set(_eo_test_print_cb, &ctx);
188 188
189 const Eo *klass; 189 const Eo_Class *klass;
190 const Eo *klass_mixin; 190 const Eo_Class *klass_mixin;
191 const Eo *klass_simple; 191 const Eo_Class *klass_simple;
192 192
193 static const Eo_Class_Description class_desc_simple = { 193 static const Eo_Class_Description class_desc_simple = {
194 EO_VERSION, 194 EO_VERSION,
@@ -253,10 +253,10 @@ START_TEST(eo_inconsistent_mro)
253 eo_init(); 253 eo_init();
254 eina_log_print_cb_set(_eo_test_print_cb, &ctx); 254 eina_log_print_cb_set(_eo_test_print_cb, &ctx);
255 255
256 const Eo *klass; 256 const Eo_Class *klass;
257 const Eo *klass_mixin; 257 const Eo_Class *klass_mixin;
258 const Eo *klass_mixin2; 258 const Eo_Class *klass_mixin2;
259 const Eo *klass_mixin3; 259 const Eo_Class *klass_mixin3;
260 260
261 static const Eo_Class_Description class_desc_simple = { 261 static const Eo_Class_Description class_desc_simple = {
262 EO_VERSION, 262 EO_VERSION,
@@ -328,14 +328,14 @@ START_TEST(eo_inconsistent_mro)
328} 328}
329END_TEST 329END_TEST
330 330
331static void _stub_class_constructor(Eo *klass EINA_UNUSED) {} 331static void _stub_class_constructor(Eo_Class *klass EINA_UNUSED) {}
332 332
333START_TEST(eo_bad_interface) 333START_TEST(eo_bad_interface)
334{ 334{
335 eo_init(); 335 eo_init();
336 eina_log_print_cb_set(_eo_test_safety_print_cb, &ctx); 336 eina_log_print_cb_set(_eo_test_safety_print_cb, &ctx);
337 337
338 const Eo *klass; 338 const Eo_Class *klass;
339 339
340 static Eo_Class_Description class_desc = { 340 static Eo_Class_Description class_desc = {
341 EO_VERSION, 341 EO_VERSION,
@@ -399,7 +399,7 @@ _const_ops_class_hi_print(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, va_
399} 399}
400 400
401static void 401static void
402_const_ops_class_constructor(Eo *klass) 402_const_ops_class_constructor(Eo_Class *klass)
403{ 403{
404 const Eo_Op_Func_Description func_desc[] = { 404 const Eo_Op_Func_Description func_desc[] = {
405 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _const_ops_a_set), 405 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _const_ops_a_set),
@@ -419,7 +419,7 @@ START_TEST(eo_op_types)
419 eo_init(); 419 eo_init();
420 eina_log_print_cb_set(_eo_test_print_cb, &ctx); 420 eina_log_print_cb_set(_eo_test_print_cb, &ctx);
421 421
422 const Eo *klass; 422 const Eo_Class *klass;
423 423
424 static Eo_Class_Description class_desc = { 424 static Eo_Class_Description class_desc = {
425 EO_VERSION, 425 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 55e3283..cbeb183 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)
33} 33}
34 34
35static void 35static void
36_class_hi_print(Eo *klass, void *data EINA_UNUSED, va_list *list) 36_class_hi_print(Eo_Class *klass, void *data EINA_UNUSED, va_list *list)
37{ 37{
38 (void) list; 38 (void) list;
39 printf("Hi Print %s\n", eo_class_name_get(klass)); 39 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)
49} 49}
50 50
51static void 51static void
52_class_constructor(Eo *klass) 52_class_constructor(Eo_Class *klass)
53{ 53{
54 const Eo_Op_Func_Description func_desc[] = { 54 const Eo_Op_Func_Description func_desc[] = {
55 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DBG_INFO_GET), _dbg_info_get), 55 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 58aa988..699ddb8 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;
25#define EV_A_CHANGED (&(_EV_A_CHANGED)) 25#define EV_A_CHANGED (&(_EV_A_CHANGED))
26 26
27#define SIMPLE_CLASS simple_class_get() 27#define SIMPLE_CLASS simple_class_get()
28const Eo *simple_class_get(void); 28const Eo_Class *simple_class_get(void);
29 29
30#endif 30#endif
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 1460a24..b1bbdea 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)
121 NULL 121 NULL
122 }; 122 };
123 123
124 const Eo *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); 124 const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
125 fail_if(!klass); 125 fail_if(!klass);
126 126
127 Eo *obj = eo_add(klass, NULL); 127 Eo *obj = eo_add(klass, NULL);
@@ -148,7 +148,7 @@ START_TEST(eo_isa_tests)
148{ 148{
149 eo_init(); 149 eo_init();
150 150
151 const Eo *klass, *iface, *mixin; 151 const Eo_Class *klass, *iface, *mixin;
152 152
153 { 153 {
154 /* Usually should be const, not const only for the test... */ 154 /* Usually should be const, not const only for the test... */
@@ -246,7 +246,7 @@ END_TEST
246 246
247static Eina_Bool _man_should_con = EINA_TRUE; 247static Eina_Bool _man_should_con = EINA_TRUE;
248static Eina_Bool _man_should_des = EINA_TRUE; 248static Eina_Bool _man_should_des = EINA_TRUE;
249static const Eo *cur_klass = NULL; 249static const Eo_Class *cur_klass = NULL;
250 250
251static void 251static void
252_man_con(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED) 252_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)
266 266
267 267
268static void 268static void
269_man_class_constructor(Eo *klass) 269_man_class_constructor(Eo_Class *klass)
270{ 270{
271 const Eo_Op_Func_Description func_desc[] = { 271 const Eo_Op_Func_Description func_desc[] = {
272 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _man_con), 272 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _man_con),
@@ -294,7 +294,7 @@ START_TEST(eo_man_free)
294 NULL 294 NULL
295 }; 295 };
296 296
297 const Eo *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); 297 const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
298 fail_if(!klass); 298 fail_if(!klass);
299 cur_klass = klass; 299 cur_klass = klass;
300 300
@@ -504,7 +504,7 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, va_list *list EINA_UNU
504} 504}
505 505
506static void 506static void
507_op_errors_class_constructor(Eo *klass) 507_op_errors_class_constructor(Eo_Class *klass)
508{ 508{
509 const Eo_Op_Func_Description func_desc[] = { 509 const Eo_Op_Func_Description func_desc[] = {
510 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_LAST), _a_set), 510 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_LAST), _a_set),
@@ -531,7 +531,7 @@ START_TEST(eo_op_errors)
531 NULL 531 NULL
532 }; 532 };
533 533
534 const Eo *klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL); 534 const Eo_Class *klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);
535 fail_if(!klass); 535 fail_if(!klass);
536 536
537 Eo *obj = eo_add(klass, NULL); 537 Eo *obj = eo_add(klass, NULL);
@@ -658,7 +658,7 @@ START_TEST(eo_magic_checks)
658 Eo *parent = NULL; 658 Eo *parent = NULL;
659 Eo *wref = NULL; 659 Eo *wref = NULL;
660 660
661 obj = eo_add((Eo *) buf, NULL); 661 obj = eo_add((Eo_Class *) buf, NULL);
662 fail_if(obj); 662 fail_if(obj);
663 663
664 obj = eo_add(SIMPLE_CLASS, NULL); 664 obj = eo_add(SIMPLE_CLASS, NULL);
@@ -666,15 +666,15 @@ START_TEST(eo_magic_checks)
666 666
667 fail_if(eo_do((Eo *) buf, EO_NOOP)); 667 fail_if(eo_do((Eo *) buf, EO_NOOP));
668 fail_if(eo_do_super((Eo *) buf, SIMPLE_CLASS, EO_NOOP)); 668 fail_if(eo_do_super((Eo *) buf, SIMPLE_CLASS, EO_NOOP));
669 fail_if(eo_do_super(obj, (const Eo *) buf, EO_NOOP)); 669 fail_if(eo_do_super(obj, (const Eo_Class *) buf, EO_NOOP));
670 fail_if(eo_class_get((Eo *) buf)); 670 fail_if(eo_class_get((Eo *) buf));
671 fail_if(eo_class_name_get((Eo*) buf)); 671 fail_if(eo_class_name_get((Eo_Class*) buf));
672 eo_class_funcs_set((Eo *) buf, NULL); 672 eo_class_funcs_set((Eo_Class *) buf, NULL);
673 eo_class_do((Eo *) buf, NULL); 673 eo_class_do((Eo_Class *) buf, NULL);
674 eo_class_do_super((Eo *) buf, SIMPLE_CLASS, EO_NOOP); 674 eo_class_do_super((Eo_Class *) buf, SIMPLE_CLASS, EO_NOOP);
675 eo_class_do_super(SIMPLE_CLASS, (Eo *) buf, EO_NOOP); 675 eo_class_do_super(SIMPLE_CLASS, (Eo_Class *) buf, EO_NOOP);
676 676
677 fail_if(eo_class_new(NULL, (Eo *) buf), NULL); 677 fail_if(eo_class_new(NULL, (Eo_Class *) buf), NULL);
678 678
679 eo_xref(obj, (Eo *) buf); 679 eo_xref(obj, (Eo *) buf);
680 eo_xunref(obj, (Eo *) buf); 680 eo_xunref(obj, (Eo *) buf);
@@ -686,7 +686,7 @@ START_TEST(eo_magic_checks)
686 eo_del((Eo *) buf); 686 eo_del((Eo *) buf);
687 687
688 eo_isa((Eo *) buf, SIMPLE_CLASS); 688 eo_isa((Eo *) buf, SIMPLE_CLASS);
689 eo_isa(obj, (Eo *) buf); 689 eo_isa(obj, (Eo_Class *) buf);
690 690
691 fail_if(0 != eo_ref_get((Eo *) buf)); 691 fail_if(0 != eo_ref_get((Eo *) buf));
692 692
@@ -738,7 +738,7 @@ _a_print(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, va_list *list EINA_U
738} 738}
739 739
740static void 740static void
741_class_hi_print(const Eo *klass EINA_UNUSED, va_list *list EINA_UNUSED) 741_class_hi_print(const Eo_Class *klass EINA_UNUSED, va_list *list EINA_UNUSED)
742{ 742{
743 printf("Hi\n"); 743 printf("Hi\n");
744} 744}
@@ -750,7 +750,7 @@ enum {
750}; 750};
751 751
752static void 752static void
753_eo_multiple_do_class_constructor(Eo *klass) 753_eo_multiple_do_class_constructor(Eo_Class *klass)
754{ 754{
755 const Eo_Op_Func_Description func_desc[] = { 755 const Eo_Op_Func_Description func_desc[] = {
756 EO_OP_FUNC(MULTI_ID(MULTI_SUB_ID_A_PRINT), _a_print), 756 EO_OP_FUNC(MULTI_ID(MULTI_SUB_ID_A_PRINT), _a_print),
@@ -784,7 +784,7 @@ START_TEST(eo_multiple_do)
784 NULL 784 NULL
785 }; 785 };
786 786
787 const Eo *klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL); 787 const Eo_Class *klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);
788 fail_if(!klass); 788 fail_if(!klass);
789 789
790 Eo *obj = eo_add(klass, NULL); 790 Eo *obj = eo_add(klass, NULL);
@@ -841,7 +841,7 @@ START_TEST(eo_pointers_indirection)
841 NULL 841 NULL
842 }; 842 };
843 843
844 const Eo *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); 844 const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
845 fail_if(!klass); 845 fail_if(!klass);
846 846
847 /* Check simple id validity */ 847 /* Check simple id validity */