summaryrefslogtreecommitdiff
path: root/src/tests/eo
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-04-02 09:46:34 +0100
committerTom Hacohen <tom@stosb.com>2014-04-10 04:20:21 +0100
commitc32bb4fe958cca857f7f74171bc1be6b53c4fe99 (patch)
treea139f4ac8b0147bcb944afd08609e58e298d7377 /src/tests/eo
parent80faa56ed3399fb10dafa0a88831f52e6769a7d4 (diff)
Eo2: Updated naming Eo2->Eo.
Diffstat (limited to 'src/tests/eo')
-rw-r--r--src/tests/eo/access/access_inherit.c12
-rw-r--r--src/tests/eo/access/access_main.c4
-rw-r--r--src/tests/eo/access/access_simple.c16
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c24
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c14
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c20
-rw-r--r--src/tests/eo/constructors/constructors_main.c22
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c24
-rw-r--r--src/tests/eo/constructors/constructors_simple.c38
-rw-r--r--src/tests/eo/constructors/constructors_simple2.c14
-rw-r--r--src/tests/eo/constructors/constructors_simple3.c12
-rw-r--r--src/tests/eo/constructors/constructors_simple4.c4
-rw-r--r--src/tests/eo/constructors/constructors_simple5.c12
-rw-r--r--src/tests/eo/constructors/constructors_simple6.c14
-rw-r--r--src/tests/eo/constructors/constructors_simple7.c12
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit.c4
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c32
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c12
-rw-r--r--src/tests/eo/function_overrides/function_overrides_main.c34
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c32
-rw-r--r--src/tests/eo/interface/interface_interface.c12
-rw-r--r--src/tests/eo/interface/interface_interface2.c12
-rw-r--r--src/tests/eo/interface/interface_main.c10
-rw-r--r--src/tests/eo/interface/interface_simple.c30
-rw-r--r--src/tests/eo/mixin/mixin_inherit.c12
-rw-r--r--src/tests/eo/mixin/mixin_main.c12
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c24
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c22
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.c22
-rw-r--r--src/tests/eo/mixin/mixin_mixin4.c4
-rw-r--r--src/tests/eo/mixin/mixin_simple.c22
-rw-r--r--src/tests/eo/signals/signals_main.c110
-rw-r--r--src/tests/eo/signals/signals_simple.c26
-rw-r--r--src/tests/eo/suite/eo_test_call_errors.c18
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c90
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c46
-rw-r--r--src/tests/eo/suite/eo_test_general.c302
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c28
-rw-r--r--src/tests/eo/suite/eo_test_value.c4
39 files changed, 581 insertions, 581 deletions
diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c
index 6db73134de..46db0c22ad 100644
--- a/src/tests/eo/access/access_inherit.c
+++ b/src/tests/eo/access/access_inherit.c
@@ -16,18 +16,18 @@ _prot_print(Eo *obj, void *class_data EINA_UNUSED)
16 printf("%s %d\n", __func__, pd->protected_x1); 16 printf("%s %d\n", __func__, pd->protected_x1);
17} 17}
18 18
19EAPI EO2_VOID_FUNC_BODY(inherit_prot_print); 19EAPI EO_VOID_FUNC_BODY(inherit_prot_print);
20 20
21static Eo2_Op_Description op_descs[] = { 21static Eo_Op_Description op_descs[] = {
22 EO2_OP_FUNC(inherit_prot_print, _prot_print, "Print protected var x1."), 22 EO_OP_FUNC(inherit_prot_print, _prot_print, "Print protected var x1."),
23 EO2_OP_SENTINEL 23 EO_OP_SENTINEL
24}; 24};
25 25
26static const Eo_Class_Description class_desc = { 26static const Eo_Class_Description class_desc = {
27 EO2_VERSION, 27 EO_VERSION,
28 "Inherit", 28 "Inherit",
29 EO_CLASS_TYPE_REGULAR, 29 EO_CLASS_TYPE_REGULAR,
30 EO2_CLASS_DESCRIPTION_OPS(op_descs), 30 EO_CLASS_DESCRIPTION_OPS(op_descs),
31 NULL, 31 NULL,
32 0, 32 0,
33 NULL, 33 NULL,
diff --git a/src/tests/eo/access/access_main.c b/src/tests/eo/access/access_main.c
index 3f624f9acd..61cd381167 100644
--- a/src/tests/eo/access/access_main.c
+++ b/src/tests/eo/access/access_main.c
@@ -13,9 +13,9 @@ main(int argc, char *argv[])
13 (void) argv; 13 (void) argv;
14 eo_init(); 14 eo_init();
15 15
16 Eo *obj = eo2_add(INHERIT_CLASS, NULL); 16 Eo *obj = eo_add(INHERIT_CLASS, NULL);
17 17
18 eo2_do(obj, simple_a_set(1), inherit_prot_print()); 18 eo_do(obj, simple_a_set(1), inherit_prot_print());
19 19
20 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); 20 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
21 printf("Pub: %d\n", pd->public_x2); 21 printf("Pub: %d\n", pd->public_x2);
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index 59997f3a78..2eeb8cc570 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -27,14 +27,14 @@ _a_set(Eo *obj, void *class_data, int a)
27 pd->protected.protected_x1 = a + 1; 27 pd->protected.protected_x1 = a + 1;
28 pd->protected.public.public_x2 = a + 2; 28 pd->protected.public.public_x2 = a + 2;
29 29
30 eo2_do(obj, eo2_event_callback_call(EV_A_CHANGED, &pd->a)); 30 eo_do(obj, eo_event_callback_call(EV_A_CHANGED, &pd->a));
31} 31}
32 32
33EAPI EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a); 33EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
34 34
35static Eo2_Op_Description op_descs[] = { 35static Eo_Op_Description op_descs[] = {
36 EO2_OP_FUNC(simple_a_set, _a_set, "Set property A"), 36 EO_OP_FUNC(simple_a_set, _a_set, "Set property A"),
37 EO2_OP_SENTINEL 37 EO_OP_SENTINEL
38}; 38};
39 39
40static const Eo_Event_Description *event_desc[] = { 40static const Eo_Event_Description *event_desc[] = {
@@ -43,15 +43,15 @@ static const Eo_Event_Description *event_desc[] = {
43}; 43};
44 44
45static const Eo_Class_Description class_desc = { 45static const Eo_Class_Description class_desc = {
46 EO2_VERSION, 46 EO_VERSION,
47 "Simple", 47 "Simple",
48 EO_CLASS_TYPE_REGULAR, 48 EO_CLASS_TYPE_REGULAR,
49 EO2_CLASS_DESCRIPTION_OPS(op_descs), 49 EO_CLASS_DESCRIPTION_OPS(op_descs),
50 event_desc, 50 event_desc,
51 sizeof(Private_Data), 51 sizeof(Private_Data),
52 NULL, 52 NULL,
53 NULL 53 NULL
54}; 54};
55 55
56EO_DEFINE_CLASS(simple_class_get, &class_desc, EO2_BASE_CLASS, NULL) 56EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL)
57 57
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index 32f22da68a..c711ffe28f 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -14,7 +14,7 @@ static int
14_a_get(Eo *obj, void *class_data EINA_UNUSED) 14_a_get(Eo *obj, void *class_data EINA_UNUSED)
15{ 15{
16 int a = 0; 16 int a = 0;
17 eo2_do_super(obj, MY_CLASS, a = simple_a_get()); 17 eo_do_super(obj, MY_CLASS, a = simple_a_get());
18 18
19 return a; 19 return a;
20} 20}
@@ -22,37 +22,37 @@ _a_get(Eo *obj, void *class_data EINA_UNUSED)
22static void 22static void
23_constructor(Eo *obj, void *class_data EINA_UNUSED) 23_constructor(Eo *obj, void *class_data EINA_UNUSED)
24{ 24{
25 eo2_do_super(obj, MY_CLASS, eo2_constructor()); 25 eo_do_super(obj, MY_CLASS, eo_constructor());
26 26
27 Eo *simple = eo2_add(SIMPLE_CLASS, obj); 27 Eo *simple = eo_add(SIMPLE_CLASS, obj);
28 eo_composite_attach(simple, obj); 28 eo_composite_attach(simple, obj);
29 eo2_do(simple, eo2_event_callback_forwarder_add(EV_A_CHANGED, obj)); 29 eo_do(simple, eo_event_callback_forwarder_add(EV_A_CHANGED, obj));
30 30
31 fail_if(eo_composite_is(obj)); 31 fail_if(eo_composite_is(obj));
32 fail_if(!eo_composite_is(simple)); 32 fail_if(!eo_composite_is(simple));
33 33
34 eo2_do(obj, eo2_base_data_set("simple-obj", simple, NULL)); 34 eo_do(obj, eo_base_data_set("simple-obj", simple, NULL));
35 35
36 eo_unref(simple); 36 eo_unref(simple);
37} 37}
38 38
39static Eo2_Op_Description op_descs[] = { 39static Eo_Op_Description op_descs[] = {
40 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), 40 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
41 EO2_OP_FUNC_OVERRIDE(simple_a_get, _a_get), 41 EO_OP_FUNC_OVERRIDE(simple_a_get, _a_get),
42 EO2_OP_SENTINEL 42 EO_OP_SENTINEL
43}; 43};
44 44
45static const Eo_Class_Description class_desc = { 45static const Eo_Class_Description class_desc = {
46 EO2_VERSION, 46 EO_VERSION,
47 "Comp", 47 "Comp",
48 EO_CLASS_TYPE_REGULAR, 48 EO_CLASS_TYPE_REGULAR,
49 EO2_CLASS_DESCRIPTION_OPS(op_descs), 49 EO_CLASS_DESCRIPTION_OPS(op_descs),
50 NULL, 50 NULL,
51 0, 51 0,
52 NULL, 52 NULL,
53 NULL 53 NULL
54}; 54};
55 55
56EO_DEFINE_CLASS(comp_class_get, &class_desc, EO2_BASE_CLASS, 56EO_DEFINE_CLASS(comp_class_get, &class_desc, EO_BASE_CLASS,
57 SIMPLE_CLASS, NULL); 57 SIMPLE_CLASS, NULL);
58 58
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index b71c4cd585..ecf5983cb0 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -30,27 +30,27 @@ main(int argc, char *argv[])
30 (void) argv; 30 (void) argv;
31 eo_init(); 31 eo_init();
32 32
33 Eo *obj = eo2_add(COMP_CLASS, NULL); 33 Eo *obj = eo_add(COMP_CLASS, NULL);
34 eo2_do(obj, eo2_event_callback_add(EV_A_CHANGED, _a_changed_cb, NULL)); 34 eo_do(obj, eo_event_callback_add(EV_A_CHANGED, _a_changed_cb, NULL));
35 35
36 fail_if(!eo_isa(obj, COMP_CLASS)); 36 fail_if(!eo_isa(obj, COMP_CLASS));
37 fail_if(!eo_isa(obj, SIMPLE_CLASS)); 37 fail_if(!eo_isa(obj, SIMPLE_CLASS));
38 38
39 int a = 0; 39 int a = 0;
40 eo2_do(obj, simple_a_set(1)); 40 eo_do(obj, simple_a_set(1));
41 fail_if(!cb_called); 41 fail_if(!cb_called);
42 42
43 eo2_do(obj, a = simple_a_get()); 43 eo_do(obj, a = simple_a_get());
44 fail_if(a != 1); 44 fail_if(a != 1);
45 45
46 /* disable the callback forwarder, and fail if it's still called. */ 46 /* disable the callback forwarder, and fail if it's still called. */
47 Eo *simple = NULL; 47 Eo *simple = NULL;
48 eo2_do(obj, simple = eo2_base_data_get("simple-obj")); 48 eo_do(obj, simple = eo_base_data_get("simple-obj"));
49 eo_ref(simple); 49 eo_ref(simple);
50 eo2_do(simple, eo2_event_callback_forwarder_del(EV_A_CHANGED, obj)); 50 eo_do(simple, eo_event_callback_forwarder_del(EV_A_CHANGED, obj));
51 51
52 cb_called = EINA_FALSE; 52 cb_called = EINA_FALSE;
53 eo2_do(obj, simple_a_set(2)); 53 eo_do(obj, simple_a_set(2));
54 fail_if(cb_called); 54 fail_if(cb_called);
55 55
56 fail_if(!eo_composite_is(simple)); 56 fail_if(!eo_composite_is(simple));
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index e44df196fb..c4490da8c0 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -17,7 +17,7 @@ _a_set(Eo *obj, void *class_data, int a)
17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
18 pd->a = a; 18 pd->a = a;
19 19
20 eo2_do(obj, eo2_event_callback_call(EV_A_CHANGED, &pd->a)); 20 eo_do(obj, eo_event_callback_call(EV_A_CHANGED, &pd->a));
21} 21}
22 22
23static int 23static int
@@ -27,13 +27,13 @@ _a_get(Eo *obj EINA_UNUSED, void *class_data)
27 return pd->a; 27 return pd->a;
28} 28}
29 29
30EAPI EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a); 30EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
31EAPI EO2_FUNC_BODY(simple_a_get, int, 0); 31EAPI EO_FUNC_BODY(simple_a_get, int, 0);
32 32
33static Eo2_Op_Description op_descs[] = { 33static Eo_Op_Description op_descs[] = {
34 EO2_OP_FUNC(simple_a_set, _a_set, "Set property A"), 34 EO_OP_FUNC(simple_a_set, _a_set, "Set property A"),
35 EO2_OP_FUNC(simple_a_get, _a_get, "Get property A"), 35 EO_OP_FUNC(simple_a_get, _a_get, "Get property A"),
36 EO2_OP_SENTINEL 36 EO_OP_SENTINEL
37}; 37};
38 38
39static const Eo_Event_Description *event_desc[] = { 39static const Eo_Event_Description *event_desc[] = {
@@ -42,15 +42,15 @@ static const Eo_Event_Description *event_desc[] = {
42}; 42};
43 43
44static const Eo_Class_Description class_desc = { 44static const Eo_Class_Description class_desc = {
45 EO2_VERSION, 45 EO_VERSION,
46 "Simple", 46 "Simple",
47 EO_CLASS_TYPE_REGULAR, 47 EO_CLASS_TYPE_REGULAR,
48 EO2_CLASS_DESCRIPTION_OPS(op_descs), 48 EO_CLASS_DESCRIPTION_OPS(op_descs),
49 event_desc, 49 event_desc,
50 sizeof(Simple_Public_Data), 50 sizeof(Simple_Public_Data),
51 NULL, 51 NULL,
52 NULL 52 NULL
53}; 53};
54 54
55EO_DEFINE_CLASS(simple_class_get, &class_desc, EO2_BASE_CLASS, NULL); 55EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL);
56 56
diff --git a/src/tests/eo/constructors/constructors_main.c b/src/tests/eo/constructors/constructors_main.c
index e40ec915a4..7b7da023f1 100644
--- a/src/tests/eo/constructors/constructors_main.c
+++ b/src/tests/eo/constructors/constructors_main.c
@@ -24,14 +24,14 @@ main(int argc, char *argv[])
24 (void) argv; 24 (void) argv;
25 eo_init(); 25 eo_init();
26 26
27 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 27 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
28 28
29 fail_if(my_init_count != 2); 29 fail_if(my_init_count != 2);
30 30
31 eo2_do(obj, simple_a_set(1), simple_b_set(2)); 31 eo_do(obj, simple_a_set(1), simple_b_set(2));
32 32
33 int a = 0, b = 0; 33 int a = 0, b = 0;
34 eo2_do(obj, a = simple_a_get(), b = simple_b_get(), mixin_add_and_print(5)); 34 eo_do(obj, a = simple_a_get(), b = simple_b_get(), mixin_add_and_print(5));
35 fail_if(a != 1); 35 fail_if(a != 1);
36 fail_if(b != 2); 36 fail_if(b != 2);
37 37
@@ -39,14 +39,14 @@ main(int argc, char *argv[])
39 39
40 fail_if(my_init_count != 0); 40 fail_if(my_init_count != 0);
41 41
42 obj = eo2_add(SIMPLE2_CLASS, NULL); 42 obj = eo_add(SIMPLE2_CLASS, NULL);
43 fail_if(obj); 43 fail_if(obj);
44 44
45 obj = eo2_add(SIMPLE3_CLASS, NULL); 45 obj = eo_add(SIMPLE3_CLASS, NULL);
46 fail_if(obj); 46 fail_if(obj);
47 47
48 my_init_count = 0; 48 my_init_count = 0;
49 obj = eo2_add(SIMPLE4_CLASS, NULL); 49 obj = eo_add(SIMPLE4_CLASS, NULL);
50 50
51 fail_if(my_init_count != 2); 51 fail_if(my_init_count != 2);
52 52
@@ -54,23 +54,23 @@ main(int argc, char *argv[])
54 54
55 fail_if(my_init_count != 0); 55 fail_if(my_init_count != 0);
56 56
57 obj = eo2_add(SIMPLE5_CLASS, NULL); 57 obj = eo_add(SIMPLE5_CLASS, NULL);
58 fail_if(!obj); 58 fail_if(!obj);
59 eo_unref(obj); 59 eo_unref(obj);
60 60
61 obj = eo2_add(SIMPLE6_CLASS, NULL); 61 obj = eo_add(SIMPLE6_CLASS, NULL);
62 fail_if(!obj); 62 fail_if(!obj);
63 eo_unref(obj); 63 eo_unref(obj);
64 64
65 obj = eo2_add(SIMPLE7_CLASS, NULL); 65 obj = eo_add(SIMPLE7_CLASS, NULL);
66 fail_if(obj); 66 fail_if(obj);
67 67
68 my_init_count = 0; 68 my_init_count = 0;
69 obj = eo2_add_custom(SIMPLE_CLASS, NULL, simple_constructor(7)); 69 obj = eo_add_custom(SIMPLE_CLASS, NULL, simple_constructor(7));
70 fail_if(!obj); 70 fail_if(!obj);
71 71
72 fail_if(my_init_count != 2); 72 fail_if(my_init_count != 2);
73 eo2_do(obj, a = simple_a_get()); 73 eo_do(obj, a = simple_a_get());
74 fail_if(a != 7); 74 fail_if(a != 7);
75 75
76 eo_unref(obj); 76 eo_unref(obj);
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index 69a957aee2..3076802143 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -12,7 +12,7 @@ static void
12_add_and_print_set(Eo *obj, void *class_data EINA_UNUSED, int x) 12_add_and_print_set(Eo *obj, void *class_data EINA_UNUSED, int x)
13{ 13{
14 int a = 0, b = 0; 14 int a = 0, b = 0;
15 eo2_do(obj, a = simple_a_get(), b = simple_b_get()); 15 eo_do(obj, a = simple_a_get(), b = simple_b_get());
16 printf("%s %d\n", __func__, a + b + x); 16 printf("%s %d\n", __func__, a + b + x);
17} 17}
18 18
@@ -21,7 +21,7 @@ extern int my_init_count;
21static void 21static void
22_constructor(Eo *obj, void *class_data EINA_UNUSED) 22_constructor(Eo *obj, void *class_data EINA_UNUSED)
23{ 23{
24 eo2_do_super(obj, MY_CLASS, eo2_constructor()); 24 eo_do_super(obj, MY_CLASS, eo_constructor());
25 25
26 my_init_count++; 26 my_init_count++;
27} 27}
@@ -29,30 +29,30 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
29static void 29static void
30_destructor(Eo *obj, void *class_data EINA_UNUSED) 30_destructor(Eo *obj, void *class_data EINA_UNUSED)
31{ 31{
32 eo2_do_super(obj, MY_CLASS, eo2_destructor()); 32 eo_do_super(obj, MY_CLASS, eo_destructor());
33 33
34 my_init_count--; 34 my_init_count--;
35} 35}
36 36
37EAPI EO2_VOID_FUNC_BODYV(mixin_add_and_print, EO2_FUNC_CALL(x), int x); 37EAPI EO_VOID_FUNC_BODYV(mixin_add_and_print, EO_FUNC_CALL(x), int x);
38 38
39static Eo2_Op_Description op_descs[] = { 39static Eo_Op_Description op_descs[] = {
40 EO2_OP_FUNC(mixin_add_and_print, _add_and_print_set, "Add A + B + param and print it"), 40 EO_OP_FUNC(mixin_add_and_print, _add_and_print_set, "Add A + B + param and print it"),
41 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), 41 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
42 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), 42 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
43 EO2_OP_SENTINEL 43 EO_OP_SENTINEL
44}; 44};
45 45
46static const Eo_Class_Description class_desc = { 46static const Eo_Class_Description class_desc = {
47 EO2_VERSION, 47 EO_VERSION,
48 "Mixin", 48 "Mixin",
49 EO_CLASS_TYPE_MIXIN, 49 EO_CLASS_TYPE_MIXIN,
50 EO2_CLASS_DESCRIPTION_OPS(op_descs), 50 EO_CLASS_DESCRIPTION_OPS(op_descs),
51 NULL, 51 NULL,
52 0, 52 0,
53 NULL, 53 NULL,
54 NULL 54 NULL
55}; 55};
56 56
57EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO2_BASE_CLASS, NULL); 57EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_BASE_CLASS, NULL);
58 58
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index dfa51bf75e..3441d44451 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -31,8 +31,8 @@ _##name##_set(Eo *obj EINA_UNUSED, void *class_data, int name) \
31 pd->name = name; \ 31 pd->name = name; \
32 printf("%s %d\n", __func__, pd->name); \ 32 printf("%s %d\n", __func__, pd->name); \
33} \ 33} \
34EO2_VOID_FUNC_BODYV(simple_##name##_set, EO2_FUNC_CALL(name), int name); \ 34EO_VOID_FUNC_BODYV(simple_##name##_set, EO_FUNC_CALL(name), int name); \
35EO2_FUNC_BODY(simple_##name##_get, int, 0); 35EO_FUNC_BODY(simple_##name##_get, int, 0);
36 36
37_GET_SET_FUNC(a) 37_GET_SET_FUNC(a)
38_GET_SET_FUNC(b) 38_GET_SET_FUNC(b)
@@ -44,7 +44,7 @@ _simple_constructor(Eo *obj, void *class_data, int a)
44{ 44{
45 Private_Data *pd = class_data; 45 Private_Data *pd = class_data;
46 46
47 eo2_do_super(obj, MY_CLASS, eo2_constructor()); 47 eo_do_super(obj, MY_CLASS, eo_constructor());
48 48
49 pd->a = a; 49 pd->a = a;
50 printf("%s %d\n", __func__, pd->a); 50 printf("%s %d\n", __func__, pd->a);
@@ -55,7 +55,7 @@ _simple_constructor(Eo *obj, void *class_data, int a)
55static void 55static void
56_constructor(Eo *obj, void *class_data EINA_UNUSED) 56_constructor(Eo *obj, void *class_data EINA_UNUSED)
57{ 57{
58 eo2_do_super(obj, MY_CLASS, eo2_constructor()); 58 eo_do_super(obj, MY_CLASS, eo_constructor());
59 59
60 my_init_count++; 60 my_init_count++;
61} 61}
@@ -63,7 +63,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
63static void 63static void
64_destructor(Eo *obj, void *class_data EINA_UNUSED) 64_destructor(Eo *obj, void *class_data EINA_UNUSED)
65{ 65{
66 eo2_do_super(obj, MY_CLASS, eo2_destructor()); 66 eo_do_super(obj, MY_CLASS, eo_destructor());
67 67
68 my_init_count--; 68 my_init_count--;
69} 69}
@@ -80,30 +80,30 @@ _class_destructor(Eo_Class *klass EINA_UNUSED)
80 free(class_var); 80 free(class_var);
81} 81}
82 82
83EO2_VOID_FUNC_BODYV(simple_constructor, EO2_FUNC_CALL(a), int a); 83EO_VOID_FUNC_BODYV(simple_constructor, EO_FUNC_CALL(a), int a);
84 84
85static Eo2_Op_Description op_descs[] = { 85static Eo_Op_Description op_descs[] = {
86 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), 86 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
87 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), 87 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
88 EO2_OP_FUNC(simple_constructor, _simple_constructor, "Construct and set A."), 88 EO_OP_FUNC(simple_constructor, _simple_constructor, "Construct and set A."),
89 EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"), 89 EO_OP_FUNC(simple_a_set, _a_set, "Set property a"),
90 EO2_OP_FUNC(simple_a_get, _a_get, "Get property a"), 90 EO_OP_FUNC(simple_a_get, _a_get, "Get property a"),
91 EO2_OP_FUNC(simple_b_set, _b_set, "Set property b"), 91 EO_OP_FUNC(simple_b_set, _b_set, "Set property b"),
92 EO2_OP_FUNC(simple_b_get, _b_get, "Get property b"), 92 EO_OP_FUNC(simple_b_get, _b_get, "Get property b"),
93 EO2_OP_SENTINEL 93 EO_OP_SENTINEL
94}; 94};
95 95
96static const Eo_Class_Description class_desc = { 96static const Eo_Class_Description class_desc = {
97 EO2_VERSION, 97 EO_VERSION,
98 "Simple", 98 "Simple",
99 EO_CLASS_TYPE_REGULAR, 99 EO_CLASS_TYPE_REGULAR,
100 EO2_CLASS_DESCRIPTION_OPS(op_descs), 100 EO_CLASS_DESCRIPTION_OPS(op_descs),
101 NULL, 101 NULL,
102 sizeof(Private_Data), 102 sizeof(Private_Data),
103 _class_constructor, 103 _class_constructor,
104 _class_destructor 104 _class_destructor
105}; 105};
106 106
107EO_DEFINE_CLASS(simple_class_get, &class_desc, EO2_BASE_CLASS, 107EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS,
108 MIXIN_CLASS, NULL); 108 MIXIN_CLASS, NULL);
109 109
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index b7b4aaef2d..06c9e1d87a 100644
--- a/src/tests/eo/constructors/constructors_simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -11,26 +11,26 @@
11static void 11static void
12_constructor(Eo *obj, void *class_data EINA_UNUSED) 12_constructor(Eo *obj, void *class_data EINA_UNUSED)
13{ 13{
14 eo2_do_super(obj, MY_CLASS, eo2_constructor()); 14 eo_do_super(obj, MY_CLASS, eo_constructor());
15 15
16 eo_error_set(obj); 16 eo_error_set(obj);
17} 17}
18 18
19static Eo2_Op_Description op_descs[] = { 19static Eo_Op_Description op_descs[] = {
20 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), 20 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
21 EO2_OP_SENTINEL 21 EO_OP_SENTINEL
22}; 22};
23 23
24static const Eo_Class_Description class_desc = { 24static const Eo_Class_Description class_desc = {
25 EO2_VERSION, 25 EO_VERSION,
26 "Simple2", 26 "Simple2",
27 EO_CLASS_TYPE_REGULAR, 27 EO_CLASS_TYPE_REGULAR,
28 EO2_CLASS_DESCRIPTION_OPS(op_descs), 28 EO_CLASS_DESCRIPTION_OPS(op_descs),
29 NULL, 29 NULL,
30 0, 30 0,
31 NULL, 31 NULL,
32 NULL 32 NULL
33}; 33};
34 34
35EO_DEFINE_CLASS(simple2_class_get, &class_desc, EO2_BASE_CLASS, NULL); 35EO_DEFINE_CLASS(simple2_class_get, &class_desc, EO_BASE_CLASS, NULL);
36 36
diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c
index 233005eecb..79ef940c8c 100644
--- a/src/tests/eo/constructors/constructors_simple3.c
+++ b/src/tests/eo/constructors/constructors_simple3.c
@@ -14,21 +14,21 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
14 (void) obj; 14 (void) obj;
15} 15}
16 16
17static Eo2_Op_Description op_descs[] = { 17static Eo_Op_Description op_descs[] = {
18 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), 18 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
19 EO2_OP_SENTINEL 19 EO_OP_SENTINEL
20}; 20};
21 21
22static const Eo_Class_Description class_desc = { 22static const Eo_Class_Description class_desc = {
23 EO2_VERSION, 23 EO_VERSION,
24 "Simple3", 24 "Simple3",
25 EO_CLASS_TYPE_REGULAR, 25 EO_CLASS_TYPE_REGULAR,
26 EO2_CLASS_DESCRIPTION_OPS(op_descs), 26 EO_CLASS_DESCRIPTION_OPS(op_descs),
27 NULL, 27 NULL,
28 0, 28 0,
29 NULL, 29 NULL,
30 NULL 30 NULL
31}; 31};
32 32
33EO_DEFINE_CLASS(simple3_class_get, &class_desc, EO2_BASE_CLASS, NULL); 33EO_DEFINE_CLASS(simple3_class_get, &class_desc, EO_BASE_CLASS, NULL);
34 34
diff --git a/src/tests/eo/constructors/constructors_simple4.c b/src/tests/eo/constructors/constructors_simple4.c
index 71fca13476..a7f627b09f 100644
--- a/src/tests/eo/constructors/constructors_simple4.c
+++ b/src/tests/eo/constructors/constructors_simple4.c
@@ -10,10 +10,10 @@
10#define MY_CLASS SIMPLE4_CLASS 10#define MY_CLASS SIMPLE4_CLASS
11 11
12static const Eo_Class_Description class_desc = { 12static const Eo_Class_Description class_desc = {
13 EO2_VERSION, 13 EO_VERSION,
14 "Simple4", 14 "Simple4",
15 EO_CLASS_TYPE_REGULAR, 15 EO_CLASS_TYPE_REGULAR,
16 EO2_CLASS_DESCRIPTION_NOOPS(), 16 EO_CLASS_DESCRIPTION_NOOPS(),
17 NULL, 17 NULL,
18 0, 18 0,
19 NULL, 19 NULL,
diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c
index b64b969819..bbfbafd00e 100644
--- a/src/tests/eo/constructors/constructors_simple5.c
+++ b/src/tests/eo/constructors/constructors_simple5.c
@@ -14,21 +14,21 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
14 (void) obj; 14 (void) obj;
15} 15}
16 16
17static Eo2_Op_Description op_descs[] = { 17static Eo_Op_Description op_descs[] = {
18 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), 18 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
19 EO2_OP_SENTINEL 19 EO_OP_SENTINEL
20}; 20};
21 21
22static const Eo_Class_Description class_desc = { 22static const Eo_Class_Description class_desc = {
23 EO2_VERSION, 23 EO_VERSION,
24 "Simple5", 24 "Simple5",
25 EO_CLASS_TYPE_REGULAR, 25 EO_CLASS_TYPE_REGULAR,
26 EO2_CLASS_DESCRIPTION_OPS(op_descs), 26 EO_CLASS_DESCRIPTION_OPS(op_descs),
27 NULL, 27 NULL,
28 0, 28 0,
29 NULL, 29 NULL,
30 NULL 30 NULL
31}; 31};
32 32
33EO_DEFINE_CLASS(simple5_class_get, &class_desc, EO2_BASE_CLASS, NULL); 33EO_DEFINE_CLASS(simple5_class_get, &class_desc, EO_BASE_CLASS, NULL);
34 34
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index 7a23eb31d4..71e29953f4 100644
--- a/src/tests/eo/constructors/constructors_simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -11,26 +11,26 @@
11static void 11static void
12_destructor(Eo *obj, void *class_data EINA_UNUSED) 12_destructor(Eo *obj, void *class_data EINA_UNUSED)
13{ 13{
14 eo2_do_super(obj, MY_CLASS, eo2_destructor()); 14 eo_do_super(obj, MY_CLASS, eo_destructor());
15 15
16 eo_error_set(obj); 16 eo_error_set(obj);
17} 17}
18 18
19static Eo2_Op_Description op_descs [] = { 19static Eo_Op_Description op_descs [] = {
20 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), 20 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
21 EO2_OP_SENTINEL 21 EO_OP_SENTINEL
22}; 22};
23 23
24static const Eo_Class_Description class_desc = { 24static const Eo_Class_Description class_desc = {
25 EO2_VERSION, 25 EO_VERSION,
26 "Simple6", 26 "Simple6",
27 EO_CLASS_TYPE_REGULAR, 27 EO_CLASS_TYPE_REGULAR,
28 EO2_CLASS_DESCRIPTION_OPS(op_descs), 28 EO_CLASS_DESCRIPTION_OPS(op_descs),
29 NULL, 29 NULL,
30 0, 30 0,
31 NULL, 31 NULL,
32 NULL 32 NULL
33}; 33};
34 34
35EO_DEFINE_CLASS(simple6_class_get, &class_desc, EO2_BASE_CLASS, NULL); 35EO_DEFINE_CLASS(simple6_class_get, &class_desc, EO_BASE_CLASS, NULL);
36 36
diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c
index fb4a731261..cd0298948d 100644
--- a/src/tests/eo/constructors/constructors_simple7.c
+++ b/src/tests/eo/constructors/constructors_simple7.c
@@ -15,19 +15,19 @@ static void
15_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 15_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
16{ 16{
17 /* FIXME: Actually test it. */ 17 /* FIXME: Actually test it. */
18 eo2_do_super(obj, MY_CLASS, eo2_constructor()); 18 eo_do_super(obj, MY_CLASS, eo_constructor());
19} 19}
20 20
21static Eo2_Op_Description op_descs [] = { 21static Eo_Op_Description op_descs [] = {
22 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), 22 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
23 EO2_OP_SENTINEL 23 EO_OP_SENTINEL
24}; 24};
25 25
26static const Eo_Class_Description class_desc = { 26static const Eo_Class_Description class_desc = {
27 EO2_VERSION, 27 EO_VERSION,
28 "Simple7", 28 "Simple7",
29 EO_CLASS_TYPE_REGULAR, 29 EO_CLASS_TYPE_REGULAR,
30 EO2_CLASS_DESCRIPTION_OPS(op_descs), 30 EO_CLASS_DESCRIPTION_OPS(op_descs),
31 NULL, 31 NULL,
32 0, 32 0,
33 NULL, 33 NULL,
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit.c b/src/tests/eo/function_overrides/function_overrides_inherit.c
index 641c07c49e..3a767f9e1a 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit.c
@@ -9,10 +9,10 @@
9#define MY_CLASS INHERIT_CLASS 9#define MY_CLASS INHERIT_CLASS
10 10
11static const Eo_Class_Description class_desc = { 11static const Eo_Class_Description class_desc = {
12 EO2_VERSION, 12 EO_VERSION,
13 "Inherit", 13 "Inherit",
14 EO_CLASS_TYPE_REGULAR, 14 EO_CLASS_TYPE_REGULAR,
15 EO2_CLASS_DESCRIPTION_NOOPS(), 15 EO_CLASS_DESCRIPTION_NOOPS(),
16 NULL, 16 NULL,
17 0, 17 0,
18 NULL, 18 NULL,
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index 6a2369a6fc..a892aaf96e 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -15,11 +15,11 @@ static void
15_a_set(Eo *obj, void *class_data EINA_UNUSED, int a) 15_a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
16{ 16{
17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
18 eo2_do(obj, simple_a_print()); 18 eo_do(obj, simple_a_print());
19 eo2_do_super(obj, MY_CLASS, simple_a_set(a + 1)); 19 eo_do_super(obj, MY_CLASS, simple_a_set(a + 1));
20 20
21 Eina_Bool called = EINA_FALSE; 21 Eina_Bool called = EINA_FALSE;
22 eo2_do_super(obj, MY_CLASS, called = simple_a_print()); 22 eo_do_super(obj, MY_CLASS, called = simple_a_print());
23 fail_if(!called); 23 fail_if(!called);
24} 24}
25 25
@@ -28,7 +28,7 @@ _print(Eo *obj, void *class_data EINA_UNUSED)
28{ 28{
29 Eina_Bool called = EINA_FALSE; 29 Eina_Bool called = EINA_FALSE;
30 printf("Hey\n"); 30 printf("Hey\n");
31 eo2_do_super(obj, MY_CLASS, called = inherit2_print()); 31 eo_do_super(obj, MY_CLASS, called = inherit2_print());
32 fail_if(called); 32 fail_if(called);
33 33
34 return EINA_TRUE; 34 return EINA_TRUE;
@@ -47,31 +47,31 @@ _class_print(Eo_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));
50 eo2_do_super(klass, MY_CLASS, called = simple_class_print()); 50 eo_do_super(klass, MY_CLASS, called = simple_class_print());
51 fail_if(!called); 51 fail_if(!called);
52 52
53 eo2_do_super(klass, MY_CLASS, called = simple_class_print2()); 53 eo_do_super(klass, MY_CLASS, called = simple_class_print2());
54 fail_if(!called); 54 fail_if(!called);
55 55
56 return EINA_TRUE; 56 return EINA_TRUE;
57} 57}
58 58
59EAPI EO2_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE); 59EAPI EO_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
60EAPI EO2_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE); 60EAPI EO_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
61 61
62static Eo2_Op_Description op_descs[] = { 62static Eo_Op_Description op_descs[] = {
63 EO2_OP_FUNC(inherit2_print, _print, "Print hey"), 63 EO_OP_FUNC(inherit2_print, _print, "Print hey"),
64 EO2_OP_FUNC(inherit2_print2, _print2, "Print hey2"), 64 EO_OP_FUNC(inherit2_print2, _print2, "Print hey2"),
65 EO2_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print), 65 EO_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print),
66 EO2_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 66 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
67 EO2_OP_SENTINEL 67 EO_OP_SENTINEL
68}; 68};
69 69
70static const Eo_Class_Description class_desc = { 70static const Eo_Class_Description class_desc = {
71 EO2_VERSION, 71 EO_VERSION,
72 "Inherit2", 72 "Inherit2",
73 EO_CLASS_TYPE_REGULAR, 73 EO_CLASS_TYPE_REGULAR,
74 EO2_CLASS_DESCRIPTION_OPS(op_descs), 74 EO_CLASS_DESCRIPTION_OPS(op_descs),
75 NULL, 75 NULL,
76 0, 76 0,
77 NULL, 77 NULL,
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index 68214b7b26..d8b6190098 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -13,19 +13,19 @@ static void
13_a_set(Eo *obj, void *class_data EINA_UNUSED, int a) 13_a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
14{ 14{
15 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 15 printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
16 eo2_do_super(obj, MY_CLASS, simple_a_set(a + 1)); 16 eo_do_super(obj, MY_CLASS, simple_a_set(a + 1));
17} 17}
18 18
19static Eo2_Op_Description op_descs[] = { 19static Eo_Op_Description op_descs[] = {
20 EO2_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 20 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
21 EO2_OP_SENTINEL 21 EO_OP_SENTINEL
22}; 22};
23 23
24static const Eo_Class_Description class_desc = { 24static const Eo_Class_Description class_desc = {
25 EO2_VERSION, 25 EO_VERSION,
26 "Inherit3", 26 "Inherit3",
27 EO_CLASS_TYPE_REGULAR, 27 EO_CLASS_TYPE_REGULAR,
28 EO2_CLASS_DESCRIPTION_OPS(op_descs), 28 EO_CLASS_DESCRIPTION_OPS(op_descs),
29 NULL, 29 NULL,
30 0, 30 0,
31 NULL, 31 NULL,
diff --git a/src/tests/eo/function_overrides/function_overrides_main.c b/src/tests/eo/function_overrides/function_overrides_main.c
index 17aab2910d..920595c077 100644
--- a/src/tests/eo/function_overrides/function_overrides_main.c
+++ b/src/tests/eo/function_overrides/function_overrides_main.c
@@ -18,57 +18,57 @@ main(int argc, char *argv[])
18 eo_init(); 18 eo_init();
19 19
20 Eina_Bool called = EINA_FALSE; 20 Eina_Bool called = EINA_FALSE;
21 Eo *obj = eo2_add(INHERIT2_CLASS, NULL); 21 Eo *obj = eo_add(INHERIT2_CLASS, NULL);
22 22
23 eo2_do(obj, simple_a_set(1)); 23 eo_do(obj, simple_a_set(1));
24 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); 24 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
25 fail_if(pd->a != 2); 25 fail_if(pd->a != 2);
26 26
27 eo_unref(obj); 27 eo_unref(obj);
28 28
29 obj = eo2_add(INHERIT3_CLASS, NULL); 29 obj = eo_add(INHERIT3_CLASS, NULL);
30 30
31 eo2_do(obj, simple_a_set(1)); 31 eo_do(obj, simple_a_set(1));
32 pd = eo_data_scope_get(obj, SIMPLE_CLASS); 32 pd = eo_data_scope_get(obj, SIMPLE_CLASS);
33 fail_if(pd->a != 3); 33 fail_if(pd->a != 3);
34 34
35 eo_unref(obj); 35 eo_unref(obj);
36 36
37 obj = eo2_add(INHERIT2_CLASS, NULL); 37 obj = eo_add(INHERIT2_CLASS, NULL);
38 eo2_do(obj, called = inherit2_print()); 38 eo_do(obj, called = inherit2_print());
39 fail_if(!called); 39 fail_if(!called);
40 eo2_do(obj, called = inherit2_print(), called = inherit2_print()); 40 eo_do(obj, called = inherit2_print(), called = inherit2_print());
41 fail_if(!called); 41 fail_if(!called);
42 eo_unref(obj); 42 eo_unref(obj);
43 43
44 obj = eo2_add(SIMPLE_CLASS, NULL); 44 obj = eo_add(SIMPLE_CLASS, NULL);
45 eo2_do(obj, called = inherit2_print()); 45 eo_do(obj, called = inherit2_print());
46 fail_if(called); 46 fail_if(called);
47 47
48#ifdef EO_DEBUG 48#ifdef EO_DEBUG
49 eo2_do(obj, called = simple_class_print()); 49 eo_do(obj, called = simple_class_print());
50 fail_if(called); 50 fail_if(called);
51#endif 51#endif
52 52
53 eo2_do(SIMPLE_CLASS, called = simple_class_print()); 53 eo_do(SIMPLE_CLASS, called = simple_class_print());
54 fail_if(!called); 54 fail_if(!called);
55 55
56 eo2_do(INHERIT_CLASS, called = simple_class_print()); 56 eo_do(INHERIT_CLASS, called = simple_class_print());
57 fail_if(!called); 57 fail_if(!called);
58 58
59 eo2_do(INHERIT2_CLASS, called = simple_class_print()); 59 eo_do(INHERIT2_CLASS, called = simple_class_print());
60 fail_if(!called); 60 fail_if(!called);
61 61
62 eo2_do(INHERIT3_CLASS, called = simple_class_print()); 62 eo_do(INHERIT3_CLASS, called = simple_class_print());
63 fail_if(!called); 63 fail_if(!called);
64 64
65#ifdef EO_DEBUG 65#ifdef EO_DEBUG
66 eo2_do(SIMPLE_CLASS, called = simple_a_print()); 66 eo_do(SIMPLE_CLASS, called = simple_a_print());
67 fail_if(called); 67 fail_if(called);
68#endif 68#endif
69 69
70 eo2_do_super(obj, SIMPLE_CLASS, eo2_constructor()); 70 eo_do_super(obj, SIMPLE_CLASS, eo_constructor());
71 eo2_do_super(obj, SIMPLE_CLASS, eo2_destructor()); 71 eo_do_super(obj, SIMPLE_CLASS, eo_destructor());
72 72
73 eo_unref(obj); 73 eo_unref(obj);
74 74
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index 1e2ef0e6f7..ce6590b143 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -34,10 +34,10 @@ _class_print(Eo_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;
37 eo2_do_super(klass, MY_CLASS, called = simple_class_print()); 37 eo_do_super(klass, MY_CLASS, called = simple_class_print());
38 fail_if(called); 38 fail_if(called);
39 39
40 eo2_do_super(klass, MY_CLASS, called = simple_class_print2()); 40 eo_do_super(klass, MY_CLASS, called = simple_class_print2());
41 fail_if(called); 41 fail_if(called);
42 42
43 return EINA_TRUE; 43 return EINA_TRUE;
@@ -51,29 +51,29 @@ _class_print2(Eo_Class *klass, void *class_data EINA_UNUSED)
51 return EINA_TRUE; 51 return EINA_TRUE;
52} 52}
53 53
54EAPI EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a); 54EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
55EAPI EO2_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE); 55EAPI EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
56EAPI EO2_FUNC_BODY(simple_class_print, Eina_Bool, EINA_FALSE); 56EAPI EO_FUNC_BODY(simple_class_print, Eina_Bool, EINA_FALSE);
57EAPI EO2_FUNC_BODY(simple_class_print2, Eina_Bool, EINA_FALSE); 57EAPI EO_FUNC_BODY(simple_class_print2, Eina_Bool, EINA_FALSE);
58 58
59static Eo2_Op_Description op_descs[] = { 59static Eo_Op_Description op_descs[] = {
60 EO2_OP_FUNC(simple_a_set, _a_set, "Set property A"), 60 EO_OP_FUNC(simple_a_set, _a_set, "Set property A"),
61 EO2_OP_FUNC(simple_a_print, _a_print, "Print property A"), 61 EO_OP_FUNC(simple_a_print, _a_print, "Print property A"),
62 EO2_OP_FUNC(simple_class_print, _class_print, "Print class name."), 62 EO_OP_FUNC(simple_class_print, _class_print, "Print class name."),
63 EO2_OP_FUNC(simple_class_print2, _class_print2, "Print2 class name."), 63 EO_OP_FUNC(simple_class_print2, _class_print2, "Print2 class name."),
64 EO2_OP_SENTINEL 64 EO_OP_SENTINEL
65}; 65};
66 66
67static const Eo_Class_Description class_desc = { 67static const Eo_Class_Description class_desc = {
68 EO2_VERSION, 68 EO_VERSION,
69 "Simple", 69 "Simple",
70 EO_CLASS_TYPE_REGULAR, 70 EO_CLASS_TYPE_REGULAR,
71 EO2_CLASS_DESCRIPTION_OPS(op_descs), 71 EO_CLASS_DESCRIPTION_OPS(op_descs),
72 NULL, 72 NULL,
73 sizeof(Simple_Public_Data), 73 sizeof(Simple_Public_Data),
74 NULL, 74 NULL,
75 NULL 75 NULL
76}; 76};
77 77
78EO_DEFINE_CLASS(simple_class_get, &class_desc, EO2_BASE_CLASS, NULL); 78EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL);
79 79
diff --git a/src/tests/eo/interface/interface_interface.c b/src/tests/eo/interface/interface_interface.c
index eac93cd2b0..7a58a3b8fa 100644
--- a/src/tests/eo/interface/interface_interface.c
+++ b/src/tests/eo/interface/interface_interface.c
@@ -8,18 +8,18 @@
8 8
9#define MY_CLASS INTERFACE_CLASS 9#define MY_CLASS INTERFACE_CLASS
10 10
11EO2_FUNC_BODY(interface_ab_sum_get, int, 0); 11EO_FUNC_BODY(interface_ab_sum_get, int, 0);
12 12
13static Eo2_Op_Description op_descs[] = { 13static Eo_Op_Description op_descs[] = {
14 EO2_OP_FUNC(interface_ab_sum_get, NULL, "Get the sum of a and b."), 14 EO_OP_FUNC(interface_ab_sum_get, NULL, "Get the sum of a and b."),
15 EO2_OP_SENTINEL 15 EO_OP_SENTINEL
16}; 16};
17 17
18static const Eo_Class_Description class_desc = { 18static const Eo_Class_Description class_desc = {
19 EO2_VERSION, 19 EO_VERSION,
20 "Interface", 20 "Interface",
21 EO_CLASS_TYPE_INTERFACE, 21 EO_CLASS_TYPE_INTERFACE,
22 EO2_CLASS_DESCRIPTION_OPS(op_descs), 22 EO_CLASS_DESCRIPTION_OPS(op_descs),
23 NULL, 23 NULL,
24 0, 24 0,
25 NULL, 25 NULL,
diff --git a/src/tests/eo/interface/interface_interface2.c b/src/tests/eo/interface/interface_interface2.c
index 198850da05..5e29c1712b 100644
--- a/src/tests/eo/interface/interface_interface2.c
+++ b/src/tests/eo/interface/interface_interface2.c
@@ -9,18 +9,18 @@
9 9
10#define MY_CLASS INTERFACE2_CLASS 10#define MY_CLASS INTERFACE2_CLASS
11 11
12EO2_FUNC_BODY(interface2_ab_sum_get2, int, 0); 12EO_FUNC_BODY(interface2_ab_sum_get2, int, 0);
13 13
14static Eo2_Op_Description op_descs[] = { 14static Eo_Op_Description op_descs[] = {
15 EO2_OP_FUNC(interface2_ab_sum_get2, NULL, "Print the sum of a and b."), 15 EO_OP_FUNC(interface2_ab_sum_get2, NULL, "Print the sum of a and b."),
16 EO2_OP_SENTINEL 16 EO_OP_SENTINEL
17}; 17};
18 18
19static const Eo_Class_Description class_desc = { 19static const Eo_Class_Description class_desc = {
20 EO2_VERSION, 20 EO_VERSION,
21 "Interface2", 21 "Interface2",
22 EO_CLASS_TYPE_INTERFACE, 22 EO_CLASS_TYPE_INTERFACE,
23 EO2_CLASS_DESCRIPTION_OPS(op_descs), 23 EO_CLASS_DESCRIPTION_OPS(op_descs),
24 NULL, 24 NULL,
25 0, 25 0,
26 NULL, 26 NULL,
diff --git a/src/tests/eo/interface/interface_main.c b/src/tests/eo/interface/interface_main.c
index 6fe9de131f..40936d42e7 100644
--- a/src/tests/eo/interface/interface_main.c
+++ b/src/tests/eo/interface/interface_main.c
@@ -16,18 +16,18 @@ main(int argc, char *argv[])
16 (void) argv; 16 (void) argv;
17 eo_init(); 17 eo_init();
18 18
19 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 19 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
20 20
21 eo2_do(obj, simple_a_set(1), simple_b_set(2)); 21 eo_do(obj, simple_a_set(1), simple_b_set(2));
22 22
23 int a = 0, b = 0, sum = 0; 23 int a = 0, b = 0, sum = 0;
24 eo2_do(obj, a = simple_a_get(), b = simple_b_get(), sum = interface_ab_sum_get()); 24 eo_do(obj, a = simple_a_get(), b = simple_b_get(), sum = interface_ab_sum_get());
25 fail_if(sum != a + b); 25 fail_if(sum != a + b);
26 26
27 sum = 0; 27 sum = 0;
28 eo2_do(obj, sum = interface_ab_sum_get(), sum = interface_ab_sum_get()); 28 eo_do(obj, sum = interface_ab_sum_get(), sum = interface_ab_sum_get());
29 fail_if(sum != a + b); 29 fail_if(sum != a + b);
30 eo2_do(obj, sum = interface2_ab_sum_get2(), sum = interface2_ab_sum_get2()); 30 eo_do(obj, sum = interface2_ab_sum_get2(), sum = interface2_ab_sum_get2());
31 fail_if(sum != a + b + 1); 31 fail_if(sum != a + b + 1);
32 32
33 eo_unref(obj); 33 eo_unref(obj);
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index 32cd9cb31b..e4bd477357 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -30,8 +30,8 @@ _##name##_set(Eo *obj EINA_UNUSED, void *class_data, int name) \
30 pd->name = name; \ 30 pd->name = name; \
31 printf("%s %d\n", __func__, pd->name); \ 31 printf("%s %d\n", __func__, pd->name); \
32} \ 32} \
33EO2_VOID_FUNC_BODYV(simple_##name##_set, EO2_FUNC_CALL(name), int name); \ 33EO_VOID_FUNC_BODYV(simple_##name##_set, EO_FUNC_CALL(name), int name); \
34EO2_FUNC_BODY(simple_##name##_get, int, 0); 34EO_FUNC_BODY(simple_##name##_get, int, 0);
35 35
36_GET_SET_FUNC(a) 36_GET_SET_FUNC(a)
37_GET_SET_FUNC(b) 37_GET_SET_FUNC(b)
@@ -40,7 +40,7 @@ static int
40_ab_sum_get(Eo *obj, void *class_data EINA_UNUSED) 40_ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
41{ 41{
42 int a = 0, b = 0; 42 int a = 0, b = 0;
43 eo2_do(obj, a = simple_a_get(), b = simple_b_get()); 43 eo_do(obj, a = simple_a_get(), b = simple_b_get());
44 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 44 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
45 return a + b; 45 return a + b;
46} 46}
@@ -49,30 +49,30 @@ static int
49_ab_sum_get2(Eo *obj, void *class_data EINA_UNUSED) 49_ab_sum_get2(Eo *obj, void *class_data EINA_UNUSED)
50{ 50{
51 int a = 0, b = 0; 51 int a = 0, b = 0;
52 eo2_do(obj, a = simple_a_get(), b = simple_b_get()); 52 eo_do(obj, a = simple_a_get(), b = simple_b_get());
53 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 53 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
54 return a + b + 1; 54 return a + b + 1;
55} 55}
56 56
57static Eo2_Op_Description op_descs[] = { 57static Eo_Op_Description op_descs[] = {
58 EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"), 58 EO_OP_FUNC(simple_a_set, _a_set, "Set property a"),
59 EO2_OP_FUNC(simple_a_get, _a_get, "Get property a"), 59 EO_OP_FUNC(simple_a_get, _a_get, "Get property a"),
60 EO2_OP_FUNC(simple_b_set, _b_set, "Set property b"), 60 EO_OP_FUNC(simple_b_set, _b_set, "Set property b"),
61 EO2_OP_FUNC(simple_b_get, _b_get, "Get property b"), 61 EO_OP_FUNC(simple_b_get, _b_get, "Get property b"),
62 EO2_OP_FUNC_OVERRIDE(interface_ab_sum_get, _ab_sum_get), 62 EO_OP_FUNC_OVERRIDE(interface_ab_sum_get, _ab_sum_get),
63 EO2_OP_FUNC_OVERRIDE(interface2_ab_sum_get2, _ab_sum_get2), 63 EO_OP_FUNC_OVERRIDE(interface2_ab_sum_get2, _ab_sum_get2),
64 EO2_OP_SENTINEL 64 EO_OP_SENTINEL
65}; 65};
66 66
67static const Eo_Class_Description class_desc = { 67static const Eo_Class_Description class_desc = {
68 EO2_VERSION, 68 EO_VERSION,
69 "Simple", 69 "Simple",
70 EO_CLASS_TYPE_REGULAR, 70 EO_CLASS_TYPE_REGULAR,
71 EO2_CLASS_DESCRIPTION_OPS(op_descs), 71 EO_CLASS_DESCRIPTION_OPS(op_descs),
72 NULL, 72 NULL,
73 sizeof(Private_Data), 73 sizeof(Private_Data),
74 NULL, 74 NULL,
75 NULL 75 NULL
76}; 76};
77 77
78EO_DEFINE_CLASS(simple_class_get, &class_desc, EO2_BASE_CLASS, INTERFACE2_CLASS, NULL); 78EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, INTERFACE2_CLASS, NULL);
diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c
index 4578b54039..521acbe721 100644
--- a/src/tests/eo/mixin/mixin_inherit.c
+++ b/src/tests/eo/mixin/mixin_inherit.c
@@ -13,22 +13,22 @@ static int
13_a_get(Eo *obj, void *class_data EINA_UNUSED) 13_a_get(Eo *obj, void *class_data EINA_UNUSED)
14{ 14{
15 int ret = 0; 15 int ret = 0;
16 eo2_do_super(obj, MY_CLASS, ret = simple_a_get()); 16 eo_do_super(obj, MY_CLASS, ret = simple_a_get());
17 printf("%s %d\n", __func__, ret); 17 printf("%s %d\n", __func__, ret);
18 18
19 return ret; 19 return ret;
20} 20}
21 21
22static Eo2_Op_Description op_descs[] = { 22static Eo_Op_Description op_descs[] = {
23 EO2_OP_FUNC_OVERRIDE(simple_a_get, _a_get), 23 EO_OP_FUNC_OVERRIDE(simple_a_get, _a_get),
24 EO2_OP_SENTINEL 24 EO_OP_SENTINEL
25}; 25};
26 26
27static const Eo_Class_Description class_desc = { 27static const Eo_Class_Description class_desc = {
28 EO2_VERSION, 28 EO_VERSION,
29 "Inherit", 29 "Inherit",
30 EO_CLASS_TYPE_REGULAR, 30 EO_CLASS_TYPE_REGULAR,
31 EO2_CLASS_DESCRIPTION_OPS(op_descs), 31 EO_CLASS_DESCRIPTION_OPS(op_descs),
32 NULL, 32 NULL,
33 0, 33 0,
34 NULL, 34 NULL,
diff --git a/src/tests/eo/mixin/mixin_main.c b/src/tests/eo/mixin/mixin_main.c
index a0221b3bf0..6ab6af288e 100644
--- a/src/tests/eo/mixin/mixin_main.c
+++ b/src/tests/eo/mixin/mixin_main.c
@@ -18,15 +18,15 @@ main(int argc, char *argv[])
18 (void) argv; 18 (void) argv;
19 eo_init(); 19 eo_init();
20 20
21 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 21 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
22 22
23 eo2_do(obj, simple_a_set(1), simple_b_set(2)); 23 eo_do(obj, simple_a_set(1), simple_b_set(2));
24 24
25 int a = 0, b = 0, sum = 0; 25 int a = 0, b = 0, sum = 0;
26 eo2_do(obj, a = simple_a_get(), b = simple_b_get(), sum = mixin_ab_sum_get()); 26 eo_do(obj, a = simple_a_get(), b = simple_b_get(), sum = mixin_ab_sum_get());
27 fail_if(sum != a + b + 2); /* 2 for the two mixins... */ 27 fail_if(sum != a + b + 2); /* 2 for the two mixins... */
28 28
29 eo2_do(obj, sum = mixin_ab_sum_get(), sum = mixin_ab_sum_get()); 29 eo_do(obj, sum = mixin_ab_sum_get(), sum = mixin_ab_sum_get());
30 30
31 Mixin2_Public_Data *pd2 = eo_data_scope_get(obj, MIXIN2_CLASS); 31 Mixin2_Public_Data *pd2 = eo_data_scope_get(obj, MIXIN2_CLASS);
32 fail_if(pd2->count != 6); 32 fail_if(pd2->count != 6);
@@ -36,8 +36,8 @@ main(int argc, char *argv[])
36 36
37 eo_unref(obj); 37 eo_unref(obj);
38 38
39 obj = eo2_add(INHERIT_CLASS, NULL); 39 obj = eo_add(INHERIT_CLASS, NULL);
40 eo2_do(obj, simple_a_set(5), a = simple_a_get()); 40 eo_do(obj, simple_a_set(5), a = simple_a_get());
41 printf("%d\n", a); 41 printf("%d\n", a);
42 fail_if(a != 5); 42 fail_if(a != 5);
43 43
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index 0392e9099c..073ad3b988 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -12,7 +12,7 @@ static int
12_ab_sum_get(Eo *obj, void *class_data EINA_UNUSED) 12_ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
13{ 13{
14 int a = 0, b = 0; 14 int a = 0, b = 0;
15 eo2_do(obj, a = simple_a_get(), b = simple_b_get()); 15 eo_do(obj, a = simple_a_get(), b = simple_b_get());
16 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 16 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
17 return a + b; 17 return a + b;
18} 18}
@@ -20,34 +20,34 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
20static void 20static void
21_constructor(Eo *obj, void *class_data EINA_UNUSED) 21_constructor(Eo *obj, void *class_data EINA_UNUSED)
22{ 22{
23 eo2_do_super(obj, MY_CLASS, eo2_constructor()); 23 eo_do_super(obj, MY_CLASS, eo_constructor());
24} 24}
25 25
26static void 26static void
27_destructor(Eo *obj, void *class_data EINA_UNUSED) 27_destructor(Eo *obj, void *class_data EINA_UNUSED)
28{ 28{
29 eo2_do_super(obj, MY_CLASS, eo2_destructor()); 29 eo_do_super(obj, MY_CLASS, eo_destructor());
30} 30}
31 31
32EAPI EO2_FUNC_BODY(mixin_ab_sum_get, int, 0); 32EAPI EO_FUNC_BODY(mixin_ab_sum_get, int, 0);
33 33
34static Eo2_Op_Description op_descs[] = { 34static Eo_Op_Description op_descs[] = {
35 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), 35 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
36 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), 36 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
37 EO2_OP_FUNC(mixin_ab_sum_get, _ab_sum_get, "Get the sum of a and b."), 37 EO_OP_FUNC(mixin_ab_sum_get, _ab_sum_get, "Get the sum of a and b."),
38 EO2_OP_SENTINEL 38 EO_OP_SENTINEL
39}; 39};
40 40
41static const Eo_Class_Description class_desc = { 41static const Eo_Class_Description class_desc = {
42 EO2_VERSION, 42 EO_VERSION,
43 "Mixin", 43 "Mixin",
44 EO_CLASS_TYPE_MIXIN, 44 EO_CLASS_TYPE_MIXIN,
45 EO2_CLASS_DESCRIPTION_OPS(op_descs), 45 EO_CLASS_DESCRIPTION_OPS(op_descs),
46 NULL, 46 NULL,
47 0, 47 0,
48 NULL, 48 NULL,
49 NULL 49 NULL
50}; 50};
51 51
52EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO2_BASE_CLASS, NULL) 52EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_BASE_CLASS, NULL)
53 53
diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c
index 621715ea86..6df0a85fec 100644
--- a/src/tests/eo/mixin/mixin_mixin2.c
+++ b/src/tests/eo/mixin/mixin_mixin2.c
@@ -18,14 +18,14 @@ _ab_sum_get(Eo *obj, void *class_data)
18 Mixin2_Public_Data *pd = (Mixin2_Public_Data *) class_data; 18 Mixin2_Public_Data *pd = (Mixin2_Public_Data *) class_data;
19 int sum = 0; 19 int sum = 0;
20 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 20 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
21 eo2_do_super(obj, MY_CLASS, sum = mixin_ab_sum_get()); 21 eo_do_super(obj, MY_CLASS, sum = mixin_ab_sum_get());
22 22
23 ++sum; 23 ++sum;
24 pd->count += 2; 24 pd->count += 2;
25 25
26 { 26 {
27 int _a = 0, _b = 0; 27 int _a = 0, _b = 0;
28 eo2_do(obj, _a = simple_a_get(), _b = simple_b_get()); 28 eo_do(obj, _a = simple_a_get(), _b = simple_b_get());
29 fail_if(sum != _a + _b + 1); 29 fail_if(sum != _a + _b + 1);
30 } 30 }
31 31
@@ -35,27 +35,27 @@ _ab_sum_get(Eo *obj, void *class_data)
35static void 35static void
36_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 36_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
37{ 37{
38 eo2_do_super(obj, MY_CLASS, eo2_constructor()); 38 eo_do_super(obj, MY_CLASS, eo_constructor());
39} 39}
40 40
41static void 41static void
42_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 42_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
43{ 43{
44 eo2_do_super(obj, MY_CLASS, eo2_destructor()); 44 eo_do_super(obj, MY_CLASS, eo_destructor());
45} 45}
46 46
47static Eo2_Op_Description op_descs[] = { 47static Eo_Op_Description op_descs[] = {
48 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), 48 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
49 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), 49 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
50 EO2_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get), 50 EO_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get),
51 EO2_OP_SENTINEL 51 EO_OP_SENTINEL
52}; 52};
53 53
54static const Eo_Class_Description class_desc = { 54static const Eo_Class_Description class_desc = {
55 EO2_VERSION, 55 EO_VERSION,
56 "Mixin2", 56 "Mixin2",
57 EO_CLASS_TYPE_MIXIN, 57 EO_CLASS_TYPE_MIXIN,
58 EO2_CLASS_DESCRIPTION_OPS(op_descs), 58 EO_CLASS_DESCRIPTION_OPS(op_descs),
59 NULL, 59 NULL,
60 sizeof(Mixin2_Public_Data), 60 sizeof(Mixin2_Public_Data),
61 NULL, 61 NULL,
diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c
index 1a90847e1f..6d0d99d4f8 100644
--- a/src/tests/eo/mixin/mixin_mixin3.c
+++ b/src/tests/eo/mixin/mixin_mixin3.c
@@ -18,14 +18,14 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
18 Mixin3_Public_Data *pd = (Mixin3_Public_Data *) class_data; 18 Mixin3_Public_Data *pd = (Mixin3_Public_Data *) class_data;
19 int sum = 0; 19 int sum = 0;
20 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 20 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
21 eo2_do_super(obj, MY_CLASS, sum = mixin_ab_sum_get()); 21 eo_do_super(obj, MY_CLASS, sum = mixin_ab_sum_get());
22 22
23 ++sum; 23 ++sum;
24 pd->count += 3; 24 pd->count += 3;
25 25
26 { 26 {
27 int _a = 0, _b = 0; 27 int _a = 0, _b = 0;
28 eo2_do(obj, _a = simple_a_get(), _b = simple_b_get()); 28 eo_do(obj, _a = simple_a_get(), _b = simple_b_get());
29 fail_if(sum != _a + _b + 2); 29 fail_if(sum != _a + _b + 2);
30 } 30 }
31 31
@@ -35,27 +35,27 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
35static void 35static void
36_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 36_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
37{ 37{
38 eo2_do_super(obj, MY_CLASS, eo2_constructor()); 38 eo_do_super(obj, MY_CLASS, eo_constructor());
39} 39}
40 40
41static void 41static void
42_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 42_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
43{ 43{
44 eo2_do_super(obj, MY_CLASS, eo2_destructor()); 44 eo_do_super(obj, MY_CLASS, eo_destructor());
45} 45}
46 46
47static Eo2_Op_Description op_descs[] = { 47static Eo_Op_Description op_descs[] = {
48 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), 48 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
49 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), 49 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
50 EO2_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get), 50 EO_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get),
51 EO2_OP_SENTINEL 51 EO_OP_SENTINEL
52}; 52};
53 53
54static const Eo_Class_Description class_desc = { 54static const Eo_Class_Description class_desc = {
55 EO2_VERSION, 55 EO_VERSION,
56 "Mixin3", 56 "Mixin3",
57 EO_CLASS_TYPE_MIXIN, 57 EO_CLASS_TYPE_MIXIN,
58 EO2_CLASS_DESCRIPTION_OPS(op_descs), 58 EO_CLASS_DESCRIPTION_OPS(op_descs),
59 NULL, 59 NULL,
60 sizeof(Mixin3_Public_Data), 60 sizeof(Mixin3_Public_Data),
61 NULL, 61 NULL,
diff --git a/src/tests/eo/mixin/mixin_mixin4.c b/src/tests/eo/mixin/mixin_mixin4.c
index efd9e42990..f4e312f77b 100644
--- a/src/tests/eo/mixin/mixin_mixin4.c
+++ b/src/tests/eo/mixin/mixin_mixin4.c
@@ -12,10 +12,10 @@
12#define MY_CLASS MIXIN4_CLASS 12#define MY_CLASS MIXIN4_CLASS
13 13
14static const Eo_Class_Description class_desc = { 14static const Eo_Class_Description class_desc = {
15 EO2_VERSION, 15 EO_VERSION,
16 "Mixin4", 16 "Mixin4",
17 EO_CLASS_TYPE_MIXIN, 17 EO_CLASS_TYPE_MIXIN,
18 EO2_CLASS_DESCRIPTION_NOOPS(), 18 EO_CLASS_DESCRIPTION_NOOPS(),
19 NULL, 19 NULL,
20 0, 20 0,
21 NULL, 21 NULL,
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index 879728964f..5da36be987 100644
--- a/src/tests/eo/mixin/mixin_simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -31,31 +31,31 @@ _##name##_set(Eo *obj EINA_UNUSED, void *class_data, int name) \
31 pd->name = name; \ 31 pd->name = name; \
32 printf("%s %d\n", __func__, pd->name); \ 32 printf("%s %d\n", __func__, pd->name); \
33} \ 33} \
34EO2_VOID_FUNC_BODYV(simple_##name##_set, EO2_FUNC_CALL(name), int name); \ 34EO_VOID_FUNC_BODYV(simple_##name##_set, EO_FUNC_CALL(name), int name); \
35EO2_FUNC_BODY(simple_##name##_get, int, 0); 35EO_FUNC_BODY(simple_##name##_get, int, 0);
36 36
37_GET_SET_FUNC(a) 37_GET_SET_FUNC(a)
38_GET_SET_FUNC(b) 38_GET_SET_FUNC(b)
39 39
40static Eo2_Op_Description op_descs[] = { 40static Eo_Op_Description op_descs[] = {
41 EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"), 41 EO_OP_FUNC(simple_a_set, _a_set, "Set property a"),
42 EO2_OP_FUNC(simple_a_get, _a_get, "Get property a"), 42 EO_OP_FUNC(simple_a_get, _a_get, "Get property a"),
43 EO2_OP_FUNC(simple_b_set, _b_set, "Set property b"), 43 EO_OP_FUNC(simple_b_set, _b_set, "Set property b"),
44 EO2_OP_FUNC(simple_b_get, _b_get, "Get property b"), 44 EO_OP_FUNC(simple_b_get, _b_get, "Get property b"),
45 EO2_OP_SENTINEL 45 EO_OP_SENTINEL
46}; 46};
47 47
48static const Eo_Class_Description class_desc = { 48static const Eo_Class_Description class_desc = {
49 EO2_VERSION, 49 EO_VERSION,
50 "Simple", 50 "Simple",
51 EO_CLASS_TYPE_REGULAR, 51 EO_CLASS_TYPE_REGULAR,
52 EO2_CLASS_DESCRIPTION_OPS(op_descs), 52 EO_CLASS_DESCRIPTION_OPS(op_descs),
53 NULL, 53 NULL,
54 sizeof(Private_Data), 54 sizeof(Private_Data),
55 NULL, 55 NULL,
56 NULL 56 NULL
57}; 57};
58 58
59EO_DEFINE_CLASS(simple_class_get, &class_desc, EO2_BASE_CLASS, 59EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS,
60 MIXIN3_CLASS, MIXIN2_CLASS, NULL); 60 MIXIN3_CLASS, MIXIN2_CLASS, NULL);
61 61
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index 17f6af1b54..eb0784febd 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -29,8 +29,8 @@ _a_changed_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event
29 29
30 cb_count++; 30 cb_count++;
31 31
32 eo2_do(obj, eo2_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423)); 32 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423));
33 eo2_do(obj, eo2_event_callback_del(EV_A_CHANGED, _null_cb, (void *) 23423)); 33 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _null_cb, (void *) 23423));
34 34
35 /* Stop as we reached the 3rd one. */ 35 /* Stop as we reached the 3rd one. */
36 return (cb_count != 3); 36 return (cb_count != 3);
@@ -43,136 +43,136 @@ main(int argc, char *argv[])
43 (void) argv; 43 (void) argv;
44 eo_init(); 44 eo_init();
45 45
46 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 46 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
47 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); 47 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
48 48
49 /* The order of these two is undetermined. */ 49 /* The order of these two is undetermined. */
50 eo2_do(obj, eo2_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2)); 50 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2));
51 eo2_do(obj, eo2_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1)); 51 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1));
52 /* This will be called afterwards. */ 52 /* This will be called afterwards. */
53 eo2_do(obj, eo2_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_DEFAULT, _a_changed_cb, (void *) 3)); 53 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_DEFAULT, _a_changed_cb, (void *) 3));
54 /* This will never be called because the previous callback returns NULL. */ 54 /* This will never be called because the previous callback returns NULL. */
55 eo2_do(obj, eo2_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4)); 55 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4));
56 56
57 eo2_do(obj, simple_a_set(1)); 57 eo_do(obj, simple_a_set(1));
58 58
59 fail_if(cb_count != 3); 59 fail_if(cb_count != 3);
60 60
61 eo2_do(obj, eo2_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 3)); 61 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 3));
62 fail_if(pd->cb_count != 3); 62 fail_if(pd->cb_count != 3);
63 63
64 eo2_do(obj, eo2_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 12)); 64 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 12));
65 fail_if(pd->cb_count != 3); 65 fail_if(pd->cb_count != 3);
66 66
67 eo2_do(obj, eo2_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 4)); 67 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 4));
68 fail_if(pd->cb_count != 2); 68 fail_if(pd->cb_count != 2);
69 69
70 eo2_do(obj, eo2_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 2)); 70 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 2));
71 fail_if(pd->cb_count != 1); 71 fail_if(pd->cb_count != 1);
72 72
73 eo2_do(obj, eo2_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 1)); 73 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 1));
74 fail_if(pd->cb_count != 0); 74 fail_if(pd->cb_count != 0);
75 75
76 /* Freeze/thaw. */ 76 /* Freeze/thaw. */
77 int fcount = 0; 77 int fcount = 0;
78 cb_count = 0; 78 cb_count = 0;
79 eo2_do(obj, eo2_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1)); 79 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1));
80 fail_if(pd->cb_count != 1); 80 fail_if(pd->cb_count != 1);
81 81
82 eo2_do(obj, fcount = eo2_event_freeze_get()); 82 eo_do(obj, fcount = eo_event_freeze_get());
83 fail_if(fcount != 0); 83 fail_if(fcount != 0);
84 84
85 eo2_do(obj, eo2_event_freeze()); 85 eo_do(obj, eo_event_freeze());
86 eo2_do(obj, fcount = eo2_event_freeze_get()); 86 eo_do(obj, fcount = eo_event_freeze_get());
87 fail_if(fcount != 1); 87 fail_if(fcount != 1);
88 88
89 eo2_do(obj, eo2_event_freeze()); 89 eo_do(obj, eo_event_freeze());
90 eo2_do(obj, fcount = eo2_event_freeze_get()); 90 eo_do(obj, fcount = eo_event_freeze_get());
91 fail_if(fcount != 2); 91 fail_if(fcount != 2);
92 92
93 eo2_do(obj, eo2_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2)); 93 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2));
94 fail_if(pd->cb_count != 1); 94 fail_if(pd->cb_count != 1);
95 95
96 eo2_do(obj, simple_a_set(2)); 96 eo_do(obj, simple_a_set(2));
97 fail_if(cb_count != 0); 97 fail_if(cb_count != 0);
98 eo2_do(obj, eo2_event_thaw()); 98 eo_do(obj, eo_event_thaw());
99 eo2_do(obj, fcount = eo2_event_freeze_get()); 99 eo_do(obj, fcount = eo_event_freeze_get());
100 fail_if(fcount != 1); 100 fail_if(fcount != 1);
101 101
102 eo2_do(obj, eo2_event_thaw()); 102 eo_do(obj, eo_event_thaw());
103 eo2_do(obj, fcount = eo2_event_freeze_get()); 103 eo_do(obj, fcount = eo_event_freeze_get());
104 fail_if(fcount != 0); 104 fail_if(fcount != 0);
105 105
106 eo2_do(obj, simple_a_set(3)); 106 eo_do(obj, simple_a_set(3));
107 fail_if(cb_count != 2); 107 fail_if(cb_count != 2);
108 108
109 cb_count = 0; 109 cb_count = 0;
110 eo2_do(obj, eo2_event_thaw()); 110 eo_do(obj, eo_event_thaw());
111 eo2_do(obj, fcount = eo2_event_freeze_get()); 111 eo_do(obj, fcount = eo_event_freeze_get());
112 fail_if(fcount != 0); 112 fail_if(fcount != 0);
113 113
114 eo2_do(obj, eo2_event_freeze()); 114 eo_do(obj, eo_event_freeze());
115 eo2_do(obj, fcount = eo2_event_freeze_get()); 115 eo_do(obj, fcount = eo_event_freeze_get());
116 fail_if(fcount != 1); 116 fail_if(fcount != 1);
117 117
118 eo2_do(obj, simple_a_set(2)); 118 eo_do(obj, simple_a_set(2));
119 fail_if(cb_count != 0); 119 fail_if(cb_count != 0);
120 eo2_do(obj, eo2_event_thaw()); 120 eo_do(obj, eo_event_thaw());
121 eo2_do(obj, fcount = eo2_event_freeze_get()); 121 eo_do(obj, fcount = eo_event_freeze_get());
122 fail_if(fcount != 0); 122 fail_if(fcount != 0);
123 123
124 eo2_do(obj, eo2_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 1)); 124 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 1));
125 fail_if(pd->cb_count != 0); 125 fail_if(pd->cb_count != 0);
126 eo2_do(obj, eo2_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 2)); 126 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 2));
127 fail_if(pd->cb_count != -1); 127 fail_if(pd->cb_count != -1);
128 128
129 /* Global Freeze/thaw. */ 129 /* Global Freeze/thaw. */
130 fcount = 0; 130 fcount = 0;
131 cb_count = 0; 131 cb_count = 0;
132 pd->cb_count = 0; 132 pd->cb_count = 0;
133 eo2_do(obj, eo2_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1)); 133 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1));
134 fail_if(pd->cb_count != 1); 134 fail_if(pd->cb_count != 1);
135 135
136 eo2_do(EO2_BASE_CLASS, fcount = eo2_event_global_freeze_get()); 136 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
137 fail_if(fcount != 0); 137 fail_if(fcount != 0);
138 138
139 eo2_do(EO2_BASE_CLASS, eo2_event_global_freeze()); 139 eo_do(EO_BASE_CLASS, eo_event_global_freeze());
140 eo2_do(EO2_BASE_CLASS, fcount = eo2_event_global_freeze_get()); 140 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
141 fail_if(fcount != 1); 141 fail_if(fcount != 1);
142 142
143 eo2_do(EO2_BASE_CLASS, eo2_event_global_freeze()); 143 eo_do(EO_BASE_CLASS, eo_event_global_freeze());
144 eo2_do(EO2_BASE_CLASS, fcount = eo2_event_global_freeze_get()); 144 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
145 fail_if(fcount != 2); 145 fail_if(fcount != 2);
146 146
147 eo2_do(obj, eo2_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2)); 147 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2));
148 fail_if(pd->cb_count != 1); 148 fail_if(pd->cb_count != 1);
149 149
150 eo2_do(obj, simple_a_set(2)); 150 eo_do(obj, simple_a_set(2));
151 fail_if(cb_count != 0); 151 fail_if(cb_count != 0);
152 eo2_do(EO2_BASE_CLASS, eo2_event_global_thaw()); 152 eo_do(EO_BASE_CLASS, eo_event_global_thaw());
153 eo2_do(EO2_BASE_CLASS, fcount = eo2_event_global_freeze_get()); 153 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
154 fail_if(fcount != 1); 154 fail_if(fcount != 1);
155 155
156 eo2_do(EO2_BASE_CLASS, eo2_event_global_thaw()); 156 eo_do(EO_BASE_CLASS, eo_event_global_thaw());
157 eo2_do(EO2_BASE_CLASS, fcount = eo2_event_global_freeze_get()); 157 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
158 fail_if(fcount != 0); 158 fail_if(fcount != 0);
159 159
160 eo2_do(obj, simple_a_set(3)); 160 eo_do(obj, simple_a_set(3));
161 fail_if(cb_count != 2); 161 fail_if(cb_count != 2);
162 162
163 cb_count = 0; 163 cb_count = 0;
164 eo2_do(EO2_BASE_CLASS, eo2_event_global_thaw()); 164 eo_do(EO_BASE_CLASS, eo_event_global_thaw());
165 eo2_do(EO2_BASE_CLASS, fcount = eo2_event_global_freeze_get()); 165 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
166 fail_if(fcount != 0); 166 fail_if(fcount != 0);
167 167
168 eo2_do(EO2_BASE_CLASS, eo2_event_global_freeze()); 168 eo_do(EO_BASE_CLASS, eo_event_global_freeze());
169 eo2_do(EO2_BASE_CLASS, fcount = eo2_event_global_freeze_get()); 169 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
170 fail_if(fcount != 1); 170 fail_if(fcount != 1);
171 171
172 eo2_do(obj, simple_a_set(2)); 172 eo_do(obj, simple_a_set(2));
173 fail_if(cb_count != 0); 173 fail_if(cb_count != 0);
174 eo2_do(EO2_BASE_CLASS, eo2_event_global_thaw()); 174 eo_do(EO_BASE_CLASS, eo_event_global_thaw());
175 eo2_do(EO2_BASE_CLASS, fcount = eo2_event_global_freeze_get()); 175 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
176 fail_if(fcount != 0); 176 fail_if(fcount != 0);
177 177
178 178
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 1de1ad9e34..6786aae8fb 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -23,7 +23,7 @@ _a_set(Eo *obj, void *class_data, int a)
23 pd->a = a; 23 pd->a = a;
24 printf("%s %d\n", __func__, pd->a); 24 printf("%s %d\n", __func__, pd->a);
25 25
26 eo2_do(obj, eo2_event_callback_call(EV_A_CHANGED, &pd->a)); 26 eo_do(obj, eo_event_callback_call(EV_A_CHANGED, &pd->a));
27} 27}
28 28
29Eina_Bool 29Eina_Bool
@@ -63,20 +63,20 @@ _cb_deled(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_inf
63static void 63static void
64_constructor(Eo *obj, void *class_data EINA_UNUSED) 64_constructor(Eo *obj, void *class_data EINA_UNUSED)
65{ 65{
66 eo2_do_super(obj, MY_CLASS, eo2_constructor()); 66 eo_do_super(obj, MY_CLASS, eo_constructor());
67 67
68 eo2_do(obj, eo2_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, NULL)); 68 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, NULL));
69 eo2_do(obj, eo2_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, NULL)); 69 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, NULL));
70 70
71 eo2_do(obj, eo2_base_data_set("cb_count", (intptr_t) 0, NULL)); 71 eo_do(obj, eo_base_data_set("cb_count", (intptr_t) 0, NULL));
72} 72}
73 73
74EAPI EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a); 74EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
75 75
76static Eo2_Op_Description op_descs[] = { 76static Eo_Op_Description op_descs[] = {
77 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), 77 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
78 EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"), 78 EO_OP_FUNC(simple_a_set, _a_set, "Set property a"),
79 EO2_OP_SENTINEL 79 EO_OP_SENTINEL
80}; 80};
81 81
82 82
@@ -86,15 +86,15 @@ static const Eo_Event_Description *event_desc[] = {
86}; 86};
87 87
88static const Eo_Class_Description class_desc = { 88static const Eo_Class_Description class_desc = {
89 EO2_VERSION, 89 EO_VERSION,
90 "Simple", 90 "Simple",
91 EO_CLASS_TYPE_REGULAR, 91 EO_CLASS_TYPE_REGULAR,
92 EO2_CLASS_DESCRIPTION_OPS(op_descs), 92 EO_CLASS_DESCRIPTION_OPS(op_descs),
93 event_desc, 93 event_desc,
94 sizeof(Private_Data), 94 sizeof(Private_Data),
95 NULL, 95 NULL,
96 NULL 96 NULL
97}; 97};
98 98
99EO_DEFINE_CLASS(simple_class_get, &class_desc, EO2_BASE_CLASS, NULL); 99EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL);
100 100
diff --git a/src/tests/eo/suite/eo_test_call_errors.c b/src/tests/eo/suite/eo_test_call_errors.c
index 76a60ffc53..08e1635a7d 100644
--- a/src/tests/eo/suite/eo_test_call_errors.c
+++ b/src/tests/eo/suite/eo_test_call_errors.c
@@ -16,11 +16,11 @@ START_TEST(eo_pure_virtual_fct_call)
16 eo_init(); 16 eo_init();
17 eina_log_print_cb_set(eo_test_print_cb, &ctx); 17 eina_log_print_cb_set(eo_test_print_cb, &ctx);
18 18
19 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 19 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
20 fail_if(!obj); 20 fail_if(!obj);
21 21
22 TEST_EO_ERROR("_eo2_call_resolve", "in %s:%d: you called a pure virtual func '%s' (%d)."); 22 TEST_EO_ERROR("_eo_call_resolve", "in %s:%d: you called a pure virtual func '%s' (%d).");
23 eo2_do(obj, simple_pure_virtual()); 23 eo_do(obj, simple_pure_virtual());
24 fail_unless(ctx.did); 24 fail_unless(ctx.did);
25 25
26 eo_unref(obj); 26 eo_unref(obj);
@@ -34,11 +34,11 @@ START_TEST(eo_api_not_implemented_call)
34 eo_init(); 34 eo_init();
35 eina_log_print_cb_set(eo_test_print_cb, &ctx); 35 eina_log_print_cb_set(eo_test_print_cb, &ctx);
36 36
37 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 37 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
38 fail_if(!obj); 38 fail_if(!obj);
39 39
40 TEST_EO_ERROR("_eo2_api_op_id_get", "in %s:%d: unable to resolve %s api func %p."); 40 TEST_EO_ERROR("_eo_api_op_id_get", "in %s:%d: unable to resolve %s api func %p.");
41 eo2_do(obj, simple_no_implementation()); 41 eo_do(obj, simple_no_implementation());
42 fail_unless(ctx.did); 42 fail_unless(ctx.did);
43 43
44 eo_unref(obj); 44 eo_unref(obj);
@@ -52,11 +52,11 @@ START_TEST(eo_op_not_found_in_super)
52 eo_init(); 52 eo_init();
53 eina_log_print_cb_set(eo_test_print_cb, &ctx); 53 eina_log_print_cb_set(eo_test_print_cb, &ctx);
54 54
55 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 55 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
56 fail_if(!obj); 56 fail_if(!obj);
57 57
58 TEST_EO_ERROR("_eo2_call_resolve", "in %s:%d: func '%s' (%d) could not be resolved for class '%s' for super of '%s'."); 58 TEST_EO_ERROR("_eo_call_resolve", "in %s:%d: func '%s' (%d) could not be resolved for class '%s' for super of '%s'.");
59 eo2_do_super(obj, SIMPLE_CLASS, simple_a_set(10)); 59 eo_do_super(obj, SIMPLE_CLASS, simple_a_set(10));
60 fail_unless(ctx.did); 60 fail_unless(ctx.did);
61 61
62 eo_unref(obj); 62 eo_unref(obj);
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index cbea8e1b2d..36a85151cc 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -21,10 +21,10 @@ START_TEST(eo_inherit_errors)
21 const Eo_Class *klass_simple; 21 const Eo_Class *klass_simple;
22 22
23 static const Eo_Class_Description class_desc_simple = { 23 static const Eo_Class_Description class_desc_simple = {
24 EO2_VERSION, 24 EO_VERSION,
25 "Simple", 25 "Simple",
26 EO_CLASS_TYPE_REGULAR, 26 EO_CLASS_TYPE_REGULAR,
27 EO2_CLASS_DESCRIPTION_NOOPS(), 27 EO_CLASS_DESCRIPTION_NOOPS(),
28 NULL, 28 NULL,
29 0, 29 0,
30 NULL, 30 NULL,
@@ -32,10 +32,10 @@ START_TEST(eo_inherit_errors)
32 }; 32 };
33 33
34 static const Eo_Class_Description class_desc_mixin = { 34 static const Eo_Class_Description class_desc_mixin = {
35 EO2_VERSION, 35 EO_VERSION,
36 "Mixin", 36 "Mixin",
37 EO_CLASS_TYPE_MIXIN, 37 EO_CLASS_TYPE_MIXIN,
38 EO2_CLASS_DESCRIPTION_NOOPS(), 38 EO_CLASS_DESCRIPTION_NOOPS(),
39 NULL, 39 NULL,
40 0, 40 0,
41 NULL, 41 NULL,
@@ -43,10 +43,10 @@ START_TEST(eo_inherit_errors)
43 }; 43 };
44 44
45 static Eo_Class_Description class_desc = { 45 static Eo_Class_Description class_desc = {
46 EO2_VERSION, 46 EO_VERSION,
47 "General", 47 "General",
48 EO_CLASS_TYPE_MIXIN, 48 EO_CLASS_TYPE_MIXIN,
49 EO2_CLASS_DESCRIPTION_NOOPS(), 49 EO_CLASS_DESCRIPTION_NOOPS(),
50 NULL, 50 NULL,
51 0, 51 0,
52 NULL, 52 NULL,
@@ -56,7 +56,7 @@ START_TEST(eo_inherit_errors)
56 klass_mixin = eo_class_new(&class_desc_mixin, NULL, NULL); 56 klass_mixin = eo_class_new(&class_desc_mixin, NULL, NULL);
57 fail_if(!klass_mixin); 57 fail_if(!klass_mixin);
58 58
59 klass_simple = eo_class_new(&class_desc_simple, EO2_BASE_CLASS, NULL); 59 klass_simple = eo_class_new(&class_desc_simple, EO_BASE_CLASS, NULL);
60 fail_if(!klass_simple); 60 fail_if(!klass_simple);
61 61
62 TEST_EO_ERROR("eo_class_new", "Non-regular classes ('%s') aren't allowed to inherit from regular classes ('%s')."); 62 TEST_EO_ERROR("eo_class_new", "Non-regular classes ('%s') aren't allowed to inherit from regular classes ('%s').");
@@ -89,10 +89,10 @@ START_TEST(eo_inconsistent_mro)
89 const Eo_Class *klass_mixin3; 89 const Eo_Class *klass_mixin3;
90 90
91 static const Eo_Class_Description class_desc_simple = { 91 static const Eo_Class_Description class_desc_simple = {
92 EO2_VERSION, 92 EO_VERSION,
93 "Simple", 93 "Simple",
94 EO_CLASS_TYPE_REGULAR, 94 EO_CLASS_TYPE_REGULAR,
95 EO2_CLASS_DESCRIPTION_NOOPS(), 95 EO_CLASS_DESCRIPTION_NOOPS(),
96 NULL, 96 NULL,
97 0, 97 0,
98 NULL, 98 NULL,
@@ -100,10 +100,10 @@ START_TEST(eo_inconsistent_mro)
100 }; 100 };
101 101
102 static const Eo_Class_Description class_desc_mixin = { 102 static const Eo_Class_Description class_desc_mixin = {
103 EO2_VERSION, 103 EO_VERSION,
104 "Mixin", 104 "Mixin",
105 EO_CLASS_TYPE_MIXIN, 105 EO_CLASS_TYPE_MIXIN,
106 EO2_CLASS_DESCRIPTION_NOOPS(), 106 EO_CLASS_DESCRIPTION_NOOPS(),
107 NULL, 107 NULL,
108 0, 108 0,
109 NULL, 109 NULL,
@@ -111,10 +111,10 @@ START_TEST(eo_inconsistent_mro)
111 }; 111 };
112 112
113 static const Eo_Class_Description class_desc_mixin2 = { 113 static const Eo_Class_Description class_desc_mixin2 = {
114 EO2_VERSION, 114 EO_VERSION,
115 "Mixin2", 115 "Mixin2",
116 EO_CLASS_TYPE_MIXIN, 116 EO_CLASS_TYPE_MIXIN,
117 EO2_CLASS_DESCRIPTION_NOOPS(), 117 EO_CLASS_DESCRIPTION_NOOPS(),
118 NULL, 118 NULL,
119 0, 119 0,
120 NULL, 120 NULL,
@@ -122,10 +122,10 @@ START_TEST(eo_inconsistent_mro)
122 }; 122 };
123 123
124 static const Eo_Class_Description class_desc_mixin3 = { 124 static const Eo_Class_Description class_desc_mixin3 = {
125 EO2_VERSION, 125 EO_VERSION,
126 "Mixin3", 126 "Mixin3",
127 EO_CLASS_TYPE_MIXIN, 127 EO_CLASS_TYPE_MIXIN,
128 EO2_CLASS_DESCRIPTION_NOOPS(), 128 EO_CLASS_DESCRIPTION_NOOPS(),
129 NULL, 129 NULL,
130 0, 130 0,
131 NULL, 131 NULL,
@@ -142,14 +142,14 @@ START_TEST(eo_inconsistent_mro)
142 fail_if(!klass_mixin3); 142 fail_if(!klass_mixin3);
143 143
144 TEST_EO_ERROR("_eo_class_mro_init", "Cannot create a consistent method resolution order for class '%s' because of '%s'."); 144 TEST_EO_ERROR("_eo_class_mro_init", "Cannot create a consistent method resolution order for class '%s' because of '%s'.");
145 klass = eo_class_new(&class_desc_simple, EO2_BASE_CLASS, klass_mixin, klass_mixin2, NULL); 145 klass = eo_class_new(&class_desc_simple, EO_BASE_CLASS, klass_mixin, klass_mixin2, NULL);
146 fail_if(klass); 146 fail_if(klass);
147 fail_unless(ctx.did); 147 fail_unless(ctx.did);
148 148
149 klass = eo_class_new(&class_desc_simple, EO2_BASE_CLASS, klass_mixin2, klass_mixin, NULL); 149 klass = eo_class_new(&class_desc_simple, EO_BASE_CLASS, klass_mixin2, klass_mixin, NULL);
150 fail_if(!klass); 150 fail_if(!klass);
151 151
152 klass = eo_class_new(&class_desc_simple, EO2_BASE_CLASS, klass_mixin2, klass_mixin3, NULL); 152 klass = eo_class_new(&class_desc_simple, EO_BASE_CLASS, klass_mixin2, klass_mixin3, NULL);
153 fail_if(!klass); 153 fail_if(!klass);
154 154
155 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL); 155 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
@@ -168,10 +168,10 @@ START_TEST(eo_bad_interface)
168 const Eo_Class *klass; 168 const Eo_Class *klass;
169 169
170 static Eo_Class_Description class_desc = { 170 static Eo_Class_Description class_desc = {
171 EO2_VERSION, 171 EO_VERSION,
172 "Interface", 172 "Interface",
173 EO_CLASS_TYPE_INTERFACE, 173 EO_CLASS_TYPE_INTERFACE,
174 EO2_CLASS_DESCRIPTION_NOOPS(), 174 EO_CLASS_DESCRIPTION_NOOPS(),
175 NULL, 175 NULL,
176 10, 176 10,
177 NULL, 177 NULL,
@@ -216,22 +216,22 @@ START_TEST(eo_null_api)
216 216
217 const Eo_Class *klass; 217 const Eo_Class *klass;
218 218
219 static Eo2_Op_Description op_descs[] = { 219 static Eo_Op_Description op_descs[] = {
220 EO2_OP_FUNC(NULL, _null_fct, "NULL API function"), 220 EO_OP_FUNC(NULL, _null_fct, "NULL API function"),
221 EO2_OP_SENTINEL 221 EO_OP_SENTINEL
222 }; 222 };
223 static Eo_Class_Description class_desc = { 223 static Eo_Class_Description class_desc = {
224 EO2_VERSION, 224 EO_VERSION,
225 "Simple", 225 "Simple",
226 EO_CLASS_TYPE_REGULAR, 226 EO_CLASS_TYPE_REGULAR,
227 EO2_CLASS_DESCRIPTION_OPS(op_descs), 227 EO_CLASS_DESCRIPTION_OPS(op_descs),
228 NULL, 228 NULL,
229 0, 229 0,
230 NULL, 230 NULL,
231 NULL 231 NULL
232 }; 232 };
233 233
234 TEST_EO_ERROR("_eo2_class_funcs_set", "Class '%s': NULL API not allowed (%d NULL->%p '%s')."); 234 TEST_EO_ERROR("_eo_class_funcs_set", "Class '%s': NULL API not allowed (%d NULL->%p '%s').");
235 klass = eo_class_new(&class_desc, NULL, NULL); 235 klass = eo_class_new(&class_desc, NULL, NULL);
236 fail_if(klass); 236 fail_if(klass);
237 fail_unless(ctx.did); 237 fail_unless(ctx.did);
@@ -249,22 +249,22 @@ START_TEST(eo_wrong_override)
249 249
250 const Eo_Class *klass; 250 const Eo_Class *klass;
251 251
252 static Eo2_Op_Description op_descs[] = { 252 static Eo_Op_Description op_descs[] = {
253 EO2_OP_FUNC_OVERRIDE(null_fct, _null_fct), 253 EO_OP_FUNC_OVERRIDE(null_fct, _null_fct),
254 EO2_OP_SENTINEL 254 EO_OP_SENTINEL
255 }; 255 };
256 static Eo_Class_Description class_desc = { 256 static Eo_Class_Description class_desc = {
257 EO2_VERSION, 257 EO_VERSION,
258 "Simple", 258 "Simple",
259 EO_CLASS_TYPE_REGULAR, 259 EO_CLASS_TYPE_REGULAR,
260 EO2_CLASS_DESCRIPTION_OPS(op_descs), 260 EO_CLASS_DESCRIPTION_OPS(op_descs),
261 NULL, 261 NULL,
262 0, 262 0,
263 NULL, 263 NULL,
264 NULL 264 NULL
265 }; 265 };
266 266
267 TEST_EO_ERROR("_eo2_class_funcs_set", "Class '%s': Can't find api func description in class hierarchy (%p->%p)."); 267 TEST_EO_ERROR("_eo_class_funcs_set", "Class '%s': Can't find api func description in class hierarchy (%p->%p).");
268 klass = eo_class_new(&class_desc, NULL, NULL); 268 klass = eo_class_new(&class_desc, NULL, NULL);
269 fail_if(klass); 269 fail_if(klass);
270 fail_unless(ctx.did); 270 fail_unless(ctx.did);
@@ -282,23 +282,23 @@ START_TEST(eo_api_redefined)
282 282
283 const Eo_Class *klass; 283 const Eo_Class *klass;
284 284
285 static Eo2_Op_Description op_descs[] = { 285 static Eo_Op_Description op_descs[] = {
286 EO2_OP_FUNC(null_fct, _null_fct, "API function"), 286 EO_OP_FUNC(null_fct, _null_fct, "API function"),
287 EO2_OP_FUNC(null_fct, NULL, "Redefining API function"), 287 EO_OP_FUNC(null_fct, NULL, "Redefining API function"),
288 EO2_OP_SENTINEL 288 EO_OP_SENTINEL
289 }; 289 };
290 static Eo_Class_Description class_desc = { 290 static Eo_Class_Description class_desc = {
291 EO2_VERSION, 291 EO_VERSION,
292 "Simple", 292 "Simple",
293 EO_CLASS_TYPE_REGULAR, 293 EO_CLASS_TYPE_REGULAR,
294 EO2_CLASS_DESCRIPTION_OPS(op_descs), 294 EO_CLASS_DESCRIPTION_OPS(op_descs),
295 NULL, 295 NULL,
296 0, 296 0,
297 NULL, 297 NULL,
298 NULL 298 NULL
299 }; 299 };
300 300
301 TEST_EO_ERROR("_eo2_class_funcs_set", "Class '%s': API previously defined (%d %p->%p '%s')."); 301 TEST_EO_ERROR("_eo_class_funcs_set", "Class '%s': API previously defined (%d %p->%p '%s').");
302 klass = eo_class_new(&class_desc, NULL, NULL); 302 klass = eo_class_new(&class_desc, NULL, NULL);
303 fail_if(klass); 303 fail_if(klass);
304 fail_unless(ctx.did); 304 fail_unless(ctx.did);
@@ -316,16 +316,16 @@ START_TEST(eo_dich_func_override)
316 316
317 const Eo_Class *klass; 317 const Eo_Class *klass;
318 318
319 static Eo2_Op_Description op_descs[] = { 319 static Eo_Op_Description op_descs[] = {
320 EO2_OP_FUNC_OVERRIDE(simple_a_set, _null_fct), 320 EO_OP_FUNC_OVERRIDE(simple_a_set, _null_fct),
321 EO2_OP_FUNC_OVERRIDE(simple_a_set, NULL), 321 EO_OP_FUNC_OVERRIDE(simple_a_set, NULL),
322 EO2_OP_SENTINEL 322 EO_OP_SENTINEL
323 }; 323 };
324 static Eo_Class_Description class_desc = { 324 static Eo_Class_Description class_desc = {
325 EO2_VERSION, 325 EO_VERSION,
326 "Simple", 326 "Simple",
327 EO_CLASS_TYPE_REGULAR, 327 EO_CLASS_TYPE_REGULAR,
328 EO2_CLASS_DESCRIPTION_OPS(op_descs), 328 EO_CLASS_DESCRIPTION_OPS(op_descs),
329 NULL, 329 NULL,
330 0, 330 0,
331 NULL, 331 NULL,
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 89cd14e073..5b8c2e06ac 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -17,7 +17,7 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
18 pd->a = a; 18 pd->a = a;
19 19
20 eo2_do(obj, eo2_event_callback_call(EV_A_CHANGED, &pd->a)); 20 eo_do(obj, eo_event_callback_call(EV_A_CHANGED, &pd->a));
21} 21}
22 22
23static int 23static int
@@ -45,7 +45,7 @@ _class_hi_print(Eo_Class *klass, void *data EINA_UNUSED)
45 return EINA_TRUE; 45 return EINA_TRUE;
46} 46}
47 47
48EO2_VOID_FUNC_BODYV(simple_recursive, EO2_FUNC_CALL(n), int n); 48EO_VOID_FUNC_BODYV(simple_recursive, EO_FUNC_CALL(n), int n);
49 49
50static void 50static void
51_recursive(Eo *obj, void *class_data EINA_UNUSED, int n) 51_recursive(Eo *obj, void *class_data EINA_UNUSED, int n)
@@ -55,7 +55,7 @@ _recursive(Eo *obj, void *class_data EINA_UNUSED, int n)
55 if (count < n) 55 if (count < n)
56 { 56 {
57 count++; 57 count++;
58 eo2_do(obj, simple_recursive(n)); 58 eo_do(obj, simple_recursive(n));
59 } 59 }
60 else 60 else
61 count = 0; 61 count = 0;
@@ -64,39 +64,39 @@ _recursive(Eo *obj, void *class_data EINA_UNUSED, int n)
64static void 64static void
65_dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, Eo_Dbg_Info *root) 65_dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, Eo_Dbg_Info *root)
66{ 66{
67 eo2_do_super(eo_obj, MY_CLASS, eo2_dbg_info_get(root)); 67 eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
68 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, "Test list"); 68 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, "Test list");
69 EO_DBG_INFO_APPEND(group, "Test", EINA_VALUE_TYPE_INT, 8); 69 EO_DBG_INFO_APPEND(group, "Test", EINA_VALUE_TYPE_INT, 8);
70} 70}
71 71
72EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a); 72EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
73EO2_FUNC_BODY(simple_a_get, int, 0); 73EO_FUNC_BODY(simple_a_get, int, 0);
74EO2_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE); 74EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
75EO2_FUNC_BODY(simple_class_hi_print, Eina_Bool, EINA_FALSE); 75EO_FUNC_BODY(simple_class_hi_print, Eina_Bool, EINA_FALSE);
76EO2_VOID_FUNC_BODY(simple_pure_virtual); 76EO_VOID_FUNC_BODY(simple_pure_virtual);
77EO2_VOID_FUNC_BODY(simple_no_implementation); 77EO_VOID_FUNC_BODY(simple_no_implementation);
78 78
79static Eo2_Op_Description op_descs[] = { 79static Eo_Op_Description op_descs[] = {
80 EO2_OP_FUNC_OVERRIDE(eo2_dbg_info_get, _dbg_info_get), 80 EO_OP_FUNC_OVERRIDE(eo_dbg_info_get, _dbg_info_get),
81 EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"), 81 EO_OP_FUNC(simple_a_set, _a_set, "Set property a"),
82 EO2_OP_FUNC(simple_a_get, _a_get, "Get property a"), 82 EO_OP_FUNC(simple_a_get, _a_get, "Get property a"),
83 EO2_OP_FUNC(simple_a_print, _a_print, "Print property a"), 83 EO_OP_FUNC(simple_a_print, _a_print, "Print property a"),
84 EO2_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print, "Print property a"), 84 EO_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print, "Print property a"),
85 EO2_OP_FUNC(simple_recursive, _recursive, "Recursive function"), 85 EO_OP_FUNC(simple_recursive, _recursive, "Recursive function"),
86 EO2_OP_FUNC(simple_pure_virtual, NULL, "Pure Virtual function"), 86 EO_OP_FUNC(simple_pure_virtual, NULL, "Pure Virtual function"),
87 EO2_OP_SENTINEL 87 EO_OP_SENTINEL
88}; 88};
89 89
90static const Eo_Class_Description class_desc = { 90static const Eo_Class_Description class_desc = {
91 EO2_VERSION, 91 EO_VERSION,
92 "Simple", 92 "Simple",
93 EO_CLASS_TYPE_REGULAR, 93 EO_CLASS_TYPE_REGULAR,
94 EO2_CLASS_DESCRIPTION_OPS(op_descs), 94 EO_CLASS_DESCRIPTION_OPS(op_descs),
95 NULL, 95 NULL,
96 sizeof(Simple_Public_Data), 96 sizeof(Simple_Public_Data),
97 NULL, 97 NULL,
98 NULL 98 NULL
99}; 99};
100 100
101EO_DEFINE_CLASS(simple_class_get, &class_desc, EO2_BASE_CLASS, NULL) 101EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL)
102 102
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index e0a95c6cc8..a5e9f3340c 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -11,13 +11,13 @@
11START_TEST(eo_simple) 11START_TEST(eo_simple)
12{ 12{
13 eo_init(); 13 eo_init();
14 Eo *obj = eo2_add(EO2_BASE_CLASS, NULL); 14 Eo *obj = eo_add(EO_BASE_CLASS, NULL);
15 fail_if(obj); 15 fail_if(obj);
16 16
17 obj = eo2_add(SIMPLE_CLASS, NULL); 17 obj = eo_add(SIMPLE_CLASS, NULL);
18 fail_if(!obj); 18 fail_if(!obj);
19 eo2_do(obj, eo2_constructor()); 19 eo_do(obj, eo_constructor());
20 eo2_do(obj, eo2_destructor()); 20 eo_do(obj, eo_destructor());
21 eo_unref(obj); 21 eo_unref(obj);
22 22
23 eo_shutdown(); 23 eo_shutdown();
@@ -27,10 +27,10 @@ END_TEST
27START_TEST(eo_stack) 27START_TEST(eo_stack)
28{ 28{
29 eo_init(); 29 eo_init();
30 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 30 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
31 fail_if(!obj); 31 fail_if(!obj);
32 32
33 eo2_do(obj, simple_recursive(123)); 33 eo_do(obj, simple_recursive(123));
34 34
35 eo_unref(obj); 35 eo_unref(obj);
36 36
@@ -94,23 +94,23 @@ START_TEST(eo_signals)
94 { EO_EV_DEL, _eo_signals_eo_del_cb }, 94 { EO_EV_DEL, _eo_signals_eo_del_cb },
95 { NULL, NULL } 95 { NULL, NULL }
96 }; 96 };
97 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 97 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
98 98
99 eo2_do(obj, eo2_event_callback_add(EO_EV_CALLBACK_ADD, _eo_signals_cb_added_deled, callbacks)); 99 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _eo_signals_cb_added_deled, callbacks));
100 eo2_do(obj, eo2_event_callback_add(EO_EV_CALLBACK_DEL, _eo_signals_cb_added_deled, callbacks)); 100 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_DEL, _eo_signals_cb_added_deled, callbacks));
101 eo2_do(obj, eo2_event_callback_array_priority_add(callbacks, -100, (void *) 1)); 101 eo_do(obj, eo_event_callback_array_priority_add(callbacks, -100, (void *) 1));
102 eo2_do(obj, eo2_event_callback_array_add(callbacks, (void *) 3)); 102 eo_do(obj, eo_event_callback_array_add(callbacks, (void *) 3));
103 eo2_do(obj, eo2_event_callback_array_priority_add(callbacks, -50, (void *) 2)); 103 eo_do(obj, eo_event_callback_array_priority_add(callbacks, -50, (void *) 2));
104 eo2_do(obj, simple_a_set(1)); 104 eo_do(obj, simple_a_set(1));
105 ck_assert_int_eq(_eo_signals_cb_flag, 0x3); 105 ck_assert_int_eq(_eo_signals_cb_flag, 0x3);
106 106
107 eo2_do(obj, eo2_event_callback_array_del(callbacks, (void *) 1)); 107 eo_do(obj, eo_event_callback_array_del(callbacks, (void *) 1));
108 eo2_do(obj, eo2_event_callback_array_del(callbacks, (void *) 2)); 108 eo_do(obj, eo_event_callback_array_del(callbacks, (void *) 2));
109 eo2_do(obj, eo2_event_callback_array_del(callbacks, (void *) 3)); 109 eo_do(obj, eo_event_callback_array_del(callbacks, (void *) 3));
110 /* Try to delete something that doesn't exist. */ 110 /* Try to delete something that doesn't exist. */
111 eo2_do(obj, eo2_event_callback_array_del(callbacks, (void *) 4)); 111 eo_do(obj, eo_event_callback_array_del(callbacks, (void *) 4));
112 _eo_signals_cb_flag = 0; 112 _eo_signals_cb_flag = 0;
113 eo2_do(obj, simple_a_set(1)); 113 eo_do(obj, simple_a_set(1));
114 ck_assert_int_eq(_eo_signals_cb_flag, 0x0); 114 ck_assert_int_eq(_eo_signals_cb_flag, 0x0);
115 115
116 eo_unref(obj); 116 eo_unref(obj);
@@ -125,20 +125,20 @@ START_TEST(eo_data_fetch)
125 125
126 /* Usually should be const, not const only for the test... */ 126 /* Usually should be const, not const only for the test... */
127 static Eo_Class_Description class_desc = { 127 static Eo_Class_Description class_desc = {
128 EO2_VERSION, 128 EO_VERSION,
129 "Simple2", 129 "Simple2",
130 EO_CLASS_TYPE_REGULAR, 130 EO_CLASS_TYPE_REGULAR,
131 EO2_CLASS_DESCRIPTION_NOOPS(), 131 EO_CLASS_DESCRIPTION_NOOPS(),
132 NULL, 132 NULL,
133 10, 133 10,
134 NULL, 134 NULL,
135 NULL 135 NULL
136 }; 136 };
137 137
138 const Eo_Class *klass = eo_class_new(&class_desc, EO2_BASE_CLASS, NULL); 138 const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
139 fail_if(!klass); 139 fail_if(!klass);
140 140
141 Eo *obj = eo2_add(klass, NULL); 141 Eo *obj = eo_add(klass, NULL);
142 fail_if(!obj); 142 fail_if(!obj);
143#ifdef EO_DEBUG 143#ifdef EO_DEBUG
144 fail_if(eo_data_scope_get(obj, SIMPLE_CLASS)); 144 fail_if(eo_data_scope_get(obj, SIMPLE_CLASS));
@@ -146,10 +146,10 @@ START_TEST(eo_data_fetch)
146 eo_unref(obj); 146 eo_unref(obj);
147 147
148 class_desc.data_size = 0; 148 class_desc.data_size = 0;
149 klass = eo_class_new(&class_desc, EO2_BASE_CLASS, NULL); 149 klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
150 fail_if(!klass); 150 fail_if(!klass);
151 151
152 obj = eo2_add(klass, NULL); 152 obj = eo_add(klass, NULL);
153 fail_if(!obj); 153 fail_if(!obj);
154 fail_if(eo_data_scope_get(obj, klass)); 154 fail_if(eo_data_scope_get(obj, klass));
155 eo_unref(obj); 155 eo_unref(obj);
@@ -167,10 +167,10 @@ START_TEST(eo_isa_tests)
167 { 167 {
168 /* Usually should be const, not const only for the test... */ 168 /* Usually should be const, not const only for the test... */
169 static Eo_Class_Description class_desc = { 169 static Eo_Class_Description class_desc = {
170 EO2_VERSION, 170 EO_VERSION,
171 "Iface", 171 "Iface",
172 EO_CLASS_TYPE_INTERFACE, 172 EO_CLASS_TYPE_INTERFACE,
173 EO2_CLASS_DESCRIPTION_NOOPS(), 173 EO_CLASS_DESCRIPTION_NOOPS(),
174 NULL, 174 NULL,
175 0, 175 0,
176 NULL, 176 NULL,
@@ -184,10 +184,10 @@ START_TEST(eo_isa_tests)
184 { 184 {
185 /* Usually should be const, not const only for the test... */ 185 /* Usually should be const, not const only for the test... */
186 static Eo_Class_Description class_desc = { 186 static Eo_Class_Description class_desc = {
187 EO2_VERSION, 187 EO_VERSION,
188 "Mixin", 188 "Mixin",
189 EO_CLASS_TYPE_MIXIN, 189 EO_CLASS_TYPE_MIXIN,
190 EO2_CLASS_DESCRIPTION_NOOPS(), 190 EO_CLASS_DESCRIPTION_NOOPS(),
191 NULL, 191 NULL,
192 0, 192 0,
193 NULL, 193 NULL,
@@ -201,36 +201,36 @@ START_TEST(eo_isa_tests)
201 { 201 {
202 /* Usually should be const, not const only for the test... */ 202 /* Usually should be const, not const only for the test... */
203 static Eo_Class_Description class_desc = { 203 static Eo_Class_Description class_desc = {
204 EO2_VERSION, 204 EO_VERSION,
205 "Simple2", 205 "Simple2",
206 EO_CLASS_TYPE_REGULAR, 206 EO_CLASS_TYPE_REGULAR,
207 EO2_CLASS_DESCRIPTION_NOOPS(), 207 EO_CLASS_DESCRIPTION_NOOPS(),
208 NULL, 208 NULL,
209 10, 209 10,
210 NULL, 210 NULL,
211 NULL 211 NULL
212 }; 212 };
213 213
214 klass = eo_class_new(&class_desc, EO2_BASE_CLASS, iface, mixin, NULL); 214 klass = eo_class_new(&class_desc, EO_BASE_CLASS, iface, mixin, NULL);
215 fail_if(!klass); 215 fail_if(!klass);
216 } 216 }
217 217
218 Eo *obj = eo2_add(klass, NULL); 218 Eo *obj = eo_add(klass, NULL);
219 fail_if(!obj); 219 fail_if(!obj);
220 fail_if(eo_isa(obj, SIMPLE_CLASS)); 220 fail_if(eo_isa(obj, SIMPLE_CLASS));
221 fail_if(!eo_isa(obj, iface)); 221 fail_if(!eo_isa(obj, iface));
222 fail_if(!eo_isa(obj, mixin)); 222 fail_if(!eo_isa(obj, mixin));
223 fail_if(!eo_isa(obj, klass)); 223 fail_if(!eo_isa(obj, klass));
224 fail_if(!eo_isa(obj, EO2_BASE_CLASS)); 224 fail_if(!eo_isa(obj, EO_BASE_CLASS));
225 eo_unref(obj); 225 eo_unref(obj);
226 226
227 obj = eo2_add(SIMPLE_CLASS, NULL); 227 obj = eo_add(SIMPLE_CLASS, NULL);
228 fail_if(!obj); 228 fail_if(!obj);
229 fail_if(eo_isa(obj, klass)); 229 fail_if(eo_isa(obj, klass));
230 fail_if(eo_isa(obj, iface)); 230 fail_if(eo_isa(obj, iface));
231 fail_if(eo_isa(obj, mixin)); 231 fail_if(eo_isa(obj, mixin));
232 fail_if(!eo_isa(obj, SIMPLE_CLASS)); 232 fail_if(!eo_isa(obj, SIMPLE_CLASS));
233 fail_if(!eo_isa(obj, EO2_BASE_CLASS)); 233 fail_if(!eo_isa(obj, EO_BASE_CLASS));
234 eo_unref(obj); 234 eo_unref(obj);
235 235
236 eo_shutdown(); 236 eo_shutdown();
@@ -242,13 +242,13 @@ START_TEST(eo_composite_tests)
242{ 242{
243 eo_init(); 243 eo_init();
244 244
245 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 245 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
246 fail_if(!obj); 246 fail_if(!obj);
247 Eo *obj2 = eo2_add(SIMPLE_CLASS, NULL); 247 Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
248 fail_if(!obj2); 248 fail_if(!obj2);
249 249
250 eo_composite_attach(obj2, obj); 250 eo_composite_attach(obj2, obj);
251 eo2_do(obj2, eo2_parent_set(NULL)); 251 eo_do(obj2, eo_parent_set(NULL));
252 fail_if(eo_composite_is(obj2)); 252 fail_if(eo_composite_is(obj2));
253 253
254 eo_unref(obj2); 254 eo_unref(obj2);
@@ -267,21 +267,21 @@ _man_con(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED)
267{ 267{
268 if (_man_should_con) 268 if (_man_should_con)
269 eo_manual_free_set(obj, EINA_TRUE); 269 eo_manual_free_set(obj, EINA_TRUE);
270 eo2_do_super(obj, cur_klass, eo2_constructor()); 270 eo_do_super(obj, cur_klass, eo_constructor());
271} 271}
272 272
273static void 273static void
274_man_des(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED) 274_man_des(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED)
275{ 275{
276 eo2_do_super(obj, cur_klass, eo2_destructor()); 276 eo_do_super(obj, cur_klass, eo_destructor());
277 if (_man_should_des) 277 if (_man_should_des)
278 eo_manual_free_set(obj, EINA_FALSE); 278 eo_manual_free_set(obj, EINA_FALSE);
279} 279}
280 280
281static Eo2_Op_Description op_descs[] = { 281static Eo_Op_Description op_descs[] = {
282 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _man_con), 282 EO_OP_FUNC_OVERRIDE(eo_constructor, _man_con),
283 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _man_des), 283 EO_OP_FUNC_OVERRIDE(eo_destructor, _man_des),
284 EO2_OP_SENTINEL 284 EO_OP_SENTINEL
285}; 285};
286 286
287START_TEST(eo_man_free) 287START_TEST(eo_man_free)
@@ -290,35 +290,35 @@ START_TEST(eo_man_free)
290 290
291 /* Usually should be const, not const only for the test... */ 291 /* Usually should be const, not const only for the test... */
292 static Eo_Class_Description class_desc = { 292 static Eo_Class_Description class_desc = {
293 EO2_VERSION, 293 EO_VERSION,
294 "Simple2", 294 "Simple2",
295 EO_CLASS_TYPE_REGULAR, 295 EO_CLASS_TYPE_REGULAR,
296 EO2_CLASS_DESCRIPTION_OPS(op_descs), 296 EO_CLASS_DESCRIPTION_OPS(op_descs),
297 NULL, 297 NULL,
298 10, 298 10,
299 NULL, 299 NULL,
300 NULL 300 NULL
301 }; 301 };
302 302
303 const Eo_Class *klass = eo_class_new(&class_desc, EO2_BASE_CLASS, NULL); 303 const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
304 fail_if(!klass); 304 fail_if(!klass);
305 cur_klass = klass; 305 cur_klass = klass;
306 306
307 Eo *obj = eo2_add(klass, NULL); 307 Eo *obj = eo_add(klass, NULL);
308 fail_if(!obj); 308 fail_if(!obj);
309 eo_unref(obj); 309 eo_unref(obj);
310 310
311 obj = eo2_add(klass, NULL); 311 obj = eo_add(klass, NULL);
312 fail_if(!obj); 312 fail_if(!obj);
313 fail_if(eo_manual_free(obj)); 313 fail_if(eo_manual_free(obj));
314 eo_unref(obj); 314 eo_unref(obj);
315 315
316 _man_should_des = EINA_FALSE; 316 _man_should_des = EINA_FALSE;
317 klass = eo_class_new(&class_desc, EO2_BASE_CLASS, NULL); 317 klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
318 cur_klass = klass; 318 cur_klass = klass;
319 fail_if(!klass); 319 fail_if(!klass);
320 320
321 obj = eo2_add(klass, NULL); 321 obj = eo_add(klass, NULL);
322 fail_if(!obj); 322 fail_if(!obj);
323 fail_if(eo_manual_free(obj)); 323 fail_if(eo_manual_free(obj));
324 fail_if(eo_destructed_is(obj)); 324 fail_if(eo_destructed_is(obj));
@@ -326,23 +326,23 @@ START_TEST(eo_man_free)
326 fail_if(!eo_destructed_is(obj)); 326 fail_if(!eo_destructed_is(obj));
327 fail_if(!eo_manual_free(obj)); 327 fail_if(!eo_manual_free(obj));
328 328
329 obj = eo2_add(klass, NULL); 329 obj = eo_add(klass, NULL);
330 fail_if(!obj); 330 fail_if(!obj);
331 eo_unref(obj); 331 eo_unref(obj);
332 fail_if(!eo_destructed_is(obj)); 332 fail_if(!eo_destructed_is(obj));
333 fail_if(!eo_manual_free(obj)); 333 fail_if(!eo_manual_free(obj));
334 334
335 _man_should_con = EINA_FALSE; 335 _man_should_con = EINA_FALSE;
336 klass = eo_class_new(&class_desc, EO2_BASE_CLASS, NULL); 336 klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
337 cur_klass = klass; 337 cur_klass = klass;
338 fail_if(!klass); 338 fail_if(!klass);
339 339
340 obj = eo2_add(klass, NULL); 340 obj = eo_add(klass, NULL);
341 fail_if(!obj); 341 fail_if(!obj);
342 fail_if(eo_manual_free(obj)); 342 fail_if(eo_manual_free(obj));
343 eo_unref(obj); 343 eo_unref(obj);
344 344
345 obj = eo2_add(klass, NULL); 345 obj = eo_add(klass, NULL);
346 fail_if(!obj); 346 fail_if(!obj);
347 eo_manual_free_set(obj, EINA_TRUE); 347 eo_manual_free_set(obj, EINA_TRUE);
348 eo_unref(obj); 348 eo_unref(obj);
@@ -351,7 +351,7 @@ START_TEST(eo_man_free)
351 eo_unref(obj); 351 eo_unref(obj);
352 fail_if(!eo_manual_free(obj)); 352 fail_if(!eo_manual_free(obj));
353 353
354 obj = eo2_add(klass, NULL); 354 obj = eo_add(klass, NULL);
355 fail_if(!obj); 355 fail_if(!obj);
356 eo_manual_free_set(obj, EINA_TRUE); 356 eo_manual_free_set(obj, EINA_TRUE);
357 eo_unref(obj); 357 eo_unref(obj);
@@ -369,9 +369,9 @@ END_TEST
369START_TEST(eo_refs) 369START_TEST(eo_refs)
370{ 370{
371 eo_init(); 371 eo_init();
372 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 372 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
373 Eo *obj2 = eo2_add(SIMPLE_CLASS, NULL); 373 Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
374 Eo *obj3 = eo2_add(SIMPLE_CLASS, NULL); 374 Eo *obj3 = eo_add(SIMPLE_CLASS, NULL);
375 375
376 eo_xref(obj, obj2); 376 eo_xref(obj, obj2);
377 fail_if(eo_ref_get(obj) != 2); 377 fail_if(eo_ref_get(obj) != 2);
@@ -406,11 +406,11 @@ START_TEST(eo_refs)
406 eo_unref(obj3); 406 eo_unref(obj3);
407 407
408 /* Check hierarchy */ 408 /* Check hierarchy */
409 obj = eo2_add(SIMPLE_CLASS, NULL); 409 obj = eo_add(SIMPLE_CLASS, NULL);
410 obj2 = eo2_add(SIMPLE_CLASS, obj); 410 obj2 = eo_add(SIMPLE_CLASS, obj);
411 411
412 Eo *wref = NULL; 412 Eo *wref = NULL;
413 eo2_do(obj2, eo2_wref_add(&wref)); 413 eo_do(obj2, eo_wref_add(&wref));
414 fail_if(!wref); 414 fail_if(!wref);
415 415
416 eo_unref(obj2); 416 eo_unref(obj2);
@@ -422,13 +422,13 @@ START_TEST(eo_refs)
422 fail_if(wref); 422 fail_if(wref);
423 423
424 /* Just check it doesn't seg atm. */ 424 /* Just check it doesn't seg atm. */
425 obj = eo2_add(SIMPLE_CLASS, NULL); 425 obj = eo_add(SIMPLE_CLASS, NULL);
426 eo_ref(obj); 426 eo_ref(obj);
427 eo_unref(obj); 427 eo_unref(obj);
428 eo_unref(obj); 428 eo_unref(obj);
429 429
430 obj = eo2_add(SIMPLE_CLASS, NULL); 430 obj = eo_add(SIMPLE_CLASS, NULL);
431 obj2 = eo2_add(SIMPLE_CLASS, obj); 431 obj2 = eo_add(SIMPLE_CLASS, obj);
432 eo_unref(obj2); 432 eo_unref(obj2);
433 eo_ref(obj2); 433 eo_ref(obj2);
434 eo_del(obj2); 434 eo_del(obj2);
@@ -442,17 +442,17 @@ START_TEST(eo_weak_reference)
442{ 442{
443 eo_init(); 443 eo_init();
444 444
445 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 445 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
446 Eo *obj2 = eo2_add(SIMPLE_CLASS, NULL); 446 Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
447 Eo *wref = NULL, *wref2 = NULL, *wref3 = NULL; 447 Eo *wref = NULL, *wref2 = NULL, *wref3 = NULL;
448 eo2_do(obj, eo2_wref_add(&wref)); 448 eo_do(obj, eo_wref_add(&wref));
449 fail_if(!wref); 449 fail_if(!wref);
450 450
451 eo_unref(obj); 451 eo_unref(obj);
452 fail_if(wref); 452 fail_if(wref);
453 453
454 obj = eo2_add(SIMPLE_CLASS, NULL); 454 obj = eo_add(SIMPLE_CLASS, NULL);
455 eo2_do(obj, eo2_wref_add(&wref)); 455 eo_do(obj, eo_wref_add(&wref));
456 456
457 eo_ref(obj); 457 eo_ref(obj);
458 fail_if(!wref); 458 fail_if(!wref);
@@ -463,37 +463,37 @@ START_TEST(eo_weak_reference)
463 eo_unref(obj); 463 eo_unref(obj);
464 fail_if(wref); 464 fail_if(wref);
465 465
466 obj = eo2_add(SIMPLE_CLASS, NULL); 466 obj = eo_add(SIMPLE_CLASS, NULL);
467 467
468 eo2_do(obj, eo2_wref_add(&wref)); 468 eo_do(obj, eo_wref_add(&wref));
469 eo2_do(obj, eo2_wref_del(&wref)); 469 eo_do(obj, eo_wref_del(&wref));
470 fail_if(wref); 470 fail_if(wref);
471 471
472 eo2_do(obj, eo2_wref_add(&wref)); 472 eo_do(obj, eo_wref_add(&wref));
473 eo2_do(obj2, eo2_wref_del(&wref)); 473 eo_do(obj2, eo_wref_del(&wref));
474 fail_if(!wref); 474 fail_if(!wref);
475 eo2_wref_del_safe(&wref); 475 eo_wref_del_safe(&wref);
476 fail_if(wref); 476 fail_if(wref);
477 477
478 wref = obj; 478 wref = obj;
479 eo2_do(obj, eo2_wref_del(&wref)); 479 eo_do(obj, eo_wref_del(&wref));
480 fail_if(wref); 480 fail_if(wref);
481 481
482 wref = wref2 = wref3 = NULL; 482 wref = wref2 = wref3 = NULL;
483 eo2_do(obj, eo2_wref_add(&wref), eo2_wref_add(&wref2), eo2_wref_add(&wref3)); 483 eo_do(obj, eo_wref_add(&wref), eo_wref_add(&wref2), eo_wref_add(&wref3));
484 fail_if(!wref); 484 fail_if(!wref);
485 fail_if(!wref2); 485 fail_if(!wref2);
486 fail_if(!wref3); 486 fail_if(!wref3);
487 eo2_do(obj, eo2_wref_del(&wref), eo2_wref_del(&wref2), eo2_wref_del(&wref3)); 487 eo_do(obj, eo_wref_del(&wref), eo_wref_del(&wref2), eo_wref_del(&wref3));
488 fail_if(wref); 488 fail_if(wref);
489 fail_if(wref2); 489 fail_if(wref2);
490 fail_if(wref3); 490 fail_if(wref3);
491 491
492 eo2_do(obj, eo2_wref_add(&wref2), eo2_wref_add(&wref3)); 492 eo_do(obj, eo_wref_add(&wref2), eo_wref_add(&wref3));
493 wref = obj; 493 wref = obj;
494 eo2_do(obj, eo2_wref_del(&wref)); 494 eo_do(obj, eo_wref_del(&wref));
495 fail_if(wref); 495 fail_if(wref);
496 eo2_do(obj, eo2_wref_del(&wref2), eo2_wref_del(&wref3)); 496 eo_do(obj, eo_wref_del(&wref2), eo_wref_del(&wref3));
497 497
498 eo_unref(obj); 498 eo_unref(obj);
499 eo_unref(obj2); 499 eo_unref(obj2);
@@ -516,59 +516,59 @@ _fake_free_func(void *data)
516START_TEST(eo_generic_data) 516START_TEST(eo_generic_data)
517{ 517{
518 eo_init(); 518 eo_init();
519 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 519 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
520 void *data = NULL; 520 void *data = NULL;
521 521
522 eo2_do(obj, eo2_base_data_set("test1", (void *) 1, NULL)); 522 eo_do(obj, eo_base_data_set("test1", (void *) 1, NULL));
523 eo2_do(obj, data = eo2_base_data_get("test1")); 523 eo_do(obj, data = eo_base_data_get("test1"));
524 fail_if(1 != (intptr_t) data); 524 fail_if(1 != (intptr_t) data);
525 eo2_do(obj, eo2_base_data_del("test1")); 525 eo_do(obj, eo_base_data_del("test1"));
526 eo2_do(obj, data = eo2_base_data_get("test1")); 526 eo_do(obj, data = eo_base_data_get("test1"));
527 fail_if(data); 527 fail_if(data);
528 528
529 eo2_do(obj, eo2_base_data_set("test1", (void *) 1, NULL)); 529 eo_do(obj, eo_base_data_set("test1", (void *) 1, NULL));
530 eo2_do(obj, eo2_base_data_set("test2", (void *) 2, NULL)); 530 eo_do(obj, eo_base_data_set("test2", (void *) 2, NULL));
531 eo2_do(obj, data = eo2_base_data_get("test1")); 531 eo_do(obj, data = eo_base_data_get("test1"));
532 fail_if(1 != (intptr_t) data); 532 fail_if(1 != (intptr_t) data);
533 eo2_do(obj, data = eo2_base_data_get("test2")); 533 eo_do(obj, data = eo_base_data_get("test2"));
534 fail_if(2 != (intptr_t) data); 534 fail_if(2 != (intptr_t) data);
535 535
536 eo2_do(obj, data = eo2_base_data_get("test2")); 536 eo_do(obj, data = eo_base_data_get("test2"));
537 fail_if(2 != (intptr_t) data); 537 fail_if(2 != (intptr_t) data);
538 eo2_do(obj, eo2_base_data_del("test2")); 538 eo_do(obj, eo_base_data_del("test2"));
539 eo2_do(obj, data = eo2_base_data_get("test2")); 539 eo_do(obj, data = eo_base_data_get("test2"));
540 fail_if(data); 540 fail_if(data);
541 541
542 eo2_do(obj, data = eo2_base_data_get("test1")); 542 eo_do(obj, data = eo_base_data_get("test1"));
543 fail_if(1 != (intptr_t) data); 543 fail_if(1 != (intptr_t) data);
544 eo2_do(obj, eo2_base_data_del("test1")); 544 eo_do(obj, eo_base_data_del("test1"));
545 eo2_do(obj, data = eo2_base_data_get("test1")); 545 eo_do(obj, data = eo_base_data_get("test1"));
546 fail_if(data); 546 fail_if(data);
547 547
548 int a = 0; 548 int a = 0;
549 eo2_do(obj, eo2_base_data_set("test3", &a, _fake_free_func)); 549 eo_do(obj, eo_base_data_set("test3", &a, _fake_free_func));
550 eo2_do(obj, data = eo2_base_data_get("test3")); 550 eo_do(obj, data = eo_base_data_get("test3"));
551 fail_if(&a != data); 551 fail_if(&a != data);
552 eo2_do(obj, eo2_base_data_get("test3")); 552 eo_do(obj, eo_base_data_get("test3"));
553 eo2_do(obj, eo2_base_data_del("test3")); 553 eo_do(obj, eo_base_data_del("test3"));
554 fail_if(a != 1); 554 fail_if(a != 1);
555 555
556 a = 0; 556 a = 0;
557 eo2_do(obj, eo2_base_data_set("test3", &a, _fake_free_func)); 557 eo_do(obj, eo_base_data_set("test3", &a, _fake_free_func));
558 eo2_do(obj, eo2_base_data_set("test3", NULL, _fake_free_func)); 558 eo_do(obj, eo_base_data_set("test3", NULL, _fake_free_func));
559 fail_if(a != 1); 559 fail_if(a != 1);
560 a = 0; 560 a = 0;
561 data = (void *) 123; 561 data = (void *) 123;
562 eo2_do(obj, eo2_base_data_set(NULL, &a, _fake_free_func)); 562 eo_do(obj, eo_base_data_set(NULL, &a, _fake_free_func));
563 eo2_do(obj, data = eo2_base_data_get(NULL)); 563 eo_do(obj, data = eo_base_data_get(NULL));
564 fail_if(data); 564 fail_if(data);
565 eo2_do(obj, eo2_base_data_del(NULL)); 565 eo_do(obj, eo_base_data_del(NULL));
566 566
567 a = 0; 567 a = 0;
568 eo2_do(obj, eo2_base_data_set("test3", &a, _fake_free_func)); 568 eo_do(obj, eo_base_data_set("test3", &a, _fake_free_func));
569 eo2_do(obj, eo2_base_data_set("test3", NULL, NULL)); 569 eo_do(obj, eo_base_data_set("test3", NULL, NULL));
570 fail_if(a != 1); 570 fail_if(a != 1);
571 eo2_do(obj, eo2_base_data_set("test3", &a, _fake_free_func)); 571 eo_do(obj, eo_base_data_set("test3", &a, _fake_free_func));
572 572
573 eo_unref(obj); 573 eo_unref(obj);
574 fail_if(a != 2); 574 fail_if(a != 2);
@@ -586,7 +586,7 @@ START_TEST(eo_magic_checks)
586 586
587 memset(_buf, 1, sizeof(_buf)); 587 memset(_buf, 1, sizeof(_buf));
588 588
589 Eo *obj = eo2_add(SIMPLE_CLASS, (Eo *) buf); 589 Eo *obj = eo_add(SIMPLE_CLASS, (Eo *) buf);
590 fail_if(obj); 590 fail_if(obj);
591 591
592 while (1) 592 while (1)
@@ -596,28 +596,28 @@ START_TEST(eo_magic_checks)
596 Eo *wref = NULL; 596 Eo *wref = NULL;
597 Eo *obj2 = NULL; 597 Eo *obj2 = NULL;
598 598
599 obj = eo2_add((Eo_Class *) buf, NULL); 599 obj = eo_add((Eo_Class *) buf, NULL);
600 fail_if(obj); 600 fail_if(obj);
601 601
602 obj = eo2_add(SIMPLE_CLASS, NULL); 602 obj = eo_add(SIMPLE_CLASS, NULL);
603 fail_if(!obj); 603 fail_if(!obj);
604 604
605 eo2_do((Eo *) buf, simple_a_set(++i), a = simple_a_get()); 605 eo_do((Eo *) buf, simple_a_set(++i), a = simple_a_get());
606 ck_assert_int_ne(i, a); 606 ck_assert_int_ne(i, a);
607 eo2_do_super((Eo *) buf, SIMPLE_CLASS, simple_a_set(++i)); 607 eo_do_super((Eo *) buf, SIMPLE_CLASS, simple_a_set(++i));
608 eo2_do_super((Eo *) buf, SIMPLE_CLASS, a = simple_a_get()); 608 eo_do_super((Eo *) buf, SIMPLE_CLASS, a = simple_a_get());
609 ck_assert_int_ne(i, a); 609 ck_assert_int_ne(i, a);
610 eo2_do_super(obj, (const Eo_Class *) buf, simple_a_set(++i)); 610 eo_do_super(obj, (const Eo_Class *) buf, simple_a_set(++i));
611 eo2_do_super(obj, (const Eo_Class *) buf, a = simple_a_get()); 611 eo_do_super(obj, (const Eo_Class *) buf, a = simple_a_get());
612 ck_assert_int_ne(i, a); 612 ck_assert_int_ne(i, a);
613 fail_if(eo_class_get((Eo *) buf)); 613 fail_if(eo_class_get((Eo *) buf));
614 fail_if(eo_class_name_get((Eo_Class*) buf)); 614 fail_if(eo_class_name_get((Eo_Class*) buf));
615 fail_if(eo_class_get(obj) != SIMPLE_CLASS); 615 fail_if(eo_class_get(obj) != SIMPLE_CLASS);
616 fail_if(eo_class_get(SIMPLE_CLASS) != EO2_CLASS_CLASS); 616 fail_if(eo_class_get(SIMPLE_CLASS) != EO_CLASS_CLASS);
617 eo_class_funcs_set((Eo_Class *) buf, NULL); 617 eo_class_funcs_set((Eo_Class *) buf, NULL);
618 eo2_do((Eo_Class *) buf,(void) NULL); 618 eo_do((Eo_Class *) buf,(void) NULL);
619 eo2_do_super((Eo_Class *) buf, SIMPLE_CLASS, simple_a_set(++i)); 619 eo_do_super((Eo_Class *) buf, SIMPLE_CLASS, simple_a_set(++i));
620 eo2_do_super(SIMPLE_CLASS, (Eo_Class *) buf, simple_a_set(++i)); 620 eo_do_super(SIMPLE_CLASS, (Eo_Class *) buf, simple_a_set(++i));
621 fail_if(eo_class_new(NULL, (Eo_Class *) buf), NULL); 621 fail_if(eo_class_new(NULL, (Eo_Class *) buf), NULL);
622 622
623 eo_xref(obj, (Eo *) buf); 623 eo_xref(obj, (Eo *) buf);
@@ -634,9 +634,9 @@ START_TEST(eo_magic_checks)
634 634
635 fail_if(0 != eo_ref_get((Eo *) buf)); 635 fail_if(0 != eo_ref_get((Eo *) buf));
636 636
637 eo2_do((Eo *) buf, 637 eo_do((Eo *) buf,
638 eo2_wref_add(&wref), 638 eo_wref_add(&wref),
639 parent = eo2_parent_get()); 639 parent = eo_parent_get());
640 fail_if(wref); 640 fail_if(wref);
641 fail_if(parent); 641 fail_if(parent);
642 642
@@ -650,8 +650,8 @@ START_TEST(eo_magic_checks)
650 eo_composite_detach(obj, (Eo *) buf); 650 eo_composite_detach(obj, (Eo *) buf);
651 eo_composite_is((Eo *) buf); 651 eo_composite_is((Eo *) buf);
652 652
653 eo2_do(obj, eo2_event_callback_forwarder_add(NULL, (Eo *) buf)); 653 eo_do(obj, eo_event_callback_forwarder_add(NULL, (Eo *) buf));
654 eo2_do(obj, eo2_event_callback_forwarder_del(NULL, (Eo *) buf)); 654 eo_do(obj, eo_event_callback_forwarder_del(NULL, (Eo *) buf));
655 655
656 eo_manual_free_set((Eo *) buf, EINA_TRUE); 656 eo_manual_free_set((Eo *) buf, EINA_TRUE);
657 eo_manual_free((Eo *) buf); 657 eo_manual_free((Eo *) buf);
@@ -692,13 +692,13 @@ _class_hi_print(Eo_Class *klass EINA_UNUSED, void *class_data EINA_UNUSED)
692 return EINA_TRUE; 692 return EINA_TRUE;
693} 693}
694 694
695EO2_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE); 695EO_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE);
696EO2_FUNC_BODY(multi_class_hi_print, Eina_Bool, EINA_FALSE); 696EO_FUNC_BODY(multi_class_hi_print, Eina_Bool, EINA_FALSE);
697 697
698static Eo2_Op_Description _multi_do_op_descs[] = { 698static Eo_Op_Description _multi_do_op_descs[] = {
699 EO2_OP_FUNC(multi_a_print, _a_print, "Print property a"), 699 EO_OP_FUNC(multi_a_print, _a_print, "Print property a"),
700 EO2_OP_FUNC(multi_class_hi_print, _class_hi_print, "Print Hi"), 700 EO_OP_FUNC(multi_class_hi_print, _class_hi_print, "Print Hi"),
701 EO2_OP_SENTINEL 701 EO_OP_SENTINEL
702}; 702};
703 703
704START_TEST(eo_multiple_do) 704START_TEST(eo_multiple_do)
@@ -707,10 +707,10 @@ START_TEST(eo_multiple_do)
707 707
708 /* Usually should be const, not const only for the test... */ 708 /* Usually should be const, not const only for the test... */
709 static Eo_Class_Description class_desc = { 709 static Eo_Class_Description class_desc = {
710 EO2_VERSION, 710 EO_VERSION,
711 "Inherit", 711 "Inherit",
712 EO_CLASS_TYPE_REGULAR, 712 EO_CLASS_TYPE_REGULAR,
713 EO2_CLASS_DESCRIPTION_OPS(_multi_do_op_descs), 713 EO_CLASS_DESCRIPTION_OPS(_multi_do_op_descs),
714 NULL, 714 NULL,
715 0, 715 0,
716 NULL, 716 NULL,
@@ -720,17 +720,17 @@ START_TEST(eo_multiple_do)
720 const Eo_Class *klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL); 720 const Eo_Class *klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);
721 fail_if(!klass); 721 fail_if(!klass);
722 722
723 Eo *obj = eo2_add(klass, NULL); 723 Eo *obj = eo_add(klass, NULL);
724 fail_if(!obj); 724 fail_if(!obj);
725 725
726 Eina_Bool ca, cb, cc; 726 Eina_Bool ca, cb, cc;
727 727
728 ca = cb = cc = EINA_FALSE; 728 ca = cb = cc = EINA_FALSE;
729 eo2_do(obj, ca = simple_a_print(), cb = multi_a_print(), cc = multi_a_print()); 729 eo_do(obj, ca = simple_a_print(), cb = multi_a_print(), cc = multi_a_print());
730 fail_if(!(ca && cb && cc)); 730 fail_if(!(ca && cb && cc));
731 731
732 ca = cb = cc = EINA_FALSE; 732 ca = cb = cc = EINA_FALSE;
733 eo2_do(klass, ca = simple_class_hi_print(), cb = multi_class_hi_print(), cc = multi_class_hi_print()); 733 eo_do(klass, ca = simple_class_hi_print(), cb = multi_class_hi_print(), cc = multi_class_hi_print());
734 fail_if(!(ca && cb && cc)); 734 fail_if(!(ca && cb && cc));
735 735
736 eo_unref(obj); 736 eo_unref(obj);
@@ -739,23 +739,23 @@ START_TEST(eo_multiple_do)
739} 739}
740END_TEST 740END_TEST
741 741
742START_TEST(eo2_add_do_and_custom) 742START_TEST(eo_add_do_and_custom)
743{ 743{
744 Simple_Public_Data *pd = NULL; 744 Simple_Public_Data *pd = NULL;
745 Eo *obj = NULL; 745 Eo *obj = NULL;
746 eo_init(); 746 eo_init();
747 747
748 obj = eo2_add_custom(SIMPLE_CLASS, NULL, eo2_constructor()); 748 obj = eo_add_custom(SIMPLE_CLASS, NULL, eo_constructor());
749 fail_if(!obj); 749 fail_if(!obj);
750 eo_unref(obj); 750 eo_unref(obj);
751 751
752 obj = eo2_add(SIMPLE_CLASS, NULL, simple_a_set(7)); 752 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(7));
753 fail_if(!obj); 753 fail_if(!obj);
754 pd = eo_data_scope_get(obj, SIMPLE_CLASS); 754 pd = eo_data_scope_get(obj, SIMPLE_CLASS);
755 fail_if(pd->a != 7); 755 fail_if(pd->a != 7);
756 eo_unref(obj); 756 eo_unref(obj);
757 757
758 obj = eo2_add_custom(SIMPLE_CLASS, NULL, eo2_constructor(), simple_a_set(7)); 758 obj = eo_add_custom(SIMPLE_CLASS, NULL, eo_constructor(), simple_a_set(7));
759 fail_if(!obj); 759 fail_if(!obj);
760 pd = eo_data_scope_get(obj, SIMPLE_CLASS); 760 pd = eo_data_scope_get(obj, SIMPLE_CLASS);
761 fail_if(pd->a != 7); 761 fail_if(pd->a != 7);
@@ -771,21 +771,21 @@ START_TEST(eo_pointers_indirection)
771 eo_init(); 771 eo_init();
772 772
773 static const Eo_Class_Description class_desc = { 773 static const Eo_Class_Description class_desc = {
774 EO2_VERSION, 774 EO_VERSION,
775 "Simple", 775 "Simple",
776 EO_CLASS_TYPE_REGULAR, 776 EO_CLASS_TYPE_REGULAR,
777 EO2_CLASS_DESCRIPTION_NOOPS(), 777 EO_CLASS_DESCRIPTION_NOOPS(),
778 NULL, 778 NULL,
779 0, 779 0,
780 NULL, 780 NULL,
781 NULL 781 NULL
782 }; 782 };
783 783
784 const Eo_Class *klass = eo_class_new(&class_desc, EO2_BASE_CLASS, NULL); 784 const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
785 fail_if(!klass); 785 fail_if(!klass);
786 786
787 /* Check simple id validity */ 787 /* Check simple id validity */
788 Eo *obj = eo2_add(klass, NULL); 788 Eo *obj = eo_add(klass, NULL);
789 fail_if(!obj); 789 fail_if(!obj);
790 fail_if(!eo_isa(obj, klass)); 790 fail_if(!eo_isa(obj, klass));
791 obj = (Eo *)((char *)(obj) + 1); 791 obj = (Eo *)((char *)(obj) + 1);
@@ -796,10 +796,10 @@ START_TEST(eo_pointers_indirection)
796 fail_if(eo_isa(obj, klass)); 796 fail_if(eo_isa(obj, klass));
797 797
798 /* Check id invalidity after deletion */ 798 /* Check id invalidity after deletion */
799 Eo *obj1 = eo2_add(klass, NULL); 799 Eo *obj1 = eo_add(klass, NULL);
800 fail_if(!obj1); 800 fail_if(!obj1);
801 eo_unref(obj1); 801 eo_unref(obj1);
802 Eo *obj2 = eo2_add(klass, NULL); 802 Eo *obj2 = eo_add(klass, NULL);
803 fail_if(!obj2); 803 fail_if(!obj2);
804 fail_if(!eo_isa(obj2, klass)); 804 fail_if(!eo_isa(obj2, klass));
805 fail_if(eo_isa(obj1, klass)); 805 fail_if(eo_isa(obj1, klass));
@@ -812,7 +812,7 @@ START_TEST(eo_pointers_indirection)
812 /* Creation of the objects */ 812 /* Creation of the objects */
813 for ( obj_id = 0; obj_id < NB_OBJS; obj_id++) 813 for ( obj_id = 0; obj_id < NB_OBJS; obj_id++)
814 { 814 {
815 objs[obj_id] = eo2_add(klass, NULL); 815 objs[obj_id] = eo_add(klass, NULL);
816 if(!objs[obj_id]) 816 if(!objs[obj_id])
817 fail_if(!objs[obj_id]); 817 fail_if(!objs[obj_id]);
818 if(!eo_isa(objs[obj_id], klass)) 818 if(!eo_isa(objs[obj_id], klass))
@@ -828,7 +828,7 @@ START_TEST(eo_pointers_indirection)
828 /* Creation of the deleted objects */ 828 /* Creation of the deleted objects */
829 for ( obj_id = 0; obj_id < NB_OBJS; obj_id+=2000) 829 for ( obj_id = 0; obj_id < NB_OBJS; obj_id+=2000)
830 { 830 {
831 objs[obj_id] = eo2_add(klass, NULL); 831 objs[obj_id] = eo_add(klass, NULL);
832 if(!objs[obj_id]) 832 if(!objs[obj_id])
833 fail_if(!objs[obj_id]); 833 fail_if(!objs[obj_id]);
834 if(!eo_isa(objs[obj_id], klass)) 834 if(!eo_isa(objs[obj_id], klass))
@@ -860,6 +860,6 @@ void eo_test_general(TCase *tc)
860 tcase_add_test(tc, eo_generic_data); 860 tcase_add_test(tc, eo_generic_data);
861 tcase_add_test(tc, eo_magic_checks); 861 tcase_add_test(tc, eo_magic_checks);
862 tcase_add_test(tc, eo_multiple_do); 862 tcase_add_test(tc, eo_multiple_do);
863 tcase_add_test(tc, eo2_add_do_and_custom); 863 tcase_add_test(tc, eo_add_do_and_custom);
864 tcase_add_test(tc, eo_pointers_indirection); 864 tcase_add_test(tc, eo_pointers_indirection);
865} 865}
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index a954463e46..951b6551b4 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -18,9 +18,9 @@ typedef struct
18#define THREAD_TEST_CLASS thread_test_class_get() 18#define THREAD_TEST_CLASS thread_test_class_get()
19const Eo_Class *thread_test_class_get(void); 19const Eo_Class *thread_test_class_get(void);
20 20
21EO2_FUNC_BODY(thread_test_v_get, int, 0); 21EO_FUNC_BODY(thread_test_v_get, int, 0);
22EO2_VOID_FUNC_BODY(thread_test_try_swap_stack); 22EO_VOID_FUNC_BODY(thread_test_try_swap_stack);
23EO2_VOID_FUNC_BODYV(thread_test_constructor, EO2_FUNC_CALL(v), int v); 23EO_VOID_FUNC_BODYV(thread_test_constructor, EO_FUNC_CALL(v), int v);
24 24
25static int 25static int
26_v_get(Eo *obj EINA_UNUSED, void *class_data) 26_v_get(Eo *obj EINA_UNUSED, void *class_data)
@@ -53,30 +53,30 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, int v)
53{ 53{
54 Thread_Test_Public_Data *pd = class_data; 54 Thread_Test_Public_Data *pd = class_data;
55 55
56 eo2_do_super(obj, THREAD_TEST_CLASS, eo2_constructor()); 56 eo_do_super(obj, THREAD_TEST_CLASS, eo_constructor());
57 57
58 pd->v = v; 58 pd->v = v;
59} 59}
60 60
61static Eo2_Op_Description op_descs[] = { 61static Eo_Op_Description op_descs[] = {
62 EO2_OP_FUNC(thread_test_constructor, _constructor, "Constructor."), 62 EO_OP_FUNC(thread_test_constructor, _constructor, "Constructor."),
63 EO2_OP_FUNC(thread_test_v_get, _v_get, "Get property v."), 63 EO_OP_FUNC(thread_test_v_get, _v_get, "Get property v."),
64 EO2_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack, "Swap call stack frames if it is not thread safe."), 64 EO_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack, "Swap call stack frames if it is not thread safe."),
65 EO2_OP_SENTINEL 65 EO_OP_SENTINEL
66}; 66};
67 67
68static const Eo_Class_Description class_desc = { 68static const Eo_Class_Description class_desc = {
69 EO2_VERSION, 69 EO_VERSION,
70 "Thread Test", 70 "Thread Test",
71 EO_CLASS_TYPE_REGULAR, 71 EO_CLASS_TYPE_REGULAR,
72 EO2_CLASS_DESCRIPTION_OPS(op_descs), 72 EO_CLASS_DESCRIPTION_OPS(op_descs),
73 NULL, 73 NULL,
74 sizeof(Thread_Test_Public_Data), 74 sizeof(Thread_Test_Public_Data),
75 NULL, 75 NULL,
76 NULL 76 NULL
77}; 77};
78 78
79EO_DEFINE_CLASS(thread_test_class_get, &class_desc, EO2_BASE_CLASS, NULL) 79EO_DEFINE_CLASS(thread_test_class_get, &class_desc, EO_BASE_CLASS, NULL)
80 80
81static void * 81static void *
82_thread_job(void *data, Eina_Thread t EINA_UNUSED) 82_thread_job(void *data, Eina_Thread t EINA_UNUSED)
@@ -87,9 +87,9 @@ _thread_job(void *data, Eina_Thread t EINA_UNUSED)
87 if (v == 1) 87 if (v == 1)
88 eina_spinlock_take(&locks[0]); 88 eina_spinlock_take(&locks[0]);
89 89
90 obj = eo2_add_custom(THREAD_TEST_CLASS, NULL, thread_test_constructor(v)); 90 obj = eo_add_custom(THREAD_TEST_CLASS, NULL, thread_test_constructor(v));
91 91
92 eo2_do(obj, thread_test_try_swap_stack(), v = thread_test_v_get()); 92 eo_do(obj, thread_test_try_swap_stack(), v = thread_test_v_get());
93 93
94 eina_spinlock_release(&locks[1]); 94 eina_spinlock_release(&locks[1]);
95 95
diff --git a/src/tests/eo/suite/eo_test_value.c b/src/tests/eo/suite/eo_test_value.c
index 5715457657..afdec776ce 100644
--- a/src/tests/eo/suite/eo_test_value.c
+++ b/src/tests/eo/suite/eo_test_value.c
@@ -16,10 +16,10 @@ START_TEST(eo_value)
16 Eina_Value val2, eo_val; 16 Eina_Value val2, eo_val;
17 void *tmpp = NULL; 17 void *tmpp = NULL;
18 Eo_Dbg_Info *eo_dbg_info; 18 Eo_Dbg_Info *eo_dbg_info;
19 Eo *obj = eo2_add(SIMPLE_CLASS, NULL); 19 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
20 20
21 eo_dbg_info = EO_DBG_INFO_LIST_APPEND(NULL, "Root"); 21 eo_dbg_info = EO_DBG_INFO_LIST_APPEND(NULL, "Root");
22 eo2_do(obj, eo2_dbg_info_get(eo_dbg_info)); 22 eo_do(obj, eo_dbg_info_get(eo_dbg_info));
23 fail_if(!eo_dbg_info); 23 fail_if(!eo_dbg_info);
24 ck_assert_str_eq(eo_dbg_info->name, "Root"); 24 ck_assert_str_eq(eo_dbg_info->name, "Root");
25 str = eina_value_to_string(&eo_dbg_info->value); 25 str = eina_value_to_string(&eo_dbg_info->value);