diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo index bcaa5097e5..4f54020558 100644 --- a/src/lib/elementary/efl_access_object.eo +++ b/src/lib/elementary/efl_access_object.eo @@ -118,7 +118,6 @@ enum Efl.Access.Role enum Efl.Access.State_Type { [[Describes the possible states for an object visible to accessibility clients.]] - legacy: efl_access_state; invalid, [[State: invalid]] active, [[State: active]] armed, [[State: armed]] @@ -166,7 +165,6 @@ enum Efl.Access.State_Type enum Efl.Access.Relation_Type { [[Describes the relationship between two objects.]] - legacy: efl_access_relation; null, [[No relation]] label_for, [[Label for relation]] labelled_by, [[Labelled by relation]] @@ -413,8 +411,8 @@ mixin @beta Efl.Access.Object requires Efl.Object provide customized feedback, improving overall user experience. Relationship_append API is asymmetric, which means that - appending, for example, relation EFL_ACCESS_RELATION_FLOWS_TO from object A to B, - do NOT append relation EFL_ACCESS_RELATION_FLOWS_FROM from object B to + appending, for example, relation EFL_ACCESS_RELATION_TYPE_FLOWS_TO from object A to B, + do NOT append relation EFL_ACCESS_RELATION_TYPE_FLOWS_FROM from object B to object A.]] return: bool; [[$true if relationship was successfully appended, $false otherwise]] params { diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index 175c47fb0f..488672a9a7 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -100,7 +100,7 @@ _activate(Evas_Object *obj) if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(obj, - EFL_ACCESS_STATE_CHECKED, + EFL_ACCESS_STATE_TYPE_CHECKED, efl_ui_nstate_value_get(obj)); } @@ -112,7 +112,7 @@ _efl_ui_check_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Check_Data * states = efl_access_object_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS)); if (elm_check_state_get(obj)) - STATE_TYPE_SET(states, EFL_ACCESS_STATE_CHECKED); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_CHECKED); return states; } @@ -233,7 +233,7 @@ _on_check_off(void *data, if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(data, - EFL_ACCESS_STATE_CHECKED, + EFL_ACCESS_STATE_TYPE_CHECKED, efl_ui_nstate_value_get(obj)); } @@ -258,7 +258,7 @@ _on_check_on(void *data, if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(data, - EFL_ACCESS_STATE_CHECKED, + EFL_ACCESS_STATE_TYPE_CHECKED, efl_ui_nstate_value_get(obj)); } diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index e31ada969c..63a0e4d473 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -88,7 +88,7 @@ _state_set(Evas_Object *obj, Eina_Bool state, Eina_Bool activate) { if (sd->state) { - efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_CHECKED, EINA_TRUE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_CHECKED, EINA_TRUE); } } } @@ -359,7 +359,7 @@ _efl_ui_radio_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Radio_Data * ret = efl_access_object_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS)); if (obj == elm_radio_selected_object_get(obj)) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_CHECKED); return ret; } diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index eb18a80233..11db0bea6a 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -953,7 +953,7 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd) if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_TRUE); _return_key_enabled_check(obj); _validate(obj); } @@ -969,7 +969,7 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd) if (top && top_is_win && sd->input_panel_enable) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_FALSE); if (_elm_config->selection_clear_enable) { @@ -3371,7 +3371,7 @@ _efl_ui_text_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Text_Data *_p ret = efl_access_object_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS)); if (efl_text_interactive_editable_get(obj)) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_EDITABLE); return ret; } diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 3b91def02f..5c8aa75748 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -884,11 +884,11 @@ _efl_ui_widget_efl_gfx_entity_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Ei { efl_access_added(obj); if (_elm_widget_onscreen_is(obj)) - efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_SHOWING, EINA_TRUE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_SHOWING, EINA_TRUE); } else { - efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_SHOWING, EINA_FALSE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_SHOWING, EINA_FALSE); } } @@ -3973,18 +3973,18 @@ _elm_widget_item_efl_access_object_state_set_get(const Eo *eo_item, { Efl_Access_State_Set states = 0; - STATE_TYPE_SET(states, EFL_ACCESS_STATE_FOCUSABLE); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_FOCUSABLE); if (elm_object_item_focus_get(eo_item)) - STATE_TYPE_SET(states, EFL_ACCESS_STATE_FOCUSED); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_FOCUSED); if (!elm_object_item_disabled_get(eo_item)) { - STATE_TYPE_SET(states, EFL_ACCESS_STATE_ENABLED); - STATE_TYPE_SET(states, EFL_ACCESS_STATE_SENSITIVE); - STATE_TYPE_SET(states, EFL_ACCESS_STATE_VISIBLE); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_ENABLED); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_SENSITIVE); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_VISIBLE); } if (_elm_widget_item_onscreen_is(eo_item)) - STATE_TYPE_SET(states, EFL_ACCESS_STATE_SHOWING); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_SHOWING); return states; } @@ -5099,7 +5099,7 @@ _efl_ui_widget_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Widget_Smart_Dat evas_object_focus_set(obj, focused); if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj)) - efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, focused); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_FOCUSED, focused); return EINA_TRUE; } @@ -5186,21 +5186,21 @@ _efl_ui_widget_efl_access_object_state_set_get(const Eo *obj, Elm_Widget_Smart_D if (evas_object_visible_get(obj)) { - STATE_TYPE_SET(states, EFL_ACCESS_STATE_VISIBLE); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_VISIBLE); if (_elm_widget_onscreen_is(obj)) - STATE_TYPE_SET(states, EFL_ACCESS_STATE_SHOWING); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_SHOWING); } if (!elm_widget_child_can_focus_get(obj)) { if (elm_object_focus_allow_get(obj)) - STATE_TYPE_SET(states, EFL_ACCESS_STATE_FOCUSABLE); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_FOCUSABLE); if (elm_object_focus_get(obj)) - STATE_TYPE_SET(states, EFL_ACCESS_STATE_FOCUSED); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_FOCUSED); } if (!elm_object_disabled_get(obj)) { - STATE_TYPE_SET(states, EFL_ACCESS_STATE_ENABLED); - STATE_TYPE_SET(states, EFL_ACCESS_STATE_SENSITIVE); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_ENABLED); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_SENSITIVE); } return states; diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 3b2fe25747..1458d9a7fe 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -1400,7 +1400,7 @@ _elm_win_focus_in(Ecore_Evas *ee) if (_elm_config->atspi_mode) { efl_access_window_activated_signal_emit(obj); - efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_ACTIVE, EINA_TRUE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_ACTIVE, EINA_TRUE); } /* do nothing */ @@ -1447,7 +1447,7 @@ _elm_win_focus_out(Ecore_Evas *ee) if (_elm_config->atspi_mode) { efl_access_window_deactivated_signal_emit(obj); - efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_ACTIVE, EINA_FALSE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_ACTIVE, EINA_FALSE); } if (sd->type != EFL_UI_WIN_TYPE_FAKE) @@ -7276,7 +7276,7 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUS target = efl_ui_focus_manager_focus_get(m); } if (target) - efl_access_state_changed_signal_emit(target, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(target, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_TRUE); } else efl_access_window_deactivated_signal_emit(win); @@ -7323,7 +7323,7 @@ _efl_ui_win_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Win_Data *sd E ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS)); if (elm_win_focus_get(obj)) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_ACTIVE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_ACTIVE); return ret; } diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 1d10e820d6..3222c652c4 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -1515,7 +1515,7 @@ _elm_ctxpopup_efl_access_object_state_set_get(const Eo *obj, Elm_Ctxpopup_Data * Efl_Access_State_Set ret; ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS)); - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_MODAL); return ret; } diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index 782cd84865..6aa9b94673 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -495,7 +495,7 @@ _on_item_clicked(void *data, if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(eo_it, - EFL_ACCESS_STATE_CHECKED, + EFL_ACCESS_STATE_TYPE_CHECKED, EINA_TRUE); if (sd->selected_it) @@ -1974,10 +1974,10 @@ _elm_multibuttonentry_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_ sel = elm_obj_multibuttonentry_item_selected_get(eo_it); - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_EDITABLE); if (sel) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_CHECKED); return ret; } diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index c4525759b6..5c575b3827 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -1816,7 +1816,7 @@ _elm_popup_efl_access_object_state_set_get(const Eo *obj, Elm_Popup_Data *sd EIN Efl_Access_State_Set ret; ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS)); - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_MODAL); return ret; } diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c index 588a0c6762..035292f089 100644 --- a/src/lib/elementary/elm_access.c +++ b/src/lib/elementary/elm_access.c @@ -1531,8 +1531,8 @@ _elm_access_efl_access_object_state_set_get(const Eo *obj, void *pd EINA_UNUSED) Elm_Access_Info *info = _elm_access_info_get(obj); if (info && !evas_object_visible_get(info->part_object)) { - STATE_TYPE_UNSET(ret, EFL_ACCESS_STATE_VISIBLE); - STATE_TYPE_UNSET(ret, EFL_ACCESS_STATE_SHOWING); + STATE_TYPE_UNSET(ret, EFL_ACCESS_STATE_TYPE_VISIBLE); + STATE_TYPE_UNSET(ret, EFL_ACCESS_STATE_TYPE_SHOWING); } return ret; diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index 0f95798e84..53e79cc3fa 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c @@ -397,71 +397,71 @@ struct atspi_state_desc }; static const struct atspi_state_desc elm_states_to_atspi_state[] = { - { EFL_ACCESS_STATE_INVALID, ATSPI_STATE_INVALID, "invalid" }, - { EFL_ACCESS_STATE_ACTIVE, ATSPI_STATE_ACTIVE, "active" }, - { EFL_ACCESS_STATE_ARMED, ATSPI_STATE_ARMED, "armed" }, - { EFL_ACCESS_STATE_BUSY, ATSPI_STATE_BUSY, "busy" }, - { EFL_ACCESS_STATE_CHECKED, ATSPI_STATE_CHECKED, "checked" }, - { EFL_ACCESS_STATE_COLLAPSED, ATSPI_STATE_COLLAPSED, "collapsed" }, - { EFL_ACCESS_STATE_DEFUNCT, ATSPI_STATE_DEFUNCT, "defunct" }, - { EFL_ACCESS_STATE_EDITABLE, ATSPI_STATE_EDITABLE, "editable" }, - { EFL_ACCESS_STATE_ENABLED, ATSPI_STATE_ENABLED, "enabled" }, - { EFL_ACCESS_STATE_EXPANDABLE, ATSPI_STATE_EXPANDABLE, "expandable" }, - { EFL_ACCESS_STATE_EXPANDED, ATSPI_STATE_EXPANDED, "expanded" }, - { EFL_ACCESS_STATE_FOCUSABLE, ATSPI_STATE_FOCUSABLE, "focusable" }, - { EFL_ACCESS_STATE_FOCUSED, ATSPI_STATE_FOCUSED, "focused" }, - { EFL_ACCESS_STATE_HAS_TOOLTIP, ATSPI_STATE_HAS_TOOLTIP, "has-tooltip" }, - { EFL_ACCESS_STATE_HORIZONTAL, ATSPI_STATE_HORIZONTAL, "horizontal" }, - { EFL_ACCESS_STATE_MINIMIZED, ATSPI_STATE_ICONIFIED, "minimized" }, - { EFL_ACCESS_STATE_MODAL, ATSPI_STATE_MODAL, "modal" }, - { EFL_ACCESS_STATE_MULTI_LINE, ATSPI_STATE_MULTI_LINE, "multi-line" }, - { EFL_ACCESS_STATE_MULTISELECTABLE, ATSPI_STATE_MULTISELECTABLE, "multiselectable" }, - { EFL_ACCESS_STATE_OPAQUE, ATSPI_STATE_OPAQUE, "opaque" }, - { EFL_ACCESS_STATE_PRESSED, ATSPI_STATE_PRESSED, "pressed" }, - { EFL_ACCESS_STATE_RESIZABLE, ATSPI_STATE_RESIZABLE, "resizable" }, - { EFL_ACCESS_STATE_SELECTABLE, ATSPI_STATE_SELECTABLE, "selectable" }, - { EFL_ACCESS_STATE_SELECTED, ATSPI_STATE_SELECTED, "selected" }, - { EFL_ACCESS_STATE_SENSITIVE, ATSPI_STATE_SENSITIVE, "sensitive" }, - { EFL_ACCESS_STATE_SHOWING, ATSPI_STATE_SHOWING, "showing" }, - { EFL_ACCESS_STATE_SINGLE_LINE, ATSPI_STATE_SINGLE_LINE, "single-line" }, - { EFL_ACCESS_STATE_STALE, ATSPI_STATE_STALE, "stale" }, - { EFL_ACCESS_STATE_TRANSIENT, ATSPI_STATE_TRANSIENT, "transient" }, - { EFL_ACCESS_STATE_VERTICAL, ATSPI_STATE_VERTICAL, "vertical" }, - { EFL_ACCESS_STATE_VISIBLE, ATSPI_STATE_VISIBLE, "visible" }, - { EFL_ACCESS_STATE_MANAGES_DESCENDANTS, ATSPI_STATE_MANAGES_DESCENDANTS, "manages-descendants" }, - { EFL_ACCESS_STATE_INDETERMINATE, ATSPI_STATE_INDETERMINATE, "indeterminate" }, - { EFL_ACCESS_STATE_REQUIRED, ATSPI_STATE_REQUIRED, "required" }, - { EFL_ACCESS_STATE_TRUNCATED, ATSPI_STATE_TRUNCATED, "truncated" }, - { EFL_ACCESS_STATE_ANIMATED, ATSPI_STATE_ANIMATED, "animated" }, - { EFL_ACCESS_STATE_INVALID_ENTRY, ATSPI_STATE_INVALID_ENTRY, "invalid-entry" }, - { EFL_ACCESS_STATE_SUPPORTS_AUTOCOMPLETION, ATSPI_STATE_SUPPORTS_AUTOCOMPLETION, "supports-autocompletion" }, - { EFL_ACCESS_STATE_SELECTABLE_TEXT, ATSPI_STATE_SELECTABLE_TEXT, "selectable-text" }, - { EFL_ACCESS_STATE_IS_DEFAULT, ATSPI_STATE_IS_DEFAULT, "is-default" }, - { EFL_ACCESS_STATE_VISITED, ATSPI_STATE_VISITED, "visited" }, - { EFL_ACCESS_STATE_LAST_DEFINED, ATSPI_STATE_LAST_DEFINED, "last-defined" }, + { EFL_ACCESS_STATE_TYPE_INVALID, ATSPI_STATE_INVALID, "invalid" }, + { EFL_ACCESS_STATE_TYPE_ACTIVE, ATSPI_STATE_ACTIVE, "active" }, + { EFL_ACCESS_STATE_TYPE_ARMED, ATSPI_STATE_ARMED, "armed" }, + { EFL_ACCESS_STATE_TYPE_BUSY, ATSPI_STATE_BUSY, "busy" }, + { EFL_ACCESS_STATE_TYPE_CHECKED, ATSPI_STATE_CHECKED, "checked" }, + { EFL_ACCESS_STATE_TYPE_COLLAPSED, ATSPI_STATE_COLLAPSED, "collapsed" }, + { EFL_ACCESS_STATE_TYPE_DEFUNCT, ATSPI_STATE_DEFUNCT, "defunct" }, + { EFL_ACCESS_STATE_TYPE_EDITABLE, ATSPI_STATE_EDITABLE, "editable" }, + { EFL_ACCESS_STATE_TYPE_ENABLED, ATSPI_STATE_ENABLED, "enabled" }, + { EFL_ACCESS_STATE_TYPE_EXPANDABLE, ATSPI_STATE_EXPANDABLE, "expandable" }, + { EFL_ACCESS_STATE_TYPE_EXPANDED, ATSPI_STATE_EXPANDED, "expanded" }, + { EFL_ACCESS_STATE_TYPE_FOCUSABLE, ATSPI_STATE_FOCUSABLE, "focusable" }, + { EFL_ACCESS_STATE_TYPE_FOCUSED, ATSPI_STATE_FOCUSED, "focused" }, + { EFL_ACCESS_STATE_TYPE_HAS_TOOLTIP, ATSPI_STATE_HAS_TOOLTIP, "has-tooltip" }, + { EFL_ACCESS_STATE_TYPE_HORIZONTAL, ATSPI_STATE_HORIZONTAL, "horizontal" }, + { EFL_ACCESS_STATE_TYPE_MINIMIZED, ATSPI_STATE_ICONIFIED, "minimized" }, + { EFL_ACCESS_STATE_TYPE_MODAL, ATSPI_STATE_MODAL, "modal" }, + { EFL_ACCESS_STATE_TYPE_MULTI_LINE, ATSPI_STATE_MULTI_LINE, "multi-line" }, + { EFL_ACCESS_STATE_TYPE_MULTISELECTABLE, ATSPI_STATE_MULTISELECTABLE, "multiselectable" }, + { EFL_ACCESS_STATE_TYPE_OPAQUE, ATSPI_STATE_OPAQUE, "opaque" }, + { EFL_ACCESS_STATE_TYPE_PRESSED, ATSPI_STATE_PRESSED, "pressed" }, + { EFL_ACCESS_STATE_TYPE_RESIZABLE, ATSPI_STATE_RESIZABLE, "resizable" }, + { EFL_ACCESS_STATE_TYPE_SELECTABLE, ATSPI_STATE_SELECTABLE, "selectable" }, + { EFL_ACCESS_STATE_TYPE_SELECTED, ATSPI_STATE_SELECTED, "selected" }, + { EFL_ACCESS_STATE_TYPE_SENSITIVE, ATSPI_STATE_SENSITIVE, "sensitive" }, + { EFL_ACCESS_STATE_TYPE_SHOWING, ATSPI_STATE_SHOWING, "showing" }, + { EFL_ACCESS_STATE_TYPE_SINGLE_LINE, ATSPI_STATE_SINGLE_LINE, "single-line" }, + { EFL_ACCESS_STATE_TYPE_STALE, ATSPI_STATE_STALE, "stale" }, + { EFL_ACCESS_STATE_TYPE_TRANSIENT, ATSPI_STATE_TRANSIENT, "transient" }, + { EFL_ACCESS_STATE_TYPE_VERTICAL, ATSPI_STATE_VERTICAL, "vertical" }, + { EFL_ACCESS_STATE_TYPE_VISIBLE, ATSPI_STATE_VISIBLE, "visible" }, + { EFL_ACCESS_STATE_TYPE_MANAGES_DESCENDANTS, ATSPI_STATE_MANAGES_DESCENDANTS, "manages-descendants" }, + { EFL_ACCESS_STATE_TYPE_INDETERMINATE, ATSPI_STATE_INDETERMINATE, "indeterminate" }, + { EFL_ACCESS_STATE_TYPE_REQUIRED, ATSPI_STATE_REQUIRED, "required" }, + { EFL_ACCESS_STATE_TYPE_TRUNCATED, ATSPI_STATE_TRUNCATED, "truncated" }, + { EFL_ACCESS_STATE_TYPE_ANIMATED, ATSPI_STATE_ANIMATED, "animated" }, + { EFL_ACCESS_STATE_TYPE_INVALID_ENTRY, ATSPI_STATE_INVALID_ENTRY, "invalid-entry" }, + { EFL_ACCESS_STATE_TYPE_SUPPORTS_AUTOCOMPLETION, ATSPI_STATE_SUPPORTS_AUTOCOMPLETION, "supports-autocompletion" }, + { EFL_ACCESS_STATE_TYPE_SELECTABLE_TEXT, ATSPI_STATE_SELECTABLE_TEXT, "selectable-text" }, + { EFL_ACCESS_STATE_TYPE_IS_DEFAULT, ATSPI_STATE_IS_DEFAULT, "is-default" }, + { EFL_ACCESS_STATE_TYPE_VISITED, ATSPI_STATE_VISITED, "visited" }, + { EFL_ACCESS_STATE_TYPE_LAST_DEFINED, ATSPI_STATE_LAST_DEFINED, "last-defined" }, }; static const int elm_relation_to_atspi_relation_mapping[] = { - [EFL_ACCESS_RELATION_NULL] = ATSPI_RELATION_NULL, - [EFL_ACCESS_RELATION_LABEL_FOR] = ATSPI_RELATION_LABEL_FOR, - [EFL_ACCESS_RELATION_LABELLED_BY] = ATSPI_RELATION_LABELLED_BY, - [EFL_ACCESS_RELATION_CONTROLLER_FOR] = ATSPI_RELATION_CONTROLLER_FOR, - [EFL_ACCESS_RELATION_CONTROLLED_BY] = ATSPI_RELATION_CONTROLLED_BY, - [EFL_ACCESS_RELATION_MEMBER_OF] = ATSPI_RELATION_MEMBER_OF, - [EFL_ACCESS_RELATION_TOOLTIP_FOR] = ATSPI_RELATION_TOOLTIP_FOR, - [EFL_ACCESS_RELATION_NODE_CHILD_OF] = ATSPI_RELATION_NODE_CHILD_OF, - [EFL_ACCESS_RELATION_NODE_PARENT_OF] = ATSPI_RELATION_NODE_PARENT_OF, - [EFL_ACCESS_RELATION_EXTENDED] = ATSPI_RELATION_EXTENDED, - [EFL_ACCESS_RELATION_FLOWS_TO] = ATSPI_RELATION_FLOWS_TO, - [EFL_ACCESS_RELATION_FLOWS_FROM] = ATSPI_RELATION_FLOWS_FROM, - [EFL_ACCESS_RELATION_SUBWINDOW_OF] = ATSPI_RELATION_SUBWINDOW_OF, - [EFL_ACCESS_RELATION_EMBEDS] = ATSPI_RELATION_EMBEDS, - [EFL_ACCESS_RELATION_EMBEDDED_BY] = ATSPI_RELATION_EMBEDDED_BY, - [EFL_ACCESS_RELATION_POPUP_FOR] = ATSPI_RELATION_POPUP_FOR, - [EFL_ACCESS_RELATION_PARENT_WINDOW_OF] = ATSPI_RELATION_PARENT_WINDOW_OF, - [EFL_ACCESS_RELATION_DESCRIPTION_FOR] = ATSPI_RELATION_DESCRIPTION_FOR, - [EFL_ACCESS_RELATION_DESCRIBED_BY] = ATSPI_RELATION_DESCRIBED_BY, - [EFL_ACCESS_RELATION_LAST_DEFINED] = ATSPI_RELATION_LAST_DEFINED, + [EFL_ACCESS_RELATION_TYPE_NULL] = ATSPI_RELATION_NULL, + [EFL_ACCESS_RELATION_TYPE_LABEL_FOR] = ATSPI_RELATION_LABEL_FOR, + [EFL_ACCESS_RELATION_TYPE_LABELLED_BY] = ATSPI_RELATION_LABELLED_BY, + [EFL_ACCESS_RELATION_TYPE_CONTROLLER_FOR] = ATSPI_RELATION_CONTROLLER_FOR, + [EFL_ACCESS_RELATION_TYPE_CONTROLLED_BY] = ATSPI_RELATION_CONTROLLED_BY, + [EFL_ACCESS_RELATION_TYPE_MEMBER_OF] = ATSPI_RELATION_MEMBER_OF, + [EFL_ACCESS_RELATION_TYPE_TOOLTIP_FOR] = ATSPI_RELATION_TOOLTIP_FOR, + [EFL_ACCESS_RELATION_TYPE_NODE_CHILD_OF] = ATSPI_RELATION_NODE_CHILD_OF, + [EFL_ACCESS_RELATION_TYPE_NODE_PARENT_OF] = ATSPI_RELATION_NODE_PARENT_OF, + [EFL_ACCESS_RELATION_TYPE_EXTENDED] = ATSPI_RELATION_EXTENDED, + [EFL_ACCESS_RELATION_TYPE_FLOWS_TO] = ATSPI_RELATION_FLOWS_TO, + [EFL_ACCESS_RELATION_TYPE_FLOWS_FROM] = ATSPI_RELATION_FLOWS_FROM, + [EFL_ACCESS_RELATION_TYPE_SUBWINDOW_OF] = ATSPI_RELATION_SUBWINDOW_OF, + [EFL_ACCESS_RELATION_TYPE_EMBEDS] = ATSPI_RELATION_EMBEDS, + [EFL_ACCESS_RELATION_TYPE_EMBEDDED_BY] = ATSPI_RELATION_EMBEDDED_BY, + [EFL_ACCESS_RELATION_TYPE_POPUP_FOR] = ATSPI_RELATION_POPUP_FOR, + [EFL_ACCESS_RELATION_TYPE_PARENT_WINDOW_OF] = ATSPI_RELATION_PARENT_WINDOW_OF, + [EFL_ACCESS_RELATION_TYPE_DESCRIPTION_FOR] = ATSPI_RELATION_DESCRIPTION_FOR, + [EFL_ACCESS_RELATION_TYPE_DESCRIBED_BY] = ATSPI_RELATION_DESCRIBED_BY, + [EFL_ACCESS_RELATION_TYPE_LAST_DEFINED] = ATSPI_RELATION_LAST_DEFINED, }; static inline Eldbus_Message *_dbus_invalid_ref_error_new(const Eldbus_Message *msg) @@ -471,7 +471,7 @@ static inline Eldbus_Message *_dbus_invalid_ref_error_new(const Eldbus_Message * static AtspiRelationType _elm_relation_to_atspi_relation(Efl_Access_Relation_Type type) { - if ((type < EFL_ACCESS_RELATION_LAST_DEFINED) && (type > EFL_ACCESS_RELATION_NULL)) + if ((type < EFL_ACCESS_RELATION_TYPE_LAST_DEFINED) && (type > EFL_ACCESS_RELATION_TYPE_NULL)) return elm_relation_to_atspi_relation_mapping[type]; return ATSPI_RELATION_NULL; } @@ -3895,7 +3895,7 @@ _state_changed_signal_send(void *data, const Efl_Event *event) return; } - if ((state_data->type > EFL_ACCESS_STATE_LAST_DEFINED) || + if ((state_data->type > EFL_ACCESS_STATE_TYPE_LAST_DEFINED) || (int)state_data->type < 0) { efl_event_callback_stop(event->object); diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 7a442d6d73..b39d69cbb0 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -1739,7 +1739,7 @@ _item_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) elm_object_signal_emit(VIEW(item), "elm,state,selected", "elm"); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(obj, - EFL_ACCESS_STATE_CHECKED, + EFL_ACCESS_STATE_TYPE_CHECKED, EINA_TRUE); elm_colorselector_color_set(WIDGET(item), item->color->r, item->color->g, item->color->b, item->color->a); @@ -2633,7 +2633,7 @@ _elm_color_item_efl_access_object_state_set_get(const Eo *obj, Elm_Color_Item_Da sel = elm_obj_color_item_selected_get(obj); if (sel) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_CHECKED); return ret; } diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 4c4990fb5f..b743f51d3e 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -1298,7 +1298,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd) !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text")) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_TRUE); _return_key_enabled_check(obj); _validate(obj); } @@ -1312,7 +1312,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd) !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text")) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_FALSE); if (_elm_config->selection_clear_enable) { @@ -6159,7 +6159,7 @@ _elm_entry_efl_access_object_state_set_get(const Eo *obj, Elm_Entry_Data *_pd EI ret = efl_access_object_state_set_get(efl_super(obj, ELM_ENTRY_CLASS)); if (elm_entry_editable_get(obj)) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_EDITABLE); return ret; } diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index d51a15a3cf..a88d110f8d 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -723,7 +723,7 @@ _item_unselect(Elm_Gen_Item *it) efl_event_callback_legacy_call (WIDGET(it), EFL_UI_EVENT_UNSELECTED, eo_it); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_SELECTED, EINA_FALSE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); } } @@ -2351,7 +2351,7 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it) efl_event_callback_legacy_call(obj, ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_TRUE); } static void @@ -2382,7 +2382,7 @@ _elm_gengrid_item_unfocused(Elm_Object_Item *eo_it) sd->focused_item = NULL; efl_event_callback_legacy_call(obj, ELM_GENGRID_EVENT_ITEM_UNFOCUSED, eo_it); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_FALSE); } static Eina_Bool @@ -3958,7 +3958,7 @@ _item_select(Elm_Gen_Item *it) { efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_SELECTED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); } efl_ref(eo_it); @@ -5481,10 +5481,10 @@ _elm_gengrid_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Gen_Item sel = elm_obj_gengrid_item_selected_get(eo_it); - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_SELECTABLE); if (sel) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_SELECTED); return ret; } @@ -5692,10 +5692,10 @@ _elm_gengrid_efl_access_object_state_set_get(const Eo *obj, Elm_Gengrid_Data *sd ret = efl_access_object_state_set_get(efl_super(obj, ELM_GENGRID_CLASS)); - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MANAGES_DESCENDANTS); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_MANAGES_DESCENDANTS); if (elm_gengrid_multi_select_get(obj)) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MULTISELECTABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_MULTISELECTABLE); return ret; } diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 86f97484b0..ddbd77b926 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -2896,7 +2896,7 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it) _elm_genlist_item_focus_update(it); efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_TRUE); } static void @@ -2925,7 +2925,7 @@ _elm_genlist_item_unfocused(Elm_Object_Item *eo_it) sd->focused_item = NULL; efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_ITEM_UNFOCUSED, eo_it); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_FALSE); } static Eina_Bool @@ -3933,7 +3933,7 @@ _item_unselect(Elm_Gen_Item *it) efl_event_callback_legacy_call (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it)); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_SELECTED, EINA_FALSE); + efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); } static void @@ -4154,7 +4154,7 @@ _long_press_cb(void *data) { edje_object_signal_emit(VIEW(it), SIGNAL_REORDER_ENABLED, "elm"); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_ANIMATED, EINA_TRUE); + efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_ANIMATED, EINA_TRUE); } } @@ -5134,7 +5134,7 @@ _item_mouse_up_cb(void *data, } edje_object_signal_emit(VIEW(it), SIGNAL_REORDER_DISABLED, "elm"); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_ANIMATED, EINA_FALSE); + efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_ANIMATED, EINA_FALSE); sd->reorder_it = sd->reorder_rel = NULL; elm_interface_scrollable_hold_set(sd->obj, EINA_FALSE); elm_interface_scrollable_bounce_allow_set @@ -6117,7 +6117,7 @@ _item_select(Elm_Gen_Item *it) if ((it->base)->on_deletion) goto item_deleted; efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_SELECTED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); // delete item if it's requested deletion in the above callbacks. if ((it->base)->on_deletion) { @@ -7203,7 +7203,7 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B (WIDGET(it), ELM_GENLIST_EVENT_EXPANDED, EO_OBJ(it)); sd->auto_scroll_enabled = EINA_TRUE; if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_item, EFL_ACCESS_STATE_EXPANDED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_item, EFL_ACCESS_STATE_TYPE_EXPANDED, EINA_TRUE); } else { @@ -7213,7 +7213,7 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B (WIDGET(it), ELM_GENLIST_EVENT_CONTRACTED, EO_OBJ(it)); sd->auto_scroll_enabled = EINA_FALSE; if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_item, EFL_ACCESS_STATE_EXPANDED, EINA_FALSE); + efl_access_state_changed_signal_emit(eo_item, EFL_ACCESS_STATE_TYPE_EXPANDED, EINA_FALSE); } } @@ -8531,16 +8531,16 @@ _elm_genlist_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Gen_Item sel = elm_obj_genlist_item_selected_get(eo_it); - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_SELECTABLE); if (sel) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_SELECTED); if (elm_genlist_item_type_get(eo_it) == ELM_GENLIST_ITEM_TREE) { - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EXPANDABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_EXPANDABLE); if (elm_genlist_item_expanded_get(eo_it)) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EXPANDED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_EXPANDED); } return ret; @@ -8793,13 +8793,13 @@ _elm_genlist_efl_access_object_state_set_get(const Eo *obj, Elm_Genlist_Data *sd ret = efl_access_object_state_set_get(efl_super(obj, ELM_GENLIST_CLASS)); - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MANAGES_DESCENDANTS); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_MANAGES_DESCENDANTS); if (elm_genlist_multi_select_get(obj)) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MULTISELECTABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_MULTISELECTABLE); if (elm_genlist_reorder_mode_get(obj)) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_ANIMATED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_ANIMATED); return ret; } diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index 682c968b39..660a72867b 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -859,7 +859,7 @@ _elm_hover_efl_access_object_state_set_get(const Eo *obj, Elm_Hover_Data *pd EIN Efl_Access_State_Set states; states = efl_access_object_state_set_get(efl_super(obj, MY_CLASS)); - STATE_TYPE_SET(states, EFL_ACCESS_STATE_MODAL); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_MODAL); return states; } diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index 2631875008..9ef6d66e74 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -1304,7 +1304,7 @@ _elm_index_item_selected_set(Eo *eo_it, sd->delay = ecore_timer_add(sd->delay_change_time, _delay_change_cb, obj); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_SELECTED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); } else { diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 74db37fb5b..0119a66633 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -1182,7 +1182,7 @@ _elm_list_item_focused(Elm_Object_Item *eo_it) efl_event_callback_legacy_call (WIDGET(it), ELM_LIST_EVENT_ITEM_FOCUSED, eo_it); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_TRUE); } static void @@ -1210,7 +1210,7 @@ _elm_list_item_unfocused(Elm_Object_Item *eo_it) sd->focused_item = NULL; efl_event_callback_legacy_call(obj, ELM_LIST_EVENT_ITEM_UNFOCUSED, eo_it); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_FALSE); } /* @@ -1449,7 +1449,7 @@ call: if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, eo_it); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_SELECTED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); sd->last_selected_item = eo_it; _elm_list_unwalk(obj, sd); @@ -1525,7 +1525,7 @@ _item_unselect(Elm_List_Item_Data *it) efl_event_callback_legacy_call (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it)); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_SELECTED, EINA_FALSE); + efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); } _elm_list_unwalk(obj, sd); @@ -2141,13 +2141,13 @@ _elm_list_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_List_Item_Da if (elm_object_item_disabled_get(eo_it)) return ret; - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_SELECTABLE); sel = elm_obj_list_item_selected_get(eo_it); if (sel) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_SELECTED); else - STATE_TYPE_UNSET(ret, EFL_ACCESS_STATE_SELECTED); + STATE_TYPE_UNSET(ret, EFL_ACCESS_STATE_TYPE_SELECTED); return ret; } diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index 774a6d749e..8c56dc995b 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -129,7 +129,7 @@ _submenu_sizing_eval(Elm_Menu_Item_Data *parent_it) ELM_MENU_ITEM_DATA_GET(eo_item, item); elm_layout_sizing_eval(VIEW(item)); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_item, EFL_ACCESS_STATE_SHOWING, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_item, EFL_ACCESS_STATE_TYPE_SHOWING, EINA_TRUE); } @@ -518,7 +518,7 @@ _menu_item_activate_cb(void *data, _menu_item_select_cb(item, NULL, NULL, NULL); } if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_SELECTED, EINA_TRUE); + efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); } static void @@ -532,7 +532,7 @@ _menu_item_inactivate_cb(void *data, item->selected = 0; if (item->submenu.open) _submenu_hide(item); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_SELECTED, EINA_FALSE); + efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); } static void @@ -1359,10 +1359,10 @@ _elm_menu_item_efl_access_object_state_set_get(const Eo *obj EINA_UNUSED, Elm_Me Efl_Access_State_Set ret; ret = efl_access_object_state_set_get(efl_super(obj, ELM_MENU_ITEM_CLASS)); - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_SELECTABLE); if (sd->selected) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_SELECTED); return ret; } diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 46414b84e9..d2a447f341 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -179,7 +179,7 @@ _item_unselect(Elm_Toolbar_Item_Data *item) elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm"); efl_event_callback_legacy_call(WIDGET(item), EFL_UI_EVENT_UNSELECTED, EO_OBJ(item)); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_SELECTED, EINA_FALSE); + efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); } static void @@ -657,7 +657,7 @@ _elm_toolbar_item_focused(Elm_Object_Item *eo_it) efl_event_callback_legacy_call (obj, ELM_TOOLBAR_EVENT_ITEM_FOCUSED, EO_OBJ(it)); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_TRUE); } static void @@ -685,7 +685,7 @@ _elm_toolbar_item_unfocused(Elm_Object_Item *eo_it) efl_event_callback_legacy_call (obj, ELM_TOOLBAR_EVENT_ITEM_UNFOCUSED, eo_it); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_FOCUSED, EINA_TRUE); } /* @@ -1095,7 +1095,7 @@ _item_select(Elm_Toolbar_Item_Data *it) } efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, EO_OBJ(it)); if (_elm_config->atspi_mode) - efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_SELECTED, EINA_TRUE); + efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); } /* Send order signals when item is added/deleted. @@ -3864,10 +3864,10 @@ _elm_toolbar_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Toolbar_I sel = elm_toolbar_item_selected_get(eo_it); - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_SELECTABLE); if (sel) - STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_SELECTED); return ret; } diff --git a/src/tests/elementary/efl_ui_test_atspi.c b/src/tests/elementary/efl_ui_test_atspi.c index ecb0f96ddb..ed419a3cef 100644 --- a/src/tests/elementary/efl_ui_test_atspi.c +++ b/src/tests/elementary/efl_ui_test_atspi.c @@ -286,8 +286,8 @@ EFL_START_TEST(test_efl_access_object_relationship_append) Eina_Iterator *it; unsigned int i = 0; - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, g_win); it = efl_access_object_relations_get(g_btn); ck_assert(it != NULL); @@ -297,9 +297,9 @@ EFL_START_TEST(test_efl_access_object_relationship_append) { i++; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) rel_to = rel; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) rel_from = rel; } @@ -313,8 +313,8 @@ EFL_START_TEST(test_efl_access_object_relationship_append) eina_iterator_free(it); /* Check if append do not procude duplicated relations */ - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, g_win); it = efl_access_object_relations_get(g_btn); i = 0; rel_to = rel_from = NULL; @@ -322,9 +322,9 @@ EFL_START_TEST(test_efl_access_object_relationship_append) { i++; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) rel_to = rel; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) rel_from = rel; } @@ -351,9 +351,9 @@ EFL_START_TEST(test_efl_access_object_relationship_remove) unsigned int i = 0; /* Test if removal of single relationship works */ - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); - efl_access_object_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, g_win); + efl_access_object_relationship_remove(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); it = efl_access_object_relations_get(g_btn); ck_assert(it != NULL); @@ -363,9 +363,9 @@ EFL_START_TEST(test_efl_access_object_relationship_remove) { i++; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) rel_to = rel; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) rel_from = rel; } @@ -378,9 +378,9 @@ EFL_START_TEST(test_efl_access_object_relationship_remove) eina_iterator_free(it); /* Test if removal of type relationship works */ - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win); - efl_access_object_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, NULL); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_win); + efl_access_object_relationship_remove(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, NULL); it = efl_access_object_relations_get(g_btn); i = 0; rel_to = rel_from = NULL; @@ -388,9 +388,9 @@ EFL_START_TEST(test_efl_access_object_relationship_remove) { i++; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) rel_to = rel; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) rel_from = rel; } @@ -401,8 +401,8 @@ EFL_START_TEST(test_efl_access_object_relationship_remove) eina_iterator_free(it); /* Test if relationship is implicity removed when object is deleted */ - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, g_bg); efl_del(g_bg); it = efl_access_object_relations_get(g_btn); i = 0; @@ -411,9 +411,9 @@ EFL_START_TEST(test_efl_access_object_relationship_remove) { i++; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) rel_to = rel; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) rel_from = rel; } @@ -431,20 +431,20 @@ EFL_START_TEST(test_efl_access_object_relationships_clear) generate_app(); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_win); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, g_win); efl_access_object_relationships_clear(g_btn); it = efl_access_object_relations_get(g_btn); EINA_ITERATOR_FOREACH(it, rel) { - ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg))); - ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_bg))); - ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_win))); - ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_win))); + ck_assert(!((rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg))); + ck_assert(!((rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) && eina_list_data_find(rel->objects, g_bg))); + ck_assert(!((rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) && eina_list_data_find(rel->objects, g_win))); + ck_assert(!((rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) && eina_list_data_find(rel->objects, g_win))); } eina_iterator_free(it); } diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c index 649af0bbd5..ebd121b1fc 100644 --- a/src/tests/elementary/elm_test_atspi.c +++ b/src/tests/elementary/elm_test_atspi.c @@ -285,8 +285,8 @@ EFL_START_TEST(test_efl_access_object_relationship_append) Eina_Iterator *it; unsigned int i = 0; - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, g_win); it = efl_access_object_relations_get(g_btn); ck_assert(it != NULL); @@ -296,9 +296,9 @@ EFL_START_TEST(test_efl_access_object_relationship_append) { i++; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) rel_to = rel; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) rel_from = rel; } @@ -312,8 +312,8 @@ EFL_START_TEST(test_efl_access_object_relationship_append) eina_iterator_free(it); /* Check if append do not procude duplicated relations */ - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, g_win); it = efl_access_object_relations_get(g_btn); i = 0; rel_to = rel_from = NULL; @@ -321,9 +321,9 @@ EFL_START_TEST(test_efl_access_object_relationship_append) { i++; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) rel_to = rel; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) rel_from = rel; } @@ -350,9 +350,9 @@ EFL_START_TEST(test_efl_access_object_relationship_remove) unsigned int i = 0; /* Test if removal of single relationship works */ - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); - efl_access_object_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, g_win); + efl_access_object_relationship_remove(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); it = efl_access_object_relations_get(g_btn); ck_assert(it != NULL); @@ -362,9 +362,9 @@ EFL_START_TEST(test_efl_access_object_relationship_remove) { i++; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) rel_to = rel; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) rel_from = rel; } @@ -377,9 +377,9 @@ EFL_START_TEST(test_efl_access_object_relationship_remove) eina_iterator_free(it); /* Test if removal of type relationship works */ - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win); - efl_access_object_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, NULL); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_win); + efl_access_object_relationship_remove(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, NULL); it = efl_access_object_relations_get(g_btn); i = 0; rel_to = rel_from = NULL; @@ -387,9 +387,9 @@ EFL_START_TEST(test_efl_access_object_relationship_remove) { i++; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) rel_to = rel; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) rel_from = rel; } @@ -400,8 +400,8 @@ EFL_START_TEST(test_efl_access_object_relationship_remove) eina_iterator_free(it); /* Test if relationship is implicity removed when object is deleted */ - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, g_bg); efl_del(g_bg); it = efl_access_object_relations_get(g_btn); i = 0; @@ -410,9 +410,9 @@ EFL_START_TEST(test_efl_access_object_relationship_remove) { i++; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) rel_to = rel; - if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) rel_from = rel; } @@ -430,20 +430,20 @@ EFL_START_TEST(test_efl_access_object_relationships_clear) generate_app(); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win); - efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, g_bg); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_TO, g_win); + efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, g_win); efl_access_object_relationships_clear(g_btn); it = efl_access_object_relations_get(g_btn); EINA_ITERATOR_FOREACH(it, rel) { - ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg))); - ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_bg))); - ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_win))); - ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_win))); + ck_assert(!((rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg))); + ck_assert(!((rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) && eina_list_data_find(rel->objects, g_bg))); + ck_assert(!((rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_TO) && eina_list_data_find(rel->objects, g_win))); + ck_assert(!((rel->type == EFL_ACCESS_RELATION_TYPE_FLOWS_FROM) && eina_list_data_find(rel->objects, g_win))); } eina_iterator_free(it); }