summaryrefslogtreecommitdiff
path: root/src/lib
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 /src/lib
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
Diffstat (limited to 'src/lib')
-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
44 files changed, 77 insertions, 77 deletions
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),