summaryrefslogtreecommitdiff
path: root/src/lib/ecore
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/ecore
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/ecore')
-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
9 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index 31177fcc28..0daf06aa53 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -11,7 +11,7 @@ extern "C" {
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 a9f8430cf2..5d32c31603 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -600,7 +600,7 @@ _ecore_animator(void *data EINA_UNUSED)
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 8d1fa57fcf..7cbabc8a52 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -282,7 +282,7 @@ _ecore_idle_enterer_exist(void)
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 b1418a0c39..da85f1dc0f 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -233,7 +233,7 @@ _ecore_idle_exiter_exist(void)
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 8f0438222f..051c3e1e7a 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -216,7 +216,7 @@ _ecore_idler_exist(void)
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 04cd09d352..8720a7f2ee 100644
--- a/src/lib/ecore/ecore_job.c
+++ b/src/lib/ecore/ecore_job.c
@@ -169,7 +169,7 @@ _ecore_job_event_free(void *data,
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 92007bd24b..4883d7bb86 100644
--- a/src/lib/ecore/ecore_poll.c
+++ b/src/lib/ecore/ecore_poll.c
@@ -457,7 +457,7 @@ _ecore_poller_shutdown(void)
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 e2ad2c9aca..1c7f53e5a4 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -417,6 +417,6 @@ GENERIC_ALLOC_FREE_HEADER(Ecore_Win32_Handler, ecore_win32_handler);
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 d99fed20c3..eb83321dfb 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -976,7 +976,7 @@ _ecore_timer_cmp(const void *d1,
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),