summaryrefslogtreecommitdiff
path: root/legacy/elementary/src/lib/elm_interface_atspi_accessible.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-02 12:10:48 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 10:08:27 +0000
commitd16aa5956be0ce308c0eb8d8e876dd0d9af55a46 (patch)
treeae809b5766557b903abd6c1a4d9ef22459c40cff /legacy/elementary/src/lib/elm_interface_atspi_accessible.c
parent1546c9c107bac28a36422c3aed8a68d9bd1bc170 (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 '')
-rw-r--r--legacy/elementary/src/lib/elm_interface_atspi_accessible.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_accessible.c b/legacy/elementary/src/lib/elm_interface_atspi_accessible.c
index 19b198533e..700f18d4b9 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_accessible.c
+++ b/legacy/elementary/src/lib/elm_interface_atspi_accessible.c
@@ -144,10 +144,10 @@ _elm_interface_atspi_accessible_index_in_parent_get(Eo *obj, Elm_Interface_Atspi
144 Eo *chld, *parent = NULL; 144 Eo *chld, *parent = NULL;
145 int ret = 0; 145 int ret = 0;
146 146
147 eo_do(obj, parent = elm_interface_atspi_accessible_parent_get()); 147 parent = elm_interface_atspi_accessible_parent_get(obj);
148 if (!parent) return -1; 148 if (!parent) return -1;
149 149
150 eo_do(parent, children = elm_interface_atspi_accessible_children_get()); 150 children = elm_interface_atspi_accessible_children_get(parent);
151 if (!children) return -1; 151 if (!children) return -1;
152 152
153 EINA_LIST_FOREACH(children, l, chld) 153 EINA_LIST_FOREACH(children, l, chld)
@@ -172,10 +172,10 @@ _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 eo_do(obj, parent = eo_parent_get()); 175 parent = eo_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 eo_do(parent, type = elm_interface_atspi_accessible_type_get()); 178 type = elm_interface_atspi_accessible_type_get(parent);
179 if (type != ELM_ATSPI_TYPE_SKIPPED) break; 179 if (type != ELM_ATSPI_TYPE_SKIPPED) break;
180 } 180 }
181 } while (parent); 181 } while (parent);
@@ -219,7 +219,7 @@ _elm_interface_atspi_accessible_role_name_get(Eo *obj EINA_UNUSED, Elm_Interface
219{ 219{
220 Elm_Atspi_Role role; 220 Elm_Atspi_Role role;
221 221
222 eo_do(obj, role = elm_interface_atspi_accessible_role_get()); 222 role = elm_interface_atspi_accessible_role_get(obj);
223 223
224 return role > ELM_ATSPI_ROLE_LAST_DEFINED ? "" : Atspi_Name[role]; 224 return role > ELM_ATSPI_ROLE_LAST_DEFINED ? "" : Atspi_Name[role];
225} 225}
@@ -267,7 +267,7 @@ EOLIAN static const char *
267_elm_interface_atspi_accessible_localized_role_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 267_elm_interface_atspi_accessible_localized_role_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED)
268{ 268{
269 const char *ret = NULL; 269 const char *ret = NULL;
270 eo_do(obj, ret = elm_interface_atspi_accessible_role_name_get()); 270 ret = elm_interface_atspi_accessible_role_name_get(obj);
271#ifdef ENABLE_NLS 271#ifdef ENABLE_NLS
272 ret = gettext(ret); 272 ret = gettext(ret);
273#endif 273#endif
@@ -282,7 +282,7 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_
282 Eo *chld; 282 Eo *chld;
283 283
284 // By default use Eo_Base object hierarchy 284 // By default use Eo_Base object hierarchy
285 eo_do(obj, iter = eo_children_iterator_new()); 285 iter = eo_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)
@@ -331,14 +331,14 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
331 return; 331 return;
332 } 332 }
333 333
334 eo_do(accessible, type = elm_interface_atspi_accessible_type_get()); 334 type = elm_interface_atspi_accessible_type_get(accessible);
335 if (type != ELM_ATSPI_TYPE_REGULAR) 335 if (type != ELM_ATSPI_TYPE_REGULAR)
336 return; 336 return;
337 337
338 if (event == ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED) 338 if (event == ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED)
339 { 339 {
340 Elm_Atspi_Event_Children_Changed_Data *atspi_data = event_info; 340 Elm_Atspi_Event_Children_Changed_Data *atspi_data = event_info;
341 eo_do(atspi_data->child, type = elm_interface_atspi_accessible_type_get()); 341 type = elm_interface_atspi_accessible_type_get(atspi_data->child);
342 if (type != ELM_ATSPI_TYPE_REGULAR) 342 if (type != ELM_ATSPI_TYPE_REGULAR)
343 return; 343 return;
344 } 344 }
@@ -454,7 +454,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
454 if (!eina_list_data_find(rel->objects, rel_obj)) 454 if (!eina_list_data_find(rel->objects, rel_obj))
455 { 455 {
456 rel->objects = eina_list_append(rel->objects, rel_obj); 456 rel->objects = eina_list_append(rel->objects, rel_obj);
457 eo_do(rel_obj, eo_event_callback_add(EO_BASE_EVENT_DEL, _on_rel_obj_del, set)); 457 eo_event_callback_add(rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
458 } 458 }
459 return EINA_TRUE; 459 return EINA_TRUE;
460 } 460 }
@@ -467,7 +467,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
467 rel->objects = eina_list_append(rel->objects, rel_obj); 467 rel->objects = eina_list_append(rel->objects, rel_obj);
468 *set = eina_list_append(*set, rel); 468 *set = eina_list_append(*set, rel);
469 469
470 eo_do(rel_obj, eo_event_callback_add(EO_BASE_EVENT_DEL, _on_rel_obj_del, set)); 470 eo_event_callback_add(rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
471 return EINA_TRUE; 471 return EINA_TRUE;
472} 472}
473 473
@@ -483,7 +483,7 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
483 { 483 {
484 if (eina_list_data_find(rel->objects, rel_obj)) 484 if (eina_list_data_find(rel->objects, rel_obj))
485 { 485 {
486 eo_do(rel_obj, eo_event_callback_del(EO_BASE_EVENT_DEL, _on_rel_obj_del, set)); 486 eo_event_callback_del(rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
487 rel->objects = eina_list_remove(rel->objects, rel_obj); 487 rel->objects = eina_list_remove(rel->objects, rel_obj);
488 } 488 }
489 if (!rel->objects) 489 if (!rel->objects)
@@ -508,7 +508,7 @@ elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *set, Elm_Ats
508 if (rel->type == type) 508 if (rel->type == type)
509 { 509 {
510 EINA_LIST_FOREACH(rel->objects, l, obj) 510 EINA_LIST_FOREACH(rel->objects, l, obj)
511 eo_do(obj, eo_event_callback_del(EO_BASE_EVENT_DEL, _on_rel_obj_del, set)); 511 eo_event_callback_del(obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
512 *set = eina_list_remove(*set, rel); 512 *set = eina_list_remove(*set, rel);
513 elm_atspi_relation_free(rel); 513 elm_atspi_relation_free(rel);
514 return; 514 return;
@@ -526,7 +526,7 @@ elm_atspi_relation_set_free(Elm_Atspi_Relation_Set set)
526 EINA_LIST_FREE(set, rel) 526 EINA_LIST_FREE(set, rel)
527 { 527 {
528 EINA_LIST_FOREACH(rel->objects, l, obj) 528 EINA_LIST_FOREACH(rel->objects, l, obj)
529 eo_do(obj, eo_event_callback_del(EO_BASE_EVENT_DEL, _on_rel_obj_del, set)); 529 eo_event_callback_del(obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
530 elm_atspi_relation_free(rel); 530 elm_atspi_relation_free(rel);
531 } 531 }
532} 532}
@@ -591,7 +591,7 @@ _elm_interface_atspi_accessible_type_set(Eo *obj, Elm_Interface_Atspi_Accessible
591 if (val == pd->type) 591 if (val == pd->type)
592 return; 592 return;
593 593
594 eo_do(obj, parent = elm_interface_atspi_accessible_parent_get()); 594 parent = elm_interface_atspi_accessible_parent_get(obj);
595 595
596 switch (val) 596 switch (val)
597 { 597 {