summaryrefslogtreecommitdiff
path: root/src/tests/eo/function_overrides
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-10 15:23:04 +0100
committerTom Hacohen <tom@stosb.com>2016-08-11 17:04:43 +0100
commitc662934be8bcbaba60d1688e77533acbea5d09b9 (patch)
tree8e12b5ffd083024f09b7ec7fa9f979113056fb9d /src/tests/eo/function_overrides
parente64e120a51972c44fb8cae88a78bb4aa34f502c7 (diff)
Change the EFL to follow the new Eo rename.
Diffstat (limited to 'src/tests/eo/function_overrides')
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit.h2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c6
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.h2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c4
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.h2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_main.c4
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c8
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.h4
9 files changed, 17 insertions, 17 deletions
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit.c b/src/tests/eo/function_overrides/function_overrides_inherit.c
index 3a767f9e1a..845515128c 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit.c
@@ -8,7 +8,7 @@
8 8
9#define MY_CLASS INHERIT_CLASS 9#define MY_CLASS INHERIT_CLASS
10 10
11static const Eo_Class_Description class_desc = { 11static const Efl_Class_Description class_desc = {
12 EO_VERSION, 12 EO_VERSION,
13 "Inherit", 13 "Inherit",
14 EO_CLASS_TYPE_REGULAR, 14 EO_CLASS_TYPE_REGULAR,
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit.h b/src/tests/eo/function_overrides/function_overrides_inherit.h
index 2f33647958..3ab1e1319d 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_Class *inherit_class_get(void); 5const Efl_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 b4602aac00..26e92e5212 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -43,7 +43,7 @@ _print2(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED)
43} 43}
44 44
45static Eina_Bool 45static Eina_Bool
46_class_print(Eo_Class *klass, void *data EINA_UNUSED) 46_class_print(Efl_Class *klass, void *data EINA_UNUSED)
47{ 47{
48 Eina_Bool called = EINA_FALSE; 48 Eina_Bool called = EINA_FALSE;
49 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 49 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
@@ -59,14 +59,14 @@ _class_print(Eo_Class *klass, void *data EINA_UNUSED)
59EAPI EO_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE); 59EAPI EO_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
60EAPI EO_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE); 60EAPI EO_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
61 61
62static Eo_Op_Description op_descs[] = { 62static Efl_Op_Description op_descs[] = {
63 EO_OP_FUNC(inherit2_print, _print), 63 EO_OP_FUNC(inherit2_print, _print),
64 EO_OP_FUNC(inherit2_print2, _print2), 64 EO_OP_FUNC(inherit2_print2, _print2),
65 EO_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print), 65 EO_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print),
66 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 66 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
67}; 67};
68 68
69static const Eo_Class_Description class_desc = { 69static const Efl_Class_Description class_desc = {
70 EO_VERSION, 70 EO_VERSION,
71 "Inherit2", 71 "Inherit2",
72 EO_CLASS_TYPE_REGULAR, 72 EO_CLASS_TYPE_REGULAR,
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.h b/src/tests/eo/function_overrides/function_overrides_inherit2.h
index ad7d8008ba..773ead195b 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.h
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.h
@@ -5,6 +5,6 @@ EAPI Eina_Bool inherit2_print(Eo *obj);
5EAPI Eina_Bool inherit2_print2(Eo *obj); 5EAPI Eina_Bool inherit2_print2(Eo *obj);
6 6
7#define INHERIT2_CLASS inherit2_class_get() 7#define INHERIT2_CLASS inherit2_class_get()
8const Eo_Class *inherit2_class_get(void); 8const Efl_Class *inherit2_class_get(void);
9 9
10#endif 10#endif
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index 4c23281587..3f09b19e78 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -16,11 +16,11 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
16 simple_a_set(eo_super(obj, MY_CLASS), a + 1); 16 simple_a_set(eo_super(obj, MY_CLASS), a + 1);
17} 17}
18 18
19static Eo_Op_Description op_descs[] = { 19static Efl_Op_Description op_descs[] = {
20 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 20 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
21}; 21};
22 22
23static const Eo_Class_Description class_desc = { 23static const Efl_Class_Description class_desc = {
24 EO_VERSION, 24 EO_VERSION,
25 "Inherit3", 25 "Inherit3",
26 EO_CLASS_TYPE_REGULAR, 26 EO_CLASS_TYPE_REGULAR,
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.h b/src/tests/eo/function_overrides/function_overrides_inherit3.h
index 73436ba239..a6ddb404c3 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_Class *inherit3_class_get(void); 5const Efl_Class *inherit3_class_get(void);
6 6
7#endif 7#endif
diff --git a/src/tests/eo/function_overrides/function_overrides_main.c b/src/tests/eo/function_overrides/function_overrides_main.c
index b2aa840897..d5fc195d23 100644
--- a/src/tests/eo/function_overrides/function_overrides_main.c
+++ b/src/tests/eo/function_overrides/function_overrides_main.c
@@ -68,8 +68,8 @@ main(int argc, char *argv[])
68 fail_if(called); 68 fail_if(called);
69#endif 69#endif
70 70
71 eo_constructor(eo_super(obj, SIMPLE_CLASS)); 71 efl_constructor(eo_super(obj, SIMPLE_CLASS));
72 eo_destructor(eo_super(obj, SIMPLE_CLASS)); 72 efl_destructor(eo_super(obj, SIMPLE_CLASS));
73 73
74 eo_unref(obj); 74 eo_unref(obj);
75 75
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index 1e0a6a27f1..dbdd935a10 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)
30} 30}
31 31
32static Eina_Bool 32static Eina_Bool
33_class_print(Eo_Class *klass, void *class_data EINA_UNUSED) 33_class_print(Efl_Class *klass, void *class_data EINA_UNUSED)
34{ 34{
35 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 35 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
36 Eina_Bool called = EINA_FALSE; 36 Eina_Bool called = EINA_FALSE;
@@ -44,7 +44,7 @@ _class_print(Eo_Class *klass, void *class_data EINA_UNUSED)
44} 44}
45 45
46static Eina_Bool 46static Eina_Bool
47_class_print2(Eo_Class *klass, void *class_data EINA_UNUSED) 47_class_print2(Efl_Class *klass, void *class_data EINA_UNUSED)
48{ 48{
49 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 49 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
50 50
@@ -56,14 +56,14 @@ EAPI EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
56EAPI EO_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE); 56EAPI EO_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE);
57EAPI EO_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE); 57EAPI EO_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE);
58 58
59static Eo_Op_Description op_descs[] = { 59static Efl_Op_Description op_descs[] = {
60 EO_OP_FUNC(simple_a_set, _a_set), 60 EO_OP_FUNC(simple_a_set, _a_set),
61 EO_OP_FUNC(simple_a_print, _a_print), 61 EO_OP_FUNC(simple_a_print, _a_print),
62 EO_OP_FUNC(simple_class_print, _class_print), 62 EO_OP_FUNC(simple_class_print, _class_print),
63 EO_OP_FUNC(simple_class_print2, _class_print2), 63 EO_OP_FUNC(simple_class_print2, _class_print2),
64}; 64};
65 65
66static const Eo_Class_Description class_desc = { 66static const Efl_Class_Description class_desc = {
67 EO_VERSION, 67 EO_VERSION,
68 "Simple", 68 "Simple",
69 EO_CLASS_TYPE_REGULAR, 69 EO_CLASS_TYPE_REGULAR,
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.h b/src/tests/eo/function_overrides/function_overrides_simple.h
index 9128c90d34..87dfba7ba0 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.h
+++ b/src/tests/eo/function_overrides/function_overrides_simple.h
@@ -11,10 +11,10 @@ EAPI Eina_Bool simple_a_print(Eo *obj);
11EAPI Eina_Bool simple_class_print(const Eo *obj); 11EAPI Eina_Bool simple_class_print(const Eo *obj);
12EAPI Eina_Bool simple_class_print2(const Eo *obj); 12EAPI Eina_Bool simple_class_print2(const Eo *obj);
13 13
14extern const Eo_Event_Description _SIG_A_CHANGED; 14extern const Efl_Event_Description _SIG_A_CHANGED;
15#define SIG_A_CHANGED (&(_SIG_A_CHANGED)) 15#define SIG_A_CHANGED (&(_SIG_A_CHANGED))
16 16
17#define SIMPLE_CLASS simple_class_get() 17#define SIMPLE_CLASS simple_class_get()
18const Eo_Class *simple_class_get(void); 18const Efl_Class *simple_class_get(void);
19 19
20#endif 20#endif