summaryrefslogtreecommitdiff
path: root/src/lib/elementary/elm_interface_atspi_accessible.c
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/lib/elementary/elm_interface_atspi_accessible.c
parente64e120a51972c44fb8cae88a78bb4aa34f502c7 (diff)
Change the EFL to follow the new Eo rename.
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c
index ca8fe1ffc6..a5f2d2f234 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/elm_interface_atspi_accessible.c
@@ -117,7 +117,7 @@ const char* Atspi_Name[] = {
117 117
118struct _Elm_Atspi_Event_Handler 118struct _Elm_Atspi_Event_Handler
119{ 119{
120 Eo_Event_Cb cb; 120 Efl_Event_Cb cb;
121 void *data; 121 void *data;
122}; 122};
123 123
@@ -172,7 +172,7 @@ _elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Interface_At
172 Eo *parent = obj; 172 Eo *parent = obj;
173 173
174 do { 174 do {
175 parent = eo_parent_get(obj); 175 parent = efl_parent_get(obj);
176 if (eo_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) 176 if (eo_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
177 { 177 {
178 type = elm_interface_atspi_accessible_type_get(parent); 178 type = elm_interface_atspi_accessible_type_get(parent);
@@ -281,8 +281,8 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_
281 Eina_Iterator *iter = NULL; 281 Eina_Iterator *iter = NULL;
282 Eo *chld; 282 Eo *chld;
283 283
284 // By default use Eo_Base object hierarchy 284 // By default use Efl_Object object hierarchy
285 iter = eo_children_iterator_new(obj); 285 iter = efl_children_iterator_new(obj);
286 if (!iter) return NULL; 286 if (!iter) return NULL;
287 287
288 EINA_ITERATOR_FOREACH(iter, chld) 288 EINA_ITERATOR_FOREACH(iter, chld)
@@ -319,7 +319,7 @@ EAPI void elm_atspi_attributes_list_free(Eina_List *list)
319} 319}
320 320
321EOLIAN void 321EOLIAN void
322_elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Eo_Event_Description *event, void *event_info) 322_elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info)
323{ 323{
324 Eina_List *l; 324 Eina_List *l;
325 Elm_Atspi_Event_Handler *hdl; 325 Elm_Atspi_Event_Handler *hdl;
@@ -355,7 +355,7 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
355} 355}
356 356
357EOLIAN Elm_Atspi_Event_Handler * 357EOLIAN Elm_Atspi_Event_Handler *
358_elm_interface_atspi_accessible_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo_Event_Cb cb, void *data) 358_elm_interface_atspi_accessible_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data)
359{ 359{
360 Elm_Atspi_Event_Handler *ret = calloc(1, sizeof(Elm_Atspi_Event_Handler)); 360 Elm_Atspi_Event_Handler *ret = calloc(1, sizeof(Elm_Atspi_Event_Handler));
361 361
@@ -453,7 +453,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
453 if (!eina_list_data_find(rel->objects, rel_obj)) 453 if (!eina_list_data_find(rel->objects, rel_obj))
454 { 454 {
455 rel->objects = eina_list_append(rel->objects, rel_obj); 455 rel->objects = eina_list_append(rel->objects, rel_obj);
456 eo_event_callback_add((Eo *) rel_obj, EO_EVENT_DEL, _on_rel_obj_del, set); 456 efl_event_callback_add((Eo *) rel_obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
457 } 457 }
458 return EINA_TRUE; 458 return EINA_TRUE;
459 } 459 }
@@ -466,7 +466,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
466 rel->objects = eina_list_append(rel->objects, rel_obj); 466 rel->objects = eina_list_append(rel->objects, rel_obj);
467 *set = eina_list_append(*set, rel); 467 *set = eina_list_append(*set, rel);
468 468
469 eo_event_callback_add((Eo *) rel_obj, EO_EVENT_DEL, _on_rel_obj_del, set); 469 efl_event_callback_add((Eo *) rel_obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
470 return EINA_TRUE; 470 return EINA_TRUE;
471} 471}
472 472
@@ -482,7 +482,7 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
482 { 482 {
483 if (eina_list_data_find(rel->objects, rel_obj)) 483 if (eina_list_data_find(rel->objects, rel_obj))
484 { 484 {
485 eo_event_callback_del((Eo *) rel_obj, EO_EVENT_DEL, _on_rel_obj_del, set); 485 efl_event_callback_del((Eo *) rel_obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
486 rel->objects = eina_list_remove(rel->objects, rel_obj); 486 rel->objects = eina_list_remove(rel->objects, rel_obj);
487 } 487 }
488 if (!rel->objects) 488 if (!rel->objects)
@@ -507,7 +507,7 @@ elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *set, Elm_Ats
507 if (rel->type == type) 507 if (rel->type == type)
508 { 508 {
509 EINA_LIST_FOREACH(rel->objects, l, obj) 509 EINA_LIST_FOREACH(rel->objects, l, obj)
510 eo_event_callback_del(obj, EO_EVENT_DEL, _on_rel_obj_del, set); 510 efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
511 *set = eina_list_remove(*set, rel); 511 *set = eina_list_remove(*set, rel);
512 elm_atspi_relation_free(rel); 512 elm_atspi_relation_free(rel);
513 return; 513 return;
@@ -525,7 +525,7 @@ elm_atspi_relation_set_free(Elm_Atspi_Relation_Set set)
525 EINA_LIST_FREE(set, rel) 525 EINA_LIST_FREE(set, rel)
526 { 526 {
527 EINA_LIST_FOREACH(rel->objects, l, obj) 527 EINA_LIST_FOREACH(rel->objects, l, obj)
528 eo_event_callback_del(obj, EO_EVENT_DEL, _on_rel_obj_del, set); 528 efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
529 elm_atspi_relation_free(rel); 529 elm_atspi_relation_free(rel);
530 } 530 }
531} 531}