tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=48f7eb02a8a7c59af2118f7e617b943b0d1500c7
commit 48f7eb02a8a7c59af2118f7e617b943b0d1500c7
Author: Tom Hacohen <t...@stosb.com>
Date: Mon Sep 5 15:59:19 2016 +0100
Eolian: Fix tests according to recent generator changes.
---
src/tests/eolian/data/class_simple_ref.c | 20 +++++++++++-------
src/tests/eolian/data/override_ref.c | 36 +++++++++++++++++++-------------
2 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/src/tests/eolian/data/class_simple_ref.c
b/src/tests/eolian/data/class_simple_ref.c
index a022792..cd075e1 100644
--- a/src/tests/eolian/data/class_simple_ref.c
+++ b/src/tests/eolian/data/class_simple_ref.c
@@ -25,20 +25,26 @@ int * _class_simple_bar(Eo *obj, Evas_Simple_Data *pd, int
x);
EOAPI EFL_FUNC_BODYV(efl_canvas_object_simple_bar, int *, 0, EFL_FUNC_CALL(x),
int x);
-static const Efl_Op_Description _class_simple_op_desc[] = {
- EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_a_set, _class_simple_a_set),
- EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_a_get, _class_simple_a_get),
- EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_foo,
__eolian_class_simple_foo),
-};
+static Eina_Bool
+_class_simple_class_initializer(Efl_Class *klass)
+{
+ EFL_OPS_DEFINE(ops,
+ EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_a_set, _class_simple_a_set),
+ EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_a_get, _class_simple_a_get),
+ EFL_OBJECT_OP_FUNC(efl_canvas_object_simple_foo,
__eolian_class_simple_foo)
+ );
+
+ return efl_class_functions_set(klass, &ops);
+}
static const Efl_Class_Description _class_simple_class_desc = {
EO_VERSION,
"Class_Simple",
EFL_CLASS_TYPE_REGULAR,
- EFL_CLASS_DESCRIPTION_OPS(_class_simple_op_desc),
sizeof(Evas_Simple_Data),
+ _class_simple_class_initializer,
NULL,
NULL
};
-EFL_DEFINE_CLASS(class_simple_class_get, &_class_simple_class_desc, NULL,
NULL);
+EFL_DEFINE_CLASS(class_simple_class_get, &_class_simple_class_desc, NULL,
NULL);
\ No newline at end of file
diff --git a/src/tests/eolian/data/override_ref.c
b/src/tests/eolian/data/override_ref.c
index 8e79ce3..3a77e8c 100644
--- a/src/tests/eolian/data/override_ref.c
+++ b/src/tests/eolian/data/override_ref.c
@@ -53,28 +53,34 @@ static void __eolian_override_base_z_set(Eo *obj
EINA_UNUSED, Override_Data *pd
}
-static const Efl_Op_Description _override_op_desc[] = {
- EFL_OBJECT_OP_FUNC_OVERRIDE(base_constructor, _override_base_constructor),
- EFL_OBJECT_OP_FUNC_OVERRIDE(base_z_get, __eolian_override_base_z_get),
- EFL_OBJECT_OP_FUNC_OVERRIDE(base_z_set, __eolian_override_base_z_set),
- EFL_OBJECT_OP_FUNC(override_b_set, __eolian_override_b_set),
- EFL_OBJECT_OP_FUNC(override_bar, __eolian_override_bar),
- EFL_OBJECT_OP_FUNC(override_c_get, __eolian_override_c_get),
- EFL_OBJECT_OP_FUNC(override_a_set, NULL),
- EFL_OBJECT_OP_FUNC(override_a_get, _override_a_get),
- EFL_OBJECT_OP_FUNC(override_b_get, _override_b_get),
- EFL_OBJECT_OP_FUNC(override_c_set, _override_c_set),
- EFL_OBJECT_OP_FUNC(override_foo, NULL),
-};
+static Eina_Bool
+_override_class_initializer(Efl_Class *klass)
+{
+ EFL_OPS_DEFINE(ops,
+ EFL_OBJECT_OP_FUNC_OVERRIDE(base_constructor,
_override_base_constructor),
+ EFL_OBJECT_OP_FUNC_OVERRIDE(base_z_get, __eolian_override_base_z_get),
+ EFL_OBJECT_OP_FUNC_OVERRIDE(base_z_set, __eolian_override_base_z_set),
+ EFL_OBJECT_OP_FUNC(override_b_set, __eolian_override_b_set),
+ EFL_OBJECT_OP_FUNC(override_bar, __eolian_override_bar),
+ EFL_OBJECT_OP_FUNC(override_c_get, __eolian_override_c_get),
+ EFL_OBJECT_OP_FUNC(override_a_set, NULL),
+ EFL_OBJECT_OP_FUNC(override_a_get, _override_a_get),
+ EFL_OBJECT_OP_FUNC(override_b_get, _override_b_get),
+ EFL_OBJECT_OP_FUNC(override_c_set, _override_c_set),
+ EFL_OBJECT_OP_FUNC(override_foo, NULL)
+ );
+
+ return efl_class_functions_set(klass, &ops);
+}
static const Efl_Class_Description _override_class_desc = {
EO_VERSION,
"Override",
EFL_CLASS_TYPE_REGULAR,
- EFL_CLASS_DESCRIPTION_OPS(_override_op_desc),
sizeof(Override_Data),
+ _override_class_initializer,
NULL,
NULL
};
-EFL_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL);
+EFL_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL);
\ No newline at end of file
--
