enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Efl.Access: resolve more name conflicts 

children -> access_children
type -> access_type
This commit is contained in:
Mike Blumenkrantz 2018-02-14 21:14:52 -05:00
parent 6e0d8badbb
commit b0bb09ef7a
29 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/elementary/efl_access.c
View File

@ -350,7 +350,7 @@ _efl_access_localized_role_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EIN
}
EOLIAN static Eina_List *
_efl_access_children_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
_efl_access_access_children_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
{
Eina_List *children = NULL;
Eina_Iterator *iter = NULL;
@ -653,13 +653,13 @@ _efl_access_access_root_get(Eo *class EINA_UNUSED, void *pd EINA_UNUSED)
}
EOLIAN Efl_Access_Type
_efl_access_type_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
_efl_access_access_type_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
{
return pd->type;
}
EOLIAN void
_efl_access_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Type val)
_efl_access_access_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Type val)
{
Efl_Access *parent;
if (val == pd->type)

4
src/lib/elementary/efl_access.eo
View File

@ -286,7 +286,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
role: Efl.Access.Role; [[Accessible role]]
}
}
@property children @protected @beta {
@property access_children @protected @beta {
[[Gets object's accessible children.]]
get {
}
@ -405,7 +405,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
domain: string; [[Translation domain]]
}
}
@property type @beta {
@property access_type @beta {
[[Type of accessibility object]]
get {
}

2
src/lib/elementary/efl_ui_list.c
View File

@ -970,7 +970,7 @@ _efl_ui_list_efl_ui_focus_composition_prepare(Eo *obj, Efl_Ui_List_Data *pd)
}
EOLIAN Eina_List*
_efl_ui_list_efl_access_children_get(Eo *obj, Efl_Ui_List_Data *pd)
_efl_ui_list_efl_access_access_children_get(Eo *obj, Efl_Ui_List_Data *pd)
{
Eina_List *ret = NULL, *ret2 = NULL;

2
src/lib/elementary/efl_ui_list.eo
View File

@ -92,7 +92,7 @@ class Efl.Ui.List (Efl.Ui.Layout, Efl.Ui.View, Efl.Ui.Scrollable.Interactive, Ef
// Elm.Interface.Atspi_Accessible.children { get; }
// Elm.Interface.Atspi_Widget.Action.elm_actions { get; }
// Efl.Access.Widget.Action.elm_actions { get; }
Efl.Access.children { get; }
Efl.Access.access_children { get; }
Efl.Access.Selection.selected_children_count { get; }
Efl.Access.Selection.selected_child { get; }
Efl.Access.Selection.selected_child_deselect;

2
src/lib/elementary/efl_ui_multibuttonentry.c
View File

@ -1975,7 +1975,7 @@ _efl_ui_multibuttonentry_class_constructor(Efl_Class *klass EINA_UNUSED)
}
EOLIAN static Eina_List*
_efl_ui_multibuttonentry_efl_access_children_get(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd)
_efl_ui_multibuttonentry_efl_access_access_children_get(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd)
{
Eina_List *ret;
ret = efl_access_children_get(efl_super(obj, EFL_UI_MULTIBUTTONENTRY_CLASS));

2
src/lib/elementary/efl_ui_multibuttonentry.eo
View File

@ -166,7 +166,7 @@ class Efl.Ui.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Format)
Efl.Ui.Widget.on_access_update;
Efl.Ui.Translatable.translation_update;
Efl.Ui.Widget.widget_event;
Efl.Access.children { get; }
Efl.Access.access_children { get; }
Efl.Part.part;
Efl.Ui.Format.format_cb { set; }
}

2
src/lib/elementary/efl_ui_widget.c
View File

@ -5383,7 +5383,7 @@ _efl_ui_widget_efl_access_i18n_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA
}
EOLIAN static Eina_List*
_efl_ui_widget_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd)
_efl_ui_widget_efl_access_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd)
{
Eina_List *l, *accs = NULL;
Evas_Object *widget;

2
src/lib/elementary/efl_ui_widget.eo
View File

@ -587,7 +587,7 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access,
Efl.Canvas.Group.group_member_add;
Efl.Access.i18n_name { get; }
Efl.Access.state_set { get; }
Efl.Access.children { get; }
Efl.Access.access_children { get; }
Efl.Access.attributes { get; }
Efl.Access.Component.focus_grab;
Efl.Ui.Focus.Object.focus_manager { get; }

2
src/lib/elementary/elc_hoversel.c
View File

@ -1030,7 +1030,7 @@ _elm_hoversel_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_
}
EOLIAN Eina_List*
_elm_hoversel_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *pd)
_elm_hoversel_efl_access_access_children_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *pd)
{
return eina_list_clone(pd->items);
}

2
src/lib/elementary/elc_naviframe.c
View File

@ -1950,7 +1950,7 @@ _elm_naviframe_item_pop_cb_set(Eo *eo_item EINA_UNUSED,
}
EOLIAN static Eina_List*
_elm_naviframe_item_efl_access_children_get(Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit)
_elm_naviframe_item_efl_access_access_children_get(Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit)
{
Eina_List *ret = NULL;

2
src/lib/elementary/elm_atspi_app_object.c
View File

@ -26,7 +26,7 @@ _elm_atspi_app_object_efl_object_destructor(Eo *obj EINA_UNUSED, Elm_Atspi_App_O
}
EOLIAN static Eina_List*
_elm_atspi_app_object_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
_elm_atspi_app_object_efl_access_access_children_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
{
Eina_List *l, *accs = NULL;
Evas_Object *win;

2
src/lib/elementary/elm_atspi_app_object.eo
View File

@ -8,6 +8,6 @@ class Elm.Atspi.App.Object (Efl.Object, Efl.Access)
Efl.Access.i18n_name { get; }
Efl.Access.description { get; set; }
Efl.Access.role { get; }
Efl.Access.children { get; }
Efl.Access.access_children { get; }
}
}

2
src/lib/elementary/elm_colorselector.c
View File

@ -2601,7 +2601,7 @@ _elm_colorselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED,
}
EOLIAN static Eina_List*
_elm_colorselector_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd)
_elm_colorselector_efl_access_access_children_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd)
{
Eina_List *ret = NULL;

2
src/lib/elementary/elm_colorselector.eo
View File

@ -115,7 +115,7 @@ class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition,
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Access.children { get; }
Efl.Access.access_children { get; }
}
events {
color,item,selected; [[Called when color item was selected]]

2
src/lib/elementary/elm_gengrid.c
View File

@ -5581,7 +5581,7 @@ _elm_gengrid_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_G
}
EOLIAN Eina_List*
_elm_gengrid_efl_access_children_get(Eo *obj, Elm_Gengrid_Data *sd)
_elm_gengrid_efl_access_access_children_get(Eo *obj, Elm_Gengrid_Data *sd)
{
Eina_List *ret = NULL, *ret2 = NULL;
Elm_Gen_Item *it;

2
src/lib/elementary/elm_gengrid.eo
View File

@ -515,7 +515,7 @@ class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll
Elm.Interface_Scrollable.item_loop_enabled { get; set; }
Elm.Interface_Scrollable.bounce_allow { set; }
Elm.Interface_Scrollable.policy { get; set; }
Efl.Access.children { get; }
Efl.Access.access_children { get; }
Efl.Access.state_set { get; }
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Access.Selection.selected_children_count { get; }

2
src/lib/elementary/elm_genlist.c
View File

@ -8618,7 +8618,7 @@ _elm_genlist_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_G
}
EOLIAN Eina_List*
_elm_genlist_efl_access_children_get(Eo *obj, Elm_Genlist_Data *sd)
_elm_genlist_efl_access_access_children_get(Eo *obj, Elm_Genlist_Data *sd)
{
Eina_List *ret = NULL, *ret2 = NULL;
Elm_Gen_Item *it;

2
src/lib/elementary/elm_genlist.eo
View File

@ -544,7 +544,7 @@ class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll
Elm.Interface_Scrollable.item_loop_enabled { get; set; }
Elm.Interface_Scrollable.bounce_allow { get; set; }
Elm.Interface_Scrollable.policy { get; set; }
Efl.Access.children { get; }
Efl.Access.access_children { get; }
Efl.Access.state_set { get; }
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Access.Selection.selected_children_count { get; }

2
src/lib/elementary/elm_hoversel.eo
View File

@ -102,7 +102,7 @@ class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable,
Efl.Ui.Widget.widget_event;
Efl.Ui.Autorepeat.autorepeat_supported { get; }
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Access.children { get; }
Efl.Access.access_children { get; }
}
events {
dismissed; [[Called when hoversel is dismissed]]

2
src/lib/elementary/elm_index.c
View File

@ -1677,7 +1677,7 @@ _item_action_activate(Eo *obj, const char *params EINA_UNUSED EINA_UNUSED)
}
EOLIAN static Eina_List*
_elm_index_efl_access_children_get(Eo *obj, Elm_Index_Data *data)
_elm_index_efl_access_access_children_get(Eo *obj, Elm_Index_Data *data)
{
Eina_List *ret;
ret = efl_access_children_get(efl_super(obj, ELM_INDEX_CLASS));

2
src/lib/elementary/elm_index.eo
View File

@ -200,7 +200,7 @@ class Elm.Index (Efl.Ui.Layout, Efl.Ui.Direction,
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $vertical.]] }
Efl.Access.children { get; }
Efl.Access.access_children { get; }
}
events {
changed; [[Called when index changed]]

2
src/lib/elementary/elm_list.c
View File

@ -3130,7 +3130,7 @@ _elm_list_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_List
}
EOLIAN Eina_List*
_elm_list_efl_access_children_get(Eo *obj, Elm_List_Data *pd)
_elm_list_efl_access_access_children_get(Eo *obj, Elm_List_Data *pd)
{
Eina_List *ret;
ret = efl_access_children_get(efl_super(obj, ELM_LIST_CLASS));

2
src/lib/elementary/elm_list.eo
View File

@ -445,7 +445,7 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
Elm.Interface_Scrollable.item_loop_enabled { get; set; }
Elm.Interface_Scrollable.policy { set; }
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Access.children { get; }
Efl.Access.access_children { get; }
Efl.Access.Selection.selected_children_count { get; }
Efl.Access.Selection.selected_child { get; }
Efl.Access.Selection.selected_child_deselect;

4
src/lib/elementary/elm_menu.c
View File

@ -1380,7 +1380,7 @@ _elm_menu_class_constructor(Efl_Class *klass)
}
EOLIAN static Eina_List*
_elm_menu_efl_access_children_get(Eo *obj, Elm_Menu_Data *sd)
_elm_menu_efl_access_access_children_get(Eo *obj, Elm_Menu_Data *sd)
{
Eina_List *ret;
ret = efl_access_children_get(efl_super(obj, ELM_MENU_CLASS));
@ -1388,7 +1388,7 @@ _elm_menu_efl_access_children_get(Eo *obj, Elm_Menu_Data *sd)
}
EOLIAN static Eina_List*
_elm_menu_item_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd)
_elm_menu_item_efl_access_access_children_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd)
{
return eina_list_clone(sd->submenu.items);
}

2
src/lib/elementary/elm_menu.eo
View File

@ -62,7 +62,7 @@ class Elm.Menu (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Menu,
Efl.Ui.Widget.theme_apply;
Efl.Ui.Translatable.translation_update;
Efl.Ui.Widget.focus_manager_create;
Efl.Access.children { get; }
Efl.Access.access_children { get; }
Efl.Access.Selection.selected_children_count { get; }
Efl.Access.Selection.selected_child { get; }
Efl.Ui.Menu.selected_item { get; }

2
src/lib/elementary/elm_menu_item.eo
View File

@ -64,7 +64,7 @@ class Elm.Menu.Item(Elm.Widget.Item, Efl.Access.Selection,
Elm.Widget.Item.signal_emit;
Elm.Widget.Item.part_text { get; set; }
Elm.Widget.Item.part_content { get; set; }
Efl.Access.children { get; }
Efl.Access.access_children { get; }
Efl.Access.role { get; }
Efl.Access.i18n_name { get; }
Efl.Access.state_set { get; }

2
src/lib/elementary/elm_naviframe_item.eo
View File

@ -72,6 +72,6 @@ class Elm.Naviframe.Item(Elm.Widget.Item, Efl.Ui.Legacy)
Elm.Widget.Item.part_content { get; set; }
Elm.Widget.Item.part_content_unset;
Elm.Widget.Item.style { set; }
Efl.Access.children { get; }
Efl.Access.access_children { get; }
}
}

2
src/lib/elementary/elm_toolbar.c
View File

@ -3920,7 +3920,7 @@ _elm_toolbar_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_T
}
EOLIAN static Eina_List*
_elm_toolbar_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd)
_elm_toolbar_efl_access_access_children_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd)
{
Eina_List *ret = NULL, *ret2 = NULL;
Elm_Toolbar_Item_Data *it;

2
src/lib/elementary/elm_toolbar.eo
View File

@ -330,7 +330,7 @@ class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scroll
Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $horizontal.]] }
Efl.Ui.Widget.focus_state_apply;
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Access.children { get; }
Efl.Access.access_children { get; }
Efl.Access.state_set { get; }
Efl.Access.Selection.selected_children_count { get; }
Efl.Access.Selection.selected_child { get; }