diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index d7d3e1dadf..9dfd2f561c 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -90,7 +90,7 @@ elm_public_eolian_files = \ lib/elementary/efl_ui_scroller.eo \ lib/elementary/efl_ui_scroll_manager.eo \ lib/elementary/efl_ui_pan.eo \ - lib/elementary/efl_access.eo \ + lib/elementary/efl_access_object.eo \ lib/elementary/efl_access_action.eo \ lib/elementary/efl_access_component.eo \ lib/elementary/efl_access_editable_text.eo \ @@ -305,7 +305,7 @@ includesdir = $(includedir)/elementary-@VMAJ@ includesunstable_HEADERS = \ lib/elementary/elm_gen_common.h \ lib/elementary/elm_atspi_bridge.h \ - lib/elementary/efl_access.h \ + lib/elementary/efl_access_object.h \ lib/elementary/efl_access_text.h \ lib/elementary/efl_access_widget_action.h \ lib/elementary/efl_access_window.h \ @@ -701,7 +701,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_icon.c \ lib/elementary/efl_ui_image.c \ lib/elementary/elm_index.c \ - lib/elementary/efl_access.c \ + lib/elementary/efl_access_object.c \ lib/elementary/efl_access_action.c \ lib/elementary/efl_access_component.c \ lib/elementary/efl_access_editable_text.c \ diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h index f232a3bb1c..6590ed38ef 100644 --- a/src/lib/elementary/Efl_Ui.h +++ b/src/lib/elementary/Efl_Ui.h @@ -161,7 +161,7 @@ typedef Eo Efl_Ui_Focus_Manager; # include # include # include -# include +# include # include # include diff --git a/src/lib/elementary/efl_access_component.c b/src/lib/elementary/efl_access_component.c index 3cd166906f..90e28fc90c 100644 --- a/src/lib/elementary/efl_access_component.c +++ b/src/lib/elementary/efl_access_component.c @@ -4,7 +4,7 @@ #define EFL_ACCESS_COMPONENT_PROTECTED #define EFL_ACCESS_COMPONENT_BETA -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include @@ -47,7 +47,7 @@ _efl_access_component_accessible_at_point_get(Eo *obj, void *_pd EINA_UNUSED, Ei Eina_List *l, *children; Eo *ret = NULL, *child; - children = efl_access_children_get(obj); + children = efl_access_object_access_children_get(obj); EINA_LIST_FOREACH(children, l, child) { diff --git a/src/lib/elementary/efl_access.c b/src/lib/elementary/efl_access_object.c similarity index 76% rename from src/lib/elementary/efl_access.c rename to src/lib/elementary/efl_access_object.c index 9346b6dca4..49e9dc39b8 100644 --- a/src/lib/elementary/efl_access.c +++ b/src/lib/elementary/efl_access_object.c @@ -2,7 +2,7 @@ #include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include #include "elm_widget.h" @@ -121,7 +121,7 @@ struct _Efl_Access_Event_Handler void *data; }; -struct _Efl_Access_Data +struct _Efl_Access_Object_Data { Efl_Access_Relation_Set relations; Eina_List *attr_list; @@ -133,23 +133,23 @@ struct _Efl_Access_Data Efl_Access_Type type: 2; }; -typedef struct _Efl_Access_Data Efl_Access_Data; +typedef struct _Efl_Access_Object_Data Efl_Access_Object_Data; static Eina_List *global_callbacks; static Eo *root; EOLIAN static int -_efl_access_index_in_parent_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED) +_efl_access_object_index_in_parent_get(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED) { Eina_List *l, *children = NULL; Eo *chld, *parent = NULL; int ret = 0; - parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN); + parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); if (!parent) return -1; - children = efl_access_children_get(parent); + children = efl_access_object_access_children_get(parent); if (!children) return -1; EINA_LIST_FOREACH(children, l, chld) @@ -169,22 +169,22 @@ _efl_access_index_in_parent_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED) EOLIAN static Efl_Object * -_efl_access_efl_object_provider_find(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED, const Efl_Object *klass) +_efl_access_object_efl_object_provider_find(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED, const Efl_Object *klass) { if (efl_isa(obj, klass)) { - if (klass == EFL_ACCESS_MIXIN) + if (klass == EFL_ACCESS_OBJECT_MIXIN) { - Efl_Access_Type type = efl_access_type_get(obj); + Efl_Access_Type type = efl_access_object_access_type_get(obj); if (type != EFL_ACCESS_TYPE_SKIPPED) return (Eo*)obj; } else return (Eo*)obj; } - return efl_provider_find(efl_super(obj, EFL_ACCESS_MIXIN), klass); + return efl_provider_find(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN), klass); } EOLIAN Eina_List* -_efl_access_attributes_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) +_efl_access_object_attributes_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd) { Eina_List *attr_list = NULL; if (pd->attr_list) @@ -206,7 +206,7 @@ _efl_access_attributes_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) } EOLIAN static void -_efl_access_attribute_append(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *key, const char *value) +_efl_access_object_attribute_append(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd, const char *key, const char *value) { Eina_List *l; Efl_Access_Attribute *attr = NULL; @@ -232,7 +232,7 @@ _efl_access_attribute_append(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const cha pd->attr_list = eina_list_append(pd->attr_list, attr); } -EOLIAN static void _efl_access_attributes_clear(Eo *obj EINA_UNUSED, Efl_Access_Data *pd) +EOLIAN static void _efl_access_object_attributes_clear(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd) { if (!pd->attr_list) return; Efl_Access_Attribute *attr; @@ -246,7 +246,7 @@ EOLIAN static void _efl_access_attributes_clear(Eo *obj EINA_UNUSED, Efl_Access_ } EOLIAN static void -_efl_access_reading_info_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Reading_Info_Type reading_info) +_efl_access_object_reading_info_type_set(Eo *obj, Efl_Access_Object_Data *pd, Efl_Access_Reading_Info_Type reading_info) { Eina_Strbuf *buf = NULL; pd->reading_info = reading_info; @@ -271,24 +271,24 @@ _efl_access_reading_info_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Readi { eina_strbuf_append(buf, "state"); } - efl_access_attribute_append(obj, "reading_info_type", eina_strbuf_string_get(buf)); + efl_access_object_attribute_append(obj, "reading_info_type", eina_strbuf_string_get(buf)); eina_strbuf_free(buf); } EOLIAN Efl_Access_Reading_Info_Type -_efl_access_reading_info_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) +_efl_access_object_reading_info_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd) { return pd->reading_info; } EOLIAN static Efl_Access_Role -_efl_access_role_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) +_efl_access_object_role_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd) { return pd->role; } EOLIAN static void -_efl_access_role_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Role role) +_efl_access_object_role_set(Eo *obj, Efl_Access_Object_Data *pd, Efl_Access_Role role) { if (pd->role != role) { @@ -298,17 +298,17 @@ _efl_access_role_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Role role) } EOLIAN const char * -_efl_access_role_name_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED) +_efl_access_object_role_name_get(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED) { Efl_Access_Role role; - role = efl_access_role_get(obj); + role = efl_access_object_role_get(obj); return role > EFL_ACCESS_ROLE_LAST_DEFINED ? "" : Access_Name[role]; } EOLIAN const char * -_efl_access_i18n_name_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) +_efl_access_object_i18n_name_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd) { #ifdef ENABLE_NLS if (pd->translation_domain) @@ -318,12 +318,12 @@ _efl_access_i18n_name_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) } EOLIAN static void -_efl_access_i18n_name_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val) +_efl_access_object_i18n_name_set(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd, const char *val) { eina_stringshare_replace(&pd->name, val); } -const char * _efl_access_description_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) +const char * _efl_access_object_description_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd) { #ifdef ENABLE_NLS if (pd->translation_domain) @@ -333,16 +333,16 @@ const char * _efl_access_description_get(const Eo *obj EINA_UNUSED, Efl_Access_D } EOLIAN static void -_efl_access_description_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val) +_efl_access_object_description_set(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd, const char *val) { eina_stringshare_replace(&pd->description, val); } EOLIAN static const char * -_efl_access_localized_role_name_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED) +_efl_access_object_localized_role_name_get(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED) { const char *ret = NULL; - ret = efl_access_role_name_get(obj); + ret = efl_access_object_role_name_get(obj); #ifdef ENABLE_NLS ret = gettext(ret); #endif @@ -350,7 +350,7 @@ _efl_access_localized_role_name_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUS } EOLIAN static Eina_List * -_efl_access_access_children_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED) +_efl_access_object_access_children_get(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED) { Eina_List *children = NULL; Eina_Iterator *iter = NULL; @@ -363,7 +363,7 @@ _efl_access_access_children_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED) EINA_ITERATOR_FOREACH(iter, chld) { - if (efl_isa(chld, EFL_ACCESS_MIXIN)) + if (efl_isa(chld, EFL_ACCESS_OBJECT_MIXIN)) children = eina_list_append(children, chld); } eina_iterator_free(iter); @@ -372,13 +372,13 @@ _efl_access_access_children_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED) } EOLIAN static Efl_Access_State_Set -_efl_access_state_set_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED) +_efl_access_object_state_set_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd EINA_UNUSED) { return 0; } EOLIAN Efl_Access_Relation_Set -_efl_access_relation_set_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) +_efl_access_object_relation_set_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd) { return efl_access_relation_set_clone(pd->relations); } @@ -395,26 +395,26 @@ EAPI void efl_access_attributes_list_free(Eina_List *list) } EOLIAN void -_efl_access_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info) +_efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info) { Eina_List *l; Efl_Access_Event_Handler *hdl; Efl_Access_Type type; - if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_MIXIN)) + if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_OBJECT_MIXIN)) { CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL"); return; } - type = efl_access_type_get(accessible); + type = efl_access_object_access_type_get(accessible); if (type != EFL_ACCESS_TYPE_REGULAR) return; - if (event == EFL_ACCESS_EVENT_CHILDREN_CHANGED) + if (event == EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED) { Efl_Access_Event_Children_Changed_Data *event_data = event_info; - type = efl_access_type_get(event_data->child); + type = efl_access_object_access_type_get(event_data->child); if (type != EFL_ACCESS_TYPE_REGULAR) return; } @@ -431,7 +431,7 @@ _efl_access_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessib } EOLIAN Efl_Access_Event_Handler * -_efl_access_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data) +_efl_access_object_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data) { Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler)); @@ -444,7 +444,7 @@ _efl_access_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_E } EOLIAN void -_efl_access_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Access_Event_Handler *handler) +_efl_access_object_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Access_Event_Handler *handler) { Eina_List *l, *l2; Efl_Access_Event_Handler *hdl; @@ -460,14 +460,14 @@ _efl_access_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_A } EOLIAN void -_efl_access_translation_domain_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *domain) +_efl_access_object_translation_domain_set(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd, const char *domain) { eina_stringshare_replace(&pd->translation_domain, domain); } EOLIAN const char* -_efl_access_translation_domain_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) +_efl_access_object_translation_domain_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd) { return pd->translation_domain; } @@ -519,7 +519,7 @@ efl_access_relation_set_relation_append(Efl_Access_Relation_Set *set, Efl_Access Efl_Access_Relation *rel; Eina_List *l; - if (!efl_isa(rel_obj, EFL_ACCESS_MIXIN)) + if (!efl_isa(rel_obj, EFL_ACCESS_OBJECT_MIXIN)) return EINA_FALSE; EINA_LIST_FOREACH(*set, l, rel) @@ -623,13 +623,13 @@ efl_access_relation_set_clone(const Efl_Access_Relation_Set set) } EOLIAN static Eina_Bool -_efl_access_relationship_append(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Access_Relation_Type type, const Efl_Access *relation_obj) +_efl_access_object_relationship_append(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *sd, Efl_Access_Relation_Type type, const Efl_Access_Object *relation_obj) { return efl_access_relation_set_relation_append(&sd->relations, type, relation_obj); } EOLIAN static void -_efl_access_relationship_remove(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Access_Relation_Type type, const Efl_Access *relation_obj) +_efl_access_object_relationship_remove(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *sd, Efl_Access_Relation_Type type, const Efl_Access_Object *relation_obj) { if (relation_obj) efl_access_relation_set_relation_remove(&sd->relations, type, relation_obj); @@ -638,14 +638,14 @@ _efl_access_relationship_remove(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Ac } EOLIAN static void -_efl_access_relationships_clear(Eo *obj EINA_UNUSED, Efl_Access_Data *sd) +_efl_access_object_relationships_clear(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *sd) { efl_access_relation_set_free(sd->relations); sd->relations = NULL; } EOLIAN Eo* -_efl_access_access_root_get(const Eo *class EINA_UNUSED, void *pd EINA_UNUSED) +_efl_access_object_access_root_get(const Eo *class EINA_UNUSED, void *pd EINA_UNUSED) { if (!root) root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); @@ -654,19 +654,19 @@ _efl_access_access_root_get(const Eo *class EINA_UNUSED, void *pd EINA_UNUSED) } EOLIAN Efl_Access_Type -_efl_access_access_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) +_efl_access_object_access_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd) { return pd->type; } EOLIAN void -_efl_access_access_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Type val) +_efl_access_object_access_type_set(Eo *obj, Efl_Access_Object_Data *pd, Efl_Access_Type val) { - Efl_Access *parent; + Efl_Access_Object *parent; if (val == pd->type) return; - parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN); + parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); switch (val) { @@ -683,14 +683,14 @@ _efl_access_access_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Type val) } EOLIAN void -_efl_access_efl_object_destructor(Eo *obj, Efl_Access_Data *pd) +_efl_access_object_efl_object_destructor(Eo *obj, Efl_Access_Object_Data *pd) { eina_stringshare_del(pd->name); eina_stringshare_del(pd->description); eina_stringshare_del(pd->translation_domain); efl_access_relation_set_free(pd->relations); - efl_destructor(efl_super(obj, EFL_ACCESS_MIXIN)); + efl_destructor(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN)); } void @@ -704,4 +704,4 @@ _efl_access_shutdown(void) ELM_SAFE_DEL(root); } -#include "efl_access.eo.c" +#include "efl_access_object.eo.c" diff --git a/src/lib/elementary/efl_access.eo b/src/lib/elementary/efl_access_object.eo similarity index 97% rename from src/lib/elementary/efl_access.eo rename to src/lib/elementary/efl_access_object.eo index 7d40c65f66..1abaeb549e 100644 --- a/src/lib/elementary/efl_access.eo +++ b/src/lib/elementary/efl_access_object.eo @@ -244,11 +244,11 @@ struct Efl.Access.Relation type Efl.Access.Relation_Set: list; [[Elementary Accessibility relation set type]] -mixin Efl.Access (Efl.Interface, Efl.Object) +mixin Efl.Access.Object (Efl.Interface, Efl.Object) { [[Accessibility accessible mixin]] - eo_prefix: efl_access; - data: Efl_Access_Data; + eo_prefix: efl_access_object; + data: Efl_Access_Object_Data; methods { @property localized_role_name @protected @beta { [[Gets an localized string describing accessible object role name.]] @@ -291,7 +291,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) get { } values { - children: list @owned; [[List of widget's children]] + children: list @owned; [[List of widget's children]] } } @property role_name @protected @beta { @@ -378,7 +378,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) event_emit @class @protected @beta { [[Emit event]] params { - @in accessible: Efl.Access; [[Accessibility object.]] + @in accessible: Efl.Access.Object; [[Accessibility object.]] @cref event: Efl.Event.Description; [[Accessibility event type.]] @in event_info: void_ptr; [[Accessibility event details.]] } @@ -431,7 +431,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) return: bool; [[$true if relationship was successfully appended, $false otherwise]] params { @in type: Efl.Access.Relation_Type; [[Relation type]] - @in relation_object: const(Efl.Access); [[Object to relate to]] + @in relation_object: const(Efl.Access.Object); [[Object to relate to]] } } relationship_remove @beta { @@ -442,7 +442,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) ]] params { @in type: Efl.Access.Relation_Type; [[Relation type]] - @in relation_object: const(Efl.Access); [[Object to remove relation from]] + @in relation_object: const(Efl.Access.Object); [[Object to remove relation from]] } } relationships_clear @beta { diff --git a/src/lib/elementary/efl_access.h b/src/lib/elementary/efl_access_object.h similarity index 70% rename from src/lib/elementary/efl_access.h rename to src/lib/elementary/efl_access_object.h index 7ccf83262b..e06471ce4b 100644 --- a/src/lib/elementary/efl_access.h +++ b/src/lib/elementary/efl_access_object.h @@ -4,10 +4,10 @@ #ifdef EFL_BETA_API_SUPPORT #ifdef EFL_EO_API_SUPPORT -#include "efl_access.eo.h" +#include "efl_access_object.eo.h" #endif #ifndef EFL_NOLEGACY_API_SUPPORT -#include "efl_access.eo.legacy.h" +#include "efl_access_object.eo.legacy.h" #endif /* @@ -75,7 +75,7 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela Efl_Access_Event_State_Changed_Data evinfo; \ evinfo.type = (tp); \ evinfo.new_value = (nvl); \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_STATE_CHANGED, (void*)&evinfo); \ + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \ } while(0); } /** @@ -84,38 +84,38 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela #define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \ do { \ Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \ + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \ } while(0); /** * Emits Accessible 'PropertyChanged' signal for 'Name' property. */ #define efl_access_i18n_name_changed_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "i18n_name"); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name"); /** * Emits Accessible 'PropertyChanged' signal for 'Description' property. */ #define efl_access_description_changed_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "description"); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description"); /** * Emits Accessible 'PropertyChanged' signal for 'Parent' property. */ #define efl_access_parent_changed_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "parent"); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent"); /** * Emits Accessible 'PropertyChanged' signal for 'Role' property. */ #define efl_access_role_changed_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "role"); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role"); /** * Emits Accessible 'PropertyChanged' signal for 'Value' property. */ #define efl_access_value_changed_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "value"); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value"); /** * Emits Accessible 'ChildrenChanged' signal with added child as argument. @@ -123,7 +123,7 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela #define efl_access_children_changed_added_signal_emit(obj, child) \ do { \ Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_CHILDREN_CHANGED, &atspi_data); \ + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \ } while(0); /** @@ -132,32 +132,32 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela #define efl_access_children_changed_del_signal_emit(obj, child) \ do { \ Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_CHILDREN_CHANGED, &atspi_data); \ + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \ } while(0); /** * Emits Accessible 'ActiveDescendantChanged' signal. */ #define efl_access_active_descendant_changed_signal_emit(obj, child) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_ACTIVE_DESCENDANT_CHANGED, child); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child); /** * Emits Accessible 'VisibleDataChanged' signal. */ #define efl_access_visible_data_changed_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_VISIBLE_DATA_CHANGED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL); /** * Emits Accessible 'AddAccessible' signal. */ #define efl_access_added(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_ADDED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL); /** * Emits Accessible 'RemoveAccessible' signal. */ #define efl_access_removed(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_REMOVED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL); #endif diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h index 06dce849b1..38938d21ca 100644 --- a/src/lib/elementary/efl_access_window.h +++ b/src/lib/elementary/efl_access_window.h @@ -14,43 +14,43 @@ * Emits 'Window:Activated' accessible signal. */ #define efl_access_window_activated_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL); /** * Emits 'Window:Deactivated' accessible signal. */ #define efl_access_window_deactivated_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL); /** * Emits 'Window:Created' accessible signal. */ #define efl_access_window_created_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL); /** * Emits 'Window:Destroyed' accessible signal. */ #define efl_access_window_destroyed_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL); /** * Emits 'Window:Maximized' accessible signal. */ #define efl_access_window_maximized_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL); /** * Emits 'Window:Minimized' accessible signal. */ #define efl_access_window_minimized_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL); /** * Emits 'Window:Restored' accessible signal. */ #define efl_access_window_restored_signal_emit(obj) \ - efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL); #endif #endif diff --git a/src/lib/elementary/efl_ui_bg_widget.c b/src/lib/elementary/efl_ui_bg_widget.c index 8fe8072345..f343788c3c 100644 --- a/src/lib/elementary/efl_ui_bg_widget.c +++ b/src/lib/elementary/efl_ui_bg_widget.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_LAYOUT_PROTECTED #include @@ -48,7 +48,7 @@ _efl_ui_bg_widget_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Widget_Data *pd) pd->file = NULL; pd->key = NULL; - efl_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); + efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); efl_ui_widget_focus_allow_set(obj, EINA_FALSE); diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c index 4cf38a1273..573f7b99ec 100644 --- a/src/lib/elementary/efl_ui_box.c +++ b/src/lib/elementary/efl_ui_box.c @@ -161,8 +161,8 @@ _efl_ui_box_efl_object_constructor(Eo *obj, Efl_Ui_Box_Data *pd) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED); - efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); + efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); pd->align.h = 0.5; pd->align.v = 0.5; diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index ba24914836..8dda34a3c9 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_WIDGET_ACTION_PROTECTED -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_LAYOUT_PROTECTED #include @@ -236,7 +236,7 @@ _efl_ui_button_efl_object_constructor(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS { obj = efl_constructor(efl_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); return obj; } diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c index 60f6730083..48189c8ba7 100644 --- a/src/lib/elementary/efl_ui_calendar.c +++ b/src/lib/elementary/efl_ui_calendar.c @@ -1028,7 +1028,7 @@ _efl_ui_calendar_efl_object_constructor(Eo *obj, Efl_Ui_Calendar_Data *sd) obj = efl_constructor(efl_super(obj, MY_CLASS)); sd->obj = obj; evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR); obj = _efl_ui_calendar_constructor_internal(obj, sd); diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index dcde1a6830..6c781cf403 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_LAYOUT_PROTECTED #define EFL_UI_NSTATE_PROTECTED @@ -86,11 +86,11 @@ _activate(Evas_Object *obj) } EOLIAN static Efl_Access_State_Set -_efl_ui_check_efl_access_state_set_get(const Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED) +_efl_ui_check_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED) { Efl_Access_State_Set states = 0; - states = efl_access_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS)); + 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); @@ -287,7 +287,7 @@ _efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED) efl_layout_signal_callback_add (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj); - efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX); _elm_access_object_register(obj, wd->resize_obj); _elm_access_text_set (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Check")); diff --git a/src/lib/elementary/efl_ui_check.eo b/src/lib/elementary/efl_ui_check.eo index 5784fc9409..43b23fbcb5 100644 --- a/src/lib/elementary/efl_ui_check.eo +++ b/src/lib/elementary/efl_ui_check.eo @@ -27,7 +27,7 @@ class Efl.Ui.Check (Efl.Ui.Nstate, Efl.Access.Widget.Action) Efl.Ui.Widget.widget_event; Efl.Ui.Nstate.count { set; } Efl.Ui.Nstate.value { set; } - Efl.Access.state_set { get; } + Efl.Access.Object.state_set { get; } Efl.Access.Widget.Action.elm_actions { get; } } } diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c index 11c17986cd..bad166ced6 100644 --- a/src/lib/elementary/efl_ui_clock.c +++ b/src/lib/elementary/efl_ui_clock.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED #include @@ -933,7 +933,7 @@ _efl_ui_clock_efl_object_constructor(Eo *obj, Efl_Ui_Clock_Data *_pd EINA_UNUSED { obj = efl_constructor(efl_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR); return obj; } diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index b1a4fd2fac..65f314a6f3 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include #include "elm_priv.h" @@ -1868,7 +1868,7 @@ _efl_ui_flip_efl_object_constructor(Eo *obj, Efl_Ui_Flip_Data *sd) sd->obj = obj; evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST); return obj; } diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c index 2b9a1fe00b..6e405f703a 100644 --- a/src/lib/elementary/efl_ui_frame.c +++ b/src/lib/elementary/efl_ui_frame.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_LAYOUT_PROTECTED #include @@ -132,7 +132,7 @@ _efl_ui_frame_efl_object_constructor(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UNUSED { obj = efl_constructor(efl_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_FRAME); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FRAME); return obj; } diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index c1e2b3a602..8111298484 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_IMAGE_PROTECTED -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_LAYOUT_CALC_PROTECTED @@ -855,7 +855,7 @@ _efl_ui_image_efl_object_constructor(Eo *obj, Efl_Ui_Image_Data *pd) { obj = efl_constructor(efl_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE); pd->scale_type = EFL_IMAGE_SCALE_TYPE_FIT_INSIDE; pd->self = obj; diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index a2bb38ffb3..0ee60cf01a 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_UI_SCROLL_MANAGER_PROTECTED #define EFL_UI_SCROLLBAR_PROTECTED @@ -1789,7 +1789,7 @@ _efl_ui_image_zoomable_efl_object_constructor(Eo *obj, Efl_Ui_Image_Zoomable_Dat { obj = efl_constructor(efl_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE); return obj; } diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 1d0755ce93..63080d4e16 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_LAYOUT_PROTECTED #define EFL_UI_WIDGET_PART_BG_PROTECTED @@ -2116,7 +2116,7 @@ _efl_ui_layout_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Data *sd) sd->obj = obj; obj = efl_constructor(efl_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); return obj; } diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c index 1888cf1dc4..164d9ae7f6 100644 --- a/src/lib/elementary/efl_ui_panes.c +++ b/src/lib/elementary/efl_ui_panes.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_LAYOUT_PROTECTED #define EFL_GFX_SIZE_HINT_PROTECTED @@ -465,7 +465,7 @@ _efl_ui_panes_efl_object_constructor(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UNUSED { obj = efl_constructor(efl_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_SPLIT_PANE); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SPLIT_PANE); return obj; } diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index 1637958d99..63ffe26ddd 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_LAYOUT_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED @@ -381,7 +381,7 @@ _efl_ui_progressbar_efl_object_constructor(Eo *obj, Efl_Ui_Progressbar_Data *_pd { obj = efl_constructor(efl_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_PROGRESS_BAR); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PROGRESS_BAR); efl_ui_range_min_max_set(obj, 0.0, 1.0); return obj; } diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index 78afc19c60..755532d5e0 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_LAYOUT_PROTECTED @@ -196,7 +196,7 @@ _efl_ui_radio_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Data *pd) elm_layout_sizing_eval(obj); - efl_access_role_set(obj, EFL_ACCESS_ROLE_RADIO_BUTTON); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_RADIO_BUTTON); _elm_access_text_set (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Radio")); _elm_access_callback_set @@ -323,11 +323,11 @@ _efl_ui_radio_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED } EOLIAN Efl_Access_State_Set -_efl_ui_radio_efl_access_state_set_get(const Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED) +_efl_ui_radio_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED) { Efl_Access_State_Set ret; - ret = efl_access_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS)); + 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); diff --git a/src/lib/elementary/efl_ui_radio.eo b/src/lib/elementary/efl_ui_radio.eo index c561eac409..44d3df9276 100644 --- a/src/lib/elementary/efl_ui_radio.eo +++ b/src/lib/elementary/efl_ui_radio.eo @@ -64,7 +64,7 @@ class Efl.Ui.Radio (Efl.Ui.Check, Efl.Access.Widget.Action, Efl.Content) Efl.Ui.Widget.theme_apply; Efl.Ui.Widget.on_access_activate; Efl.Ui.Widget.widget_event; - Efl.Access.state_set { get; } + Efl.Access.Object.state_set { get; } Efl.Access.Widget.Action.elm_actions { get; } Efl.Ui.Nstate.value { set; get; } } diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index 48c447bee4..50af0f6f2e 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED #define ELM_LAYOUT_PROTECTED @@ -1216,7 +1216,7 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUS { obj = efl_constructor(efl_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_SLIDER); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SLIDER); return obj; } diff --git a/src/lib/elementary/efl_ui_slider_interval.c b/src/lib/elementary/efl_ui_slider_interval.c index f30d4efd0d..9f7f0fe5ad 100644 --- a/src/lib/elementary/efl_ui_slider_interval.c +++ b/src/lib/elementary/efl_ui_slider_interval.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_INTERFACE_ATSPI_VALUE_PROTECTED diff --git a/src/lib/elementary/efl_ui_spin.c b/src/lib/elementary/efl_ui_spin.c index c479099c6c..1df1b6c161 100644 --- a/src/lib/elementary/efl_ui_spin.c +++ b/src/lib/elementary/efl_ui_spin.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c index 21b08a31d0..fe11db473b 100644 --- a/src/lib/elementary/efl_ui_spin_button.c +++ b/src/lib/elementary/efl_ui_spin_button.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED @@ -792,7 +792,7 @@ _efl_ui_spin_button_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Button_Data *sd) elm_widget_can_focus_set(obj, EINA_TRUE); - efl_access_role_set(obj, EFL_ACCESS_ROLE_SPIN_BUTTON); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SPIN_BUTTON); return obj; } @@ -883,10 +883,10 @@ _efl_ui_spin_button_efl_access_value_increment_get(const Eo *obj EINA_UNUSED, Ef } EOLIAN static const char* -_efl_ui_spin_button_efl_access_i18n_name_get(const Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED) +_efl_ui_spin_button_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED) { const char *name; - name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS)); + name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS)); if (name) return name; const char *ret = elm_layout_text_get(obj, "elm.text"); return ret; diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo index 3883fe8b0f..c47ac268c6 100644 --- a/src/lib/elementary/efl_ui_spin_button.eo +++ b/src/lib/elementary/efl_ui_spin_button.eo @@ -68,7 +68,7 @@ class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition, Efl.Ui.Widget.widget_event; Efl.Ui.Focus.Object.on_focus_update; Efl.Ui.Range.range_value { set; } - Efl.Access.i18n_name { get; } + Efl.Access.Object.i18n_name { get; } Efl.Access.Value.value_and_text { get; set; } Efl.Access.Value.range { get; } Efl.Access.Value.increment { get; } diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c index b734057307..1cd42502aa 100644 --- a/src/lib/elementary/efl_ui_table.c +++ b/src/lib/elementary/efl_ui_table.c @@ -188,7 +188,7 @@ _efl_ui_table_efl_object_constructor(Eo *obj, Efl_Ui_Table_Data *pd) { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); - efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); pd->dir1 = EFL_UI_DIR_RIGHT; pd->dir2 = EFL_UI_DIR_DOWN; diff --git a/src/lib/elementary/efl_ui_table_static.c b/src/lib/elementary/efl_ui_table_static.c index 4febcbeee5..dff66efecc 100644 --- a/src/lib/elementary/efl_ui_table_static.c +++ b/src/lib/elementary/efl_ui_table_static.c @@ -11,7 +11,7 @@ _efl_ui_table_static_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); - efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); gd = efl_data_scope_get(obj, EFL_UI_TABLE_CLASS); gd->req_cols = 100; diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 1b784f5b7c..3d63f21f34 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_TEXT_PROTECTED #define EFL_ACCESS_EDITABLE_TEXT_PROTECTED #define ELM_LAYOUT_PROTECTED @@ -2130,14 +2130,14 @@ _entry_changed_user_signal_cb(void *data, atspi_info.content = edje_info->change.insert.content; atspi_info.pos = edje_info->change.insert.pos; atspi_info.len = edje_info->change.insert.plain_length; - efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); } else if (edje_info && !edje_info->insert) { atspi_info.content = edje_info->change.del.content; atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; - efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); } } } @@ -2192,7 +2192,7 @@ _entry_cursor_changed_signal_cb(void *data, _decoration_defer(obj); if (_elm_config->atspi_mode) - efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); } static void @@ -2203,7 +2203,7 @@ _entry_cursor_changed_manual_signal_cb(void *data, { efl_event_callback_call(data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL); if (_elm_config->atspi_mode) - efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); } static void @@ -3010,7 +3010,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd) elm_widget_sub_object_parent_add(obj); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY); efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL); efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL); @@ -3317,7 +3317,7 @@ _efl_ui_text_password_mode_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password sd->single_line = EINA_TRUE; sd->line_wrap = ELM_WRAP_NONE; efl_ui_text_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA)); - efl_access_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT); } else { @@ -3329,7 +3329,7 @@ _efl_ui_text_password_mode_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password _dnd_drop_cb, NULL); efl_ui_text_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA)); - efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY); } efl_ui_widget_theme_apply(obj); @@ -4460,10 +4460,10 @@ _efl_ui_text_efl_access_editable_text_cut(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNU } EOLIAN static Efl_Access_State_Set -_efl_ui_text_efl_access_state_set_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) +_efl_ui_text_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) { Efl_Access_State_Set ret; - ret = efl_access_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS)); + ret = efl_access_object_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS)); if (efl_ui_text_interactive_editable_get(obj)) STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE); @@ -4472,10 +4472,10 @@ _efl_ui_text_efl_access_state_set_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_ } EOLIAN static const char* -_efl_ui_text_efl_access_i18n_name_get(const Eo *obj, Efl_Ui_Text_Data *pd) +_efl_ui_text_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Text_Data *pd) { const char *name; - name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_TEXT_CLASS)); + name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_TEXT_CLASS)); if (name && strncmp("", name, 1)) return name; const char *ret = edje_object_part_text_get(pd->entry_edje, "elm.guide"); return ret; diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo index 67ba1e3bb2..2e6501cf6c 100644 --- a/src/lib/elementary/efl_ui_text.eo +++ b/src/lib/elementary/efl_ui_text.eo @@ -337,8 +337,8 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Ui.Widget.widget_sub_object_del; Elm.Interface_Scrollable.policy { set; } Elm.Interface_Scrollable.bounce_allow { set; } - Efl.Access.state_set { get; } - Efl.Access.i18n_name { get; } + Efl.Access.Object.state_set { get; } + Efl.Access.Object.i18n_name { get; } Efl.Access.Text.access_text { get; } Efl.Access.Text.string { get; } Efl.Access.Text.attribute { get; } diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c index f23fe57bce..f96a888084 100644 --- a/src/lib/elementary/efl_ui_video.c +++ b/src/lib/elementary/efl_ui_video.c @@ -4,7 +4,7 @@ #include -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include @@ -261,7 +261,7 @@ _efl_ui_video_efl_object_constructor(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED { obj = efl_constructor(efl_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ANIMATION); return obj; } diff --git a/src/lib/elementary/efl_ui_view_list.c b/src/lib/elementary/efl_ui_view_list.c index 785888e9c2..d55777beab 100644 --- a/src/lib/elementary/efl_ui_view_list.c +++ b/src/lib/elementary/efl_ui_view_list.c @@ -1,7 +1,7 @@ #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define EFL_UI_SCROLL_MANAGER_PROTECTED @@ -657,7 +657,7 @@ _efl_ui_view_list_efl_canvas_group_group_add(Eo *obj, Efl_Ui_View_List_Data *pd) efl_gfx_visible_set(pd->pan_obj, EINA_TRUE); - efl_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); + efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); edje_object_size_min_calc(wd->resize_obj, &min.w, &min.h); efl_gfx_size_hint_restricted_min_set(obj, min); @@ -719,7 +719,7 @@ _efl_ui_view_list_efl_object_constructor(Eo *obj, Efl_Ui_View_List_Data *pd) pd->obj = obj; efl_canvas_object_type_set(obj, MY_CLASS_NAME); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST); pd->segarray = efl_add(EFL_UI_VIEW_LIST_SEGARRAY_CLASS, obj, efl_ui_view_list_segarray_setup(efl_added, 32)); @@ -970,12 +970,12 @@ _efl_ui_view_list_efl_ui_focus_composition_prepare(Eo *obj, Efl_Ui_View_List_Dat } EOLIAN Eina_List* -_efl_ui_view_list_efl_access_access_children_get(const Eo *obj, Efl_Ui_View_List_Data *pd) +_efl_ui_view_list_efl_access_object_access_children_get(const Eo *obj, Efl_Ui_View_List_Data *pd) { Eina_List *ret = NULL, *ret2 = NULL; ret = efl_ui_view_list_relayout_elements_get(pd->relayout); - ret2 = efl_access_children_get(efl_super(obj, EFL_UI_VIEW_LIST_CLASS)); + ret2 = efl_access_object_access_children_get(efl_super(obj, EFL_UI_VIEW_LIST_CLASS)); return eina_list_merge(ret, ret2); } diff --git a/src/lib/elementary/efl_ui_view_list.eo b/src/lib/elementary/efl_ui_view_list.eo index cfb7607ae4..a6665af7e0 100644 --- a/src/lib/elementary/efl_ui_view_list.eo +++ b/src/lib/elementary/efl_ui_view_list.eo @@ -92,7 +92,7 @@ class Efl.Ui.View.List (Efl.Ui.Layout, Efl.Ui.View, Efl.Ui.Scrollable.Interactiv // Elm.Interface.Atspi_Accessible.children { get; } // Elm.Interface.Atspi_Widget.Action.elm_actions { get; } // Efl.Access.Widget.Action.elm_actions { get; } - Efl.Access.access_children { get; } + Efl.Access.Object.access_children { 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/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 9ec840fb20..dad8db3428 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -1565,8 +1565,8 @@ _efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Ob evas_object_size_hint_display_mode_get(obj)); if (_elm_config->atspi_mode && !sd->on_create) { - Efl_Access *aparent; - aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_MIXIN); + Efl_Access_Object *aparent; + aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_MIXIN); if (aparent) efl_access_children_changed_added_signal_emit(aparent, sobj); } @@ -1643,8 +1643,8 @@ _efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Ob } if (_elm_config->atspi_mode && !sd->on_destroy) { - Efl_Access *aparent; - aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_MIXIN); + Efl_Access_Object *aparent; + aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_MIXIN); if (aparent) efl_access_children_changed_del_signal_emit(aparent, sobj); } @@ -3967,7 +3967,7 @@ _elm_widget_item_efl_object_destructor(Eo *eo_item, Elm_Widget_Item_Data *item) } eina_hash_free(item->labels); - efl_access_attributes_clear(eo_item); + efl_access_object_attributes_clear(eo_item); efl_access_removed(eo_item); EINA_MAGIC_SET(item, EINA_MAGIC_NONE); @@ -4184,8 +4184,8 @@ _elm_widget_item_accessible_plain_name_get(const Elm_Object_Item *item, const ch } EOLIAN static Efl_Access_State_Set -_elm_widget_item_efl_access_state_set_get(const Eo *eo_item, - Elm_Widget_Item_Data *item EINA_UNUSED) +_elm_widget_item_efl_access_object_state_set_get(const Eo *eo_item, + Elm_Widget_Item_Data *item EINA_UNUSED) { Efl_Access_State_Set states = 0; @@ -5258,7 +5258,7 @@ _efl_ui_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UN efl_ui_widget_parent_set(obj, parent); sd->on_create = EINA_FALSE; - efl_access_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN); efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _focus_event_changed, NULL); @@ -5286,7 +5286,7 @@ _efl_ui_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd) efl_event_callback_del(sd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed_cb, obj); sd->manager.provider = NULL; } - efl_access_attributes_clear(obj); + efl_access_object_attributes_clear(obj); efl_access_removed(obj); if (sd->logical.parent) { @@ -5371,10 +5371,10 @@ _efl_ui_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *p } EOLIAN static const char* -_efl_ui_widget_efl_access_i18n_name_get(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_efl_ui_widget_efl_access_object_i18n_name_get(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { const char *ret, *name; - name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); + name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); if (name) return name; @@ -5385,7 +5385,7 @@ _efl_ui_widget_efl_access_i18n_name_get(const Eo *obj, Elm_Widget_Smart_Data *_p } EOLIAN static Eina_List* -_efl_ui_widget_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd) +_efl_ui_widget_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd) { Eina_List *l, *accs = NULL; Evas_Object *widget; @@ -5394,13 +5394,13 @@ _efl_ui_widget_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Wid EINA_LIST_FOREACH(pd->subobjs, l, widget) { if (!elm_object_widget_check(widget)) continue; - if (!efl_isa(widget, EFL_ACCESS_MIXIN)) continue; - type = efl_access_type_get(widget); + if (!efl_isa(widget, EFL_ACCESS_OBJECT_MIXIN)) continue; + type = efl_access_object_access_type_get(widget); if (type == EFL_ACCESS_TYPE_DISABLED) continue; if (type == EFL_ACCESS_TYPE_SKIPPED) { Eina_List *children; - children = efl_access_children_get(widget); + children = efl_access_object_access_children_get(widget); accs = eina_list_merge(accs, children); continue; } @@ -5410,11 +5410,11 @@ _efl_ui_widget_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Wid } EOLIAN static Efl_Access_State_Set -_efl_ui_widget_efl_access_state_set_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_efl_ui_widget_efl_access_object_state_set_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { Efl_Access_State_Set states = 0; - states = efl_access_state_set_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); + states = efl_access_object_state_set_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); if (evas_object_visible_get(obj)) { @@ -5439,14 +5439,14 @@ _efl_ui_widget_efl_access_state_set_get(const Eo *obj, Elm_Widget_Smart_Data *pd } EOLIAN static Eina_List* -_efl_ui_widget_efl_access_attributes_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_efl_ui_widget_efl_access_object_attributes_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { const char *type = NULL; const char *style = NULL; Eina_List *attr_list = NULL; Efl_Access_Attribute *attr = NULL; - attr_list = efl_access_attributes_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); + attr_list = efl_access_object_attributes_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); //Add type and style information in addition. type = elm_widget_type_get(obj); @@ -5477,13 +5477,13 @@ _efl_ui_widget_efl_access_attributes_get(const Eo *obj, Elm_Widget_Smart_Data *p } EOLIAN static Eina_List * -_elm_widget_item_efl_access_attributes_get(const Eo *eo_item, Elm_Widget_Item_Data *pd EINA_UNUSED) +_elm_widget_item_efl_access_object_attributes_get(const Eo *eo_item, Elm_Widget_Item_Data *pd EINA_UNUSED) { const char *style = NULL; Eina_List *attr_list = NULL; Efl_Access_Attribute *attr = NULL; - attr_list = efl_access_attributes_get(efl_super(eo_item, ELM_WIDGET_ITEM_CLASS)); + attr_list = efl_access_object_attributes_get(efl_super(eo_item, ELM_WIDGET_ITEM_CLASS)); style = elm_object_item_style_get(eo_item); if (style) @@ -5542,9 +5542,9 @@ _efl_ui_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd if ((klass == EFL_CONFIG_INTERFACE) || (klass == EFL_CONFIG_GLOBAL_CLASS)) return _efl_config_obj; - if (klass == EFL_ACCESS_MIXIN) + if (klass == EFL_ACCESS_OBJECT_MIXIN) { - Efl_Access_Type type = efl_access_type_get(obj); + Efl_Access_Type type = efl_access_object_access_type_get(obj); if (type != EFL_ACCESS_TYPE_SKIPPED) return (Eo*)obj; } diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo index beaef04de1..aacc8831b6 100644 --- a/src/lib/elementary/efl_ui_widget.eo +++ b/src/lib/elementary/efl_ui_widget.eo @@ -13,7 +13,7 @@ struct Efl.Ui.Widget.Focus_State { logical : bool; [[$true if this is registered as logical currently]] } -abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access, +abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object, Efl.Access.Component, Efl.Part, Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor, Efl.Ui.Translatable, Efl.Selection, Efl.Ui.Dnd) @@ -585,10 +585,10 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access, Efl.Canvas.Group.group_calculate; Efl.Canvas.Group.group_member_del; Efl.Canvas.Group.group_member_add; - Efl.Access.i18n_name { get; } - Efl.Access.state_set { get; } - Efl.Access.access_children { get; } - Efl.Access.attributes { get; } + Efl.Access.Object.i18n_name { get; } + Efl.Access.Object.state_set { get; } + Efl.Access.Object.access_children { get; } + Efl.Access.Object.attributes { get; } Efl.Access.Component.focus_grab; Efl.Ui.Focus.Object.focus_manager { get; } Efl.Ui.Focus.Object.focus_parent { get; } diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index d8504a8563..f314d6230c 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_INPUT_EVENT_PROTECTED @@ -2271,7 +2271,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd) { Eo *root; efl_access_window_created_signal_emit(obj); - root = efl_access_root_get(EFL_ACCESS_MIXIN); + root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); if (root) efl_access_children_changed_added_signal_emit(root, obj); } @@ -2325,7 +2325,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd) if (_elm_config->atspi_mode) { Eo *root; - root = efl_access_root_get(EFL_ACCESS_MIXIN); + root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); efl_access_window_destroyed_signal_emit(obj); if (root) efl_access_children_changed_del_signal_emit(root, obj); @@ -4324,7 +4324,7 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style) efreet_desktop_free(d); } } - efl_access_type_set(sd->icon, EFL_ACCESS_TYPE_DISABLED); + efl_access_object_access_type_set(sd->icon, EFL_ACCESS_TYPE_DISABLED); } edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon); @@ -5376,7 +5376,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U elm_win_focus_highlight_animate_set(obj, EINA_TRUE); } - efl_access_role_set(obj, EFL_ACCESS_ROLE_WINDOW); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_WINDOW); if (_elm_config->atspi_mode) efl_access_window_created_signal_emit(obj); @@ -6955,10 +6955,10 @@ _efl_ui_win_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, } EOLIAN static Efl_Access_State_Set -_efl_ui_win_efl_access_state_set_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) +_efl_ui_win_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) { Efl_Access_State_Set ret; - ret = efl_access_state_set_get(efl_super(obj, MY_CLASS)); + 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); @@ -6967,10 +6967,10 @@ _efl_ui_win_efl_access_state_set_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNU } EOLIAN static const char* -_efl_ui_win_efl_access_i18n_name_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) +_efl_ui_win_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) { const char *ret; - ret = efl_access_i18n_name_get(efl_super(obj, EFL_UI_WIN_CLASS)); + ret = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_WIN_CLASS)); if (ret) return ret; const char *name = elm_win_title_get(obj); return name; @@ -7024,7 +7024,7 @@ _efl_ui_win_efl_object_provider_find(const Eo *obj, return (Eo *)obj; // attach all kinds of windows directly to ATSPI application root object - if (klass == EFL_ACCESS_MIXIN) return efl_access_root_get(EFL_ACCESS_MIXIN); + if (klass == EFL_ACCESS_OBJECT_MIXIN) return efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE) return pd->provider; diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 53601f1b9e..b6ee42a3a1 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -788,8 +788,8 @@ class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Canvas.Pointer, Efl.Acces Efl.Ui.Focus.Object.on_focus_update; Efl.Ui.Widget.widget_event; Efl.Ui.Widget.focus_manager_create; - Efl.Access.state_set { get; } - Efl.Access.i18n_name { get; } + Efl.Access.Object.state_set { get; } + Efl.Access.Object.i18n_name { get; } Efl.Access.Component.extents { get; } Efl.Access.Widget.Action.elm_actions { get; } Efl.Input.State.modifier_enabled { get; } diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index a2b85ce880..a2c7c22e63 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -373,7 +373,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE); //hover-parent sd->hover_parent = elm_object_top_widget_get(obj); diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 2f6d499eb3..55507d7252 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_UI_WIDGET_PROTECTED //#define EFL_UI_WIDGET_BETA @@ -1145,7 +1145,7 @@ _elm_ctxpopup_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU); return obj; } @@ -1532,10 +1532,10 @@ _elm_ctxpopup_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED } EOLIAN static Efl_Access_State_Set -_elm_ctxpopup_efl_access_state_set_get(const Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED) +_elm_ctxpopup_efl_access_object_state_set_get(const Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED) { Efl_Access_State_Set ret; - ret = efl_access_state_set_get(efl_super(obj, MY_CLASS)); + ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS)); STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL); diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index e4630b60d2..e09ff15fd6 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -9,7 +9,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include @@ -2051,7 +2051,7 @@ _elm_fileselector_efl_object_constructor(Eo *obj, Elm_Fileselector_Data *sd) sd->obj = obj; efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_FILE_CHOOSER); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILE_CHOOSER); return obj; } diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index 7519ecd01a..edf8a90e47 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include #include "elm_priv.h" @@ -274,7 +274,7 @@ _elm_fileselector_button_efl_object_constructor(Eo *obj, Elm_Fileselector_Button efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); return obj; } diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index 357e48f290..d8f43e5cc5 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -3,7 +3,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include #include "elm_priv.h" @@ -338,7 +338,7 @@ _elm_fileselector_entry_efl_object_constructor(Eo *obj, Elm_Fileselector_Entry_D obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_GROUPING); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_GROUPING); return obj; } diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index d0121c05c9..c7985f5f4c 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -705,7 +705,7 @@ _elm_hoversel_efl_object_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); return obj; } @@ -1042,7 +1042,7 @@ _elm_hoversel_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED } EOLIAN Eina_List* -_elm_hoversel_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Hoversel_Data *pd) +_elm_hoversel_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Hoversel_Data *pd) { return eina_list_clone(pd->items); } diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index e30578e650..f2c7390cb6 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED //#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED @@ -748,12 +748,12 @@ _item_new(Elm_Multibuttonentry_Data *sd, return NULL; WIDGET_ITEM_DATA_SET(eo_item, data); - efl_access_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON); + efl_access_object_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON); ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item); VIEW(item) = elm_layout_add(obj); - efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_DISABLED); + efl_access_object_access_type_set(VIEW(item), EFL_ACCESS_TYPE_DISABLED); if (!elm_layout_theme_set(VIEW(item), "multibuttonentry", PART_NAME_BUTTON, elm_widget_style_get(obj))) @@ -1683,7 +1683,7 @@ _elm_multibuttonentry_efl_object_constructor(Eo *obj, Elm_Multibuttonentry_Data obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_PANEL); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PANEL); //listen to manager changes here efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _legacy_manager_changed_cb, NULL); @@ -1977,18 +1977,18 @@ _elm_multibuttonentry_class_constructor(Efl_Class *klass) } EOLIAN static Eina_List* -_elm_multibuttonentry_efl_access_access_children_get(const Eo *obj, Elm_Multibuttonentry_Data *sd) +_elm_multibuttonentry_efl_access_object_access_children_get(const Eo *obj, Elm_Multibuttonentry_Data *sd) { Eina_List *ret; - ret = efl_access_children_get(efl_super(obj, ELM_MULTIBUTTONENTRY_CLASS)); + ret = efl_access_object_access_children_get(efl_super(obj, ELM_MULTIBUTTONENTRY_CLASS)); return eina_list_merge(eina_list_clone(sd->items), ret); } EOLIAN static const char* -_elm_multibuttonentry_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Multibuttonentry_Item_Data *item) +_elm_multibuttonentry_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_Multibuttonentry_Item_Data *item) { const char *ret; - ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); + ret = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); if (ret) return ret; ret = elm_object_part_text_get(VIEW(item), "elm.btn.text"); @@ -1996,12 +1996,12 @@ _elm_multibuttonentry_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Multibu } EOLIAN static Efl_Access_State_Set -_elm_multibuttonentry_item_efl_access_state_set_get(const Eo *eo_it, Elm_Multibuttonentry_Item_Data *sd EINA_UNUSED) +_elm_multibuttonentry_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Multibuttonentry_Item_Data *sd EINA_UNUSED) { Efl_Access_State_Set ret; Eina_Bool sel; - ret = efl_access_state_set_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); + ret = efl_access_object_state_set_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); sel = elm_obj_multibuttonentry_item_selected_get(eo_it); diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 3362efcd45..fe9d75f538 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define ELM_WIDGET_PROTECTED @@ -544,7 +544,7 @@ _elm_naviframe_item_elm_widget_item_part_text_set(Eo *eo_it, if (nit->title_label) strncat(buf, " ", 1); strncat(buf, nit->subtitle_label, sizeof(buf) - strlen(buf) - 2); } - efl_access_i18n_name_set(eo_it, buf); + efl_access_object_i18n_name_set(eo_it, buf); elm_layout_sizing_eval(WIDGET(nit)); } @@ -1267,8 +1267,8 @@ _item_new(Evas_Object *obj, ELM_NAVIFRAME_DATA_GET(obj, sd); eo_item = efl_add(ELM_NAVIFRAME_ITEM_CLASS, obj); - efl_access_role_set(eo_item, EFL_ACCESS_ROLE_PAGE_TAB); - efl_access_i18n_name_set(eo_item, (char*)title_label); + efl_access_object_role_set(eo_item, EFL_ACCESS_ROLE_PAGE_TAB); + efl_access_object_i18n_name_set(eo_item, (char*)title_label); if (!eo_item) { @@ -1593,7 +1593,7 @@ _elm_naviframe_efl_object_constructor(Eo *obj, Elm_Naviframe_Data *sd) sd->obj = obj; efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST); return obj; } @@ -1950,7 +1950,7 @@ _elm_naviframe_item_pop_cb_set(Eo *eo_item EINA_UNUSED, } EOLIAN static Eina_List* -_elm_naviframe_item_efl_access_access_children_get(const Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit) +_elm_naviframe_item_efl_access_object_access_children_get(const Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit) { Eina_List *ret = NULL; diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index 1c7cb92dbd..533647a790 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -4,7 +4,7 @@ #include -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include @@ -667,7 +667,7 @@ _elm_player_efl_object_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ANIMATION); return obj; } diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 1b91e1805e..4e150af2ad 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -1523,7 +1523,7 @@ _elm_popup_efl_object_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_DIALOG); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_DIALOG); return obj; } @@ -1794,10 +1794,10 @@ _elm_popup_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, E } EOLIAN static Efl_Access_State_Set -_elm_popup_efl_access_state_set_get(const Eo *obj, Elm_Popup_Data *sd EINA_UNUSED) +_elm_popup_efl_access_object_state_set_get(const Eo *obj, Elm_Popup_Data *sd EINA_UNUSED) { Efl_Access_State_Set ret; - ret = efl_access_state_set_get(efl_super(obj, MY_CLASS)); + ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS)); STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL); @@ -1805,12 +1805,12 @@ _elm_popup_efl_access_state_set_get(const Eo *obj, Elm_Popup_Data *sd EINA_UNUSE } EOLIAN static const char* -_elm_popup_efl_access_i18n_name_get(const Eo *obj, Elm_Popup_Data *sd) +_elm_popup_efl_access_object_i18n_name_get(const Eo *obj, Elm_Popup_Data *sd) { const char *name = NULL; Eina_Strbuf *buf; - name = efl_access_i18n_name_get(efl_super(obj, ELM_POPUP_CLASS)); + name = efl_access_object_i18n_name_get(efl_super(obj, ELM_POPUP_CLASS)); if (name) return name; buf = eina_strbuf_new(); diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h index 8c44596cfb..c726711d94 100644 --- a/src/lib/elementary/elementary_config.h +++ b/src/lib/elementary/elementary_config.h @@ -15,7 +15,7 @@ #define EFL_CANVAS_OBJECT_PROTECTED #define EFL_CANVAS_GROUP_PROTECTED #define EFL_CANVAS_GROUP_BETA -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #define EFL_ACCESS_COMPONENT_BETA #define EFL_ACCESS_EDITABLE_TEXT_BETA #define EFL_ACCESS_IMAGE_BETA diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c index 0859a0ecd6..566cf492b8 100644 --- a/src/lib/elementary/elm_access.c +++ b/src/lib/elementary/elm_access.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include @@ -1522,10 +1522,10 @@ _elm_access_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, } EOLIAN static Efl_Access_State_Set -_elm_access_efl_access_state_set_get(const Eo *obj, void *pd EINA_UNUSED) +_elm_access_efl_access_object_state_set_get(const Eo *obj, void *pd EINA_UNUSED) { Efl_Access_State_Set ret; - ret = efl_access_state_set_get(efl_super(obj, ELM_ACCESS_CLASS)); + ret = efl_access_object_state_set_get(efl_super(obj, ELM_ACCESS_CLASS)); Elm_Access_Info *info = _elm_access_info_get(obj); if (info && !evas_object_visible_get(info->part_object)) diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo index 29e85037d0..fae20a694d 100644 --- a/src/lib/elementary/elm_access.eo +++ b/src/lib/elementary/elm_access.eo @@ -10,6 +10,6 @@ class Elm.Access (Efl.Ui.Widget, Efl.Access.Widget.Action) Efl.Ui.Widget.on_access_activate; Efl.Ui.Focus.Object.on_focus_update; Efl.Access.Widget.Action.elm_actions { get; } - Efl.Access.state_set { get; } + Efl.Access.Object.state_set { get; } } } diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c index ed834d87c2..912c4b5219 100644 --- a/src/lib/elementary/elm_actionslider.c +++ b/src/lib/elementary/elm_actionslider.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_LAYOUT_PROTECTED #include @@ -548,7 +548,7 @@ _elm_actionslider_efl_object_constructor(Eo *obj, Elm_Actionslider_Data *_pd EIN obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_SLIDER); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SLIDER); return obj; } diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c index 570b996a3b..77cfe7f93c 100644 --- a/src/lib/elementary/elm_atspi_app_object.c +++ b/src/lib/elementary/elm_atspi_app_object.c @@ -2,7 +2,7 @@ #include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include #include "elm_widget.h" @@ -26,7 +26,7 @@ _elm_atspi_app_object_efl_object_destructor(Eo *obj EINA_UNUSED, Elm_Atspi_App_O } EOLIAN static Eina_List* -_elm_atspi_app_object_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) +_elm_atspi_app_object_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) { Eina_List *l, *accs = NULL; Evas_Object *win; @@ -34,9 +34,9 @@ _elm_atspi_app_object_efl_access_access_children_get(const Eo *obj EINA_UNUSED, EINA_LIST_FOREACH(_elm_win_list, l, win) { Efl_Access_Type type; - if (!efl_isa(win, EFL_ACCESS_MIXIN)) + if (!efl_isa(win, EFL_ACCESS_OBJECT_MIXIN)) continue; - type = efl_access_type_get(win); + type = efl_access_object_access_type_get(win); if (type == EFL_ACCESS_TYPE_REGULAR) accs = eina_list_append(accs, win); } @@ -45,7 +45,7 @@ _elm_atspi_app_object_efl_access_access_children_get(const Eo *obj EINA_UNUSED, } EOLIAN static const char* -_elm_atspi_app_object_efl_access_i18n_name_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) +_elm_atspi_app_object_efl_access_object_i18n_name_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) { const char *ret; ret = elm_app_name_get(); @@ -53,19 +53,19 @@ _elm_atspi_app_object_efl_access_i18n_name_get(const Eo *obj EINA_UNUSED, Elm_At } EOLIAN static const char* -_elm_atspi_app_object_efl_access_description_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd) +_elm_atspi_app_object_efl_access_object_description_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd) { return _pd->descr; } EOLIAN static void -_elm_atspi_app_object_efl_access_description_set(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED, const char *descr) +_elm_atspi_app_object_efl_access_object_description_set(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED, const char *descr) { eina_stringshare_replace(&_pd->descr, descr); } EOLIAN static Efl_Access_Role -_elm_atspi_app_object_efl_access_role_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) +_elm_atspi_app_object_efl_access_object_role_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) { return EFL_ACCESS_ROLE_APPLICATION; } diff --git a/src/lib/elementary/elm_atspi_app_object.eo b/src/lib/elementary/elm_atspi_app_object.eo index 07202631e3..1e79fcd493 100644 --- a/src/lib/elementary/elm_atspi_app_object.eo +++ b/src/lib/elementary/elm_atspi_app_object.eo @@ -1,13 +1,13 @@ -class Elm.Atspi.App.Object (Efl.Object, Efl.Access) +class Elm.Atspi.App.Object (Efl.Object, Efl.Access.Object) { [[AT-SPI application object class]] legacy_prefix: elm_atspi_app_object; data: Elm_Atspi_App_Object_Data; implements { Efl.Object.destructor; - Efl.Access.i18n_name { get; } - Efl.Access.description { get; set; } - Efl.Access.role { get; } - Efl.Access.access_children { get; } + Efl.Access.Object.i18n_name { get; } + Efl.Access.Object.description { get; set; } + Efl.Access.Object.role { get; } + Efl.Access.Object.access_children { get; } } } diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index bdc912259e..7528430647 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_COMPONENT_PROTECTED -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_ACTION_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED @@ -151,14 +151,14 @@ typedef struct { } Elm_Atspi_Bridge_Event_Handler; static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = { - { EFL_ACCESS_EVENT_CHILDREN_CHANGED, _children_changed_signal_send}, - { EFL_ACCESS_EVENT_PROPERTY_CHANGED, _property_changed_signal_send}, - { EFL_ACCESS_EVENT_BOUNDS_CHANGED, _bounds_changed_signal_send}, - { EFL_ACCESS_EVENT_STATE_CHANGED, _state_changed_signal_send}, - { EFL_ACCESS_EVENT_VISIBLE_DATA_CHANGED, _visible_data_changed_signal_send}, - { EFL_ACCESS_EVENT_ACTIVE_DESCENDANT_CHANGED, _active_descendant_changed_signal_send}, - { EFL_ACCESS_EVENT_ADDED, _on_object_add}, - { EFL_ACCESS_EVENT_REMOVED, _on_object_del}, + { EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, _children_changed_signal_send}, + { EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, _property_changed_signal_send}, + { EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, _bounds_changed_signal_send}, + { EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, _state_changed_signal_send}, + { EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, _visible_data_changed_signal_send}, + { EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, _active_descendant_changed_signal_send}, + { EFL_ACCESS_OBJECT_EVENT_ADDED, _on_object_add}, + { EFL_ACCESS_OBJECT_EVENT_REMOVED, _on_object_del}, { EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, _window_signal_send}, { EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, _window_signal_send}, { EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, _window_signal_send}, @@ -487,9 +487,9 @@ _accessible_get_role(const Eldbus_Service_Interface *iface, const Eldbus_Message AtspiRole atspi_role = ATSPI_ROLE_INVALID; Efl_Access_Role role; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); - role = efl_access_role_get(obj); + role = efl_access_object_role_get(obj); Eldbus_Message *ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -506,9 +506,9 @@ _accessible_get_role_name(const Eldbus_Service_Interface *iface, const Eldbus_Me Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); - role_name = efl_access_role_name_get(obj); + role_name = efl_access_object_role_name_get(obj); Eldbus_Message *ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -524,9 +524,9 @@ _accessible_get_localized_role_name(const Eldbus_Service_Interface *iface, const Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); - l_role_name = efl_access_localized_role_name_get(obj); + l_role_name = efl_access_object_localized_role_name_get(obj); EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL); Eldbus_Message *ret = eldbus_message_method_return_new(msg); @@ -547,9 +547,9 @@ _accessible_get_children(const Eldbus_Service_Interface *iface, const Eldbus_Mes Eldbus_Message_Iter *iter, *iter_array; Eo *children; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); - children_list = efl_access_children_get(obj); + children_list = efl_access_object_access_children_get(obj); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -582,13 +582,13 @@ _accessible_get_application(const Eldbus_Service_Interface *iface, const Eldbus_ Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *root, *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret); - root = efl_access_root_get(EFL_ACCESS_MIXIN); + root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); _bridge_iter_object_reference_append(bridge, iter, root); return ret; @@ -606,12 +606,12 @@ _accessible_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_M Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); ret = eldbus_message_method_return_new(msg); if (!ret) goto error; - attrs = efl_access_attributes_get(obj); + attrs = efl_access_object_attributes_get(obj); iter = eldbus_message_iter_get(ret); if (!iter) goto error; @@ -648,7 +648,7 @@ _accessible_interfaces_get(const Eldbus_Service_Interface *iface, const Eldbus_M Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -718,7 +718,7 @@ _accessible_get_state(const Eldbus_Service_Interface *iface, const Eldbus_Messag Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -727,7 +727,7 @@ _accessible_get_state(const Eldbus_Service_Interface *iface, const Eldbus_Messag iter_array = eldbus_message_iter_container_new(iter, 'a', "u"); EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); - states = efl_access_state_set_get(obj); + states = efl_access_object_state_set_get(obj); atspi_states = _elm_atspi_state_set_to_atspi_state_set(states); @@ -754,12 +754,12 @@ _accessible_get_index_in_parent(const Eldbus_Service_Interface *iface EINA_UNUSE Eldbus_Message *ret; int idx = -1; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); - idx = efl_access_index_in_parent_get(obj); + idx = efl_access_object_index_in_parent_get(obj); eldbus_message_arguments_append(ret, "i", idx); @@ -778,7 +778,7 @@ _accessible_child_at_index(const Eldbus_Service_Interface *iface EINA_UNUSED, co Eldbus_Message *ret; Eldbus_Message_Iter *iter; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "i", &idx)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); @@ -787,7 +787,7 @@ _accessible_child_at_index(const Eldbus_Service_Interface *iface EINA_UNUSED, co EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); iter = eldbus_message_iter_get(ret); - children = efl_access_children_get(obj); + children = efl_access_object_access_children_get(obj); child = eina_list_nth(children, idx); _bridge_iter_object_reference_append(bridge, iter, child); @@ -809,7 +809,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED, Eina_List *l, *l2; Efl_Access_Relation_Set rels; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -818,7 +818,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED, iter_array = eldbus_message_iter_container_new(iter, 'a', "(ua(so))"); EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); - rels = efl_access_relation_set_get(obj); + rels = efl_access_object_relation_set_get(obj); EINA_LIST_FOREACH(rels, l, rel) { @@ -1221,7 +1221,7 @@ _image_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Message * Eo *obj = _bridge_object_from_path(bridge, obj_path); Eina_Rect r; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "u", &type)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); @@ -1247,7 +1247,7 @@ _image_position_get(const Eldbus_Service_Interface *iface, const Eldbus_Message int x = -1, y = -1; Eina_Bool screen_coords; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "u", &type)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); @@ -1275,7 +1275,7 @@ _image_size_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg Eo *obj = _bridge_object_from_path(bridge, obj_path); int w = -1, h = -1; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -2029,7 +2029,7 @@ _bridge_object_from_path(Eo *bridge, const char *path) tmp = path + len; /* Skip over the prefix */ if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp)) { - root = efl_access_root_get(EFL_ACCESS_MIXIN); + root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); return root; } @@ -2043,7 +2043,7 @@ _bridge_object_from_path(Eo *bridge, const char *path) return NULL; } - ret = efl_isa(eo, EFL_ACCESS_MIXIN) ? eo : NULL; + ret = efl_isa(eo, EFL_ACCESS_OBJECT_MIXIN) ? eo : NULL; return ret; } @@ -2056,7 +2056,7 @@ _path_from_object(const Eo *eo) if (!eo) return ATSPI_DBUS_PATH_NULL; - root = efl_access_root_get(EFL_ACCESS_MIXIN); + root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); if (eo == root) snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT); @@ -2074,11 +2074,11 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char * Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *ret_obj = NULL, *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, request_msg, error); + ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, request_msg, error); if (!strcmp(property, "Name")) { - ret = efl_access_i18n_name_get(obj); + ret = efl_access_object_i18n_name_get(obj); if (!ret) ret = ""; eldbus_message_iter_basic_append(iter, 's', ret); @@ -2086,7 +2086,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char * } else if (!strcmp(property, "Description")) { - ret = efl_access_description_get(obj); + ret = efl_access_object_description_get(obj); if (!ret) ret = ""; eldbus_message_iter_basic_append(iter, 's', ret); @@ -2094,9 +2094,9 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char * } else if (!strcmp(property, "Parent")) { - ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN); + ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID; - role = efl_access_role_get(obj); + role = efl_access_object_role_get(obj); if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role)) _object_desktop_reference_append(iter); else @@ -2106,7 +2106,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char * else if (!strcmp(property, "ChildCount")) { Eina_List *l = NULL; - l = efl_access_children_get(obj); + l = efl_access_object_access_children_get(obj); eldbus_message_iter_basic_append(iter, 'i', eina_list_count(l)); eina_list_free(l); return EINA_TRUE; @@ -2234,18 +2234,18 @@ _image_properties_get(const Eldbus_Service_Interface *interface, const char *pro Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, request_msg, error); + ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, request_msg, error); if (!strcmp(property, "ImageDescription")) { - value = efl_access_description_get(obj); + value = efl_access_object_description_get(obj); value = value ? value : ""; eldbus_message_iter_basic_append(iter, 's', value); return EINA_TRUE; } if (!strcmp(property, "ImageLocale")) { - value = efl_access_translation_domain_get(obj); + value = efl_access_object_translation_domain_get(obj); value = value ? value : ""; eldbus_message_iter_basic_append(iter, 's', value); return EINA_TRUE; @@ -2575,7 +2575,7 @@ _collection_match_states_lookup(Eo *obj, struct collection_match_rule *rule) Eina_Bool ret = EINA_FALSE; Efl_Access_State_Set ss; - ss = efl_access_state_set_get(obj); + ss = efl_access_object_state_set_get(obj); switch (rule->statematchtype) { @@ -2605,7 +2605,7 @@ _collection_match_roles_lookup(Eo *obj, struct collection_match_rule *rule) Efl_Access_Role role; int64_t role_set; - role = efl_access_role_get(obj); + role = efl_access_object_role_get(obj); if (role >= 64) { @@ -2725,7 +2725,7 @@ _collection_match_attributes_lookup(Eo *obj, struct collection_match_rule *rule) Eina_Bool ret = EINA_FALSE; Eina_List *obj_attribs; - obj_attribs = efl_access_attributes_get(obj); + obj_attribs = efl_access_object_attributes_get(obj); switch (rule->attributematchtype) { @@ -2756,7 +2756,7 @@ _collection_sort_order_canonical(struct collection_match_rule *rule, Eina_List * { int i = index; Eina_List *children; - children = efl_access_children_get(obj); + children = efl_access_object_access_children_get(obj); long acount = eina_list_count(children); Eina_Bool prev = pobj ? EINA_TRUE : EINA_FALSE; @@ -2820,21 +2820,21 @@ _collection_sort_order_reverse_canonical(struct collection_match_rule *rule, Ein flag = EINA_TRUE; /* Get the current nodes index in it's parent and the parent object. */ - indexinparent = efl_access_index_in_parent_get(obj); - parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN); + indexinparent = efl_access_object_index_in_parent_get(obj); + parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); if ((indexinparent > 0) && ((max == 0) || (count < max))) { /* there are still some siblings to visit so get the previous sibling and get it's last descendant. First, get the previous sibling */ - children = efl_access_children_get(parent); + children = efl_access_object_access_children_get(parent); nextobj = eina_list_nth(children, indexinparent - 1); eina_list_free(children); /* Now, drill down the right side to the last descendant */ do { - children = efl_access_children_get(nextobj); + children = efl_access_object_access_children_get(nextobj); if (children) nextobj = eina_list_last_data_get(children); eina_list_free(children); } while (children); @@ -2877,8 +2877,8 @@ _collection_inorder(Eo *collection, struct collection_match_rule *rule, Eina_Lis while ((max == 0 || count < max) && obj && obj != collection) { Eo *parent; - parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN); - idx = efl_access_index_in_parent_get(obj); + parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); + idx = efl_access_object_index_in_parent_get(obj); count = _collection_sort_order_canonical(rule, list, count, max, parent, idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse); obj = parent; @@ -2954,8 +2954,8 @@ _collection_get_matches_from_handle(Eo *collection, Eo *current, struct collecti result = eina_list_reverse(result); break; case ATSPI_Collection_TREE_RESTRICT_CHILDREN: - idx = efl_access_index_in_parent_get(current); - parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_MIXIN); + idx = efl_access_object_index_in_parent_get(current); + parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_OBJECT_MIXIN); _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse); break; case ATSPI_Collection_TREE_RESTRICT_SIBLING: @@ -2983,7 +2983,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED, AtspiCollectionSortOrder sortby; Eina_List *result = NULL; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); iter = eldbus_message_iter_get(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); @@ -2995,7 +2995,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED, current = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_MIXIN, msg); if (!_collection_iter_match_rule_get(rule_iter, &rule)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters."); @@ -3016,7 +3016,7 @@ _collection_get_matches_to_handle(Eo *obj, Eo *current, struct collection_match_ Eo *collection = obj; if (limit) - collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN); + collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); switch (tree) { @@ -3055,7 +3055,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co Eina_List *result = NULL; Eina_Bool limit; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); iter = eldbus_message_iter_get(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); @@ -3067,7 +3067,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co current = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_MIXIN, msg); if (!_collection_iter_match_rule_get(rule_iter, &rule)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters."); @@ -3095,7 +3095,7 @@ _collection_get_matches(const Eldbus_Service_Interface *iface, const Eldbus_Mess AtspiCollectionSortOrder sortby; Eina_List *result = NULL; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); iter = eldbus_message_iter_get(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); @@ -3169,7 +3169,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj) iter_array = eldbus_message_iter_container_new(iter, 'a', "s"); if (!iter_array) return; - if (efl_isa(obj, EFL_ACCESS_MIXIN)) + if (efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN)) { eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE); eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION); @@ -3182,7 +3182,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT); if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT); - if (efl_isa(obj, EFL_ACCESS_MIXIN)) + if (efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE); if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION); @@ -3204,9 +3204,9 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ Efl_Access_State_Set states; Efl_Access_Role role; Eo *root; - root = efl_access_root_get(EFL_ACCESS_MIXIN); + root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); - role = efl_access_role_get(data); + role = efl_access_object_role_get(data); iter_struct = eldbus_message_iter_container_new(iter_array, 'r', NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(iter_struct, EINA_TRUE); @@ -3218,7 +3218,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ _bridge_iter_object_reference_append(bridge, iter_struct, root); Eo *parent = NULL; - parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_MIXIN); + parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_OBJECT_MIXIN); /* Marshall parent */ if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role)) _object_desktop_reference_append(iter_struct); @@ -3229,7 +3229,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ Eina_List *children_list = NULL, *l; Eo *child; - children_list = efl_access_children_get(data); + children_list = efl_access_object_access_children_get(data); iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "(so)"); EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail); @@ -3244,7 +3244,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ /* Marshall name */ const char *name = NULL; - name = efl_access_i18n_name_get(data); + name = efl_access_object_i18n_name_get(data); if (!name) name = ""; @@ -3255,7 +3255,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ /* Marshall description */ const char* description = NULL; - description = efl_access_description_get(data); + description = efl_access_object_description_get(data); if (!description) description = ""; eldbus_message_iter_basic_append(iter_struct, 's', description); @@ -3264,7 +3264,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "u"); EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail); - states = efl_access_state_set_get(data); + states = efl_access_object_state_set_get(data); unsigned int s1 = states & 0xFFFFFFFF; unsigned int s2 = (states >> 32) & 0xFFFFFFFF; @@ -3301,7 +3301,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE); EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); - root = efl_access_root_get(EFL_ACCESS_MIXIN); + root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); to_process = eina_list_append(NULL, root); while (to_process) @@ -3312,7 +3312,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms _bridge_object_register(bridge, obj); Eina_List *children; - children = efl_access_children_get(obj); + children = efl_access_object_access_children_get(obj); to_process = eina_list_merge(to_process, children); } @@ -3706,7 +3706,7 @@ _elm_atspi_bridge_app_register(Eo *bridge) "Embed"); Eldbus_Message_Iter *iter = eldbus_message_iter_get(message); - root = efl_access_root_get(EFL_ACCESS_MIXIN); + root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); _bridge_iter_object_reference_append(bridge, iter, root); eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1); @@ -3719,7 +3719,7 @@ _elm_atspi_bridge_app_unregister(Eo *bridge) Eo *root; ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE); - root = efl_access_root_get(EFL_ACCESS_MIXIN); + root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY, ATSPI_DBUS_PATH_ROOT, @@ -4004,7 +4004,7 @@ _active_descendant_changed_signal_send(void *data, const Efl_Event *event) return; } - idx = efl_access_index_in_parent_get(child); + idx = efl_access_object_index_in_parent_get(child); _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "", @@ -4038,7 +4038,7 @@ _children_changed_signal_send(void *data, const Efl_Event *event) return; } - idx = efl_access_index_in_parent_get(ev_data->child); + idx = efl_access_object_index_in_parent_get(ev_data->child); _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc, idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child); @@ -4119,7 +4119,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); path = _path_from_object(obj); - root = efl_access_root_get(EFL_ACCESS_MIXIN); + root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); msg = eldbus_message_signal_new(path, infc, signal->name); if (!msg) return; @@ -4369,7 +4369,7 @@ _a11y_connection_shutdown(Eo *bridge) if (pd->event_hash) eina_hash_free(pd->event_hash); pd->event_hash = NULL; - efl_access_event_handler_del(EFL_ACCESS_MIXIN, pd->event_hdlr); + efl_access_object_event_handler_del(EFL_ACCESS_OBJECT_MIXIN, pd->event_hdlr); pd->event_hdlr = NULL; efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL); @@ -4461,7 +4461,7 @@ _a11y_bus_initialize(Eo *obj, const char *socket_addr) _elm_atspi_bridge_app_register(obj); // register accessible object event listener - pd->event_hdlr = efl_access_event_handler_add(EFL_ACCESS_MIXIN, _bridge_accessible_event_dispatch, obj); + pd->event_hdlr = efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _bridge_accessible_event_dispatch, obj); } static void @@ -4539,9 +4539,9 @@ static void _bridge_object_register(Eo *bridge, Eo *obj) { ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); - if (!efl_isa(obj, EFL_ACCESS_MIXIN)) + if (!efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN)) { - WRN("Unable to register class w/o Efl_Access!"); + WRN("Unable to register class w/o Efl_Access_Object!"); return; } diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index ed5e6097d1..dd8509e7ae 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #include @@ -375,8 +375,8 @@ _elm_box_efl_object_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED); - efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); + efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); return obj; } diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c index d4b529f061..77f6aa3135 100644 --- a/src/lib/elementary/elm_bubble.c +++ b/src/lib/elementary/elm_bubble.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_LAYOUT_PROTECTED #include @@ -196,7 +196,7 @@ _elm_bubble_efl_object_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); return obj; } diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index d633e6d389..7154619bc2 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #define EFL_UI_FOCUS_OBJECT_PROTECTED @@ -1614,7 +1614,7 @@ _elm_calendar_efl_object_constructor(Eo *obj, Elm_Calendar_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_CALENDAR); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_CALENDAR); return obj; } diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c index 58c26d8cb2..9f94c5d911 100644 --- a/src/lib/elementary/elm_clock.c +++ b/src/lib/elementary/elm_clock.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #include @@ -784,7 +784,7 @@ _elm_clock_efl_object_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_TEXT); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_TEXT); return obj; } diff --git a/src/lib/elementary/elm_color_item.eo b/src/lib/elementary/elm_color_item.eo index 80e117242e..ba473f207f 100644 --- a/src/lib/elementary/elm_color_item.eo +++ b/src/lib/elementary/elm_color_item.eo @@ -44,8 +44,8 @@ class Elm.Color.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Access.Widget.Act Elm.Widget.Item.item_focus { get; set; } Efl.Ui.Focus.Object.focus { set; } Efl.Ui.Focus.Object.focus_geometry { get; } - Efl.Access.state_set { get; } - Efl.Access.i18n_name { get; } + Efl.Access.Object.state_set { get; } + Efl.Access.Object.i18n_name { 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 d728c05745..5be97f092d 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED @@ -1804,7 +1804,7 @@ _elm_color_item_efl_object_constructor(Eo *eo_item, Elm_Color_Item_Data *item) if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) elm_wdg_item_access_register(eo_item); - efl_access_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON); + efl_access_object_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON); return eo_item; } @@ -2276,7 +2276,7 @@ _elm_colorselector_efl_object_constructor(Eo *obj, Elm_Colorselector_Data *_pd E obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_COLOR_CHOOSER); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_COLOR_CHOOSER); return obj; } @@ -2601,11 +2601,11 @@ _elm_colorselector_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_U } EOLIAN static Eina_List* -_elm_colorselector_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd) +_elm_colorselector_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd) { Eina_List *ret = NULL; - ret = efl_access_children_get(efl_super(obj, ELM_COLORSELECTOR_CLASS)); + ret = efl_access_object_access_children_get(efl_super(obj, ELM_COLORSELECTOR_CLASS)); // filter - out box contiainer ret = eina_list_remove(ret, sd->palette_box); // append items as colorselector children @@ -2615,12 +2615,12 @@ _elm_colorselector_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm } EOLIAN static Efl_Access_State_Set -_elm_color_item_efl_access_state_set_get(const Eo *obj, Elm_Color_Item_Data *sd EINA_UNUSED) +_elm_color_item_efl_access_object_state_set_get(const Eo *obj, Elm_Color_Item_Data *sd EINA_UNUSED) { Efl_Access_State_Set ret; Eina_Bool sel; - ret = efl_access_state_set_get(efl_super(obj, ELM_COLOR_ITEM_CLASS)); + ret = efl_access_object_state_set_get(efl_super(obj, ELM_COLOR_ITEM_CLASS)); sel = elm_obj_color_item_selected_get(obj); @@ -2678,14 +2678,14 @@ _elm_color_item_efl_access_widget_action_elm_actions_get(const Eo *eo_it EINA_UN } EOLIAN static const char* -_elm_color_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Color_Item_Data *it) +_elm_color_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_Color_Item_Data *it) { Eina_Strbuf *buf; const char *color_name = NULL; const char *name; char *accessible_name; - name = efl_access_i18n_name_get(efl_super(eo_it, ELM_COLOR_ITEM_CLASS)); + name = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_COLOR_ITEM_CLASS)); if (name) return name; buf = eina_strbuf_new(); diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo index be6b02ce1e..89c6aafde0 100644 --- a/src/lib/elementary/elm_colorselector.eo +++ b/src/lib/elementary/elm_colorselector.eo @@ -115,7 +115,7 @@ class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Ui.Widget.on_access_update; Efl.Ui.Widget.widget_event; Efl.Access.Widget.Action.elm_actions { get; } - Efl.Access.access_children { get; } + Efl.Access.Object.access_children { get; } } events { color,item,selected; [[Called when color item was selected]] diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index 5d0d53037b..0e51c94223 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -3,7 +3,7 @@ #endif #define ELM_WIDGET_PROTECTED -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_LAYOUT_PROTECTED #include @@ -1001,7 +1001,7 @@ _elm_conformant_efl_object_constructor(Eo *obj, Elm_Conformant_Data *sd) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); Efl_Event event = {}; event.object = sd->win; diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo index 019e0926aa..ce8999477b 100644 --- a/src/lib/elementary/elm_ctxpopup.eo +++ b/src/lib/elementary/elm_ctxpopup.eo @@ -239,7 +239,7 @@ class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Widget.widget_event; Efl.Ui.Widget.focused_item { get; } Efl.Access.Widget.Action.elm_actions { get; } - Efl.Access.state_set { get; } + Efl.Access.Object.state_set { get; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_datetime.c b/src/lib/elementary/elm_datetime.c index ce61668667..97fc763291 100644 --- a/src/lib/elementary/elm_datetime.c +++ b/src/lib/elementary/elm_datetime.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include #include "elm_priv.h" diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index f0eb1ed235..b7bcec8a40 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED #include @@ -456,7 +456,7 @@ _elm_dayselector_efl_object_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_ obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_PANEL); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PANEL); return obj; } diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index d79afa24be..cd7554623f 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -1416,7 +1416,7 @@ _elm_diskselector_efl_object_constructor(Eo *obj, Elm_Diskselector_Data *_pd EIN obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST); return obj; } diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 014eecd7e1..96f07d53a1 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -3,7 +3,7 @@ #endif #define EFL_LAYOUT_CALC_PROTECTED -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_TEXT_PROTECTED #define EFL_ACCESS_EDITABLE_TEXT_PROTECTED #define ELM_LAYOUT_PROTECTED @@ -2218,14 +2218,14 @@ _entry_changed_user_signal_cb(void *data, atspi_info.content = edje_info->change.insert.content; atspi_info.pos = edje_info->change.insert.pos; atspi_info.len = edje_info->change.insert.plain_length; - efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); } else if (edje_info && !edje_info->insert) { atspi_info.content = edje_info->change.del.content; atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; - efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); } } } @@ -2250,7 +2250,7 @@ _entry_preedit_changed_signal_cb(void *data, atspi_info.content = text; atspi_info.pos = edje_info->change.insert.pos; atspi_info.len = edje_info->change.insert.plain_length; - efl_access_event_emit(EFL_ACCESS_MIXIN, + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); @@ -2342,7 +2342,7 @@ _entry_selection_changed_signal_cb(void *data, _selection_store(ELM_SEL_TYPE_PRIMARY, data); _update_selection_handler(data); if (_elm_config->atspi_mode) - efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL); } static void @@ -2453,7 +2453,7 @@ _entry_cursor_changed_signal_cb(void *data, efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL); if (_elm_config->atspi_mode) - efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); } static void @@ -2465,7 +2465,7 @@ _entry_cursor_changed_manual_signal_cb(void *data, efl_event_callback_legacy_call (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL); if (_elm_config->atspi_mode) - efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); } static void @@ -4104,7 +4104,7 @@ _elm_entry_efl_object_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY); efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL); efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL); @@ -4189,7 +4189,7 @@ _elm_entry_password_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool password) sd->line_wrap = ELM_WRAP_NONE; elm_entry_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA)); _entry_selection_callbacks_unregister(obj); - efl_access_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT); } else { @@ -4202,7 +4202,7 @@ _elm_entry_password_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool password) elm_entry_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA)); _entry_selection_callbacks_register(obj); - efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY); } efl_ui_widget_theme_apply(obj); @@ -6094,10 +6094,10 @@ _elm_entry_efl_access_editable_text_cut(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED } EOLIAN static Efl_Access_State_Set -_elm_entry_efl_access_state_set_get(const Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) +_elm_entry_efl_access_object_state_set_get(const Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) { Efl_Access_State_Set ret; - ret = efl_access_state_set_get(efl_super(obj, ELM_ENTRY_CLASS)); + 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); @@ -6106,10 +6106,10 @@ _elm_entry_efl_access_state_set_get(const Eo *obj, Elm_Entry_Data *_pd EINA_UNUS } EOLIAN static const char* -_elm_entry_efl_access_i18n_name_get(const Eo *obj, Elm_Entry_Data *sd) +_elm_entry_efl_access_object_i18n_name_get(const Eo *obj, Elm_Entry_Data *sd) { const char *name; - name = efl_access_i18n_name_get(efl_super(obj, ELM_ENTRY_CLASS)); + name = efl_access_object_i18n_name_get(efl_super(obj, ELM_ENTRY_CLASS)); if (name && strncmp("", name, 1)) return name; if (sd->password) return NULL; diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index e0ecc9c815..fe38ce6b66 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -851,8 +851,8 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Ui.Widget.widget_sub_object_del; Elm.Interface_Scrollable.policy { set; } Elm.Interface_Scrollable.bounce_allow { set; } - Efl.Access.state_set { get; } - Efl.Access.i18n_name { get; } + Efl.Access.Object.state_set { get; } + Efl.Access.Object.i18n_name { get; } Efl.Access.Text.access_text { get; } Efl.Access.Text.string { get; } Efl.Access.Text.attribute { get; } diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index 63329d4e59..a059e9db62 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -664,7 +664,7 @@ _elm_flipselector_efl_object_constructor(Eo *obj, Elm_Flipselector_Data *sd) sd->obj = obj; efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST); return obj; } diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 9e7c50bd97..205aef61cf 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -3961,7 +3961,7 @@ _elm_gengrid_item_efl_object_constructor(Eo *eo_it, Elm_Gen_Item *it) { eo_it = efl_constructor(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS)); it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); - efl_access_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM); + efl_access_object_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM); return eo_it; } @@ -4274,7 +4274,7 @@ _elm_gengrid_efl_object_constructor(Eo *obj, Elm_Gengrid_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_TREE_TABLE); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_TREE_TABLE); efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _gengrid_element_focused, obj); @@ -5382,12 +5382,12 @@ _elm_gengrid_item_select_mode_get(const Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) } EOLIAN Efl_Access_State_Set -_elm_gengrid_item_efl_access_state_set_get(const Eo *eo_it, Elm_Gen_Item *it EINA_UNUSED) +_elm_gengrid_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Gen_Item *it EINA_UNUSED) { Efl_Access_State_Set ret; Eina_Bool sel; - ret = efl_access_state_set_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS)); + ret = efl_access_object_state_set_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS)); sel = elm_obj_gengrid_item_selected_get(eo_it); @@ -5400,13 +5400,13 @@ _elm_gengrid_item_efl_access_state_set_get(const Eo *eo_it, Elm_Gen_Item *it EIN } EOLIAN const char* -_elm_gengrid_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Gen_Item *it) +_elm_gengrid_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_Gen_Item *it) { const char *ret; Eina_Strbuf *buf; char *accessible_name; - ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS)); + ret = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS)); if (ret) return ret; buf = eina_strbuf_new(); @@ -5582,7 +5582,7 @@ _elm_gengrid_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, } EOLIAN Eina_List* -_elm_gengrid_efl_access_access_children_get(const Eo *obj, Elm_Gengrid_Data *sd) +_elm_gengrid_efl_access_object_access_children_get(const Eo *obj, Elm_Gengrid_Data *sd) { Eina_List *ret = NULL, *ret2 = NULL; Elm_Gen_Item *it; @@ -5590,17 +5590,17 @@ _elm_gengrid_efl_access_access_children_get(const Eo *obj, Elm_Gengrid_Data *sd) EINA_INLIST_FOREACH(sd->items, it) ret = eina_list_append(ret, EO_OBJ(it)); - ret2 = efl_access_children_get(efl_super(obj, ELM_GENGRID_CLASS)); + ret2 = efl_access_object_access_children_get(efl_super(obj, ELM_GENGRID_CLASS)); return eina_list_merge(ret, ret2); } EOLIAN Efl_Access_State_Set -_elm_gengrid_efl_access_state_set_get(const Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) +_elm_gengrid_efl_access_object_state_set_get(const Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) { Efl_Access_State_Set ret; - ret = efl_access_state_set_get(efl_super(obj, ELM_GENGRID_CLASS)); + ret = efl_access_object_state_set_get(efl_super(obj, ELM_GENGRID_CLASS)); STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MANAGES_DESCENDANTS); diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo index ddfca93533..dd40782270 100644 --- a/src/lib/elementary/elm_gengrid.eo +++ b/src/lib/elementary/elm_gengrid.eo @@ -514,8 +514,8 @@ class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Elm.Interface_Scrollable.item_loop_enabled { get; set; } Elm.Interface_Scrollable.bounce_allow { set; } Elm.Interface_Scrollable.policy { get; set; } - Efl.Access.access_children { get; } - Efl.Access.state_set { get; } + Efl.Access.Object.access_children { get; } + Efl.Access.Object.state_set { get; } Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo index 100ee088f0..de1515e1e4 100644 --- a/src/lib/elementary/elm_gengrid_item.eo +++ b/src/lib/elementary/elm_gengrid_item.eo @@ -228,8 +228,8 @@ class Elm.Gengrid.Item(Elm.Widget.Item.Static_Focus, Efl.Ui.Focus.Object, Efl.Ui Elm.Widget.Item.tooltip_unset; Elm.Widget.Item.cursor { set; } Elm.Widget.Item.cursor_unset; - Efl.Access.i18n_name { get; } - Efl.Access.state_set { get; } + Efl.Access.Object.i18n_name { get; } + Efl.Access.Object.state_set { get; } Efl.Ui.Focus.Object.prepare_logical_none_recursive; } } diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 7f9c480846..5360bb858a 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -4,7 +4,7 @@ #include -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -5842,7 +5842,7 @@ _elm_genlist_efl_object_constructor(Eo *obj, Elm_Genlist_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST); efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _genlist_element_focused, obj); @@ -6200,7 +6200,7 @@ _elm_genlist_item_efl_object_constructor(Eo *eo_it, Elm_Gen_Item *it) eo_it = efl_constructor(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS)); it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); - efl_access_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM); + efl_access_object_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM); return eo_it; } @@ -8598,12 +8598,12 @@ _elm_genlist_item_select_mode_get(const Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) } EOLIAN Efl_Access_State_Set -_elm_genlist_item_efl_access_state_set_get(const Eo *eo_it, Elm_Gen_Item *it EINA_UNUSED) +_elm_genlist_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Gen_Item *it EINA_UNUSED) { Efl_Access_State_Set ret; Eina_Bool sel; - ret = efl_access_state_set_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS)); + ret = efl_access_object_state_set_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS)); sel = elm_obj_genlist_item_selected_get(eo_it); @@ -8623,13 +8623,13 @@ _elm_genlist_item_efl_access_state_set_get(const Eo *eo_it, Elm_Gen_Item *it EIN } EOLIAN const char* -_elm_genlist_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Gen_Item *it) +_elm_genlist_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_Gen_Item *it) { const char *ret; Eina_Strbuf *buf; char *accessible_name; - ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS)); + ret = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS)); if (ret) return ret; buf = eina_strbuf_new(); @@ -8849,7 +8849,7 @@ _elm_genlist_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, } EOLIAN Eina_List* -_elm_genlist_efl_access_access_children_get(const Eo *obj, Elm_Genlist_Data *sd) +_elm_genlist_efl_access_object_access_children_get(const Eo *obj, Elm_Genlist_Data *sd) { Eina_List *ret = NULL, *ret2 = NULL; Elm_Gen_Item *it; @@ -8857,17 +8857,17 @@ _elm_genlist_efl_access_access_children_get(const Eo *obj, Elm_Genlist_Data *sd) EINA_INLIST_FOREACH(sd->items, it) ret = eina_list_append(ret, EO_OBJ(it)); - ret2 = efl_access_children_get(efl_super(obj, ELM_GENLIST_CLASS)); + ret2 = efl_access_object_access_children_get(efl_super(obj, ELM_GENLIST_CLASS)); return eina_list_merge(ret, ret2); } EOLIAN Efl_Access_State_Set -_elm_genlist_efl_access_state_set_get(const Eo *obj, Elm_Genlist_Data *sd EINA_UNUSED) +_elm_genlist_efl_access_object_state_set_get(const Eo *obj, Elm_Genlist_Data *sd EINA_UNUSED) { Efl_Access_State_Set ret; - ret = efl_access_state_set_get(efl_super(obj, ELM_GENLIST_CLASS)); + ret = efl_access_object_state_set_get(efl_super(obj, ELM_GENLIST_CLASS)); STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MANAGES_DESCENDANTS); diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo index ae01e70a7d..e4764911c2 100644 --- a/src/lib/elementary/elm_genlist.eo +++ b/src/lib/elementary/elm_genlist.eo @@ -543,8 +543,8 @@ class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Elm.Interface_Scrollable.item_loop_enabled { get; set; } Elm.Interface_Scrollable.bounce_allow { get; set; } Elm.Interface_Scrollable.policy { get; set; } - Efl.Access.access_children { get; } - Efl.Access.state_set { get; } + Efl.Access.Object.access_children { get; } + Efl.Access.Object.state_set { get; } Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } diff --git a/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo index 70fe8e18f3..8ab3c45314 100644 --- a/src/lib/elementary/elm_genlist_item.eo +++ b/src/lib/elementary/elm_genlist_item.eo @@ -422,8 +422,8 @@ class Elm.Genlist.Item(Elm.Widget.Item.Static_Focus, Efl.Ui.Legacy) Elm.Widget.Item.tooltip_unset; Elm.Widget.Item.cursor { set; } Elm.Widget.Item.cursor_unset; - Efl.Access.i18n_name { get; } - Efl.Access.state_set { get; } + Efl.Access.Object.i18n_name { get; } + Efl.Access.Object.state_set { get; } Efl.Ui.Focus.Object.prepare_logical_none_recursive; } } diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c index 294d19cd67..5b1f29d087 100644 --- a/src/lib/elementary/elm_glview.c +++ b/src/lib/elementary/elm_glview.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include @@ -358,7 +358,7 @@ _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd, efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ANIMATION); efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL); } diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c index f2fa303e00..3f36be46c1 100644 --- a/src/lib/elementary/elm_grid.c +++ b/src/lib/elementary/elm_grid.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #include @@ -98,7 +98,7 @@ _elm_grid_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED) { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); return obj; } diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index 69938c1180..a66c3b48a4 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -3,7 +3,7 @@ #endif #define ELM_WIDGET_PROTECTED -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_LAYOUT_PROTECTED @@ -695,7 +695,7 @@ _elm_hover_efl_object_constructor(Eo *obj, Elm_Hover_Data *pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU); return obj; } @@ -853,10 +853,10 @@ _elm_hover_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, E } EOLIAN static Efl_Access_State_Set -_elm_hover_efl_access_state_set_get(const Eo *obj, Elm_Hover_Data *pd EINA_UNUSED) +_elm_hover_efl_access_object_state_set_get(const Eo *obj, Elm_Hover_Data *pd EINA_UNUSED) { Efl_Access_State_Set states; - states = efl_access_state_set_get(efl_super(obj, MY_CLASS)); + states = efl_access_object_state_set_get(efl_super(obj, MY_CLASS)); STATE_TYPE_SET(states, EFL_ACCESS_STATE_MODAL); return states; diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo index cc67a7dde3..a5c4b5bdd7 100644 --- a/src/lib/elementary/elm_hover.eo +++ b/src/lib/elementary/elm_hover.eo @@ -70,7 +70,7 @@ class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable, Efl.Ui.Widget.widget_parent { get; set; } Efl.Ui.Widget.widget_sub_object_del; Efl.Access.Widget.Action.elm_actions { get; } - Efl.Access.state_set { get; } + Efl.Access.Object.state_set { get; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo index cff4f4d64a..4fbbd1e786 100644 --- a/src/lib/elementary/elm_hoversel.eo +++ b/src/lib/elementary/elm_hoversel.eo @@ -102,7 +102,7 @@ class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable, Efl.Ui.Widget.widget_event; Efl.Ui.Autorepeat.autorepeat_supported { get; } Efl.Access.Widget.Action.elm_actions { get; } - Efl.Access.access_children { get; } + Efl.Access.Object.access_children { get; } } events { dismissed; [[Called when hoversel is dismissed]] diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c index 39e889192d..7aa07e36df 100644 --- a/src/lib/elementary/elm_icon.c +++ b/src/lib/elementary/elm_icon.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include @@ -615,7 +615,7 @@ _elm_icon_efl_object_constructor(Eo *obj, Elm_Icon_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_ICON); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ICON); return obj; } diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index 6233af307e..8ab2b20eaa 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -543,7 +543,7 @@ _elm_index_item_efl_object_constructor(Eo *obj, Elm_Index_Item_Data *it) { obj = efl_constructor(efl_super(obj, ELM_INDEX_ITEM_CLASS)); it->base = efl_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS); - efl_access_role_set(obj, EFL_ACCESS_ROLE_RADIO_MENU_ITEM); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_RADIO_MENU_ITEM); return obj; } @@ -1211,7 +1211,7 @@ _elm_index_efl_object_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_SCROLL_BAR); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SCROLL_BAR); return obj; } @@ -1677,18 +1677,18 @@ _item_action_activate(Eo *obj, const char *params EINA_UNUSED EINA_UNUSED) } EOLIAN static Eina_List* -_elm_index_efl_access_access_children_get(const Eo *obj, Elm_Index_Data *data) +_elm_index_efl_access_object_access_children_get(const Eo *obj, Elm_Index_Data *data) { Eina_List *ret; - ret = efl_access_children_get(efl_super(obj, ELM_INDEX_CLASS)); + ret = efl_access_object_access_children_get(efl_super(obj, ELM_INDEX_CLASS)); return eina_list_merge(eina_list_clone(data->items), ret); } EOLIAN static const char* -_elm_index_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Index_Item_Data *data) +_elm_index_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_Index_Item_Data *data) { const char *name; - name = efl_access_i18n_name_get(efl_super(eo_it, ELM_INDEX_ITEM_CLASS)); + name = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_INDEX_ITEM_CLASS)); if (name) return name; return _elm_widget_item_accessible_plain_name_get(eo_it, data->letter); diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo index 042b3d25c2..64a7b8c800 100644 --- a/src/lib/elementary/elm_index.eo +++ b/src/lib/elementary/elm_index.eo @@ -200,7 +200,7 @@ class Elm.Index (Efl.Ui.Layout, Efl.Ui.Direction, Efl.Ui.Widget.theme_apply; Efl.Ui.Widget.on_access_update; Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $vertical.]] } - Efl.Access.access_children { get; } + Efl.Access.Object.access_children { get; } } events { changed; [[Called when index changed]] diff --git a/src/lib/elementary/elm_index_item.eo b/src/lib/elementary/elm_index_item.eo index 68b37f5b65..304f246cb5 100644 --- a/src/lib/elementary/elm_index_item.eo +++ b/src/lib/elementary/elm_index_item.eo @@ -44,7 +44,7 @@ class Elm.Index.Item(Elm.Widget.Item, Efl.Access.Widget.Action, Efl.Ui.Legacy) Efl.Object.constructor; Efl.Object.destructor; Elm.Widget.Item.access_register; - Efl.Access.i18n_name { get; } + Efl.Access.Object.i18n_name { 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 001d590ba1..bcbe8e646f 100644 --- a/src/lib/elementary/elm_interfaces.h +++ b/src/lib/elementary/elm_interfaces.h @@ -1,4 +1,4 @@ -#include "efl_access.h" +#include "efl_access_object.h" #include "efl_access_text.h" #include "efl_access_widget_action.h" #include "efl_access_window.h" diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c index f1154d79cc..66fd2f0f00 100644 --- a/src/lib/elementary/elm_inwin.c +++ b/src/lib/elementary/elm_inwin.c @@ -3,7 +3,7 @@ #endif #define ELM_WIDGET_PROTECTED -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_LAYOUT_PROTECTED #include @@ -86,7 +86,7 @@ _elm_inwin_efl_object_constructor(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - efl_access_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE); return obj; } diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index ab360cdfcf..40fd8930be 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_LAYOUT_PROTECTED #include @@ -426,7 +426,7 @@ _elm_label_efl_object_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_LABEL); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LABEL); return obj; } diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 1c9ee23d17..8d45fdc7f5 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -2119,12 +2119,12 @@ _elm_list_item_elm_widget_item_item_focus_get(const Eo *eo_it, Elm_List_Item_Dat } EOLIAN static Efl_Access_State_Set -_elm_list_item_efl_access_state_set_get(const Eo *eo_it, Elm_List_Item_Data *data EINA_UNUSED) +_elm_list_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_List_Item_Data *data EINA_UNUSED) { Efl_Access_State_Set ret; Eina_Bool sel; - ret = efl_access_state_set_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS)); + ret = efl_access_object_state_set_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS)); if (elm_object_item_disabled_get(eo_it)) return ret; @@ -2141,10 +2141,10 @@ _elm_list_item_efl_access_state_set_get(const Eo *eo_it, Elm_List_Item_Data *dat } EOLIAN static const char* -_elm_list_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_List_Item_Data *data) +_elm_list_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_List_Item_Data *data) { const char *ret; - ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS)); + ret = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS)); if (ret) return ret; return _elm_widget_item_accessible_plain_name_get(eo_it, data->label); } @@ -2271,7 +2271,7 @@ _elm_list_item_efl_object_constructor(Eo *eo_it, Elm_List_Item_Data *it) { eo_it = efl_constructor(efl_super(eo_it, ELM_LIST_ITEM_CLASS)); it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); - efl_access_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM); + efl_access_object_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM); return eo_it; } @@ -2324,7 +2324,7 @@ _item_new(Evas_Object *obj, evas_object_event_callback_add (it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb, obj); - efl_access_type_set(it->icon, EFL_ACCESS_TYPE_DISABLED); + efl_access_object_access_type_set(it->icon, EFL_ACCESS_TYPE_DISABLED); elm_widget_tree_unfocusable_set(it->icon, EINA_TRUE); } if (it->end) @@ -2333,7 +2333,7 @@ _item_new(Evas_Object *obj, evas_object_event_callback_add (it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb, obj); - efl_access_type_set(it->end, EFL_ACCESS_TYPE_DISABLED); + efl_access_object_access_type_set(it->end, EFL_ACCESS_TYPE_DISABLED); elm_widget_tree_unfocusable_set(it->end, EINA_TRUE); } @@ -2403,7 +2403,7 @@ _elm_list_efl_canvas_group_group_add(Eo *obj, Elm_List_Data *priv) priv->box = elm_box_add(obj); evas_object_size_hint_weight_set(priv->box, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(priv->box, EVAS_HINT_FILL, 0.0); - efl_access_type_set(priv->box, EFL_ACCESS_TYPE_DISABLED); + efl_access_object_access_type_set(priv->box, EFL_ACCESS_TYPE_DISABLED); /* FIXME: change this ugly code path later */ elm_widget_on_show_region_hook_set(priv->box, obj, _show_region_hook, NULL); @@ -2525,7 +2525,7 @@ _elm_list_efl_object_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST); return obj; } @@ -2867,9 +2867,9 @@ _elm_list_item_separator_set(Eo *eo_item, Elm_List_Item_Data *it, Eina_Bool sett it->is_separator = !!setting; if (it->is_separator) - efl_access_role_set(eo_item, EFL_ACCESS_ROLE_SEPARATOR); + efl_access_object_role_set(eo_item, EFL_ACCESS_ROLE_SEPARATOR); else - efl_access_role_set(eo_item, EFL_ACCESS_ROLE_LIST_ITEM); + efl_access_object_role_set(eo_item, EFL_ACCESS_ROLE_LIST_ITEM); } EOLIAN static Eina_Bool @@ -3157,10 +3157,10 @@ _elm_list_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, El } EOLIAN Eina_List* -_elm_list_efl_access_access_children_get(const Eo *obj, Elm_List_Data *pd) +_elm_list_efl_access_object_access_children_get(const Eo *obj, Elm_List_Data *pd) { Eina_List *ret; - ret = efl_access_children_get(efl_super(obj, ELM_LIST_CLASS)); + ret = efl_access_object_access_children_get(efl_super(obj, ELM_LIST_CLASS)); return eina_list_merge(eina_list_clone(pd->items), ret); } diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo index 27fb896c0f..bd7f1309b2 100644 --- a/src/lib/elementary/elm_list.eo +++ b/src/lib/elementary/elm_list.eo @@ -1,7 +1,7 @@ import elm_general; class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable, - Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access, + Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access.Object, Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy) { [[Elementary list class]] @@ -409,7 +409,7 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable, Elm.Interface_Scrollable.item_loop_enabled { get; set; } Elm.Interface_Scrollable.policy { set; } Efl.Access.Widget.Action.elm_actions { get; } - Efl.Access.access_children { get; } + Efl.Access.Object.access_children { 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_list_item.eo b/src/lib/elementary/elm_list_item.eo index 7844d3d68a..9733d8bfa5 100644 --- a/src/lib/elementary/elm_list_item.eo +++ b/src/lib/elementary/elm_list_item.eo @@ -115,7 +115,7 @@ class Elm.List.Item(Elm.Widget.Item, Efl.Ui.Legacy) Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.part_content { get; set; } Elm.Widget.Item.part_content_unset; - Efl.Access.i18n_name { get; } - Efl.Access.state_set { get; } + Efl.Access.Object.i18n_name { get; } + Efl.Access.Object.state_set { get; } } } diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index ae973880ba..3963fb64d7 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include @@ -4288,7 +4288,7 @@ _elm_map_efl_object_constructor(Eo *obj, Elm_Map_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE_MAP); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE_MAP); return obj; } diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c index a6346a3a65..14f057c320 100644 --- a/src/lib/elementary/elm_mapbuf.c +++ b/src/lib/elementary/elm_mapbuf.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include @@ -317,7 +317,7 @@ _elm_mapbuf_efl_object_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE_MAP); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE_MAP); return obj; } diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index 593f58439e..cce7778a06 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -3,7 +3,7 @@ #endif #define ELM_WIDGET_PROTECTED -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -498,7 +498,7 @@ _menu_item_activate_cb(void *data, if (eo_item2 != EO_OBJ(item)) elm_menu_item_selected_set(eo_item2, 0); } - efl_access_event_emit(EFL_ACCESS_MIXIN, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); } else { @@ -513,7 +513,7 @@ _menu_item_activate_cb(void *data, elm_menu_item_selected_set(eo_item2, 0); } } - efl_access_event_emit(EFL_ACCESS_MIXIN, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); + efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); if (sd->menu_bar && was_open) _menu_item_select_cb(item, NULL, NULL, NULL); } @@ -580,7 +580,7 @@ static void _item_obj_create(Elm_Menu_Item_Data *item) { VIEW(item) = elm_layout_add(WIDGET(item)); - efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED); + efl_access_object_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED); evas_object_size_hint_weight_set (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -604,7 +604,7 @@ static void _item_separator_obj_create(Elm_Menu_Item_Data *item) { VIEW(item) = elm_layout_add(WIDGET(item)); - efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED); + efl_access_object_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED); evas_object_size_hint_weight_set (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -627,9 +627,9 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item) char style[1024]; item->submenu.location = elm_icon_add(sd->bx); - efl_access_type_set(item->submenu.location, EFL_ACCESS_TYPE_DISABLED); + efl_access_object_access_type_set(item->submenu.location, EFL_ACCESS_TYPE_DISABLED); item->submenu.hv = hv = elm_hover_add(sd->bx); - efl_access_type_set(item->submenu.hv, EFL_ACCESS_TYPE_SKIPPED); + efl_access_object_access_type_set(item->submenu.hv, EFL_ACCESS_TYPE_SKIPPED); efl_ui_mirrored_set(hv, EINA_FALSE); elm_hover_target_set(hv, item->submenu.location); elm_hover_parent_set(hv, sd->parent); @@ -695,10 +695,10 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv) elm_widget_can_focus_set(obj, EINA_FALSE); priv->location = elm_icon_add(obj); - efl_access_type_set(priv->location, EFL_ACCESS_TYPE_DISABLED); + efl_access_object_access_type_set(priv->location, EFL_ACCESS_TYPE_DISABLED); priv->hv = elm_hover_add(obj); - efl_access_type_set(priv->hv, EFL_ACCESS_TYPE_SKIPPED); + efl_access_object_access_type_set(priv->hv, EFL_ACCESS_TYPE_SKIPPED); efl_ui_mirrored_set(priv->hv, EINA_FALSE); elm_object_style_set(priv->hv, "menu/default"); @@ -706,7 +706,7 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv) (priv->hv, ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj); priv->bx = elm_box_add(obj); - efl_access_type_set(priv->bx, EFL_ACCESS_TYPE_SKIPPED); + efl_access_object_access_type_set(priv->bx, EFL_ACCESS_TYPE_SKIPPED); efl_ui_mirrored_set(priv->bx, EINA_FALSE); evas_object_size_hint_weight_set (priv->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -829,7 +829,7 @@ _elm_menu_efl_object_constructor(Eo *obj, Elm_Menu_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); parent = efl_parent_get(obj); - efl_access_role_set(obj, EFL_ACCESS_ROLE_MENU); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_MENU); elm_menu_parent_set(obj, parent); elm_hover_target_set(sd->hv, sd->location); @@ -1057,7 +1057,7 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch Evas_Object *icon_obj; icon_obj = elm_icon_add(obj); - efl_access_type_set(icon_obj, EFL_ACCESS_TYPE_DISABLED); + efl_access_object_access_type_set(icon_obj, EFL_ACCESS_TYPE_DISABLED); if (!icon_obj) return NULL; eo_item = efl_add(ELM_MENU_ITEM_CLASS, obj); @@ -1322,15 +1322,15 @@ _elm_menu_class_constructor(Efl_Class *klass) } EOLIAN static Eina_List* -_elm_menu_efl_access_access_children_get(const Eo *obj, Elm_Menu_Data *sd) +_elm_menu_efl_access_object_access_children_get(const Eo *obj, Elm_Menu_Data *sd) { Eina_List *ret; - ret = efl_access_children_get(efl_super(obj, ELM_MENU_CLASS)); + ret = efl_access_object_access_children_get(efl_super(obj, ELM_MENU_CLASS)); return eina_list_merge(eina_list_clone(sd->items), ret); } EOLIAN static Eina_List* -_elm_menu_item_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) +_elm_menu_item_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) { return eina_list_clone(sd->submenu.items); } @@ -1344,25 +1344,25 @@ _elm_menu_item_efl_object_parent_get(const Eo *obj, Elm_Menu_Item_Data *sd) } EOLIAN static Efl_Access_Role -_elm_menu_item_efl_access_role_get(const Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) +_elm_menu_item_efl_access_object_role_get(const Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) { return sd->submenu.items ? EFL_ACCESS_ROLE_MENU : EFL_ACCESS_ROLE_MENU_ITEM; } EOLIAN static const char* -_elm_menu_item_efl_access_i18n_name_get(const Eo *obj, Elm_Menu_Item_Data *sd) +_elm_menu_item_efl_access_object_i18n_name_get(const Eo *obj, Elm_Menu_Item_Data *sd) { const char *ret; - ret = efl_access_i18n_name_get(efl_super(obj, ELM_MENU_ITEM_CLASS)); + ret = efl_access_object_i18n_name_get(efl_super(obj, ELM_MENU_ITEM_CLASS)); if (ret) return ret; return sd->label; } EOLIAN static Efl_Access_State_Set -_elm_menu_item_efl_access_state_set_get(const Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) +_elm_menu_item_efl_access_object_state_set_get(const Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) { Efl_Access_State_Set ret; - ret = efl_access_state_set_get(efl_super(obj, ELM_MENU_ITEM_CLASS)); + ret = efl_access_object_state_set_get(efl_super(obj, ELM_MENU_ITEM_CLASS)); STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE); diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo index 1657a2c7c1..3c1df3056b 100644 --- a/src/lib/elementary/elm_menu.eo +++ b/src/lib/elementary/elm_menu.eo @@ -92,7 +92,7 @@ class Elm.Menu (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Widget.theme_apply; Efl.Ui.Translatable.translation_update; Efl.Ui.Widget.focus_manager_create; - Efl.Access.access_children { get; } + Efl.Access.Object.access_children { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } Efl.Object.provider_find; diff --git a/src/lib/elementary/elm_menu_item.eo b/src/lib/elementary/elm_menu_item.eo index 4c7e7eb9d7..84bfbfac52 100644 --- a/src/lib/elementary/elm_menu_item.eo +++ b/src/lib/elementary/elm_menu_item.eo @@ -111,10 +111,10 @@ class Elm.Menu.Item(Elm.Widget.Item, Efl.Access.Selection, Efl.Ui.Legacy) Elm.Widget.Item.signal_emit; Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.part_content { get; set; } - Efl.Access.access_children { get; } - Efl.Access.role { get; } - Efl.Access.i18n_name { get; } - Efl.Access.state_set { get; } + Efl.Access.Object.access_children { get; } + Efl.Access.Object.role { get; } + Efl.Access.Object.i18n_name { get; } + Efl.Access.Object.state_set { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } } diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo index edde230d27..eb414dba2a 100644 --- a/src/lib/elementary/elm_multibuttonentry.eo +++ b/src/lib/elementary/elm_multibuttonentry.eo @@ -178,11 +178,11 @@ class Elm.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Legacy) implements { class.constructor; Efl.Object.constructor; - Efl.Ui.Widget.theme_apply; - Efl.Ui.Widget.on_access_update; - Efl.Ui.Translatable.translation_update; - Efl.Ui.Widget.widget_event; - Efl.Access.access_children { get; } + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_access_update; + Efl.Ui.Translatable.translation_update; + Efl.Ui.Widget.widget_event; + Efl.Access.Object.access_children { get; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_multibuttonentry_item.eo b/src/lib/elementary/elm_multibuttonentry_item.eo index 0d9b7db1b9..b8d327edd5 100644 --- a/src/lib/elementary/elm_multibuttonentry_item.eo +++ b/src/lib/elementary/elm_multibuttonentry_item.eo @@ -31,8 +31,8 @@ class Elm.Multibuttonentry.Item(Elm.Widget.Item, Elm.Widget.Item.signal_emit; Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.disable; - Efl.Access.i18n_name { get; } - Efl.Access.state_set { get; } + Efl.Access.Object.i18n_name { get; } + Efl.Access.Object.state_set { get; } Efl.Access.Widget.Action.elm_actions { get; } } } diff --git a/src/lib/elementary/elm_naviframe_item.eo b/src/lib/elementary/elm_naviframe_item.eo index d6fdb2d414..3bfceed416 100644 --- a/src/lib/elementary/elm_naviframe_item.eo +++ b/src/lib/elementary/elm_naviframe_item.eo @@ -72,6 +72,6 @@ class Elm.Naviframe.Item(Elm.Widget.Item, Efl.Ui.Legacy) Elm.Widget.Item.part_content { get; set; } Elm.Widget.Item.part_content_unset; Elm.Widget.Item.style { set; } - Efl.Access.access_children { get; } + Efl.Access.Object.access_children { get; } } } diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index e7acd30d6a..e961c47636 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -3,7 +3,7 @@ #endif #define ELM_WIDGET_PROTECTED -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include @@ -479,7 +479,7 @@ _elm_notify_efl_object_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED) { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - efl_access_role_set(obj, EFL_ACCESS_ROLE_NOTIFICATION); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_NOTIFICATION); return obj; } diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index d26303a52d..295f31f26c 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_LAYER_PROTECTED @@ -988,7 +988,7 @@ _elm_panel_efl_object_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_PANEL); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PANEL); efl_ui_focus_layer_behaviour_set(obj, EINA_FALSE, EINA_FALSE); diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index 6934f0d2c6..b34360a412 100644 --- a/src/lib/elementary/elm_photo.c +++ b/src/lib/elementary/elm_photo.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include @@ -306,7 +306,7 @@ _elm_photo_efl_object_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE); return obj; } diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c index 6bc7d611f2..13312643b1 100644 --- a/src/lib/elementary/elm_plug.c +++ b/src/lib/elementary/elm_plug.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include @@ -145,7 +145,7 @@ _elm_plug_efl_object_constructor(Eo *obj, void *sd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE); return obj; } diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index e96b08d565..992488cf36 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo @@ -176,8 +176,8 @@ class Elm.Popup (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy) Efl.Ui.Widget.widget_event; Efl.Layout.Signal.signal_emit; Efl.Access.Widget.Action.elm_actions { get; } - Efl.Access.state_set { get; } - Efl.Access.i18n_name { get; } + Efl.Access.Object.state_set { get; } + Efl.Access.Object.i18n_name { get; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c index 5b711cd801..d9d48a4c21 100644 --- a/src/lib/elementary/elm_prefs.c +++ b/src/lib/elementary/elm_prefs.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include @@ -492,7 +492,7 @@ _elm_prefs_efl_object_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _elm_prefs_smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_REDUNDANT_OBJECT); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_REDUNDANT_OBJECT); return obj; } diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 4875e6ff8b..46cffd4ec0 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #include @@ -886,7 +886,7 @@ _elm_scroller_efl_object_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_SCROLL_PANE); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SCROLL_PANE); efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _focused_element, obj); return obj; } diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index 5d18994b8d..6666394977 100644 --- a/src/lib/elementary/elm_segment_control.c +++ b/src/lib/elementary/elm_segment_control.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED @@ -682,7 +682,7 @@ _elm_segment_control_efl_object_constructor(Eo *obj, Elm_Segment_Control_Data *s efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST); return obj; } diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c index a492963911..927b329f57 100644 --- a/src/lib/elementary/elm_separator.c +++ b/src/lib/elementary/elm_separator.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include @@ -70,7 +70,7 @@ _elm_separator_efl_object_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - efl_access_role_set(obj, EFL_ACCESS_ROLE_SEPARATOR); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SEPARATOR); return obj; } diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c index e0917d7ee2..6ca5e3cfae 100644 --- a/src/lib/elementary/elm_slideshow.c +++ b/src/lib/elementary/elm_slideshow.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -376,7 +376,7 @@ _elm_slideshow_efl_object_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUS obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION); return obj; } diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 187abb4022..b42ef3f4cc 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED @@ -1402,7 +1402,7 @@ _elm_spinner_efl_object_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_SPIN_BUTTON); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SPIN_BUTTON); return obj; } @@ -1683,10 +1683,10 @@ _elm_spinner_efl_access_value_increment_get(const Eo *obj EINA_UNUSED, Elm_Spinn } EOLIAN static const char* -_elm_spinner_efl_access_i18n_name_get(const Eo *obj, Elm_Spinner_Data *sd) +_elm_spinner_efl_access_object_i18n_name_get(const Eo *obj, Elm_Spinner_Data *sd) { const char *name, *ret; - name = efl_access_i18n_name_get(efl_super(obj, ELM_SPINNER_CLASS)); + name = efl_access_object_i18n_name_get(efl_super(obj, ELM_SPINNER_CLASS)); if (name) return name; if (sd->button_layout) { diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo index 2c5d6ca51b..9dd3030eec 100644 --- a/src/lib/elementary/elm_spinner.eo +++ b/src/lib/elementary/elm_spinner.eo @@ -177,7 +177,7 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Focus.Composition, Efl.Ui.Range.range_min_max { get; set; } Efl.Ui.Range.range_step { get; set; } Efl.Ui.Range.range_value { get; set; } - Efl.Access.i18n_name { get; } + Efl.Access.Object.i18n_name { get; } Efl.Access.Value.value_and_text { get; set; } Efl.Access.Value.range { get; } Efl.Access.Value.increment { get; } diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c index 50b1a0c3ec..c5f8fe63b4 100644 --- a/src/lib/elementary/elm_table.c +++ b/src/lib/elementary/elm_table.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #include @@ -137,7 +137,7 @@ _elm_table_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED) { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); return obj; } diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c index 47c6363211..10086b61f7 100644 --- a/src/lib/elementary/elm_thumb.c +++ b/src/lib/elementary/elm_thumb.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include @@ -587,7 +587,7 @@ _elm_thumb_efl_object_constructor(Eo *obj, Elm_Thumb_Data *sd) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, "Elm_Thumb"); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE); sd->obj = obj; diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 7753a53d65..1b868aedad 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -3,7 +3,7 @@ #endif #define EFL_UI_FOCUS_COMPOSITION_PROTECTED -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -2367,7 +2367,7 @@ _elm_toolbar_item_efl_object_constructor(Eo *eo_it, Elm_Toolbar_Item_Data *it) { eo_it = efl_constructor(efl_super(eo_it, ELM_TOOLBAR_ITEM_CLASS)); it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); - efl_access_role_set(eo_it, EFL_ACCESS_ROLE_MENU_ITEM); + efl_access_object_role_set(eo_it, EFL_ACCESS_ROLE_MENU_ITEM); return eo_it; } @@ -2400,7 +2400,7 @@ _item_new(Evas_Object *obj, VIEW(it) = elm_layout_add(obj); elm_widget_tree_unfocusable_set(VIEW(it), EINA_TRUE); evas_object_data_set(VIEW(it), "item", it); - efl_access_type_set(VIEW(it), EFL_ACCESS_TYPE_DISABLED); + efl_access_object_access_type_set(VIEW(it), EFL_ACCESS_TYPE_DISABLED); icon_obj = elm_icon_add(VIEW(it)); efl_parent_set(icon_obj, eo_it); @@ -2788,7 +2788,7 @@ _elm_toolbar_efl_canvas_group_group_add(Eo *obj, Elm_Toolbar_Data *priv) else elm_object_signal_emit(priv->more, "elm,orient,horizontal", "elm"); - efl_access_type_set(priv->more, EFL_ACCESS_TYPE_DISABLED); + efl_access_object_access_type_set(priv->more, EFL_ACCESS_TYPE_DISABLED); elm_widget_sub_object_add(obj, priv->more); evas_object_show(priv->more); @@ -2967,7 +2967,7 @@ _elm_toolbar_efl_object_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_TOOL_BAR); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_TOOL_BAR); efl_ui_focus_composition_custom_manager_set(obj, obj); @@ -3833,21 +3833,21 @@ _elm_toolbar_item_bring_in(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, } EOLIAN static const char* -_elm_toolbar_item_efl_access_i18n_name_get(const Eo *eo_item, Elm_Toolbar_Item_Data *item) +_elm_toolbar_item_efl_access_object_i18n_name_get(const Eo *eo_item, Elm_Toolbar_Item_Data *item) { const char *ret; - ret = efl_access_i18n_name_get(efl_super(eo_item, ELM_TOOLBAR_ITEM_CLASS)); + ret = efl_access_object_i18n_name_get(efl_super(eo_item, ELM_TOOLBAR_ITEM_CLASS)); if (ret) return ret; return _elm_widget_item_accessible_plain_name_get(eo_item, item->label); } EOLIAN static Efl_Access_State_Set -_elm_toolbar_item_efl_access_state_set_get(const Eo *eo_it, Elm_Toolbar_Item_Data *item EINA_UNUSED) +_elm_toolbar_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Toolbar_Item_Data *item EINA_UNUSED) { Efl_Access_State_Set ret; Eina_Bool sel; - ret = efl_access_state_set_get(efl_super(eo_it, ELM_TOOLBAR_ITEM_CLASS)); + ret = efl_access_object_state_set_get(efl_super(eo_it, ELM_TOOLBAR_ITEM_CLASS)); sel = elm_toolbar_item_selected_get(eo_it); @@ -3882,11 +3882,11 @@ _elm_toolbar_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, } EOLIAN static Eina_List* -_elm_toolbar_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) +_elm_toolbar_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) { Eina_List *ret = NULL, *ret2 = NULL; Elm_Toolbar_Item_Data *it; - ret2 = efl_access_children_get(efl_super(obj, ELM_TOOLBAR_CLASS)); + ret2 = efl_access_object_access_children_get(efl_super(obj, ELM_TOOLBAR_CLASS)); EINA_INLIST_FOREACH(sd->items, it) ret = eina_list_append(ret, EO_OBJ(it)); @@ -3895,9 +3895,9 @@ _elm_toolbar_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Toolb } EOLIAN static Efl_Access_State_Set -_elm_toolbar_efl_access_state_set_get(const Eo *obj, Elm_Toolbar_Data *sd EINA_UNUSED) +_elm_toolbar_efl_access_object_state_set_get(const Eo *obj, Elm_Toolbar_Data *sd EINA_UNUSED) { - return efl_access_state_set_get(efl_super(obj, ELM_TOOLBAR_CLASS)); + return efl_access_object_state_set_get(efl_super(obj, ELM_TOOLBAR_CLASS)); } EOLIAN int diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo index 41629e0c93..04a0012a9f 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 (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Direction, - Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access, + Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access.Object, Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy) { [[Elementary toolbar class]] @@ -360,8 +360,8 @@ class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $horizontal.]] } Efl.Ui.Widget.focus_state_apply; Efl.Access.Widget.Action.elm_actions { get; } - Efl.Access.access_children { get; } - Efl.Access.state_set { get; } + Efl.Access.Object.access_children { get; } + Efl.Access.Object.state_set { 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_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo index c5fb4037e2..abfc9deeb2 100644 --- a/src/lib/elementary/elm_toolbar_item.eo +++ b/src/lib/elementary/elm_toolbar_item.eo @@ -322,7 +322,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Ui.Legacy) Elm.Widget.Item.part_content_unset; Efl.Ui.Focus.Object.focus_geometry { get; } Efl.Ui.Focus.Object.focus { set; } - Efl.Access.i18n_name { get; } - Efl.Access.state_set { get; } + Efl.Access.Object.i18n_name { get; } + Efl.Access.Object.state_set { get; } } } diff --git a/src/lib/elementary/elm_web2.c b/src/lib/elementary/elm_web2.c index 58266fdeb3..35360c40f6 100644 --- a/src/lib/elementary/elm_web2.c +++ b/src/lib/elementary/elm_web2.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include @@ -99,7 +99,7 @@ _elm_web_efl_object_constructor(Eo *obj, Elm_Web_Data *sd) sd->obj = obj; efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _elm_web_smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_HTML_CONTAINER); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_HTML_CONTAINER); return obj; } diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo index 3df4638fe3..fea0405d3f 100644 --- a/src/lib/elementary/elm_widget_item.eo +++ b/src/lib/elementary/elm_widget_item.eo @@ -4,7 +4,7 @@ import efl_ui; type Elm_Tooltip_Item_Content_Cb: __undefined_type; [[Elementary tooltip item content callback type]] type Elm_Object_Item_Signal_Cb: __undefined_type; [[Elementary object item signal callback type]] -class Elm.Widget.Item(Efl.Object, Efl.Access, +class Elm.Widget.Item(Efl.Object, Efl.Access.Object, Efl.Access.Component) { [[Elementary widget item class]] @@ -540,8 +540,8 @@ class Elm.Widget.Item(Efl.Object, Efl.Access, Efl.Object.constructor; Efl.Object.destructor; Efl.Object.del; - Efl.Access.state_set { get; } - Efl.Access.attributes { get; } + Efl.Access.Object.state_set { get; } + Efl.Access.Object.attributes { get; } Efl.Access.Component.extents { get; set; } Efl.Access.Component.focus_grab; } diff --git a/src/tests/elementary/elm_test_actionslider.c b/src/tests/elementary/elm_test_actionslider.c index 38a09e5749..6adf7afc3d 100644 --- a/src/tests/elementary/elm_test_actionslider.c +++ b/src/tests/elementary/elm_test_actionslider.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC); actionslider = elm_actionslider_add(win); - role = efl_access_role_get(actionslider); + role = efl_access_object_role_get(actionslider); ck_assert(role == EFL_ACCESS_ROLE_SLIDER); diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c index 607045bb9a..97524f4970 100644 --- a/src/tests/elementary/elm_test_atspi.c +++ b/src/tests/elementary/elm_test_atspi.c @@ -3,8 +3,8 @@ #endif #define ELM_INTERNAL_API_ARGESFSDFEFC -#define EFL_ACCESS_BETA -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_BETA +#define EFL_ACCESS_OBJECT_PROTECTED #include #include "elm_priv.h" @@ -36,7 +36,7 @@ EFL_START_TEST (test_efl_access_app_obj_name_get) elm_app_name_set("Test name"); - ret = efl_access_i18n_name_get(root); + ret = efl_access_object_i18n_name_get(root); ck_assert_str_eq(ret, "Test name"); @@ -44,13 +44,13 @@ EFL_START_TEST (test_efl_access_app_obj_name_get) } EFL_END_TEST -EFL_START_TEST (test_efl_access_i18n_name_get) +EFL_START_TEST (test_efl_access_object_i18n_name_get) { generate_app(); const char *name; - name = efl_access_i18n_name_get(g_btn); + name = efl_access_object_i18n_name_get(g_btn); if (name && name[0]) { ck_assert(0); @@ -59,7 +59,7 @@ EFL_START_TEST (test_efl_access_i18n_name_get) // Set name with additional text tags elm_object_text_set(g_btn, "Some
text"); - name = efl_access_i18n_name_get(g_btn); + name = efl_access_object_i18n_name_get(g_btn); // Accessible name should have cleared tags ck_assert(name != NULL); @@ -68,22 +68,22 @@ EFL_START_TEST (test_efl_access_i18n_name_get) } EFL_END_TEST -EFL_START_TEST (test_efl_access_i18n_name_set) +EFL_START_TEST (test_efl_access_object_i18n_name_set) { generate_app(); const char *name; elm_object_text_set(g_btn, "Other text"); - efl_access_i18n_name_set(g_btn, "Test name"); + efl_access_object_i18n_name_set(g_btn, "Test name"); - name = efl_access_i18n_name_get(g_btn); + name = efl_access_object_i18n_name_get(g_btn); ck_assert(name != NULL); ck_assert_str_eq(name, "Test name"); - efl_access_i18n_name_set(g_btn, NULL); - name = efl_access_i18n_name_get(g_btn); + efl_access_object_i18n_name_set(g_btn, NULL); + name = efl_access_object_i18n_name_get(g_btn); ck_assert(name != NULL); ck_assert_str_eq(name, "Other text"); @@ -91,13 +91,13 @@ EFL_START_TEST (test_efl_access_i18n_name_set) } EFL_END_TEST -EFL_START_TEST (test_efl_access_role_get) +EFL_START_TEST (test_efl_access_object_role_get) { Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); Efl_Access_Role role; - role = efl_access_role_get(root); + role = efl_access_object_role_get(root); ck_assert(role == EFL_ACCESS_ROLE_APPLICATION); @@ -105,19 +105,19 @@ EFL_START_TEST (test_efl_access_role_get) } EFL_END_TEST -EFL_START_TEST (test_efl_access_role_set) +EFL_START_TEST (test_efl_access_object_role_set) { generate_app(); Efl_Access_Role role; - efl_access_role_set(g_btn, EFL_ACCESS_ROLE_ACCELERATOR_LABEL); - role = efl_access_role_get(g_btn); + efl_access_object_role_set(g_btn, EFL_ACCESS_ROLE_ACCELERATOR_LABEL); + role = efl_access_object_role_get(g_btn); if (role != EFL_ACCESS_ROLE_ACCELERATOR_LABEL) ck_assert(0); - efl_access_role_set(g_btn, EFL_ACCESS_ROLE_ENTRY); - role = efl_access_role_get(g_btn); + efl_access_object_role_set(g_btn, EFL_ACCESS_ROLE_ENTRY); + role = efl_access_object_role_get(g_btn); if (role != EFL_ACCESS_ROLE_ENTRY) ck_assert(0); @@ -125,13 +125,13 @@ EFL_START_TEST (test_efl_access_role_set) } EFL_END_TEST -EFL_START_TEST (test_efl_access_role_name_get) +EFL_START_TEST (test_efl_access_object_role_name_get) { Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); const char *ret = NULL; - ret = efl_access_role_name_get(root); + ret = efl_access_object_role_name_get(root); ck_assert(ret != NULL); @@ -139,13 +139,13 @@ EFL_START_TEST (test_efl_access_role_name_get) } EFL_END_TEST -EFL_START_TEST (test_efl_access_localized_role_name_get) +EFL_START_TEST (test_efl_access_object_localized_role_name_get) { Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); const char *ret = NULL; - ret = efl_access_localized_role_name_get(root); + ret = efl_access_object_localized_role_name_get(root); ck_assert(ret != NULL); @@ -153,7 +153,7 @@ EFL_START_TEST (test_efl_access_localized_role_name_get) } EFL_END_TEST -EFL_START_TEST (test_efl_access_description_set) +EFL_START_TEST (test_efl_access_object_description_set) { Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); @@ -161,18 +161,18 @@ EFL_START_TEST (test_efl_access_description_set) const char *desc = "Test description"; - ret = efl_access_description_get(root); + ret = efl_access_object_description_get(root); ck_assert(ret == NULL); - efl_access_description_set(root, desc); - ret = efl_access_description_get(root); + efl_access_object_description_set(root, desc); + ret = efl_access_object_description_get(root); ck_assert(ret != NULL); ck_assert_str_eq(ret, "Test description"); - efl_access_description_set(root, NULL); - ret = efl_access_description_get(root); + efl_access_object_description_set(root, NULL); + ret = efl_access_object_description_get(root); ck_assert(ret == NULL); @@ -181,12 +181,12 @@ EFL_START_TEST (test_efl_access_description_set) EFL_END_TEST /* Test if initial description value is NULL */ -EFL_START_TEST (test_efl_access_description_get) +EFL_START_TEST (test_efl_access_object_description_get) { generate_app(); const char *descr; - descr = efl_access_description_get(g_bg); + descr = efl_access_object_description_get(g_bg); ck_assert(descr == NULL); @@ -200,9 +200,9 @@ EFL_START_TEST (test_efl_access_children_and_parent) Eina_List *child_list = NULL; - child_list = efl_access_children_get(root); + child_list = efl_access_object_access_children_get(root); - //bg_child_list = efl_access_children_get(eina_list_nth(child_list, 0)); + //bg_child_list = efl_access_object_access_children_get(eina_list_nth(child_list, 0)); ck_assert(eina_list_count(child_list) == 1); @@ -225,11 +225,11 @@ EFL_START_TEST (test_efl_access_children_and_parent2) Eo *win = NULL; Eina_List *root_children; - root_children = efl_access_children_get(root); + root_children = efl_access_object_access_children_get(root); win = eina_list_nth(root_children, 0); Eina_List *win_children; - win_children = efl_access_children_get(win); + win_children = efl_access_object_access_children_get(win); ck_assert(eina_list_count(win_children) == 1); @@ -244,40 +244,40 @@ EFL_START_TEST (test_efl_access_children_and_parent2) EFL_END_TEST /* Initial value of translation domain should be NULL */ -EFL_START_TEST (test_efl_access_translation_domain_get) +EFL_START_TEST (test_efl_access_object_translation_domain_get) { generate_app(); const char *domain; - domain = efl_access_translation_domain_get(g_btn); + domain = efl_access_object_translation_domain_get(g_btn); ck_assert(domain == NULL); } EFL_END_TEST -EFL_START_TEST (test_efl_access_translation_domain_set) +EFL_START_TEST (test_efl_access_object_translation_domain_set) { generate_app(); const char *domain; - efl_access_translation_domain_set(g_btn, "Test translation_domain"); - domain = efl_access_translation_domain_get(g_btn); + efl_access_object_translation_domain_set(g_btn, "Test translation_domain"); + domain = efl_access_object_translation_domain_get(g_btn); ck_assert(domain != NULL); ck_assert_str_eq(domain, "Test translation_domain"); - efl_access_translation_domain_set(g_btn, NULL); - domain = efl_access_translation_domain_get(g_btn); + efl_access_object_translation_domain_set(g_btn, NULL); + domain = efl_access_object_translation_domain_get(g_btn); ck_assert(domain == NULL); } EFL_END_TEST -EFL_START_TEST (test_efl_access_relationship_append) +EFL_START_TEST (test_efl_access_object_relationship_append) { generate_app(); @@ -285,9 +285,9 @@ EFL_START_TEST (test_efl_access_relationship_append) Efl_Access_Relation *rel, *rel_to, *rel_from; Eina_List *l; - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); - set = efl_access_relation_set_get(g_btn); + 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); + set = efl_access_object_relation_set_get(g_btn); ck_assert(set != NULL); ck_assert(eina_list_count(set) >= 2); @@ -310,9 +310,9 @@ EFL_START_TEST (test_efl_access_relationship_append) efl_access_relation_set_free(set); /* Check if append do not procude duplicated relations */ - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); - set = efl_access_relation_set_get(g_btn); + 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); + set = efl_access_object_relation_set_get(g_btn); rel_to = rel_from = NULL; EINA_LIST_FOREACH(set, l, rel) @@ -338,7 +338,7 @@ EFL_START_TEST (test_efl_access_relationship_append) } EFL_END_TEST -EFL_START_TEST (test_efl_access_relationship_remove) +EFL_START_TEST (test_efl_access_object_relationship_remove) { generate_app(); @@ -347,10 +347,10 @@ EFL_START_TEST (test_efl_access_relationship_remove) Eina_List *l; /* Test if removal of single relationship works */ - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); - efl_access_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - set = efl_access_relation_set_get(g_btn); + 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); + set = efl_access_object_relation_set_get(g_btn); ck_assert(set != NULL); ck_assert(eina_list_count(set) >= 1); @@ -371,10 +371,10 @@ EFL_START_TEST (test_efl_access_relationship_remove) efl_access_relation_set_free(set); /* Test if removal of type relationship works */ - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win); - efl_access_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, NULL); - set = efl_access_relation_set_get(g_btn); + 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); + set = efl_access_object_relation_set_get(g_btn); rel_to = rel_from = NULL; EINA_LIST_FOREACH(set, l, rel) @@ -392,10 +392,10 @@ EFL_START_TEST (test_efl_access_relationship_remove) efl_access_relation_set_free(set); /* Test if relationship is implicity removed when object is deleted */ - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg); + 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_del(g_bg); - set = efl_access_relation_set_get(g_btn); + set = efl_access_object_relation_set_get(g_btn); rel_to = rel_from = NULL; EINA_LIST_FOREACH(set, l, rel) @@ -413,7 +413,7 @@ EFL_START_TEST (test_efl_access_relationship_remove) } EFL_END_TEST -EFL_START_TEST (test_efl_access_relationships_clear) +EFL_START_TEST (test_efl_access_object_relationships_clear) { Efl_Access_Relation_Set set; Efl_Access_Relation *rel; @@ -421,14 +421,14 @@ EFL_START_TEST (test_efl_access_relationships_clear) generate_app(); - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg); - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win); - efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); + 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_relationships_clear(g_btn); + efl_access_object_relationships_clear(g_btn); - set = efl_access_relation_set_get(g_btn); + set = efl_access_object_relation_set_get(g_btn); EINA_LIST_FOREACH(set, l, rel) { ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg))); @@ -444,19 +444,19 @@ EFL_END_TEST void elm_test_atspi(TCase *tc) { tcase_add_test(tc, test_efl_access_app_obj_name_get); - tcase_add_test(tc, test_efl_access_i18n_name_get); - tcase_add_test(tc, test_efl_access_i18n_name_set); - tcase_add_test(tc, test_efl_access_role_get); - tcase_add_test(tc, test_efl_access_role_set); - tcase_add_test(tc, test_efl_access_role_name_get); - tcase_add_test(tc, test_efl_access_localized_role_name_get); - tcase_add_test(tc, test_efl_access_description_set); - tcase_add_test(tc, test_efl_access_description_get); + tcase_add_test(tc, test_efl_access_object_i18n_name_get); + tcase_add_test(tc, test_efl_access_object_i18n_name_set); + tcase_add_test(tc, test_efl_access_object_role_get); + tcase_add_test(tc, test_efl_access_object_role_set); + tcase_add_test(tc, test_efl_access_object_role_name_get); + tcase_add_test(tc, test_efl_access_object_localized_role_name_get); + tcase_add_test(tc, test_efl_access_object_description_set); + tcase_add_test(tc, test_efl_access_object_description_get); tcase_add_test(tc, test_efl_access_children_and_parent); tcase_add_test(tc, test_efl_access_children_and_parent2); - tcase_add_test(tc, test_efl_access_translation_domain_get); - tcase_add_test(tc, test_efl_access_translation_domain_set); - tcase_add_test(tc, test_efl_access_relationship_append); - tcase_add_test(tc, test_efl_access_relationship_remove); - tcase_add_test(tc, test_efl_access_relationships_clear); + tcase_add_test(tc, test_efl_access_object_translation_domain_get); + tcase_add_test(tc, test_efl_access_object_translation_domain_set); + tcase_add_test(tc, test_efl_access_object_relationship_append); + tcase_add_test(tc, test_efl_access_object_relationship_remove); + tcase_add_test(tc, test_efl_access_object_relationships_clear); } diff --git a/src/tests/elementary/elm_test_box.c b/src/tests/elementary/elm_test_box.c index becfb98f7b..86e27c8862 100644 --- a/src/tests/elementary/elm_test_box.c +++ b/src/tests/elementary/elm_test_box.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "box", ELM_WIN_BASIC); box = elm_box_add(win); - role = efl_access_role_get(box); + role = efl_access_object_role_get(box); ck_assert(role == EFL_ACCESS_ROLE_FILLER); diff --git a/src/tests/elementary/elm_test_bubble.c b/src/tests/elementary/elm_test_bubble.c index 485ac91ef9..dea1552c9c 100644 --- a/src/tests/elementary/elm_test_bubble.c +++ b/src/tests/elementary/elm_test_bubble.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC); bubble = elm_bubble_add(win); - role = efl_access_role_get(bubble); + role = efl_access_object_role_get(bubble); ck_assert(role == EFL_ACCESS_ROLE_FILLER); diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c index ee49bb98f1..99f15ef90b 100644 --- a/src/tests/elementary/elm_test_button.c +++ b/src/tests/elementary/elm_test_button.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #define EFL_ACCESS_COMPONENT_PROTECTED #define EFL_ACCESS_ACTION_PROTECTED #include @@ -36,7 +36,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "button", ELM_WIN_BASIC); button = elm_button_add(win); - role = efl_access_role_get(button); + role = efl_access_object_role_get(button); ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON); @@ -51,7 +51,7 @@ EFL_START_TEST (elm_atspi_interfaces_check) button = elm_button_add(win); - ck_assert(efl_isa(button, EFL_ACCESS_MIXIN)); + ck_assert(efl_isa(button, EFL_ACCESS_OBJECT_MIXIN)); ck_assert(efl_isa(button, EFL_ACCESS_COMPONENT_MIXIN)); ck_assert(efl_isa(button, EFL_ACCESS_ACTION_MIXIN)); diff --git a/src/tests/elementary/elm_test_calendar.c b/src/tests/elementary/elm_test_calendar.c index 90da2ffac8..8ac4d3d937 100644 --- a/src/tests/elementary/elm_test_calendar.c +++ b/src/tests/elementary/elm_test_calendar.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC); calendar = elm_calendar_add(win); - role = efl_access_role_get(calendar); + role = efl_access_object_role_get(calendar); ck_assert(role == EFL_ACCESS_ROLE_CALENDAR); diff --git a/src/tests/elementary/elm_test_check.c b/src/tests/elementary/elm_test_check.c index 486475f79b..243c38e591 100644 --- a/src/tests/elementary/elm_test_check.c +++ b/src/tests/elementary/elm_test_check.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -74,7 +74,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "check", ELM_WIN_BASIC); check = elm_check_add(win); - role = efl_access_role_get(check); + role = efl_access_object_role_get(check); ck_assert(role == EFL_ACCESS_ROLE_CHECK_BOX); diff --git a/src/tests/elementary/elm_test_clock.c b/src/tests/elementary/elm_test_clock.c index e1827a9830..568cb5b883 100644 --- a/src/tests/elementary/elm_test_clock.c +++ b/src/tests/elementary/elm_test_clock.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "clock", ELM_WIN_BASIC); clk = elm_clock_add(win); - role = efl_access_role_get(clk); + role = efl_access_object_role_get(clk); ck_assert(role == EFL_ACCESS_ROLE_TEXT); diff --git a/src/tests/elementary/elm_test_colorselector.c b/src/tests/elementary/elm_test_colorselector.c index 5e4c78151e..bc7a055934 100644 --- a/src/tests/elementary/elm_test_colorselector.c +++ b/src/tests/elementary/elm_test_colorselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -59,7 +59,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC); c = elm_colorselector_add(win); - role = efl_access_role_get(c); + role = efl_access_object_role_get(c); ck_assert(role == EFL_ACCESS_ROLE_COLOR_CHOOSER); diff --git a/src/tests/elementary/elm_test_config.c b/src/tests/elementary/elm_test_config.c index c69b53340c..2edab80b51 100644 --- a/src/tests/elementary/elm_test_config.c +++ b/src/tests/elementary/elm_test_config.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #include #include "elm_suite.h" diff --git a/src/tests/elementary/elm_test_conformant.c b/src/tests/elementary/elm_test_conformant.c index befb99727e..5bd0454c03 100644 --- a/src/tests/elementary/elm_test_conformant.c +++ b/src/tests/elementary/elm_test_conformant.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC); conformant = elm_conformant_add(win); - role = efl_access_role_get(conformant); + role = efl_access_object_role_get(conformant); ck_assert(role == EFL_ACCESS_ROLE_FILLER); diff --git a/src/tests/elementary/elm_test_ctxpopup.c b/src/tests/elementary/elm_test_ctxpopup.c index 053a5ad2ac..7d482b8f8d 100644 --- a/src/tests/elementary/elm_test_ctxpopup.c +++ b/src/tests/elementary/elm_test_ctxpopup.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); ctxpopup = elm_ctxpopup_add(win); - role = efl_access_role_get(ctxpopup); + role = efl_access_object_role_get(ctxpopup); ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU); diff --git a/src/tests/elementary/elm_test_datetime.c b/src/tests/elementary/elm_test_datetime.c index 3c614c9a59..3f35de79d2 100644 --- a/src/tests/elementary/elm_test_datetime.c +++ b/src/tests/elementary/elm_test_datetime.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC); datetime = elm_datetime_add(win); - role = efl_access_role_get(datetime); + role = efl_access_object_role_get(datetime); ck_assert(role == EFL_ACCESS_ROLE_DATE_EDITOR); diff --git a/src/tests/elementary/elm_test_dayselector.c b/src/tests/elementary/elm_test_dayselector.c index 1c3b480c02..c92eb8fe28 100644 --- a/src/tests/elementary/elm_test_dayselector.c +++ b/src/tests/elementary/elm_test_dayselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC); dayselector = elm_dayselector_add(win); - role = efl_access_role_get(dayselector); + role = efl_access_object_role_get(dayselector); ck_assert(role == EFL_ACCESS_ROLE_PANEL); diff --git a/src/tests/elementary/elm_test_diskselector.c b/src/tests/elementary/elm_test_diskselector.c index fcf95ef4b8..19162cd0aa 100644 --- a/src/tests/elementary/elm_test_diskselector.c +++ b/src/tests/elementary/elm_test_diskselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC); diskselector = elm_diskselector_add(win); - role = efl_access_role_get(diskselector); + role = efl_access_object_role_get(diskselector); ck_assert(role == EFL_ACCESS_ROLE_LIST); diff --git a/src/tests/elementary/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c index 9be9da6686..3fde6b9a7a 100644 --- a/src/tests/elementary/elm_test_entry.c +++ b/src/tests/elementary/elm_test_entry.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #define EFL_ACCESS_TEXT_BETA #define EFL_ACCESS_TEXT_PROTECTED #include @@ -386,7 +386,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); entry = elm_entry_add(win); - role = efl_access_role_get(entry); + role = efl_access_object_role_get(entry); ck_assert(role == EFL_ACCESS_ROLE_ENTRY); diff --git a/src/tests/elementary/elm_test_fileselector.c b/src/tests/elementary/elm_test_fileselector.c index 096cf368d7..d62ee349f4 100644 --- a/src/tests/elementary/elm_test_fileselector.c +++ b/src/tests/elementary/elm_test_fileselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC); fileselector = elm_fileselector_add(win); - role = efl_access_role_get(fileselector); + role = efl_access_object_role_get(fileselector); ck_assert(role == EFL_ACCESS_ROLE_FILE_CHOOSER); diff --git a/src/tests/elementary/elm_test_fileselector_button.c b/src/tests/elementary/elm_test_fileselector_button.c index 9079860569..5d315d903b 100644 --- a/src/tests/elementary/elm_test_fileselector_button.c +++ b/src/tests/elementary/elm_test_fileselector_button.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC); fs_button = elm_fileselector_button_add(win); - role = efl_access_role_get(fs_button); + role = efl_access_object_role_get(fs_button); ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON); diff --git a/src/tests/elementary/elm_test_fileselector_entry.c b/src/tests/elementary/elm_test_fileselector_entry.c index 42af79700b..9d7cfc40e2 100644 --- a/src/tests/elementary/elm_test_fileselector_entry.c +++ b/src/tests/elementary/elm_test_fileselector_entry.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC); fs_entry = elm_fileselector_entry_add(win); - role = efl_access_role_get(fs_entry); + role = efl_access_object_role_get(fs_entry); ck_assert(role == EFL_ACCESS_ROLE_GROUPING); diff --git a/src/tests/elementary/elm_test_flip.c b/src/tests/elementary/elm_test_flip.c index 4d87dfa00d..661105d0bc 100644 --- a/src/tests/elementary/elm_test_flip.c +++ b/src/tests/elementary/elm_test_flip.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "flip", ELM_WIN_BASIC); flip = elm_flip_add(win); - role = efl_access_role_get(flip); + role = efl_access_object_role_get(flip); ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST); diff --git a/src/tests/elementary/elm_test_flipselector.c b/src/tests/elementary/elm_test_flipselector.c index 40523b73bc..ba15290f50 100644 --- a/src/tests/elementary/elm_test_flipselector.c +++ b/src/tests/elementary/elm_test_flipselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC); flipselector = elm_flipselector_add(win); - role = efl_access_role_get(flipselector); + role = efl_access_object_role_get(flipselector); ck_assert(role == EFL_ACCESS_ROLE_LIST); diff --git a/src/tests/elementary/elm_test_focus_common.h b/src/tests/elementary/elm_test_focus_common.h index 7105d7f736..bfce152cc3 100644 --- a/src/tests/elementary/elm_test_focus_common.h +++ b/src/tests/elementary/elm_test_focus_common.h @@ -5,7 +5,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define ELM_INTERNAL_API_ARGESFSDFEFC #include #include "elm_suite.h" diff --git a/src/tests/elementary/elm_test_frame.c b/src/tests/elementary/elm_test_frame.c index d6ca3fedf9..0d0492a99d 100644 --- a/src/tests/elementary/elm_test_frame.c +++ b/src/tests/elementary/elm_test_frame.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "frame", ELM_WIN_BASIC); frame = elm_frame_add(win); - role = efl_access_role_get(frame); + role = efl_access_object_role_get(frame); ck_assert(role == EFL_ACCESS_ROLE_FRAME); diff --git a/src/tests/elementary/elm_test_gengrid.c b/src/tests/elementary/elm_test_gengrid.c index 85fe9af940..9134b2fe67 100644 --- a/src/tests/elementary/elm_test_gengrid.c +++ b/src/tests/elementary/elm_test_gengrid.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" #include "elm_test_helper.h" @@ -35,7 +35,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC); gengrid = elm_gengrid_add(win); - role = efl_access_role_get(gengrid); + role = efl_access_object_role_get(gengrid); ck_assert(role == EFL_ACCESS_ROLE_TREE_TABLE); @@ -69,7 +69,7 @@ EFL_START_TEST(elm_atspi_children_parent) Evas_Object *gengrid = elm_gengrid_add(win); evas_object_resize(gengrid, 100, 100); - Efl_Access *parent; + Efl_Access_Object *parent; content = NULL; itc.item_style = "default"; @@ -82,7 +82,7 @@ EFL_START_TEST(elm_atspi_children_parent) elm_gengrid_item_fields_update(it, "*.", ELM_GENGRID_ITEM_FIELD_CONTENT); ck_assert(content != NULL); - parent = efl_provider_find(efl_parent_get(content), EFL_ACCESS_MIXIN); + parent = efl_provider_find(efl_parent_get(content), EFL_ACCESS_OBJECT_MIXIN); ck_assert(it == parent); } diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c index fd346364e8..74b7575c5b 100644 --- a/src/tests/elementary/elm_test_genlist.c +++ b/src/tests/elementary/elm_test_genlist.c @@ -2,8 +2,8 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_BETA +#define EFL_ACCESS_OBJECT_PROTECTED #include #include "elm_suite.h" @@ -103,7 +103,7 @@ EFL_START_TEST (elm_atspi_role_get) Efl_Access_Role role; - role = efl_access_role_get(genlist); + role = efl_access_object_role_get(genlist); ck_assert(role == EFL_ACCESS_ROLE_LIST); @@ -116,14 +116,14 @@ EFL_START_TEST(elm_atspi_children_get1) Eina_List *children; Elm_Object_Item *it[3]; - children = efl_access_children_get(genlist); + children = efl_access_object_access_children_get(genlist); ck_assert(children == NULL); it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); it[1] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); - children = efl_access_children_get(genlist); + children = efl_access_object_access_children_get(genlist); ck_assert(eina_list_count(children) == 3); ck_assert(eina_list_nth(children, 0) == it[0]); ck_assert(eina_list_nth(children, 1) == it[1]); @@ -144,7 +144,7 @@ EFL_START_TEST(elm_atspi_children_get2) it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL); it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); - children = efl_access_children_get(genlist); + children = efl_access_object_access_children_get(genlist); ck_assert(eina_list_nth(children, 1) == it[0]); ck_assert(eina_list_nth(children, 0) == it[1]); ck_assert(eina_list_nth(children, 2) == it[2]); @@ -155,7 +155,7 @@ EFL_END_TEST static void _children_changed_cb(void *data EINA_UNUSED, const Efl_Event *event) { - if (event->desc != EFL_ACCESS_EVENT_CHILDREN_CHANGED) + if (event->desc != EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED) return; ev_data = *(Efl_Access_Event_Children_Changed_Data*)event->info; @@ -172,7 +172,7 @@ EFL_START_TEST(elm_atspi_children_events_add) Elm_Object_Item *it[3]; - efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL); + efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _children_changed_cb, NULL); it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); ck_assert(genlist == current); @@ -208,7 +208,7 @@ EFL_START_TEST(elm_atspi_children_events_del1) it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); - efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL); + efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _children_changed_cb, NULL); elm_object_item_del(it[0]); ck_assert(genlist == current); @@ -235,7 +235,7 @@ EFL_START_TEST(elm_atspi_children_events_del2) it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); - efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL); + efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _children_changed_cb, NULL); elm_genlist_clear(genlist); ck_assert(genlist == current); diff --git a/src/tests/elementary/elm_test_glview.c b/src/tests/elementary/elm_test_glview.c index 4d8525c234..7c38e4584c 100644 --- a/src/tests/elementary/elm_test_glview.c +++ b/src/tests/elementary/elm_test_glview.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -41,7 +41,7 @@ EFL_START_TEST (elm_atspi_role_get) // if no gl backend skip test if (glview) { - role = efl_access_role_get(glview); + role = efl_access_object_role_get(glview); ck_assert(role == EFL_ACCESS_ROLE_ANIMATION); } diff --git a/src/tests/elementary/elm_test_grid.c b/src/tests/elementary/elm_test_grid.c index ec08a3659b..f7c74e020a 100644 --- a/src/tests/elementary/elm_test_grid.c +++ b/src/tests/elementary/elm_test_grid.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "grid", ELM_WIN_BASIC); grid = elm_grid_add(win); - role = efl_access_role_get(grid); + role = efl_access_object_role_get(grid); ck_assert(role == EFL_ACCESS_ROLE_FILLER); diff --git a/src/tests/elementary/elm_test_hover.c b/src/tests/elementary/elm_test_hover.c index b3660ff5b8..4455f87692 100644 --- a/src/tests/elementary/elm_test_hover.c +++ b/src/tests/elementary/elm_test_hover.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "hover", ELM_WIN_BASIC); hover = elm_hover_add(win); - role = efl_access_role_get(hover); + role = efl_access_object_role_get(hover); ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU); diff --git a/src/tests/elementary/elm_test_hoversel.c b/src/tests/elementary/elm_test_hoversel.c index 1e22955d53..cf27c0abda 100644 --- a/src/tests/elementary/elm_test_hoversel.c +++ b/src/tests/elementary/elm_test_hoversel.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC); hoversel = elm_hoversel_add(win); - role = efl_access_role_get(hoversel); + role = efl_access_object_role_get(hoversel); ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON); diff --git a/src/tests/elementary/elm_test_icon.c b/src/tests/elementary/elm_test_icon.c index afd747a9aa..1b9aa33a3e 100644 --- a/src/tests/elementary/elm_test_icon.c +++ b/src/tests/elementary/elm_test_icon.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); icon = elm_icon_add(win); - role = efl_access_role_get(icon); + role = efl_access_object_role_get(icon); ck_assert(role == EFL_ACCESS_ROLE_ICON); diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c index 8e4c791ba3..0efb0e4a76 100644 --- a/src/tests/elementary/elm_test_image.c +++ b/src/tests/elementary/elm_test_image.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -45,7 +45,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "image", ELM_WIN_BASIC); image = elm_image_add(win); - role = efl_access_role_get(image); + role = efl_access_object_role_get(image); ck_assert(role == EFL_ACCESS_ROLE_IMAGE); diff --git a/src/tests/elementary/elm_test_index.c b/src/tests/elementary/elm_test_index.c index e8ea3ecff1..75d365ead7 100644 --- a/src/tests/elementary/elm_test_index.c +++ b/src/tests/elementary/elm_test_index.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "index", ELM_WIN_BASIC); idx = elm_index_add(win); - role = efl_access_role_get(idx); + role = efl_access_object_role_get(idx); ck_assert(role == EFL_ACCESS_ROLE_SCROLL_BAR); diff --git a/src/tests/elementary/elm_test_inwin.c b/src/tests/elementary/elm_test_inwin.c index 33141b4f6a..c330a63cf4 100644 --- a/src/tests/elementary/elm_test_inwin.c +++ b/src/tests/elementary/elm_test_inwin.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC); inwin = elm_win_inwin_add(win); - role = efl_access_role_get(inwin); + role = efl_access_object_role_get(inwin); ck_assert(role == EFL_ACCESS_ROLE_GLASS_PANE); diff --git a/src/tests/elementary/elm_test_label.c b/src/tests/elementary/elm_test_label.c index e580ec4c4c..a79ae73711 100644 --- a/src/tests/elementary/elm_test_label.c +++ b/src/tests/elementary/elm_test_label.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "label", ELM_WIN_BASIC); label = elm_label_add(win); - role = efl_access_role_get(label); + role = efl_access_object_role_get(label); ck_assert(role == EFL_ACCESS_ROLE_LABEL); diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c index cf7badeb91..a62e2c79e2 100644 --- a/src/tests/elementary/elm_test_layout.c +++ b/src/tests/elementary/elm_test_layout.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST(elm_atspi_role_get) win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); layout = elm_layout_add(win); - role = efl_access_role_get(layout); + role = efl_access_object_role_get(layout); ck_assert(role == EFL_ACCESS_ROLE_FILLER); diff --git a/src/tests/elementary/elm_test_list.c b/src/tests/elementary/elm_test_list.c index e5e27e6888..67a4663f80 100644 --- a/src/tests/elementary/elm_test_list.c +++ b/src/tests/elementary/elm_test_list.c @@ -3,8 +3,8 @@ #endif #define EFL_ACCESS_SELECTION_PROTECTED -#define EFL_ACCESS_BETA -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_BETA +#define EFL_ACCESS_OBJECT_PROTECTED #include #include "elm_suite.h" @@ -206,7 +206,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "list", ELM_WIN_BASIC); list = elm_list_add(win); - role = efl_access_role_get(list); + role = efl_access_object_role_get(list); ck_assert(role == EFL_ACCESS_ROLE_LIST); @@ -220,7 +220,7 @@ EFL_END_TEST */ EFL_START_TEST(elm_atspi_children_parent) { - Efl_Access *parent; + Efl_Access_Object *parent; Elm_Object_Item *it; Evas_Object *win = elm_win_add(NULL, "list", ELM_WIN_BASIC); @@ -233,10 +233,10 @@ EFL_START_TEST(elm_atspi_children_parent) evas_object_show(list); - parent = efl_provider_find(efl_parent_get(icon), EFL_ACCESS_MIXIN); + parent = efl_provider_find(efl_parent_get(icon), EFL_ACCESS_OBJECT_MIXIN); ck_assert(it == parent); - parent = efl_provider_find(efl_parent_get(end), EFL_ACCESS_MIXIN); + parent = efl_provider_find(efl_parent_get(end), EFL_ACCESS_OBJECT_MIXIN); ck_assert(it == parent); } diff --git a/src/tests/elementary/elm_test_map.c b/src/tests/elementary/elm_test_map.c index b127027057..5e5b07c7b0 100644 --- a/src/tests/elementary/elm_test_map.c +++ b/src/tests/elementary/elm_test_map.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "map", ELM_WIN_BASIC); map = elm_map_add(win); - role = efl_access_role_get(map); + role = efl_access_object_role_get(map); ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP); diff --git a/src/tests/elementary/elm_test_mapbuf.c b/src/tests/elementary/elm_test_mapbuf.c index 7f86c901be..bf4c1e6a7b 100644 --- a/src/tests/elementary/elm_test_mapbuf.c +++ b/src/tests/elementary/elm_test_mapbuf.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC); mapbuf = elm_mapbuf_add(win); - role = efl_access_role_get(mapbuf); + role = efl_access_object_role_get(mapbuf); ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP); diff --git a/src/tests/elementary/elm_test_menu.c b/src/tests/elementary/elm_test_menu.c index 3477a6044b..16ce607aec 100644 --- a/src/tests/elementary/elm_test_menu.c +++ b/src/tests/elementary/elm_test_menu.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "menu", ELM_WIN_BASIC); menu = elm_menu_add(win); - role = efl_access_role_get(menu); + role = efl_access_object_role_get(menu); ck_assert(role == EFL_ACCESS_ROLE_MENU); diff --git a/src/tests/elementary/elm_test_multibuttonentry.c b/src/tests/elementary/elm_test_multibuttonentry.c index 8d988a5fc5..501a79eeeb 100644 --- a/src/tests/elementary/elm_test_multibuttonentry.c +++ b/src/tests/elementary/elm_test_multibuttonentry.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC); multibuttonentry = elm_multibuttonentry_add(win); - role = efl_access_role_get(multibuttonentry); + role = efl_access_object_role_get(multibuttonentry); ck_assert_int_eq(role, EFL_ACCESS_ROLE_PANEL); diff --git a/src/tests/elementary/elm_test_naviframe.c b/src/tests/elementary/elm_test_naviframe.c index fcabc194e0..4e34ba5819 100644 --- a/src/tests/elementary/elm_test_naviframe.c +++ b/src/tests/elementary/elm_test_naviframe.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC); naviframe = elm_naviframe_add(win); - role = efl_access_role_get(naviframe); + role = efl_access_object_role_get(naviframe); ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST); diff --git a/src/tests/elementary/elm_test_notify.c b/src/tests/elementary/elm_test_notify.c index 41156306ab..a7e890ab9f 100644 --- a/src/tests/elementary/elm_test_notify.c +++ b/src/tests/elementary/elm_test_notify.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "notify", ELM_WIN_BASIC); notify = elm_notify_add(win); - role = efl_access_role_get(notify); + role = efl_access_object_role_get(notify); ck_assert(role == EFL_ACCESS_ROLE_NOTIFICATION); diff --git a/src/tests/elementary/elm_test_panel.c b/src/tests/elementary/elm_test_panel.c index 8a52b75bf0..e10995f4b4 100644 --- a/src/tests/elementary/elm_test_panel.c +++ b/src/tests/elementary/elm_test_panel.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "panel", ELM_WIN_BASIC); panel = elm_panel_add(win); - role = efl_access_role_get(panel); + role = efl_access_object_role_get(panel); ck_assert(role == EFL_ACCESS_ROLE_PANEL); diff --git a/src/tests/elementary/elm_test_panes.c b/src/tests/elementary/elm_test_panes.c index f6796ee81c..f084ee67e4 100644 --- a/src/tests/elementary/elm_test_panes.c +++ b/src/tests/elementary/elm_test_panes.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "panes", ELM_WIN_BASIC); panes = elm_panes_add(win); - role = efl_access_role_get(panes); + role = efl_access_object_role_get(panes); ck_assert(role == EFL_ACCESS_ROLE_SPLIT_PANE); diff --git a/src/tests/elementary/elm_test_photo.c b/src/tests/elementary/elm_test_photo.c index 454affc283..29ddcdba2b 100644 --- a/src/tests/elementary/elm_test_photo.c +++ b/src/tests/elementary/elm_test_photo.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "photo", ELM_WIN_BASIC); photo = elm_photo_add(win); - role = efl_access_role_get(photo); + role = efl_access_object_role_get(photo); ck_assert(role == EFL_ACCESS_ROLE_IMAGE); diff --git a/src/tests/elementary/elm_test_photocam.c b/src/tests/elementary/elm_test_photocam.c index 3de90e75d3..d374cbd983 100644 --- a/src/tests/elementary/elm_test_photocam.c +++ b/src/tests/elementary/elm_test_photocam.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC); photocam = elm_photocam_add(win); - role = efl_access_role_get(photocam); + role = efl_access_object_role_get(photocam); ck_assert(role == EFL_ACCESS_ROLE_IMAGE); diff --git a/src/tests/elementary/elm_test_player.c b/src/tests/elementary/elm_test_player.c index 332895c445..c300a27284 100644 --- a/src/tests/elementary/elm_test_player.c +++ b/src/tests/elementary/elm_test_player.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "player", ELM_WIN_BASIC); player = elm_player_add(win); - role = efl_access_role_get(player); + role = efl_access_object_role_get(player); ck_assert(role == EFL_ACCESS_ROLE_ANIMATION); diff --git a/src/tests/elementary/elm_test_plug.c b/src/tests/elementary/elm_test_plug.c index 3912df07b6..dff2d69684 100644 --- a/src/tests/elementary/elm_test_plug.c +++ b/src/tests/elementary/elm_test_plug.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "plug", ELM_WIN_BASIC); plug = elm_plug_add(win); - role = efl_access_role_get(plug); + role = efl_access_object_role_get(plug); ck_assert(role == EFL_ACCESS_ROLE_IMAGE); diff --git a/src/tests/elementary/elm_test_popup.c b/src/tests/elementary/elm_test_popup.c index 3283499758..99c07c63f1 100644 --- a/src/tests/elementary/elm_test_popup.c +++ b/src/tests/elementary/elm_test_popup.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "popup", ELM_WIN_BASIC); popup = elm_popup_add(win); - role = efl_access_role_get(popup); + role = efl_access_object_role_get(popup); ck_assert(role == EFL_ACCESS_ROLE_DIALOG); diff --git a/src/tests/elementary/elm_test_prefs.c b/src/tests/elementary/elm_test_prefs.c index 5efca7b9b1..a881512cf9 100644 --- a/src/tests/elementary/elm_test_prefs.c +++ b/src/tests/elementary/elm_test_prefs.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -38,7 +38,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC); prefs = elm_prefs_add(win); - role = efl_access_role_get(prefs); + role = efl_access_object_role_get(prefs); ck_assert(role == EFL_ACCESS_ROLE_REDUNDANT_OBJECT); diff --git a/src/tests/elementary/elm_test_progressbar.c b/src/tests/elementary/elm_test_progressbar.c index ad3fbec976..e561bb3575 100644 --- a/src/tests/elementary/elm_test_progressbar.c +++ b/src/tests/elementary/elm_test_progressbar.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC); progressbar = elm_progressbar_add(win); - role = efl_access_role_get(progressbar); + role = efl_access_object_role_get(progressbar); ck_assert(role == EFL_ACCESS_ROLE_PROGRESS_BAR); diff --git a/src/tests/elementary/elm_test_radio.c b/src/tests/elementary/elm_test_radio.c index 954c3d8e18..13de95d6bf 100644 --- a/src/tests/elementary/elm_test_radio.c +++ b/src/tests/elementary/elm_test_radio.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "radio", ELM_WIN_BASIC); radio = elm_radio_add(win); - role = efl_access_role_get(radio); + role = efl_access_object_role_get(radio); ck_assert(role == EFL_ACCESS_ROLE_RADIO_BUTTON); diff --git a/src/tests/elementary/elm_test_scroller.c b/src/tests/elementary/elm_test_scroller.c index a21949dbcd..00df0038fb 100644 --- a/src/tests/elementary/elm_test_scroller.c +++ b/src/tests/elementary/elm_test_scroller.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC); scroller = elm_scroller_add(win); - role = efl_access_role_get(scroller); + role = efl_access_object_role_get(scroller); ck_assert(role == EFL_ACCESS_ROLE_SCROLL_PANE); diff --git a/src/tests/elementary/elm_test_segmentcontrol.c b/src/tests/elementary/elm_test_segmentcontrol.c index baca5d3704..fa57c060c3 100644 --- a/src/tests/elementary/elm_test_segmentcontrol.c +++ b/src/tests/elementary/elm_test_segmentcontrol.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC); segmentcontrol = elm_segment_control_add(win); - role = efl_access_role_get(segmentcontrol); + role = efl_access_object_role_get(segmentcontrol); ck_assert(role == EFL_ACCESS_ROLE_LIST); diff --git a/src/tests/elementary/elm_test_separator.c b/src/tests/elementary/elm_test_separator.c index 3e85e42b33..a9863859ea 100644 --- a/src/tests/elementary/elm_test_separator.c +++ b/src/tests/elementary/elm_test_separator.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); separator = elm_separator_add(win); - role = efl_access_role_get(separator); + role = efl_access_object_role_get(separator); ck_assert(role == EFL_ACCESS_ROLE_SEPARATOR); diff --git a/src/tests/elementary/elm_test_slider.c b/src/tests/elementary/elm_test_slider.c index 1cff728e87..b3445a01ca 100644 --- a/src/tests/elementary/elm_test_slider.c +++ b/src/tests/elementary/elm_test_slider.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "slider", ELM_WIN_BASIC); slider = elm_slider_add(win); - role = efl_access_role_get(slider); + role = efl_access_object_role_get(slider); ck_assert(role == EFL_ACCESS_ROLE_SLIDER); diff --git a/src/tests/elementary/elm_test_slideshow.c b/src/tests/elementary/elm_test_slideshow.c index fd618ec44b..31e4edc8bc 100644 --- a/src/tests/elementary/elm_test_slideshow.c +++ b/src/tests/elementary/elm_test_slideshow.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC); slideshow = elm_slideshow_add(win); - role = efl_access_role_get(slideshow); + role = efl_access_object_role_get(slideshow); ck_assert(role == EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION); diff --git a/src/tests/elementary/elm_test_spinner.c b/src/tests/elementary/elm_test_spinner.c index fc3bd4edcc..c954ef5b26 100644 --- a/src/tests/elementary/elm_test_spinner.c +++ b/src/tests/elementary/elm_test_spinner.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC); spinner = elm_spinner_add(win); - role = efl_access_role_get(spinner); + role = efl_access_object_role_get(spinner); ck_assert(role == EFL_ACCESS_ROLE_SPIN_BUTTON); diff --git a/src/tests/elementary/elm_test_table.c b/src/tests/elementary/elm_test_table.c index 57b8b383df..6fb1c7092f 100644 --- a/src/tests/elementary/elm_test_table.c +++ b/src/tests/elementary/elm_test_table.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "table", ELM_WIN_BASIC); table = elm_table_add(win); - role = efl_access_role_get(table); + role = efl_access_object_role_get(table); ck_assert(role == EFL_ACCESS_ROLE_FILLER); diff --git a/src/tests/elementary/elm_test_thumb.c b/src/tests/elementary/elm_test_thumb.c index 9b82f750a2..a4983b8175 100644 --- a/src/tests/elementary/elm_test_thumb.c +++ b/src/tests/elementary/elm_test_thumb.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -35,7 +35,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC); thumb = elm_thumb_add(win); - role = efl_access_role_get(thumb); + role = efl_access_object_role_get(thumb); ck_assert(role == EFL_ACCESS_ROLE_IMAGE); diff --git a/src/tests/elementary/elm_test_toolbar.c b/src/tests/elementary/elm_test_toolbar.c index e4d759c524..39221277b2 100644 --- a/src/tests/elementary/elm_test_toolbar.c +++ b/src/tests/elementary/elm_test_toolbar.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC); toolbar = elm_toolbar_add(win); - role = efl_access_role_get(toolbar); + role = efl_access_object_role_get(toolbar); ck_assert(role == EFL_ACCESS_ROLE_TOOL_BAR); diff --git a/src/tests/elementary/elm_test_video.c b/src/tests/elementary/elm_test_video.c index 9e8d709d7f..e643475632 100644 --- a/src/tests/elementary/elm_test_video.c +++ b/src/tests/elementary/elm_test_video.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "video", ELM_WIN_BASIC); video = elm_video_add(win); - role = efl_access_role_get(video); + role = efl_access_object_role_get(video); ck_assert(role == EFL_ACCESS_ROLE_ANIMATION); diff --git a/src/tests/elementary/elm_test_web.c b/src/tests/elementary/elm_test_web.c index 2ae4a2517b..28607fac5b 100644 --- a/src/tests/elementary/elm_test_web.c +++ b/src/tests/elementary/elm_test_web.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #include #include "elm_suite.h" @@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "web", ELM_WIN_BASIC); web = elm_web_add(win); - role = efl_access_role_get(web); + role = efl_access_object_role_get(web); ck_assert(role == EFL_ACCESS_ROLE_HTML_CONTAINER); diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c index c7ef94a74e..311b16bc64 100644 --- a/src/tests/elementary/elm_test_win.c +++ b/src/tests/elementary/elm_test_win.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_BETA +#define EFL_ACCESS_OBJECT_BETA #define EFL_ACCESS_COMPONENT_BETA #define EFL_ACCESS_COMPONENT_PROTECTED #define EFL_CANVAS_SCENE_BETA @@ -88,7 +88,7 @@ EFL_START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "win", ELM_WIN_BASIC); - role = efl_access_role_get(win); + role = efl_access_object_role_get(win); ck_assert(role == EFL_ACCESS_ROLE_WINDOW);