jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c838e30a24da9d2664bb839d2a4ada619189937c
commit c838e30a24da9d2664bb839d2a4ada619189937c Author: Lukasz Stanislawski <[email protected]> Date: Thu Nov 16 11:31:26 2017 +0900 elm: Rename elm_interface_atspi_widget_action mixin Reviewers: jpeg Subscribers: jenkins, cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5400 --- src/Makefile_Elementary.am | 6 ++-- src/lib/elementary/efl_access_action.eo | 4 +-- ..._widget_action.c => efl_access_widget_action.c} | 32 +++++++++++----------- ...idget_action.eo => efl_access_widget_action.eo} | 11 ++++---- ..._widget_action.h => efl_access_widget_action.h} | 8 +++--- src/lib/elementary/efl_ui_button.c | 8 +++--- src/lib/elementary/efl_ui_button.eo | 4 +-- src/lib/elementary/efl_ui_calendar.c | 9 +++--- src/lib/elementary/efl_ui_calendar.eo | 4 +-- src/lib/elementary/efl_ui_check.c | 8 +++--- src/lib/elementary/efl_ui_check.eo | 4 +-- src/lib/elementary/efl_ui_image.c | 8 +++--- src/lib/elementary/efl_ui_image.eo | 4 +-- src/lib/elementary/efl_ui_image_zoomable.c | 8 +++--- src/lib/elementary/efl_ui_image_zoomable.eo | 2 +- src/lib/elementary/efl_ui_multibuttonentry.c | 8 +++--- src/lib/elementary/efl_ui_radio.c | 8 +++--- src/lib/elementary/efl_ui_radio.eo | 4 +-- src/lib/elementary/efl_ui_slider.c | 8 +++--- src/lib/elementary/efl_ui_slider.eo | 4 +-- src/lib/elementary/efl_ui_slider_interval.c | 2 +- src/lib/elementary/efl_ui_video.c | 8 +++--- src/lib/elementary/efl_ui_video.eo | 4 +-- src/lib/elementary/efl_ui_win.c | 8 +++--- src/lib/elementary/efl_ui_win.eo | 4 +-- src/lib/elementary/elc_combobox.c | 8 +++--- src/lib/elementary/elc_ctxpopup.c | 8 +++--- src/lib/elementary/elc_fileselector.c | 8 +++--- src/lib/elementary/elc_hoversel.c | 8 +++--- src/lib/elementary/elc_naviframe.c | 8 +++--- src/lib/elementary/elc_player.c | 8 +++--- src/lib/elementary/elc_popup.c | 8 +++--- src/lib/elementary/elementary_config.h | 1 + src/lib/elementary/elm_access.c | 8 +++--- src/lib/elementary/elm_access.eo | 4 +-- src/lib/elementary/elm_calendar.c | 8 +++--- src/lib/elementary/elm_calendar.eo | 4 +-- src/lib/elementary/elm_color_item.eo | 4 +-- src/lib/elementary/elm_colorselector.c | 14 +++++----- src/lib/elementary/elm_colorselector.eo | 4 +-- src/lib/elementary/elm_combobox.eo | 4 +-- src/lib/elementary/elm_ctxpopup.eo | 4 +-- src/lib/elementary/elm_diskselector.c | 8 +++--- src/lib/elementary/elm_diskselector.eo | 4 +-- src/lib/elementary/elm_fileselector.eo | 4 +-- src/lib/elementary/elm_flipselector.c | 8 +++--- src/lib/elementary/elm_flipselector.eo | 4 +-- src/lib/elementary/elm_general.eot | 2 +- src/lib/elementary/elm_gengrid.c | 8 +++--- src/lib/elementary/elm_gengrid.eo | 4 +-- src/lib/elementary/elm_genlist.c | 8 +++--- src/lib/elementary/elm_genlist.eo | 4 +-- src/lib/elementary/elm_hover.c | 8 +++--- src/lib/elementary/elm_hover.eo | 4 +-- src/lib/elementary/elm_hoversel.eo | 4 +-- src/lib/elementary/elm_index.c | 8 +++--- src/lib/elementary/elm_index_item.eo | 4 +-- src/lib/elementary/elm_interfaces.h | 2 +- src/lib/elementary/elm_list.c | 8 +++--- src/lib/elementary/elm_list.eo | 4 +-- src/lib/elementary/elm_map.c | 8 +++--- src/lib/elementary/elm_map.eo | 4 +-- src/lib/elementary/elm_multibuttonentry_item.eo | 4 +-- src/lib/elementary/elm_naviframe.eo | 4 +-- src/lib/elementary/elm_panel.c | 8 +++--- src/lib/elementary/elm_panel.eo | 4 +-- src/lib/elementary/elm_player.eo | 4 +-- src/lib/elementary/elm_popup.eo | 4 +-- src/lib/elementary/elm_scroller.c | 8 +++--- src/lib/elementary/elm_scroller.eo | 4 +-- src/lib/elementary/elm_slideshow.c | 8 +++--- src/lib/elementary/elm_slideshow.eo | 4 +-- src/lib/elementary/elm_spinner.c | 8 +++--- src/lib/elementary/elm_spinner.eo | 4 +-- src/lib/elementary/elm_toolbar.c | 8 +++--- src/lib/elementary/elm_toolbar.eo | 4 +-- 76 files changed, 236 insertions(+), 237 deletions(-) diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 95d1cf8976..1ae6825867 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -69,6 +69,7 @@ elm_public_eolian_files = \ lib/elementary/efl_access_selection.eo \ lib/elementary/efl_access_text.eo \ lib/elementary/efl_access_value.eo \ + lib/elementary/efl_access_widget_action.eo \ lib/elementary/efl_access_window.eo \ lib/elementary/efl_config_global.eo \ lib/elementary/elm_code_widget.eo \ @@ -78,7 +79,6 @@ elm_public_eolian_files = \ elm_public_eolian_files += \ lib/elementary/elm_spinner.eo \ lib/elementary/elm_multibuttonentry_item.eo \ - lib/elementary/elm_interface_atspi_widget_action.eo \ lib/elementary/elm_interface_scrollable.eo \ lib/elementary/elm_atspi_bridge.eo \ lib/elementary/elm_atspi_app_object.eo \ @@ -243,7 +243,7 @@ includesunstable_HEADERS = \ lib/elementary/elm_atspi_bridge.h \ lib/elementary/efl_access.h \ lib/elementary/efl_access_text.h \ - lib/elementary/elm_interface_atspi_widget_action.h \ + lib/elementary/efl_access_widget_action.h \ lib/elementary/efl_access_window.h \ lib/elementary/elm_interface_fileselector.h \ lib/elementary/elm_interface_scrollable.h \ @@ -621,7 +621,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/efl_access_selection.c \ lib/elementary/efl_access_text.c \ lib/elementary/efl_access_value.c \ - lib/elementary/elm_interface_atspi_widget_action.c \ + lib/elementary/efl_access_widget_action.c \ lib/elementary/efl_access_window.c \ lib/elementary/elm_interface_fileselector.c \ lib/elementary/elm_interface_scrollable.c \ diff --git a/src/lib/elementary/efl_access_action.eo b/src/lib/elementary/efl_access_action.eo index 12e313a038..078a7c4673 100644 --- a/src/lib/elementary/efl_access_action.eo +++ b/src/lib/elementary/efl_access_action.eo @@ -1,4 +1,4 @@ -/* FIXME: This shouldn't be using undefined Elm_Atspi_Action */ +/* FIXME: This shouldn't be using undefined Elm_Access_Action */ import elm_general; mixin Efl.Access.Action () @@ -47,7 +47,7 @@ mixin Efl.Access.Action () get @pure_virtual { } values { - actions: list<ptr(Elm_Atspi_Action)>; [[Contains statically allocated strings]] + actions: list<ptr(Elm_Access_Action)>; [[Contains statically allocated strings]] } } action_do @protected @pure_virtual @beta { diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.c b/src/lib/elementary/efl_access_widget_action.c similarity index 66% rename from src/lib/elementary/elm_interface_atspi_widget_action.c rename to src/lib/elementary/efl_access_widget_action.c index aee335b16f..2662a86f30 100644 --- a/src/lib/elementary/elm_interface_atspi_widget_action.c +++ b/src/lib/elementary/efl_access_widget_action.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_ACTION_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_ACTION_BETA #include <Elementary.h> @@ -13,14 +13,14 @@ extern Eina_Hash *_elm_key_bindings; EOLIAN static Eina_Bool -_elm_interface_atspi_widget_action_efl_access_action_action_do(Eo *obj, void *pd EINA_UNUSED, int id) +_efl_access_widget_action_efl_access_action_action_do(Eo *obj, void *pd EINA_UNUSED, int id) { - const Elm_Atspi_Action *actions = NULL; + const Elm_Access_Action *actions = NULL; const char *param; Eina_Bool (*func)(Eo *eo, const char *params) = NULL; int tmp = 0; - actions = elm_interface_atspi_widget_action_elm_actions_get(obj); + actions = efl_access_widget_action_elm_actions_get(obj); if (!actions) return EINA_FALSE; while (actions[tmp].name) @@ -41,9 +41,9 @@ _elm_interface_atspi_widget_action_efl_access_action_action_do(Eo *obj, void *pd } EOLIAN static char* -_elm_interface_atspi_widget_action_efl_access_action_action_keybinding_get(Eo *obj, void *pd EINA_UNUSED, int id) +_efl_access_widget_action_efl_access_action_action_keybinding_get(Eo *obj, void *pd EINA_UNUSED, int id) { - const Elm_Atspi_Action *actions = NULL; + const Elm_Access_Action *actions = NULL; Eina_List *l1, *binding_list; const char *action = NULL, *param = NULL; Elm_Config_Binding_Key *binding; @@ -52,7 +52,7 @@ _elm_interface_atspi_widget_action_efl_access_action_action_keybinding_get(Eo *o if (!efl_isa(obj, ELM_WIDGET_CLASS)) return NULL; - actions = elm_interface_atspi_widget_action_elm_actions_get(obj); + actions = efl_access_widget_action_elm_actions_get(obj); if (!actions) return NULL; while (actions[tmp].name) @@ -94,12 +94,12 @@ _elm_interface_atspi_widget_action_efl_access_action_action_keybinding_get(Eo *o } EOLIAN static const char * -_elm_interface_atspi_widget_action_efl_access_action_action_name_get(Eo *obj, void *pd EINA_UNUSED, int id) +_efl_access_widget_action_efl_access_action_action_name_get(Eo *obj, void *pd EINA_UNUSED, int id) { - const Elm_Atspi_Action *actions = NULL; + const Elm_Access_Action *actions = NULL; int tmp = 0; - actions = elm_interface_atspi_widget_action_elm_actions_get(obj); + actions = efl_access_widget_action_elm_actions_get(obj); if (!actions) return NULL; while (actions[tmp].name) @@ -111,25 +111,25 @@ _elm_interface_atspi_widget_action_efl_access_action_action_name_get(Eo *obj, vo } EOLIAN static Eina_Bool -_elm_interface_atspi_widget_action_efl_access_action_action_description_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED, const char *description EINA_UNUSED) +_efl_access_widget_action_efl_access_action_action_description_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED, const char *description EINA_UNUSED) { return EINA_FALSE; } EOLIAN static const char * -_elm_interface_atspi_widget_action_efl_access_action_action_description_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED) +_efl_access_widget_action_efl_access_action_action_description_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED) { return NULL; } EOLIAN static Eina_List* -_elm_interface_atspi_widget_action_efl_access_action_actions_get(Eo *obj, void *pd EINA_UNUSED) +_efl_access_widget_action_efl_access_action_actions_get(Eo *obj, void *pd EINA_UNUSED) { - const Elm_Atspi_Action *actions = NULL; + const Elm_Access_Action *actions = NULL; Eina_List *ret = NULL; int tmp = 0; - actions = elm_interface_atspi_widget_action_elm_actions_get(obj); + actions = efl_access_widget_action_elm_actions_get(obj); if (!actions) return NULL; while (actions[tmp].name) @@ -141,4 +141,4 @@ _elm_interface_atspi_widget_action_efl_access_action_actions_get(Eo *obj, void * return ret; } -#include "elm_interface_atspi_widget_action.eo.c" +#include "efl_access_widget_action.eo.c" diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.eo b/src/lib/elementary/efl_access_widget_action.eo similarity index 55% rename from src/lib/elementary/elm_interface_atspi_widget_action.eo rename to src/lib/elementary/efl_access_widget_action.eo index 568ce5ac41..962d6f8476 100644 --- a/src/lib/elementary/elm_interface_atspi_widget_action.eo +++ b/src/lib/elementary/efl_access_widget_action.eo @@ -1,17 +1,16 @@ import elm_general; -mixin Elm.Interface.Atspi_Widget_Action (Efl.Access.Action) +mixin Efl.Access.Widget.Action (Efl.Access.Action) { - [[AT-SPI widget action mixin]] - eo_prefix: elm_interface_atspi_widget_action; + [[Access widget action mixin]] data: null; methods { - @property elm_actions @protected { - [[Elementary actions]] + @property elm_actions @protected @beta { + [[Elementary actions]] get @pure_virtual { } values { - @cref actions: Elm_Atspi_Action; [[NULL-terminated array of Elm_Atspi_Action]] + @cref actions: ptr(const(Elm_Access_Action)); [[NULL-terminated array of Elm_Atspi_Action]] } } } diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.h b/src/lib/elementary/efl_access_widget_action.h similarity index 64% rename from src/lib/elementary/elm_interface_atspi_widget_action.h rename to src/lib/elementary/efl_access_widget_action.h index 329e229418..b58e93e4e8 100644 --- a/src/lib/elementary/elm_interface_atspi_widget_action.h +++ b/src/lib/elementary/efl_access_widget_action.h @@ -3,7 +3,7 @@ #ifdef EFL_BETA_API_SUPPORT -struct _Elm_Atspi_Action +struct _Elm_Access_Action { const char *name; const char *action; @@ -11,13 +11,13 @@ struct _Elm_Atspi_Action Eina_Bool (*func)(Evas_Object *obj, const char *params); }; -typedef struct _Elm_Atspi_Action Elm_Atspi_Action; +typedef struct _Elm_Access_Action Elm_Access_Action; #ifdef EFL_EO_API_SUPPORT -#include "elm_interface_atspi_widget_action.eo.h" +#include "efl_access_widget_action.eo.h" #endif #ifndef EFL_NOLEGACY_API_SUPPORT -#include "elm_interface_atspi_widget_action.eo.legacy.h" +#include "efl_access_widget_action.eo.legacy.h" #endif #endif diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index d044b4c3ca..142c6b72ae 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_PROTECTED #define ELM_LAYOUT_PROTECTED @@ -389,10 +389,10 @@ _efl_ui_button_efl_ui_autorepeat_autorepeat_gap_timeout_get(Eo *obj EINA_UNUSED, return sd->ar_gap_timeout; } -EOLIAN const Elm_Atspi_Action * -_efl_ui_button_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_efl_ui_button_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "activate", "activate", NULL, _key_action_activate }, { NULL, NULL, NULL, NULL} }; diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo index c4aa95822c..aa231ddc46 100644 --- a/src/lib/elementary/efl_ui_button.eo +++ b/src/lib/elementary/efl_ui_button.eo @@ -1,6 +1,6 @@ class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text, Efl.Text.Markup, - Elm.Interface.Atspi_Widget_Action, Efl.Ui.Translatable) + Efl.Access.Widget.Action, Efl.Ui.Translatable) { [[Push-button widget @@ -21,7 +21,7 @@ class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Elm.Widget.theme_apply; Elm.Widget.widget_sub_object_del; Elm.Widget.widget_event; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Part.part; Efl.Text.text { get; set; } Efl.Ui.Translatable.translatable_text { get; set; } diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c index 7c3c5c1776..4a1307df65 100644 --- a/src/lib/elementary/efl_ui_calendar.c +++ b/src/lib/elementary/efl_ui_calendar.c @@ -2,10 +2,9 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #define EFL_UI_FOCUS_OBJECT_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include <Elementary.h> #include "elm_priv.h" @@ -1253,10 +1252,10 @@ _efl_ui_calendar_class_constructor(Efl_Class *klass) _efl_ui_calendar_smart_focus_next_enable = EINA_TRUE; } -EOLIAN static const Elm_Atspi_Action* -_efl_ui_calendar_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Data *sd EINA_UNUSED) +EOLIAN static const Elm_Access_Action* +_efl_ui_calendar_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Data *sd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "activate", "activate", NULL, _key_action_activate}, { NULL, NULL, NULL, NULL } }; diff --git a/src/lib/elementary/efl_ui_calendar.eo b/src/lib/elementary/efl_ui_calendar.eo index 5125f2e9cd..35ac4d9069 100644 --- a/src/lib/elementary/efl_ui_calendar.eo +++ b/src/lib/elementary/efl_ui_calendar.eo @@ -16,7 +16,7 @@ enum Efl.Ui.Calendar.Weekday last [[Sentinel value to indicate last enum field during iteration]] } -class Efl.Ui.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface.Atspi_Widget_Action, Efl.Ui.Format) +class Efl.Ui.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format) { [[Calendar widget @@ -110,7 +110,7 @@ class Efl.Ui.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface.At Elm.Widget.on_access_update; Elm.Widget.on_focus_update; Elm.Widget.widget_event; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Ui.Format.format_cb { set; } } events { diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index 836cc3a83c..cfa458c1de 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_LAYOUT_PROTECTED #define EFL_UI_NSTATE_PROTECTED @@ -382,10 +382,10 @@ elm_check_state_pointer_set(Eo *obj, Eina_Bool *statep) } } -EOLIAN const Elm_Atspi_Action * -_efl_ui_check_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_efl_ui_check_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_action[] = { + static Elm_Access_Action atspi_action[] = { { "activate", "activate", NULL, _key_action_activate }, { NULL, NULL, NULL, NULL } }; diff --git a/src/lib/elementary/efl_ui_check.eo b/src/lib/elementary/efl_ui_check.eo index 00aa3b3e59..441227776d 100644 --- a/src/lib/elementary/efl_ui_check.eo +++ b/src/lib/elementary/efl_ui_check.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action) +class Efl.Ui.Check (Efl.Ui.Nstate, Efl.Access.Widget.Action) { [[Check widget @@ -30,7 +30,7 @@ class Efl.Ui.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action) Efl.Ui.Nstate.count { set; } Efl.Ui.Nstate.value { set; } Efl.Access.state_set { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } events { changed; [[This is called whenever the user changes the state of the check diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index d87b4be2b0..bae3a446ce 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -4,7 +4,7 @@ #define EFL_ACCESS_IMAGE_PROTECTED #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_CANVAS_LAYOUT_CALC_PROTECTED #include <Elementary.h> @@ -1606,10 +1606,10 @@ _efl_ui_image_efl_access_image_extents_get(Eo *obj, Efl_Ui_Image_Data *sd EINA_U elm_image_object_size_get(obj, w, h); } -EOLIAN const Elm_Atspi_Action * -_efl_ui_image_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_efl_ui_image_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "activate", "activate", NULL, _key_action_activate }, { NULL, NULL, NULL, NULL }, }; diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo index 124c51854c..09faa043aa 100644 --- a/src/lib/elementary/efl_ui_image.eo +++ b/src/lib/elementary/efl_ui_image.eo @@ -45,7 +45,7 @@ struct Efl.Ui.Image.Error class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, - Efl.Access.Image, Elm.Interface.Atspi_Widget_Action, + Efl.Access.Image, Efl.Access.Widget.Action, Efl.Orientation, Efl.Flipable, Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Canvas.Layout_Calc, Efl.Canvas.Layout_Group, Efl.Canvas.Layout_Signal) @@ -151,7 +151,7 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, Elm.Widget.theme_apply; Elm.Widget.widget_event; Efl.Access.Image.extents { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } events { drop; [[Called when drop from drag and drop happened]] /* FIXME - Belongs to DnD interface */ diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index dc2a5ba2df..830c75e367 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include <Elementary.h> @@ -2694,10 +2694,10 @@ _efl_ui_image_zoomable_class_constructor(Efl_Class *klass) PHOTO_FILE_LOAD_ERROR_UNKNOWN_FORMAT = eina_error_msg_static_register("File is not a known format"); } -EOLIAN const Elm_Atspi_Action * -_efl_ui_image_zoomable_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_efl_ui_image_zoomable_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "move,prior", "move", "prior", _key_action_move}, { "move,next", "move", "next", _key_action_move}, { "move,left", "move", "left", _key_action_move}, diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo index c214f9abe8..9549e1f4f2 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.eo +++ b/src/lib/elementary/efl_ui_image_zoomable.eo @@ -62,7 +62,7 @@ class Efl.Ui.Image_Zoomable (Elm.Widget, Efl.Ui.Image, Efl.Ui.Zoom, Elm.Widget.on_focus_update; Elm.Widget.widget_event; Elm.Interface_Scrollable.region_bring_in; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.File.file { get; set; } Efl.Orientation.orientation { get; set; } Efl.Flipable.flip { get; set; } diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c index cb489ac4eb..8efa0a0d85 100644 --- a/src/lib/elementary/efl_ui_multibuttonentry.c +++ b/src/lib/elementary/efl_ui_multibuttonentry.c @@ -4,7 +4,7 @@ #define EFL_ACCESS_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED #include <Elementary.h> @@ -2120,10 +2120,10 @@ _key_action_longpress(Eo *obj, const char *params EINA_UNUSED) return EINA_TRUE; } -EOLIAN const Elm_Atspi_Action * -_elm_multibuttonentry_item_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Item_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_multibuttonentry_item_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Item_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "activate", NULL, NULL, _key_action_activate }, { "delete", NULL, NULL, _key_action_delete}, { "longpress", NULL, NULL, _key_action_longpress}, diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index c6ef4f0904..84fc946712 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -341,10 +341,10 @@ _efl_ui_radio_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN const Elm_Atspi_Action * -_efl_ui_radio_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_efl_ui_radio_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "activate", "activate", NULL, _key_action_activate}, { NULL, NULL, NULL, NULL } }; diff --git a/src/lib/elementary/efl_ui_radio.eo b/src/lib/elementary/efl_ui_radio.eo index ff3f5752b3..07c3c8b4d2 100644 --- a/src/lib/elementary/efl_ui_radio.eo +++ b/src/lib/elementary/efl_ui_radio.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Radio (Efl.Ui.Check, Elm.Interface.Atspi_Widget_Action) +class Efl.Ui.Radio (Efl.Ui.Check, Efl.Access.Widget.Action) { [[Elementary radio class]] legacy_prefix: elm_radio; @@ -66,7 +66,7 @@ class Efl.Ui.Radio (Efl.Ui.Check, Elm.Interface.Atspi_Widget_Action) Elm.Widget.on_access_activate; Elm.Widget.widget_event; Efl.Access.state_set { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Ui.Nstate.value { set; get; } } events { diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index e4d7276ccf..402e4ed137 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED #define ELM_LAYOUT_PROTECTED @@ -1393,10 +1393,10 @@ _efl_ui_slider_efl_ui_format_format_cb_set(Eo *obj, Efl_Ui_Slider_Data *sd, void efl_canvas_group_change(obj); } -EOLIAN const Elm_Atspi_Action * -_efl_ui_slider_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_efl_ui_slider_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "drag,left", "drag", "left", _key_action_drag}, { "drag,right", "drag", "right", _key_action_drag}, { "drag,up", "drag", "up", _key_action_drag}, diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo index 31f2d89b51..7db56f49a5 100644 --- a/src/lib/elementary/efl_ui_slider.eo +++ b/src/lib/elementary/efl_ui_slider.eo @@ -3,7 +3,7 @@ type slider_freefunc_type: __undefined_type; [[Elementary slider free function t class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction, Efl.Access.Value, Efl.Text, Efl.Text.Markup, Efl.Ui.Format, - Efl.Ui.Translatable, Elm.Interface.Atspi_Widget_Action) + Efl.Ui.Translatable, Efl.Access.Widget.Action) { [[Elementary slider class]] legacy_prefix: elm_slider; @@ -82,7 +82,7 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction, Efl.Access.Value.value_and_text { get; set; } Efl.Access.Value.range { get; } Efl.Access.Value.increment { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Text.text { get; set; } Efl.Text.Markup.markup { get; set; } Efl.Ui.Format.format_cb { set; } diff --git a/src/lib/elementary/efl_ui_slider_interval.c b/src/lib/elementary/efl_ui_slider_interval.c index 8002879b7f..d1e9a7a4d0 100644 --- a/src/lib/elementary/efl_ui_slider_interval.c +++ b/src/lib/elementary/efl_ui_slider_interval.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_INTERFACE_ATSPI_VALUE_PROTECTED #include <Elementary.h> diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c index 3895b1c520..14c6613606 100644 --- a/src/lib/elementary/efl_ui_video.c +++ b/src/lib/elementary/efl_ui_video.c @@ -5,7 +5,7 @@ #include <Emotion.h> #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include <Elementary.h> @@ -367,10 +367,10 @@ _efl_ui_video_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN const Elm_Atspi_Action * -_efl_ui_video_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Video_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_efl_ui_video_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Video_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "move,left", "move", "left", _key_action_move}, { "move,right", "move", "right", _key_action_move}, { "play", "play", NULL, _key_action_play}, diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo index b3721b712f..f5a7940768 100644 --- a/src/lib/elementary/efl_ui_video.eo +++ b/src/lib/elementary/efl_ui_video.eo @@ -1,5 +1,5 @@ class Efl.Ui.Video (Efl.Ui.Layout, Efl.File, - Efl.Player, Elm.Interface.Atspi_Widget_Action) + Efl.Player, Efl.Access.Widget.Action) { [[Efl UI video class]] legacy_prefix: elm_video; @@ -65,6 +65,6 @@ class Efl.Ui.Video (Efl.Ui.Layout, Efl.File, Efl.Object.constructor; Efl.File.file { get; set; } Elm.Widget.widget_event; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } } diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 32d6fb5d19..ce8b24e094 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4,7 +4,7 @@ #define EFL_ACCESS_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_INPUT_EVENT_PROTECTED #define EFL_GFX_SIZE_HINT_PROTECTED #define EFL_CANVAS_OBJECT_BETA @@ -6822,10 +6822,10 @@ _efl_ui_win_efl_access_parent_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_ return root; } -EOLIAN static const Elm_Atspi_Action* -_efl_ui_win_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED) +EOLIAN static const Elm_Access_Action* +_efl_ui_win_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "move,previous", "move", "previous", _key_action_move}, { "move,next", "move", "next", _key_action_move}, { "move,left", "move", "left", _key_action_move}, diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 8fb9bb4033..9dbbe3eeab 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -158,7 +158,7 @@ enum Efl.Ui.Win.Move_Resize_Mode } class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, - Efl.Access.Component, Elm.Interface.Atspi_Widget_Action, + Efl.Access.Component, Efl.Access.Widget.Action, Efl.Container, Efl.Input.State, Efl.Input.Interface, Efl.Screen, Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part, Efl.Ui.Focus.Manager ) { @@ -810,7 +810,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, Efl.Access.state_set { get; } Efl.Access.name { get; } Efl.Access.Component.extents { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Input.State.modifier_enabled { get; } Efl.Input.State.lock_enabled { get; } Efl.Screen.screen_dpi { get; } diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index 11b4156833..a6ad8a793b 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -513,12 +513,12 @@ _elm_combobox_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN const Elm_Atspi_Action * -_elm_combobox_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, +EOLIAN const Elm_Access_Action * +_elm_combobox_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Combobox_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { {"activate", "activate", "return", _key_action_activate}, {"move,up", "move", "up", _key_action_move}, {"move,down", "move", "down", _key_action_move}, diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index ed5b62dd8c..788fcdd281 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -1554,10 +1554,10 @@ _elm_ctxpopup_item_init(Eo *eo_item, sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN; } -EOLIAN static const Elm_Atspi_Action* -_elm_ctxpopup_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd EINA_UNUSED) +EOLIAN static const Elm_Access_Action* +_elm_ctxpopup_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "escape", "escape", NULL, _key_action_escape}, { NULL, NULL, NULL, NULL } }; diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 3df9845f1c..b0791af1f8 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -10,7 +10,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include <Elementary.h> #include "elm_priv.h" @@ -3147,10 +3147,10 @@ _elm_fileselector_class_destructor(Efl_Class *klass EINA_UNUSED) } } -EOLIAN const Elm_Atspi_Action * -_elm_fileselector_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_fileselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "select", "select", NULL, _key_action_select }, { "escape", "escape", NULL, _key_action_escape}, { "backspace", "backspace", NULL, _key_action_backspace}, diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index e5cf4fffbc..b2dcb418d3 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -1016,10 +1016,10 @@ _elm_hoversel_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN const Elm_Atspi_Action * -_elm_hoversel_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_hoversel_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "activate", "activate", NULL, _key_action_activate}, { "move,up", "move", "up", _key_action_move}, { "move,down", "move", "down", _key_action_move}, diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 94e14f804a..2112bf4e0f 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define ELM_WIDGET_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -1998,10 +1998,10 @@ _elm_naviframe_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN const Elm_Atspi_Action * -_elm_naviframe_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_naviframe_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "top_item_get", "top_item_get", NULL, _key_action_top_item_get }, { "item_pop", "item_pop", NULL, _key_action_item_pop }, { NULL, NULL, NULL, NULL } diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index 7249bb6ae4..efde951021 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -5,7 +5,7 @@ #include <Emotion.h> #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include <Elementary.h> #include "elm_priv.h" @@ -678,10 +678,10 @@ _elm_player_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN const Elm_Atspi_Action * -_elm_player_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Player_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_player_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Player_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "move,left", "move", "left", _key_action_move}, { "move,right", "move", "right", _key_action_move}, { "play", "play", NULL, _key_action_play}, diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 0962d6dc41..334508ca9b 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -1787,10 +1787,10 @@ _action_dismiss(Evas_Object *obj, const char *params EINA_UNUSED) return EINA_TRUE; } -EOLIAN const Elm_Atspi_Action * -_elm_popup_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Popup_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_popup_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Popup_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "dismiss", NULL, NULL, _action_dismiss}, { NULL, NULL, NULL, NULL } }; diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h index 788b02530e..b062509e22 100644 --- a/src/lib/elementary/elementary_config.h +++ b/src/lib/elementary/elementary_config.h @@ -24,4 +24,5 @@ #define EFL_ACCESS_SELECTION_BETA #define EFL_ACCESS_TEXT_BETA #define EFL_ACCESS_VALUE_BETA +#define EFL_ACCESS_WIDGET_ACTION_BETA #endif diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c index 47c45a753d..2a1167132f 100644 --- a/src/lib/elementary/elm_access.c +++ b/src/lib/elementary/elm_access.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include <Elementary.h> #include "elm_priv.h" @@ -1504,10 +1504,10 @@ _access_atspi_action_do(Evas_Object *obj, const char *params) return ret; } -EOLIAN const Elm_Atspi_Action * -_elm_access_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_access_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "highlight", NULL, "highlight", _access_atspi_action_do}, { "unhighlight", NULL, "unhighlight", _access_atspi_action_do}, { "highlight,next", NULL, "highlight,next", _access_atspi_action_do}, diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo index 7a23915db5..10cb87d46c 100644 --- a/src/lib/elementary/elm_access.eo +++ b/src/lib/elementary/elm_access.eo @@ -1,4 +1,4 @@ -class Elm.Access (Elm.Widget, Elm.Interface.Atspi_Widget_Action) +class Elm.Access (Elm.Widget, Efl.Access.Widget.Action) { [[Elm abstract accessibility class]] legacy_prefix: elm_access; @@ -9,7 +9,7 @@ class Elm.Access (Elm.Widget, Elm.Interface.Atspi_Widget_Action) Efl.Object.constructor; Elm.Widget.on_access_activate; Elm.Widget.on_focus_update; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.state_set { get; } } } diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index fbbcca9f13..4740b82bb2 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #define EFL_UI_FOCUS_OBJECT_PROTECTED @@ -2009,10 +2009,10 @@ _elm_calendar_class_constructor(Efl_Class *klass) _elm_calendar_smart_focus_next_enable = EINA_TRUE; } -EOLIAN static const Elm_Atspi_Action* -_elm_calendar_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Calendar_Data *sd EINA_UNUSED) +EOLIAN static const Elm_Access_Action* +_elm_calendar_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Calendar_Data *sd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "activate", "activate", NULL, _key_action_activate}, { NULL, NULL, NULL, NULL } }; diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo index 2b734b30fe..81f7c93c38 100644 --- a/src/lib/elementary/elm_calendar.eo +++ b/src/lib/elementary/elm_calendar.eo @@ -72,7 +72,7 @@ struct Elm.Calendar.Mark; [[Item handle for a calendar mark. with @Elm.Calendar.mark_del. ]] -class Elm.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface.Atspi_Widget_Action) +class Elm.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action) { [[Calendar widget @@ -416,7 +416,7 @@ class Elm.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface.Atspi Elm.Widget.on_access_update; Elm.Widget.on_focus_update; Elm.Widget.widget_event; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } events { changed; [[Emitted when the date in the calendar is changed]] diff --git a/src/lib/elementary/elm_color_item.eo b/src/lib/elementary/elm_color_item.eo index 0b04b0b51e..a979f76534 100644 --- a/src/lib/elementary/elm_color_item.eo +++ b/src/lib/elementary/elm_color_item.eo @@ -1,4 +1,4 @@ -class Elm.Color.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Elm.Interface.Atspi_Widget_Action) +class Elm.Color.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Access.Widget.Action) { [[Elementary color item class]] legacy_prefix: elm_color_item; @@ -46,6 +46,6 @@ class Elm.Color.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Elm.Interface.Atspi_W Efl.Ui.Focus.Object.focus_geometry { get; } Efl.Access.state_set { get; } Efl.Access.name { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } } diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 4b18340d6d..e769a4cfc6 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -4,7 +4,7 @@ #define EFL_ACCESS_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #define EFL_UI_FOCUS_OBJECT_PROTECTED @@ -2587,10 +2587,10 @@ _elm_colorselector_class_constructor(Efl_Class *klass) _elm_colorselector_smart_focus_next_enable = EINA_TRUE; } -EOLIAN static const Elm_Atspi_Action* -_elm_colorselector_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd EINA_UNUSED) +EOLIAN static const Elm_Access_Action* +_elm_colorselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "move,left", "move", "left", _key_action_move}, { "move,right", "move", "right", _key_action_move}, { "move,up", "move", "up", _key_action_move}, @@ -2667,10 +2667,10 @@ _elm_color_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Color_Item_Data *it) return EINA_FALSE; } -EOLIAN static const Elm_Atspi_Action* -_elm_color_item_elm_interface_atspi_widget_action_elm_actions_get(Eo *eo_it EINA_UNUSED, Elm_Color_Item_Data *it EINA_UNUSED) +EOLIAN static const Elm_Access_Action* +_elm_color_item_efl_access_widget_action_elm_actions_get(Eo *eo_it EINA_UNUSED, Elm_Color_Item_Data *it EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "activate", "activate", NULL, _item_action_activate}, { NULL, NULL, NULL, NULL } }; diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo index c38ebcfcd2..b7b41907f7 100644 --- a/src/lib/elementary/elm_colorselector.eo +++ b/src/lib/elementary/elm_colorselector.eo @@ -13,7 +13,7 @@ enum Elm.Colorselector.Mode } class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition, - Elm.Interface.Atspi_Widget_Action, Efl.Ui.Clickable) + Efl.Access.Widget.Action, Efl.Ui.Clickable) { [[Elementary colorselector class]] legacy_prefix: elm_colorselector; @@ -112,7 +112,7 @@ class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Widget.focus_highlight_geometry { get; } Elm.Widget.on_access_update; Elm.Widget.widget_event; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.children { get; } } events { diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo index 1c9592ba75..4758cca6eb 100644 --- a/src/lib/elementary/elm_combobox.eo +++ b/src/lib/elementary/elm_combobox.eo @@ -1,5 +1,5 @@ class Elm.Combobox (Efl.Ui.Button, Efl.Ui.Selectable, - Elm.Interface.Atspi_Widget_Action, + Efl.Access.Widget.Action, Elm.Entry, Elm.Genlist, Elm.Hover) { [[Elementary combobox class]] @@ -44,7 +44,7 @@ class Elm.Combobox (Efl.Ui.Button, Efl.Ui.Selectable, Elm.Widget.widget_event; Efl.Ui.Autorepeat.autorepeat_supported { get; } Elm.Genlist.filter { set; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } //Efl.Part.part; // TODO? } events { diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo index 2941b3b0c8..4166ace696 100644 --- a/src/lib/elementary/elm_ctxpopup.eo +++ b/src/lib/elementary/elm_ctxpopup.eo @@ -8,7 +8,7 @@ enum Elm.Ctxpopup.Direction unknown [[Ctxpopup does not determine it's direction yet.]] } -class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface.Atspi_Widget_Action, +class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Menu) { [[Elementary context popup class]] @@ -212,7 +212,7 @@ class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface.Atspi_Widge Efl.Ui.Menu.first_item { get; } Efl.Ui.Menu.last_item { get; } Efl.Ui.Menu.items { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.state_set { get; } Efl.Part.part; } diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index fe27ed72d9..2ba73c56c9 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -1766,10 +1766,10 @@ _elm_diskselector_class_constructor(Efl_Class *klass) _elm_diskselector_smart_focus_next_enable = EINA_TRUE; } -EOLIAN static const Elm_Atspi_Action* -_elm_diskselector_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Diskselector_Data *sd EINA_UNUSED) +EOLIAN static const Elm_Access_Action* +_elm_diskselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Diskselector_Data *sd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "move,previous", "move", "prev", _key_action_move}, { "move,next", "move", "next", _key_action_move}, { "move,first", "move", "first", _key_action_move}, diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo index 8cee8dc496..635ea341fd 100644 --- a/src/lib/elementary/elm_diskselector.eo +++ b/src/lib/elementary/elm_diskselector.eo @@ -1,5 +1,5 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable, - Elm.Interface.Atspi_Widget_Action, + Efl.Access.Widget.Action, Efl.Ui.Clickable, Efl.Ui.Scrollable, Efl.Ui.Selectable) { @@ -208,6 +208,6 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable, Elm.Widget.widget_sub_object_del; Elm.Widget.widget_event; Elm.Interface_Scrollable.policy { get; set; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } } diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo index 84651b01cd..ea97c274f4 100644 --- a/src/lib/elementary/elm_fileselector.eo +++ b/src/lib/elementary/elm_fileselector.eo @@ -1,5 +1,5 @@ class Elm.Fileselector (Efl.Ui.Layout, Elm.Interface.Fileselector, - Elm.Interface.Atspi_Widget_Action, + Efl.Access.Widget.Action, Efl.Ui.Clickable, Efl.Ui.Selectable) { [[Elementary fileselector class]] @@ -54,7 +54,7 @@ class Elm.Fileselector (Efl.Ui.Layout, Elm.Interface.Fileselector, Elm.Interface.Fileselector.folder_only { get; set; } Elm.Interface.Fileselector.mode { get; set; } Elm.Interface.Fileselector.current_name { get; set; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index cb078c6214..7e2c5410f6 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #include <Elementary.h> @@ -887,10 +887,10 @@ _elm_flipselector_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN const Elm_Atspi_Action * -_elm_flipselector_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_flipselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "flip,up", "flip", "up", _key_action_flip}, { "flip,down", "flip", "down", _key_action_flip}, { NULL, NULL, NULL, NULL} diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo index df32bdefa9..964cc59fd2 100644 --- a/src/lib/elementary/elm_flipselector.eo +++ b/src/lib/elementary/elm_flipselector.eo @@ -1,5 +1,5 @@ class Elm.Flipselector (Efl.Ui.Layout, Efl.Ui.Spin, - Elm.Interface.Atspi_Widget_Action, + Efl.Access.Widget.Action, Efl.Ui.Selectable) { [[Elementary flipselector class]] @@ -133,7 +133,7 @@ class Elm.Flipselector (Efl.Ui.Layout, Efl.Ui.Spin, Efl.Ui.Spin.step { get; set; } Efl.Ui.Spin.value { get; set; } Efl.Ui.Spin.interval { get; set; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } events { underflowed; [[Called when flipselector is underflowed]] diff --git a/src/lib/elementary/elm_general.eot b/src/lib/elementary/elm_general.eot index f44a955687..ae99de3fa4 100644 --- a/src/lib/elementary/elm_general.eot +++ b/src/lib/elementary/elm_general.eot @@ -135,4 +135,4 @@ enum Elm.Icon.Type /* FIXME: shouldn't exist */ struct @extern Elm_Gen_Item; -struct @extern Elm_Atspi_Action; +struct @extern Elm_Access_Action; diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 025db3035e..6f7765f1e3 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -4,7 +4,7 @@ #define EFL_ACCESS_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED @@ -5559,10 +5559,10 @@ _elm_gengrid_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN const Elm_Atspi_Action * -_elm_gengrid_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_gengrid_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "move,prior", "move", "prior", _key_action_move}, { "move,next", "move", "next", _key_action_move}, { "move,left", "move", "left", _key_action_move}, diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo index efa0e954e3..cc3c7bd13b 100644 --- a/src/lib/elementary/elm_gengrid.eo +++ b/src/lib/elementary/elm_gengrid.eo @@ -11,7 +11,7 @@ enum Elm.Gengrid.Reorder_Type } class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, - Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action, + Efl.Ui.Clickable, Efl.Access.Widget.Action, Efl.Access.Selection) { [[Elementary gengrid class]] @@ -560,7 +560,7 @@ class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Elm.Interface_Scrollable.policy { get; set; } Efl.Access.children { get; } Efl.Access.state_set { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } Efl.Access.Selection.selected_child_deselect; diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index c2d59bb4c1..63ff822561 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -6,7 +6,7 @@ #define EFL_ACCESS_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED @@ -8586,10 +8586,10 @@ _elm_genlist_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN const Elm_Atspi_Action * -_elm_genlist_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_genlist_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "move,prior", "move", "prior", _key_action_move}, { "move,next", "move", "next", _key_action_move}, { "move,left", "move", "left", _key_action_move}, diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo index c0460b12ef..1c5d74c8bd 100644 --- a/src/lib/elementary/elm_genlist.eo +++ b/src/lib/elementary/elm_genlist.eo @@ -3,7 +3,7 @@ import elm_list; import elm_genlist_item; class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Clickable, - Elm.Interface.Atspi_Widget_Action, Efl.Access.Selection, + Efl.Access.Widget_Action, Efl.Access.Selection, Efl.Ui.Selectable) { [[Elementary genlist class]] @@ -546,7 +546,7 @@ class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Elm.Interface_Scrollable.policy { get; set; } Efl.Access.children { get; } Efl.Access.state_set { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } Efl.Access.Selection.selected_child_deselect; diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index d87df91638..7a615d627b 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -4,7 +4,7 @@ #define ELM_WIDGET_PROTECTED #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -855,10 +855,10 @@ _action_dismiss(Evas_Object *obj, const char *params EINA_UNUSED) return EINA_TRUE; } -EOLIAN const Elm_Atspi_Action * -_elm_hover_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Hover_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_hover_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Hover_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "dismiss", NULL, NULL, _action_dismiss}, { NULL, NULL, NULL, NULL} }; diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo index 53a339a409..a1c33f0b4b 100644 --- a/src/lib/elementary/elm_hover.eo +++ b/src/lib/elementary/elm_hover.eo @@ -7,7 +7,7 @@ enum Elm.Hover.Axis both [[ELM_HOVER_AXIS_BOTH -- both.]] } -class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action) +class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable, Efl.Access.Widget.Action) { [[Elementary hover class]] legacy_prefix: elm_hover; @@ -68,7 +68,7 @@ class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable, Elm.Interf Elm.Widget.widget_sub_object_add; Elm.Widget.widget_parent { get; set; } Elm.Widget.widget_sub_object_del; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo index 1deb509621..a1461e29a2 100644 --- a/src/lib/elementary/elm_hoversel.eo +++ b/src/lib/elementary/elm_hoversel.eo @@ -2,7 +2,7 @@ import elm_general; class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable, Efl.Ui.Clickable, - Elm.Interface.Atspi_Widget_Action) + Efl.Access.Widget.Action) { [[Elementary hoversel class]] legacy_prefix: elm_hoversel; @@ -100,7 +100,7 @@ class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable, Efl.Ui.Translatable.translation_update; Elm.Widget.widget_event; Efl.Ui.Autorepeat.autorepeat_supported { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } events { dismissed; [[Called when hoversel is dismissed]] diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index 91fb2e37d5..0f7ae5a00b 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -1693,10 +1693,10 @@ _elm_index_item_efl_access_name_get(Eo *eo_it, Elm_Index_Item_Data *data) return _elm_widget_item_accessible_plain_name_get(eo_it, data->letter); } -EOLIAN static const Elm_Atspi_Action* -_elm_index_item_elm_interface_atspi_widget_action_elm_actions_get(Eo *eo_it EINA_UNUSED, Elm_Index_Item_Data *data EINA_UNUSED) +EOLIAN static const Elm_Access_Action* +_elm_index_item_efl_access_widget_action_elm_actions_get(Eo *eo_it EINA_UNUSED, Elm_Index_Item_Data *data EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "activate", "activate", NULL, _item_action_activate}, { NULL, NULL, NULL, NULL } }; diff --git a/src/lib/elementary/elm_index_item.eo b/src/lib/elementary/elm_index_item.eo index 8db78b1d2b..b1c3d8bdeb 100644 --- a/src/lib/elementary/elm_index_item.eo +++ b/src/lib/elementary/elm_index_item.eo @@ -1,4 +1,4 @@ -class Elm.Index.Item(Elm.Widget.Item, Elm.Interface.Atspi_Widget_Action) +class Elm.Index.Item(Elm.Widget.Item, Efl.Access.Widget.Action) { [[Elementary index item class]] legacy_prefix: elm_index_item; @@ -45,6 +45,6 @@ class Elm.Index.Item(Elm.Widget.Item, Elm.Interface.Atspi_Widget_Action) Efl.Object.destructor; Elm.Widget.Item.access_register; Efl.Access.name { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } } diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h index e746e1ded6..c15669ebea 100644 --- a/src/lib/elementary/elm_interfaces.h +++ b/src/lib/elementary/elm_interfaces.h @@ -1,6 +1,6 @@ #include "efl_access.h" #include "efl_access_text.h" -#include "elm_interface_atspi_widget_action.h" +#include "efl_access_widget_action.h" #include "efl_access_window.h" // FIXME FIXME FIXME -- Still required because of photocam diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 47f63dfe88..324f4eccd4 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -3118,10 +3118,10 @@ _elm_list_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN const Elm_Atspi_Action * -_elm_list_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_List_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_list_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_List_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "move,prior", "move", "prior", _key_action_move}, { "move,next", "move", "next", _key_action_move}, { "move,left", "move", "left", _key_action_move}, diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo index e30d036d08..b496924ae1 100644 --- a/src/lib/elementary/elm_list.eo +++ b/src/lib/elementary/elm_list.eo @@ -37,7 +37,7 @@ enum Elm.List.Mode } class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable, - Elm.Interface.Atspi_Widget_Action, Efl.Access.Selection, + Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Clickable, Efl.Ui.Selectable) { [[Elementary list class]] @@ -444,7 +444,7 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable, Elm.Widget.focused_item { get; } Elm.Interface_Scrollable.item_loop_enabled { get; set; } Elm.Interface_Scrollable.policy { set; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.children { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 5c2e68d957..ef99241268 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include <Elementary.h> @@ -5600,10 +5600,10 @@ _elm_map_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN const Elm_Atspi_Action * -_elm_map_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Map_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_map_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Map_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "move,prior", "move", "prior", _key_action_move}, { "move,next", "move", "next", _key_action_move}, { "move,left", "move", "left", _key_action_move}, diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo index 908444da84..0862ce606c 100644 --- a/src/lib/elementary/elm_map.eo +++ b/src/lib/elementary/elm_map.eo @@ -70,7 +70,7 @@ enum Elm.Map.Route_Method class Elm.Map (Elm.Widget, Elm.Interface_Scrollable, - Elm.Interface.Atspi_Widget_Action, + Efl.Access.Widget.Action, Efl.Ui.Clickable) { [[Elementary map class]] @@ -633,7 +633,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable, Elm.Widget.theme_apply; Elm.Widget.on_focus_update; Elm.Widget.widget_event; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } events { press; [[Called when map was pressed]] diff --git a/src/lib/elementary/elm_multibuttonentry_item.eo b/src/lib/elementary/elm_multibuttonentry_item.eo index a3875a9a47..1c7292db71 100644 --- a/src/lib/elementary/elm_multibuttonentry_item.eo +++ b/src/lib/elementary/elm_multibuttonentry_item.eo @@ -1,5 +1,5 @@ class Elm.Multibuttonentry.Item(Elm.Widget.Item, - Elm.Interface.Atspi_Widget_Action) + Efl.Access.Widget.Action) { [[Elementary multibuttonentry class]] legacy_prefix: elm_multibuttonentry_item; @@ -32,6 +32,6 @@ class Elm.Multibuttonentry.Item(Elm.Widget.Item, Elm.Widget.Item.disable; Efl.Access.name { get; } Efl.Access.state_set { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } } diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo index a9e16e0381..bfdbfc832b 100644 --- a/src/lib/elementary/elm_naviframe.eo +++ b/src/lib/elementary/elm_naviframe.eo @@ -1,4 +1,4 @@ -class Elm.Naviframe (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action) +class Elm.Naviframe (Efl.Ui.Layout, Efl.Access.Widget.Action) { [[Elementary naviframe class]] legacy_prefix: elm_naviframe; @@ -149,7 +149,7 @@ class Elm.Naviframe (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action) Elm.Widget.theme_apply; Elm.Widget.widget_event; Efl.Canvas.Layout_Signal.signal_emit; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Elm.Widget.resize_object { set; } Efl.Part.part; } diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index b7d4bcd79a..a2ed24d661 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_LAYER_PROTECTED #include <Elementary.h> @@ -1410,10 +1410,10 @@ _elm_panel_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN const Elm_Atspi_Action * -_elm_panel_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Panel_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_panel_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Panel_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "toggle", "toggle", NULL, _key_action_toggle}, { NULL, NULL, NULL, NULL } }; diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo index 1762a8e87e..107b1aeba6 100644 --- a/src/lib/elementary/elm_panel.eo +++ b/src/lib/elementary/elm_panel.eo @@ -9,7 +9,7 @@ enum Elm.Panel.Orient } class Elm.Panel (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, - Elm.Interface.Atspi_Widget_Action) + Efl.Access.Widget.Action) { [[Elementary panel class]] legacy_prefix: elm_panel; @@ -84,7 +84,7 @@ class Elm.Panel (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, Elm.Widget.on_access_update; Elm.Widget.widget_event; Elm.Widget.interest_region { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo index 1c4e80733a..bb2d95bb24 100644 --- a/src/lib/elementary/elm_player.eo +++ b/src/lib/elementary/elm_player.eo @@ -1,4 +1,4 @@ -class Elm.Player (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action) +class Elm.Player (Efl.Ui.Layout, Efl.Access.Widget.Action) { [[Elementary player class]] legacy_prefix: elm_player; @@ -9,7 +9,7 @@ class Elm.Player (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action) Efl.Object.constructor; Elm.Widget.theme_apply; Elm.Widget.widget_event; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index cc7c0e81a0..db836a84ea 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo @@ -23,7 +23,7 @@ enum Elm.Popup.Orient } -class Elm.Popup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface.Atspi_Widget_Action) +class Elm.Popup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action) { [[Elementary popup class]] legacy_prefix: elm_popup; @@ -175,7 +175,7 @@ class Elm.Popup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface.Atspi_Widget_A Elm.Widget.widget_sub_object_del; Elm.Widget.widget_event; Efl.Canvas.Layout_Signal.signal_emit; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.state_set { get; } Efl.Access.name { get; } Efl.Part.part; diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 7198593110..dc93cc2730 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include <Elementary.h> @@ -1346,10 +1346,10 @@ _elm_scroller_elm_widget_focus_state_apply(Eo *obj, Elm_Scroller_Data *pd EINA_U } -EOLIAN const Elm_Atspi_Action * -_elm_scroller_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Scroller_Data *pd EINA_UNUSED) +EOLIAN const Elm_Access_Action * +_elm_scroller_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Scroller_Data *pd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "move,prior", "move", "prior", _key_action_move}, { "move,next", "move", "next", _key_action_move}, { "move,left", "move", "left", _key_action_move}, diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo index 2ba17180b3..10fae3ec81 100644 --- a/src/lib/elementary/elm_scroller.eo +++ b/src/lib/elementary/elm_scroller.eo @@ -1,5 +1,5 @@ class Elm.Scroller (Efl.Ui.Layout, Elm.Interface_Scrollable, - Elm.Interface.Atspi_Widget_Action, + Efl.Access.Widget.Action, Efl.Ui.Scrollable, Efl.Container) { [[Elementary scroller class]] @@ -54,7 +54,7 @@ class Elm.Scroller (Efl.Ui.Layout, Elm.Interface_Scrollable, Elm.Interface_Scrollable.page_size { set; } Elm.Interface_Scrollable.policy { set; } Elm.Interface_Scrollable.single_direction { get; set; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Part.part; Elm.Widget.focus_state_apply; } diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c index b37cba64d8..cb9ecce764 100644 --- a/src/lib/elementary/elm_slideshow.c +++ b/src/lib/elementary/elm_slideshow.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #include <Elementary.h> @@ -694,10 +694,10 @@ _elm_slideshow_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN static const Elm_Atspi_Action* -_elm_slideshow_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd EINA_UNUSED) +EOLIAN static const Elm_Access_Action* +_elm_slideshow_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "move,left", "move", "left", _key_action_move}, { "move,right", "move", "right", _key_action_move}, { "pause", "pause", NULL, _key_action_pause}, diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo index 7842be06b7..7436044040 100644 --- a/src/lib/elementary/elm_slideshow.eo +++ b/src/lib/elementary/elm_slideshow.eo @@ -1,6 +1,6 @@ type Elm_Slideshow_Item_Class: __undefined_type; [[Elementary slideshow item class type]] -class Elm.Slideshow (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action) +class Elm.Slideshow (Efl.Ui.Layout, Efl.Access.Widget.Action) { [[Elementary slideshow class]] eo_prefix: elm_obj_slideshow; @@ -305,7 +305,7 @@ class Elm.Slideshow (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action) class.constructor; Efl.Object.constructor; Elm.Widget.widget_event; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } events { changed; [[Called when slideshow widget changed]] diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index cad50767d7..25213e7758 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -4,7 +4,7 @@ #define EFL_ACCESS_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #include <Elementary.h> @@ -1645,10 +1645,10 @@ _elm_spinner_class_constructor(Efl_Class *klass) _elm_spinner_smart_focus_next_enable = EINA_TRUE; } -EOLIAN static const Elm_Atspi_Action * -_elm_spinner_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd EINA_UNUSED) +EOLIAN static const Elm_Access_Action * +_elm_spinner_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "toggle", "toggle", NULL, _key_action_toggle}, { NULL, NULL, NULL, NULL } }; diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo index 53192c146b..880916710e 100644 --- a/src/lib/elementary/elm_spinner.eo +++ b/src/lib/elementary/elm_spinner.eo @@ -1,5 +1,5 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Spin, Efl.Ui.Focus.Composition, - Efl.Access.Value, Elm.Interface.Atspi_Widget_Action) + Efl.Access.Value, Efl.Access.Widget.Action) { [[Elementary spinner class]] legacy_prefix: elm_spinner; @@ -158,7 +158,7 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Spin, Efl.Ui.Focus.Composition, Efl.Access.Value.value_and_text { get; set; } Efl.Access.Value.range { get; } Efl.Access.Value.increment { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } } events { changed; [[Called when spinner changed]] diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 5160fd4df1..24a40f6d90 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -5,7 +5,7 @@ #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #define EFL_ACCESS_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED #define EFL_UI_FOCUS_OBJECT_PROTECTED @@ -3911,10 +3911,10 @@ _elm_toolbar_class_constructor(Efl_Class *klass) evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -EOLIAN static const Elm_Atspi_Action* -_elm_toolbar_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd EINA_UNUSED) +EOLIAN static const Elm_Access_Action* +_elm_toolbar_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd EINA_UNUSED) { - static Elm_Atspi_Action atspi_actions[] = { + static Elm_Access_Action atspi_actions[] = { { "select", "select", NULL, _key_action_select}, { NULL, NULL, NULL, NULL } }; diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo index cec74dcbcc..3198d61d02 100644 --- a/src/lib/elementary/elm_toolbar.eo +++ b/src/lib/elementary/elm_toolbar.eo @@ -24,7 +24,7 @@ enum Elm.Toolbar.Shrink_Mode } class Elm.Toolbar (Elm.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Direction, - Elm.Interface.Atspi_Widget_Action, Efl.Access.Selection, + Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Menu) { [[Elementary toolbar class]] @@ -329,7 +329,7 @@ class Elm.Toolbar (Elm.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scrollabl Elm.Widget.focused_item { get; } Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $horizontal.]] } Elm.Widget.focus_state_apply; - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.children { get; } Efl.Access.state_set { get; } Efl.Access.Selection.selected_children_count { get; } --
