summaryrefslogtreecommitdiff
path: root/src/tests/eolian_js
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-10 15:23:04 +0100
committerTom Hacohen <tom@stosb.com>2016-08-11 17:04:43 +0100
commitc662934be8bcbaba60d1688e77533acbea5d09b9 (patch)
tree8e12b5ffd083024f09b7ec7fa9f979113056fb9d /src/tests/eolian_js
parente64e120a51972c44fb8cae88a78bb4aa34f502c7 (diff)
Change the EFL to follow the new Eo rename.
Diffstat (limited to 'src/tests/eolian_js')
-rw-r--r--src/tests/eolian_js/constructor_method_class.eo6
-rw-r--r--src/tests/eolian_js/eolian_js_test_constructor_method_impl.c10
-rw-r--r--src/tests/eolian_js/eolian_js_test_test_object_impl.c26
-rw-r--r--src/tests/eolian_js/test_object.eo8
4 files changed, 25 insertions, 25 deletions
diff --git a/src/tests/eolian_js/constructor_method_class.eo b/src/tests/eolian_js/constructor_method_class.eo
index 416a591..81860c2 100644
--- a/src/tests/eolian_js/constructor_method_class.eo
+++ b/src/tests/eolian_js/constructor_method_class.eo
@@ -1,4 +1,4 @@
1class Constructor_Method_Class (Eo.Base) 1class Constructor_Method_Class (Efl.Object)
2{ 2{
3 data: Constructor_Method_Class_Data; 3 data: Constructor_Method_Class_Data;
4 methods { 4 methods {
@@ -48,8 +48,8 @@ class Constructor_Method_Class (Eo.Base)
48 } 48 }
49 } 49 }
50 implements { 50 implements {
51 Eo.Base.constructor; 51 Efl.Object.constructor;
52 Eo.Base.finalize; 52 Efl.Object.finalize;
53 } 53 }
54 constructors { 54 constructors {
55 .constructor1; 55 .constructor1;
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 3ad0631..78b2852 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
@@ -19,11 +19,11 @@ typedef struct _Constructor_Method_Class_Data Constructor_Method_Class_Data;
19 19
20#define MY_CLASS CONSTRUCTOR_METHOD_CLASS_CLASS 20#define MY_CLASS CONSTRUCTOR_METHOD_CLASS_CLASS
21 21
22EOLIAN static Eo_Base * 22EOLIAN static Efl_Object *
23_constructor_method_class_eo_base_constructor(Eo* obj EINA_UNUSED, Constructor_Method_Class_Data *pd) 23_constructor_method_class_efl_object_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_constructor(eo_super(obj, MY_CLASS)); 26 return efl_constructor(eo_super(obj, MY_CLASS));
27} 27}
28 28
29EOLIAN static void 29EOLIAN static void
@@ -45,12 +45,12 @@ _constructor_method_class_constructor2(Eo* obj EINA_UNUSED, Constructor_Method_C
45} 45}
46 46
47EOLIAN static Eo * 47EOLIAN static Eo *
48_constructor_method_class_eo_base_finalize(Eo *obj, Constructor_Method_Class_Data *pd) 48_constructor_method_class_efl_object_finalize(Eo *obj, Constructor_Method_Class_Data *pd)
49{ 49{
50 if (pd->fail) 50 if (pd->fail)
51 return NULL; 51 return NULL;
52 52
53 return eo_finalize(eo_super(obj, MY_CLASS)); 53 return efl_finalize(eo_super(obj, MY_CLASS));
54} 54}
55 55
56EOLIAN static Eina_Bool 56EOLIAN static Eina_Bool
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 34981a1..1894429 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
@@ -23,31 +23,31 @@ typedef struct _Test_Object_Data Test_Object_Data;
23 23
24#define MY_CLASS TEST_OBJECT_CLASS 24#define MY_CLASS TEST_OBJECT_CLASS
25 25
26EOLIAN static Eo_Base * 26EOLIAN static Efl_Object *
27_test_object_eo_base_constructor(Eo* obj, Test_Object_Data *pd) 27_test_object_efl_object_constructor(Eo* obj, Test_Object_Data *pd)
28{ 28{
29 fprintf(stdout, "_test_object_eo_base_constructor\n"); 29 fprintf(stdout, "_test_object_efl_object_constructor\n");
30 fflush(stdout); 30 fflush(stdout);
31 31
32 pd->a = 0; 32 pd->a = 0;
33 return eo_constructor(eo_super(obj, MY_CLASS)); 33 return efl_constructor(eo_super(obj, MY_CLASS));
34} 34}
35 35
36EOLIAN static Eo * 36EOLIAN static Eo *
37_test_object_eo_base_finalize(Eo *obj, Test_Object_Data *pd EINA_UNUSED) 37_test_object_efl_object_finalize(Eo *obj, Test_Object_Data *pd EINA_UNUSED)
38{ 38{
39 fprintf(stdout, "_test_object_eo_base_finalize\n"); 39 fprintf(stdout, "_test_object_efl_object_finalize\n");
40 fflush(stdout); 40 fflush(stdout);
41 41
42 return eo_finalize(eo_super(obj, MY_CLASS)); 42 return efl_finalize(eo_super(obj, MY_CLASS));
43} 43}
44 44
45EOLIAN static void 45EOLIAN static void
46_test_object_eo_base_destructor(Eo* obj, Test_Object_Data *pd EINA_UNUSED) 46_test_object_efl_object_destructor(Eo* obj, Test_Object_Data *pd EINA_UNUSED)
47{ 47{
48 fprintf(stdout, "_test_object_eo_base_destructor\n"); 48 fprintf(stdout, "_test_object_efl_object_destructor\n");
49 fflush(stdout); 49 fflush(stdout);
50 eo_destructor(eo_super(obj, MY_CLASS)); 50 efl_destructor(eo_super(obj, MY_CLASS));
51} 51}
52 52
53 53
@@ -191,9 +191,9 @@ _test_object_event_emit(Eo* obj, Test_Object_Data *pd EINA_UNUSED)
191 fprintf(stdout, "_test_object_event_emit()\n"); 191 fprintf(stdout, "_test_object_event_emit()\n");
192 fflush(stdout); 192 fflush(stdout);
193 static Test_Struct_Ex s = {42, TEST_ENUM_EX_THIRD}; 193 static Test_Struct_Ex s = {42, TEST_ENUM_EX_THIRD};
194 eo_event_callback_call(obj, TEST_OBJECT_EVENT_TEST, NULL); 194 efl_event_callback_call(obj, TEST_OBJECT_EVENT_TEST, NULL);
195 eo_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRUCTARG, &s); 195 efl_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRUCTARG, &s);
196 eo_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRINGARG, "foo"); 196 efl_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRINGARG, "foo");
197} 197}
198 198
199EOLIAN static char * 199EOLIAN static char *
diff --git a/src/tests/eolian_js/test_object.eo b/src/tests/eolian_js/test_object.eo
index 94b4344..38e03b5 100644
--- a/src/tests/eolian_js/test_object.eo
+++ b/src/tests/eolian_js/test_object.eo
@@ -10,7 +10,7 @@ struct Test.Struct_Ex {
10 value_enum: Test.Enum_Ex; 10 value_enum: Test.Enum_Ex;
11} 11}
12 12
13class Test.Object (Eo.Base) { 13class Test.Object (Efl.Object) {
14 methods { 14 methods {
15 method_integral_in_a_check { 15 method_integral_in_a_check {
16 [[ tests integral in ]] 16 [[ tests integral in ]]
@@ -333,9 +333,9 @@ class Test.Object (Eo.Base) {
333 } 333 }
334 } 334 }
335 implements { 335 implements {
336 Eo.Base.finalize; 336 Efl.Object.finalize;
337 Eo.Base.constructor; 337 Efl.Object.constructor;
338 Eo.Base.destructor; 338 Efl.Object.destructor;
339 } 339 }
340 events { 340 events {
341 test; 341 test;