summaryrefslogtreecommitdiff
path: root/src/tests/eo/suite/eo_test_class_simple.c
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/suite/eo_test_class_simple.c
parent4aae224ef5af35e920e0c5a2c23df9afbb33bb84 (diff)
Adjust the EFL to the Eo class_initilizer changes.
Diffstat (limited to 'src/tests/eo/suite/eo_test_class_simple.c')
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c56
1 files changed, 37 insertions, 19 deletions
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 6bbeda587e..56d424c183 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -88,23 +88,29 @@ EFL_FUNC_BODY_CONST(simple_class_hi_print, Eina_Bool, EINA_FALSE);
88EFL_VOID_FUNC_BODY(simple_pure_virtual); 88EFL_VOID_FUNC_BODY(simple_pure_virtual);
89EFL_VOID_FUNC_BODY(simple_no_implementation); 89EFL_VOID_FUNC_BODY(simple_no_implementation);
90 90
91static Efl_Op_Description op_descs[] = { 91static Eina_Bool
92 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 92_class_initializer(Efl_Class *klass)
93 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 93{
94 EFL_OBJECT_OP_FUNC(simple_a_print, _a_print), 94 EFL_OPS_DEFINE(ops,
95 EFL_OBJECT_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print), 95 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
96 EFL_OBJECT_OP_FUNC(simple_recursive, _recursive), 96 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
97 EFL_OBJECT_OP_FUNC(simple_part_get, _part_get), 97 EFL_OBJECT_OP_FUNC(simple_a_print, _a_print),
98 EFL_OBJECT_OP_FUNC(simple_pure_virtual, NULL), 98 EFL_OBJECT_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print),
99 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_dbg_info_get, _dbg_info_get), 99 EFL_OBJECT_OP_FUNC(simple_recursive, _recursive),
100}; 100 EFL_OBJECT_OP_FUNC(simple_part_get, _part_get),
101 EFL_OBJECT_OP_FUNC(simple_pure_virtual, NULL),
102 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_dbg_info_get, _dbg_info_get),
103 );
104
105 return efl_class_functions_set(klass, &ops);
106}
101 107
102static const Efl_Class_Description class_desc = { 108static const Efl_Class_Description class_desc = {
103 EO_VERSION, 109 EO_VERSION,
104 "Simple", 110 "Simple",
105 EFL_CLASS_TYPE_REGULAR, 111 EFL_CLASS_TYPE_REGULAR,
106 EFL_CLASS_DESCRIPTION_OPS(op_descs),
107 sizeof(Simple_Public_Data), 112 sizeof(Simple_Public_Data),
113 _class_initializer,
108 NULL, 114 NULL,
109 NULL 115 NULL
110}; 116};
@@ -120,16 +126,22 @@ _beef_get(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED)
120 126
121EFL_FUNC_BODY_CONST(simple2_class_beef_get, int, 0); 127EFL_FUNC_BODY_CONST(simple2_class_beef_get, int, 0);
122 128
123static Efl_Op_Description op_descs2[] = { 129static Eina_Bool
124 EFL_OBJECT_OP_CLASS_FUNC(simple2_class_beef_get, _beef_get), 130_class_initializer2(Efl_Class *klass)
125}; 131{
132 EFL_OPS_DEFINE(ops,
133 EFL_OBJECT_OP_CLASS_FUNC(simple2_class_beef_get, _beef_get),
134 );
135
136 return efl_class_functions_set(klass, &ops);
137}
126 138
127static const Efl_Class_Description class_desc2 = { 139static const Efl_Class_Description class_desc2 = {
128 EO_VERSION, 140 EO_VERSION,
129 "Simple2", 141 "Simple2",
130 EFL_CLASS_TYPE_REGULAR, 142 EFL_CLASS_TYPE_REGULAR,
131 EFL_CLASS_DESCRIPTION_OPS(op_descs2),
132 0, 143 0,
144 _class_initializer2,
133 NULL, 145 NULL,
134 NULL 146 NULL
135}; 147};
@@ -144,16 +156,22 @@ _interface_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, const Efl_Object *klas
144 return efl_provider_find(efl_super(obj, SEARCHABLE_CLASS), klass); 156 return efl_provider_find(efl_super(obj, SEARCHABLE_CLASS), klass);
145} 157}
146 158
147static Efl_Op_Description op_descs_searchable[] = { 159static Eina_Bool
148 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_provider_find, _interface_get) 160_searchable_class_initializer(Efl_Class *klass)
149}; 161{
162 EFL_OPS_DEFINE(ops,
163 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_provider_find, _interface_get)
164 );
165
166 return efl_class_functions_set(klass, &ops);
167}
150 168
151static const Efl_Class_Description class_desc_searchable = { 169static const Efl_Class_Description class_desc_searchable = {
152 EO_VERSION, 170 EO_VERSION,
153 "Searchable", 171 "Searchable",
154 EFL_CLASS_TYPE_REGULAR, 172 EFL_CLASS_TYPE_REGULAR,
155 EFL_CLASS_DESCRIPTION_OPS(op_descs_searchable),
156 0, 173 0,
174 _searchable_class_initializer,
157 NULL, 175 NULL,
158 NULL 176 NULL
159}; 177};