summaryrefslogtreecommitdiff
path: root/src/lib/efl/interfaces
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/lib/efl/interfaces
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/lib/efl/interfaces')
-rw-r--r--src/lib/efl/interfaces/efl_gfx_shape.c12
-rw-r--r--src/lib/efl/interfaces/efl_input_device.c14
-rw-r--r--src/lib/efl/interfaces/efl_model_common.c2
-rw-r--r--src/lib/efl/interfaces/efl_vpath_core.c8
-rw-r--r--src/lib/efl/interfaces/efl_vpath_file_core.c10
-rw-r--r--src/lib/efl/interfaces/efl_vpath_manager.c2
6 files changed, 24 insertions, 24 deletions
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.c b/src/lib/efl/interfaces/efl_gfx_shape.c
index bc6a284..49f59af 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.c
+++ b/src/lib/efl/interfaces/efl_gfx_shape.c
@@ -321,10 +321,10 @@ _efl_gfx_shape_interpolate(Eo *obj, Efl_Gfx_Shape_Data *pd,
321 double *pts; 321 double *pts;
322 unsigned int i, j; 322 unsigned int i, j;
323 323
324 from_pd = eo_data_scope_get(from, EFL_GFX_SHAPE_MIXIN); 324 from_pd = efl_data_scope_get(from, EFL_GFX_SHAPE_MIXIN);
325 to_pd = eo_data_scope_get(to, EFL_GFX_SHAPE_MIXIN); 325 to_pd = efl_data_scope_get(to, EFL_GFX_SHAPE_MIXIN);
326 if (!eo_isa(from, EFL_GFX_SHAPE_MIXIN) || 326 if (!efl_isa(from, EFL_GFX_SHAPE_MIXIN) ||
327 !eo_isa(to, EFL_GFX_SHAPE_MIXIN)) 327 !efl_isa(to, EFL_GFX_SHAPE_MIXIN))
328 return EINA_FALSE; 328 return EINA_FALSE;
329 if (pd == from_pd || pd == to_pd) 329 if (pd == from_pd || pd == to_pd)
330 return EINA_FALSE; 330 return EINA_FALSE;
@@ -428,7 +428,7 @@ _efl_gfx_shape_equal_commands(Eo *obj EINA_UNUSED,
428{ 428{
429 Efl_Gfx_Shape_Data *with_pd; 429 Efl_Gfx_Shape_Data *with_pd;
430 430
431 with_pd = eo_data_scope_get(with, EFL_GFX_SHAPE_MIXIN); 431 with_pd = efl_data_scope_get(with, EFL_GFX_SHAPE_MIXIN);
432 if (!with_pd) return EINA_FALSE; 432 if (!with_pd) return EINA_FALSE;
433 433
434 return _efl_gfx_shape_equal_commands_internal(with_pd, pd); 434 return _efl_gfx_shape_equal_commands_internal(with_pd, pd);
@@ -1804,7 +1804,7 @@ _efl_gfx_shape_dup(Eo *obj, Efl_Gfx_Shape_Data *pd, const Eo *dup_from)
1804 Efl_Gfx_Shape_Data *from; 1804 Efl_Gfx_Shape_Data *from;
1805 1805
1806 if (obj == dup_from) return ; 1806 if (obj == dup_from) return ;
1807 from = eo_data_scope_get(dup_from, EFL_GFX_SHAPE_MIXIN); 1807 from = efl_data_scope_get(dup_from, EFL_GFX_SHAPE_MIXIN);
1808 if (!from) return ; 1808 if (!from) return ;
1809 1809
1810 pd->public.stroke.scale = from->public.stroke.scale; 1810 pd->public.stroke.scale = from->public.stroke.scale;
diff --git a/src/lib/efl/interfaces/efl_input_device.c b/src/lib/efl/interfaces/efl_input_device.c
index cae988a..6e51972 100644
--- a/src/lib/efl/interfaces/efl_input_device.c
+++ b/src/lib/efl/interfaces/efl_input_device.c
@@ -12,7 +12,7 @@
12EOLIAN static Efl_Object * 12EOLIAN static Efl_Object *
13_efl_input_device_efl_object_constructor(Eo *obj, Efl_Input_Device_Data *pd) 13_efl_input_device_efl_object_constructor(Eo *obj, Efl_Input_Device_Data *pd)
14{ 14{
15 obj = efl_constructor(eo_super(obj, EFL_INPUT_DEVICE_CLASS)); 15 obj = efl_constructor(efl_super(obj, EFL_INPUT_DEVICE_CLASS));
16 pd->eo = obj; 16 pd->eo = obj;
17 return obj; 17 return obj;
18} 18}
@@ -26,13 +26,13 @@ _efl_input_device_efl_object_destructor(Eo *obj, Efl_Input_Device_Data *pd)
26 eina_stringshare_del(pd->desc); 26 eina_stringshare_del(pd->desc);
27 EINA_LIST_FREE(pd->children, eo_child) 27 EINA_LIST_FREE(pd->children, eo_child)
28 { 28 {
29 Efl_Input_Device_Data *child = eo_data_scope_get(eo_child, EFL_INPUT_DEVICE_CLASS); 29 Efl_Input_Device_Data *child = efl_data_scope_get(eo_child, EFL_INPUT_DEVICE_CLASS);
30 child->parent = NULL; 30 child->parent = NULL;
31 eo_unref(eo_child); 31 efl_unref(eo_child);
32 } 32 }
33 eo_unref(pd->source); 33 efl_unref(pd->source);
34 34
35 return efl_destructor(eo_super(obj, EFL_INPUT_DEVICE_CLASS)); 35 return efl_destructor(efl_super(obj, EFL_INPUT_DEVICE_CLASS));
36} 36}
37 37
38EOLIAN static void 38EOLIAN static void
@@ -63,8 +63,8 @@ EOLIAN static void
63_efl_input_device_source_set(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, Efl_Input_Device *src) 63_efl_input_device_source_set(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, Efl_Input_Device *src)
64{ 64{
65 if (pd->source == src) return; 65 if (pd->source == src) return;
66 eo_unref(pd->source); 66 efl_unref(pd->source);
67 pd->source = eo_ref(src); 67 pd->source = efl_ref(src);
68} 68}
69 69
70EOLIAN static Efl_Input_Device * 70EOLIAN static Efl_Input_Device *
diff --git a/src/lib/efl/interfaces/efl_model_common.c b/src/lib/efl/interfaces/efl_model_common.c
index b5225b7..3b32205 100644
--- a/src/lib/efl/interfaces/efl_model_common.c
+++ b/src/lib/efl/interfaces/efl_model_common.c
@@ -72,7 +72,7 @@ efl_model_list_slice(Eina_List *list, unsigned start, unsigned count)
72 72
73 EINA_LIST_FOREACH(ln, l, child) 73 EINA_LIST_FOREACH(ln, l, child)
74 { 74 {
75 eo_ref(child); 75 efl_ref(child);
76 lr = eina_list_append(lr, child); 76 lr = eina_list_append(lr, child);
77 if (eina_list_count(lr) == count) 77 if (eina_list_count(lr) == count)
78 break; 78 break;
diff --git a/src/lib/efl/interfaces/efl_vpath_core.c b/src/lib/efl/interfaces/efl_vpath_core.c
index 79532da..e3678ad 100644
--- a/src/lib/efl/interfaces/efl_vpath_core.c
+++ b/src/lib/efl/interfaces/efl_vpath_core.c
@@ -31,7 +31,7 @@ _efl_vpath_core_efl_object_constructor(Eo *obj, Efl_Vpath_Core_Data *pd)
31 const char *home, *s; 31 const char *home, *s;
32 32
33 if (vpath_core) return NULL; 33 if (vpath_core) return NULL;
34 obj = efl_constructor(eo_super(obj, MY_CLASS)); 34 obj = efl_constructor(efl_super(obj, MY_CLASS));
35 pd->meta = eina_hash_string_superfast_new 35 pd->meta = eina_hash_string_superfast_new
36 ((Eina_Free_Cb)eina_stringshare_del); 36 ((Eina_Free_Cb)eina_stringshare_del);
37 eina_spinlock_new(&(pd->lock)); 37 eina_spinlock_new(&(pd->lock));
@@ -212,14 +212,14 @@ _efl_vpath_core_efl_object_destructor(Eo *obj, Efl_Vpath_Core_Data *pd)
212 pd->meta = NULL; 212 pd->meta = NULL;
213 eina_spinlock_free(&(pd->lock)); 213 eina_spinlock_free(&(pd->lock));
214 if (vpath_core == obj) vpath_core = NULL; 214 if (vpath_core == obj) vpath_core = NULL;
215 efl_destructor(eo_super(obj, MY_CLASS)); 215 efl_destructor(efl_super(obj, MY_CLASS));
216} 216}
217 217
218EOLIAN static Efl_Vpath_Core * 218EOLIAN static Efl_Vpath_Core *
219_efl_vpath_core_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) 219_efl_vpath_core_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
220{ 220{
221 // no locks here as we expect efl to init this early in main "thread" 221 // no locks here as we expect efl to init this early in main "thread"
222 if (!vpath_core) vpath_core = eo_add(EFL_VPATH_CORE_CLASS, NULL); 222 if (!vpath_core) vpath_core = efl_add(EFL_VPATH_CORE_CLASS, NULL);
223 return vpath_core; 223 return vpath_core;
224} 224}
225 225
@@ -250,7 +250,7 @@ _efl_vpath_core_efl_vpath_fetch(Eo *obj, Efl_Vpath_Core_Data *pd EINA_UNUSED, co
250{ 250{
251 Efl_Vpath_File_Core *file; 251 Efl_Vpath_File_Core *file;
252 252
253 file = eo_add(EFL_VPATH_FILE_CORE_CLASS, obj); 253 file = efl_add(EFL_VPATH_FILE_CORE_CLASS, obj);
254 efl_vpath_file_path_set(file, path); 254 efl_vpath_file_path_set(file, path);
255 // XXX: implement parse of path then look up in hash if not just create 255 // XXX: implement parse of path then look up in hash if not just create
256 // object where path and result are the same and return that with 256 // object where path and result are the same and return that with
diff --git a/src/lib/efl/interfaces/efl_vpath_file_core.c b/src/lib/efl/interfaces/efl_vpath_file_core.c
index 23ce410..e0328e7 100644
--- a/src/lib/efl/interfaces/efl_vpath_file_core.c
+++ b/src/lib/efl/interfaces/efl_vpath_file_core.c
@@ -13,7 +13,7 @@ struct _Efl_Vpath_File_Core_Data
13EOLIAN static Efl_Object * 13EOLIAN static Efl_Object *
14_efl_vpath_file_core_efl_object_constructor(Eo *obj, Efl_Vpath_File_Core_Data *pd) 14_efl_vpath_file_core_efl_object_constructor(Eo *obj, Efl_Vpath_File_Core_Data *pd)
15{ 15{
16 obj = efl_constructor(eo_super(obj, MY_CLASS)); 16 obj = efl_constructor(efl_super(obj, MY_CLASS));
17 pd->dummy = 0; 17 pd->dummy = 0;
18 return obj; 18 return obj;
19} 19}
@@ -22,7 +22,7 @@ EOLIAN static void
22_efl_vpath_file_core_efl_object_destructor(Eo *obj, Efl_Vpath_File_Core_Data *pd) 22_efl_vpath_file_core_efl_object_destructor(Eo *obj, Efl_Vpath_File_Core_Data *pd)
23{ 23{
24 pd->dummy = 0; 24 pd->dummy = 0;
25 efl_destructor(eo_super(obj, MY_CLASS)); 25 efl_destructor(efl_super(obj, MY_CLASS));
26} 26}
27 27
28EOLIAN static Eina_Bool 28EOLIAN static Eina_Bool
@@ -31,7 +31,7 @@ _efl_vpath_file_core_efl_vpath_file_do(Eo *obj, Efl_Vpath_File_Core_Data *pd)
31 const char *path; 31 const char *path;
32 32
33 if (efl_vpath_file_result_get(obj)) 33 if (efl_vpath_file_result_get(obj))
34 return efl_vpath_file_do(eo_super(obj, MY_CLASS)); 34 return efl_vpath_file_do(efl_super(obj, MY_CLASS));
35 // vpath core didn't find a match, so it'ss likely a protocol like 35 // vpath core didn't find a match, so it'ss likely a protocol like
36 // http:// etc. etc. so deal with that here 36 // http:// etc. etc. so deal with that here
37 path = efl_vpath_file_path_get(obj); 37 path = efl_vpath_file_path_get(obj);
@@ -48,7 +48,7 @@ _efl_vpath_file_core_efl_vpath_file_do(Eo *obj, Efl_Vpath_File_Core_Data *pd)
48 48
49 // not a magic path - just set result to path 49 // not a magic path - just set result to path
50 efl_vpath_file_result_set(obj, efl_vpath_file_path_get(obj)); 50 efl_vpath_file_result_set(obj, efl_vpath_file_path_get(obj));
51 return efl_vpath_file_do(eo_super(obj, MY_CLASS)); 51 return efl_vpath_file_do(efl_super(obj, MY_CLASS));
52} 52}
53 53
54EOLIAN static void 54EOLIAN static void
@@ -56,7 +56,7 @@ _efl_vpath_file_core_efl_vpath_file_wait(Eo *obj, Efl_Vpath_File_Core_Data *pd)
56{ 56{
57 if (efl_vpath_file_result_get(obj)) 57 if (efl_vpath_file_result_get(obj))
58 { 58 {
59 efl_vpath_file_do(eo_super(obj, MY_CLASS)); 59 efl_vpath_file_do(efl_super(obj, MY_CLASS));
60 return; 60 return;
61 } 61 }
62 pd->dummy = 0; 62 pd->dummy = 0;
diff --git a/src/lib/efl/interfaces/efl_vpath_manager.c b/src/lib/efl/interfaces/efl_vpath_manager.c
index df791d2..e79e25e 100644
--- a/src/lib/efl/interfaces/efl_vpath_manager.c
+++ b/src/lib/efl/interfaces/efl_vpath_manager.c
@@ -34,7 +34,7 @@ _efl_vpath_manager_fetch(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, const char *
34 file = efl_vpath_fetch(entry->vpath, path); 34 file = efl_vpath_fetch(entry->vpath, path);
35 if (file) return file; 35 if (file) return file;
36 } 36 }
37 file = eo_add(EFL_VPATH_FILE_CLASS, NULL); 37 file = efl_add(EFL_VPATH_FILE_CLASS, NULL);
38 if (file) 38 if (file)
39 { 39 {
40 efl_vpath_file_path_set(file, path); 40 efl_vpath_file_path_set(file, path);