summaryrefslogtreecommitdiff
path: root/src/tests/eo/function_overrides
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-09-05 12:31:55 +0100
committerTom Hacohen <tom@stosb.com>2016-09-05 16:03:17 +0100
commita8ccb191c6cc9d1191306449b20aba1c8eee965a (patch)
treed7f8a5182ea6388d9afb3baa80eaef37caca4fcb /src/tests/eo/function_overrides
parent4aae224ef5af35e920e0c5a2c23df9afbb33bb84 (diff)
Adjust the EFL to the Eo class_initilizer changes.
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_inherit2.c20
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c14
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c20
4 files changed, 37 insertions, 19 deletions
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit.c b/src/tests/eo/function_overrides/function_overrides_inherit.c
index de17dfb2da..d93e3839d4 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit.c
@@ -12,9 +12,9 @@ static const Efl_Class_Description class_desc = {
12 EO_VERSION, 12 EO_VERSION,
13 "Inherit", 13 "Inherit",
14 EFL_CLASS_TYPE_REGULAR, 14 EFL_CLASS_TYPE_REGULAR,
15 EFL_CLASS_DESCRIPTION_NOOPS(),
16 0, 15 0,
17 NULL, 16 NULL,
17 NULL,
18 NULL 18 NULL
19}; 19};
20 20
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index c962d8a06f..0211a8cd21 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -59,19 +59,25 @@ _class_print(Efl_Class *klass, void *data EINA_UNUSED)
59EAPI EFL_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE); 59EAPI EFL_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
60EAPI EFL_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE); 60EAPI EFL_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
61 61
62static Efl_Op_Description op_descs[] = { 62static Eina_Bool
63 EFL_OBJECT_OP_FUNC(inherit2_print, _print), 63_class_initializer(Efl_Class *klass)
64 EFL_OBJECT_OP_FUNC(inherit2_print2, _print2), 64{
65 EFL_OBJECT_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print), 65 EFL_OPS_DEFINE(ops,
66 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 66 EFL_OBJECT_OP_FUNC(inherit2_print, _print),
67}; 67 EFL_OBJECT_OP_FUNC(inherit2_print2, _print2),
68 EFL_OBJECT_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print),
69 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
70 );
71
72 return efl_class_functions_set(klass, &ops);
73}
68 74
69static const Efl_Class_Description class_desc = { 75static const Efl_Class_Description class_desc = {
70 EO_VERSION, 76 EO_VERSION,
71 "Inherit2", 77 "Inherit2",
72 EFL_CLASS_TYPE_REGULAR, 78 EFL_CLASS_TYPE_REGULAR,
73 EFL_CLASS_DESCRIPTION_OPS(op_descs),
74 0, 79 0,
80 _class_initializer,
75 NULL, 81 NULL,
76 NULL 82 NULL
77}; 83};
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index 38dd470342..1043a2a93f 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -16,16 +16,22 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
16 simple_a_set(efl_super(obj, MY_CLASS), a + 1); 16 simple_a_set(efl_super(obj, MY_CLASS), a + 1);
17} 17}
18 18
19static Efl_Op_Description op_descs[] = { 19static Eina_Bool
20 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 20_class_initializer(Efl_Class *klass)
21}; 21{
22 EFL_OPS_DEFINE(ops,
23 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
24 );
25
26 return efl_class_functions_set(klass, &ops);
27}
22 28
23static const Efl_Class_Description class_desc = { 29static const Efl_Class_Description class_desc = {
24 EO_VERSION, 30 EO_VERSION,
25 "Inherit3", 31 "Inherit3",
26 EFL_CLASS_TYPE_REGULAR, 32 EFL_CLASS_TYPE_REGULAR,
27 EFL_CLASS_DESCRIPTION_OPS(op_descs),
28 0, 33 0,
34 _class_initializer,
29 NULL, 35 NULL,
30 NULL 36 NULL
31}; 37};
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index 7b3ef7a4d0..9477e7d41a 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -56,19 +56,25 @@ EAPI EFL_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
56EAPI EFL_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE); 56EAPI EFL_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE);
57EAPI EFL_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE); 57EAPI EFL_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE);
58 58
59static Efl_Op_Description op_descs[] = { 59static Eina_Bool
60 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 60_class_initializer(Efl_Class *klass)
61 EFL_OBJECT_OP_FUNC(simple_a_print, _a_print), 61{
62 EFL_OBJECT_OP_FUNC(simple_class_print, _class_print), 62 EFL_OPS_DEFINE(ops,
63 EFL_OBJECT_OP_FUNC(simple_class_print2, _class_print2), 63 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
64}; 64 EFL_OBJECT_OP_FUNC(simple_a_print, _a_print),
65 EFL_OBJECT_OP_FUNC(simple_class_print, _class_print),
66 EFL_OBJECT_OP_FUNC(simple_class_print2, _class_print2),
67 );
68
69 return efl_class_functions_set(klass, &ops);
70}
65 71
66static const Efl_Class_Description class_desc = { 72static const Efl_Class_Description class_desc = {
67 EO_VERSION, 73 EO_VERSION,
68 "Simple", 74 "Simple",
69 EFL_CLASS_TYPE_REGULAR, 75 EFL_CLASS_TYPE_REGULAR,
70 EFL_CLASS_DESCRIPTION_OPS(op_descs),
71 sizeof(Simple_Public_Data), 76 sizeof(Simple_Public_Data),
77 _class_initializer,
72 NULL, 78 NULL,
73 NULL 79 NULL
74}; 80};