summaryrefslogtreecommitdiff
path: root/src/tests/eo/function_overrides
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/tests/eo/function_overrides
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/tests/eo/function_overrides')
-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
7 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit.h b/src/tests/eo/function_overrides/function_overrides_inherit.h
index ea334ff71f..2f33647958 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit.h
+++ b/src/tests/eo/function_overrides/function_overrides_inherit.h
@@ -2,6 +2,6 @@
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 a24c31300c..0092655dfa 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -39,7 +39,7 @@ _print2(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, va_list *list EINA_UN
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 f370b9f078..2bc0b0d36a 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.h
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.h
@@ -15,6 +15,6 @@ enum {
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 45e15d2cc3..ba6f84a229 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -19,7 +19,7 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list)
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 7769f839be..73436ba239 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.h
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.h
@@ -2,6 +2,6 @@
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 2fa046e786..ff1d5b3bc3 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -30,7 +30,7 @@ _a_print(Eo *obj EINA_UNUSED, void *class_data, va_list *list)
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 63b249a412..3a620fa611 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.h
+++ b/src/tests/eo/function_overrides/function_overrides_simple.h
@@ -27,6 +27,6 @@ extern const Eo_Event_Description _SIG_A_CHANGED;
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