summaryrefslogtreecommitdiff
path: root/src/tests/eolian_js
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-01 18:06:28 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 09:58:08 +0000
commitf21ade6123b9053fca8d1632644c48525a99d6e0 (patch)
treec5eb0445f471d21365a7a5a7b0ec7d279c11b398 /src/tests/eolian_js
parent3faf3f3fc68a839f06b311c35ba020cb25e7c9c4 (diff)
Automatic migration to Eo4.
I just ran my script (email to follow) to migrate all of the EFL automatically. This commit is *only* the automatic conversion, so it can be easily reverted and re-run.
Diffstat (limited to 'src/tests/eolian_js')
-rw-r--r--src/tests/eolian_js/eolian_js_test_constructor_method_impl.c8
-rw-r--r--src/tests/eolian_js/eolian_js_test_test_object_impl.c12
2 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c b/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c
index 1f454eb..1740e61 100644
--- a/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c
+++ b/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c
@@ -23,7 +23,7 @@ EOLIAN static Eo_Base *
23_constructor_method_class_eo_base_constructor(Eo* obj EINA_UNUSED, Constructor_Method_Class_Data *pd) 23_constructor_method_class_eo_base_constructor(Eo* obj EINA_UNUSED, Constructor_Method_Class_Data *pd)
24{ 24{
25 pd->fail = EINA_FALSE; 25 pd->fail = EINA_FALSE;
26 return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 26 return eo_constructor(eo_super(obj, MY_CLASS));
27} 27}
28 28
29EOLIAN static void 29EOLIAN static void
@@ -50,7 +50,7 @@ _constructor_method_class_eo_base_finalize(Eo *obj, Constructor_Method_Class_Dat
50 if (pd->fail) 50 if (pd->fail)
51 return NULL; 51 return NULL;
52 52
53 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 53 return eo_finalize(eo_super(obj, MY_CLASS));
54} 54}
55 55
56EOLIAN static Eina_Bool 56EOLIAN static Eina_Bool
@@ -132,7 +132,7 @@ _constructor_method_class_classoutmethod1(Eo* obj EINA_UNUSED, Constructor_Metho
132{ 132{
133 fprintf(stderr, "classoutmethod1\n"); 133 fprintf(stderr, "classoutmethod1\n");
134 fflush(stderr); 134 fflush(stderr);
135 return eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(one), constructor_method_class_constructor2(two)); 135 return eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eoid, one), constructor_method_class_constructor2(eoid, two));
136} 136}
137 137
138EOLIAN static void 138EOLIAN static void
@@ -140,7 +140,7 @@ _constructor_method_class_classoutmethod2(Eo* obj EINA_UNUSED, Constructor_Metho
140{ 140{
141 fprintf(stderr, "classoutmethod2\n"); 141 fprintf(stderr, "classoutmethod2\n");
142 fflush(stderr); 142 fflush(stderr);
143 *out_class = eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(one), constructor_method_class_constructor2(two)); 143 *out_class = eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eoid, one), constructor_method_class_constructor2(eoid, two));
144} 144}
145 145
146 146
diff --git a/src/tests/eolian_js/eolian_js_test_test_object_impl.c b/src/tests/eolian_js/eolian_js_test_test_object_impl.c
index 6f35b7e..89e9d47 100644
--- a/src/tests/eolian_js/eolian_js_test_test_object_impl.c
+++ b/src/tests/eolian_js/eolian_js_test_test_object_impl.c
@@ -29,7 +29,7 @@ _test_object_eo_base_constructor(Eo* obj, Test_Object_Data *pd)
29 fprintf(stdout, "_test_object_eo_base_constructor\n"); 29 fprintf(stdout, "_test_object_eo_base_constructor\n");
30 30
31 pd->a = 0; 31 pd->a = 0;
32 return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 32 return eo_constructor(eo_super(obj, MY_CLASS));
33} 33}
34 34
35EOLIAN static Eo * 35EOLIAN static Eo *
@@ -37,14 +37,14 @@ _test_object_eo_base_finalize(Eo *obj, Test_Object_Data *pd EINA_UNUSED)
37{ 37{
38 fprintf(stdout, "_test_object_eo_base_finalize\n"); 38 fprintf(stdout, "_test_object_eo_base_finalize\n");
39 39
40 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 40 return eo_finalize(eo_super(obj, MY_CLASS));
41} 41}
42 42
43EOLIAN static void 43EOLIAN static void
44_test_object_eo_base_destructor(Eo* obj, Test_Object_Data *pd EINA_UNUSED) 44_test_object_eo_base_destructor(Eo* obj, Test_Object_Data *pd EINA_UNUSED)
45{ 45{
46 fprintf(stdout, "_test_object_eo_base_destructor\n"); 46 fprintf(stdout, "_test_object_eo_base_destructor\n");
47 eo_do_super(obj, MY_CLASS, eo_destructor()); 47 eo_destructor(eo_super(obj, MY_CLASS));
48} 48}
49 49
50 50
@@ -175,9 +175,9 @@ _test_object_call_event(Eo* obj, Test_Object_Data *pd EINA_UNUSED)
175{ 175{
176 fprintf(stderr, "_test_object_event_call()\n"); fflush(stderr); 176 fprintf(stderr, "_test_object_event_call()\n"); fflush(stderr);
177 static Test_Struct_Ex s = {42, TEST_ENUM_EX_THIRD}; 177 static Test_Struct_Ex s = {42, TEST_ENUM_EX_THIRD};
178 eo_do(obj, eo_event_callback_call(TEST_OBJECT_EVENT_TEST, NULL)); 178 eo_event_callback_call(obj, TEST_OBJECT_EVENT_TEST, NULL);
179 eo_do(obj, eo_event_callback_call(TEST_OBJECT_EVENT_TEST_STRUCTARG, &s)); 179 eo_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRUCTARG, &s);
180 eo_do(obj, eo_event_callback_call(TEST_OBJECT_EVENT_TEST_STRINGARG, "foo")); 180 eo_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRINGARG, "foo");
181} 181}
182 182
183EOLIAN static char * 183EOLIAN static char *