summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-03 13:27:30 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:24 -0700
commit9dcc31ed4a987001101177341a2e1b47a3806d6b (patch)
treef76d95e3025db2ee1bb7681937d23b385ad3a31d /src
parent65ee277a6674dcad9c938b8b0ac9b56520105fc4 (diff)
Efl.Access.Object (from Efl.Access)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Elementary.am6
-rw-r--r--src/lib/elementary/Efl_Ui.h2
-rw-r--r--src/lib/elementary/efl_access_component.c4
-rw-r--r--src/lib/elementary/efl_access_object.c (renamed from src/lib/elementary/efl_access.c)102
-rw-r--r--src/lib/elementary/efl_access_object.eo (renamed from src/lib/elementary/efl_access.eo)14
-rw-r--r--src/lib/elementary/efl_access_object.h (renamed from src/lib/elementary/efl_access.h)30
-rw-r--r--src/lib/elementary/efl_access_window.h14
-rw-r--r--src/lib/elementary/efl_ui_bg_widget.c4
-rw-r--r--src/lib/elementary/efl_ui_box.c4
-rw-r--r--src/lib/elementary/efl_ui_button.c4
-rw-r--r--src/lib/elementary/efl_ui_calendar.c2
-rw-r--r--src/lib/elementary/efl_ui_check.c8
-rw-r--r--src/lib/elementary/efl_ui_check.eo2
-rw-r--r--src/lib/elementary/efl_ui_clock.c4
-rw-r--r--src/lib/elementary/efl_ui_flip.c4
-rw-r--r--src/lib/elementary/efl_ui_frame.c4
-rw-r--r--src/lib/elementary/efl_ui_image.c4
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c4
-rw-r--r--src/lib/elementary/efl_ui_layout.c4
-rw-r--r--src/lib/elementary/efl_ui_panes.c4
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c4
-rw-r--r--src/lib/elementary/efl_ui_radio.c8
-rw-r--r--src/lib/elementary/efl_ui_radio.eo2
-rw-r--r--src/lib/elementary/efl_ui_slider.c4
-rw-r--r--src/lib/elementary/efl_ui_slider_interval.c2
-rw-r--r--src/lib/elementary/efl_ui_spin.c2
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c8
-rw-r--r--src/lib/elementary/efl_ui_spin_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_table.c2
-rw-r--r--src/lib/elementary/efl_ui_table_static.c2
-rw-r--r--src/lib/elementary/efl_ui_text.c24
-rw-r--r--src/lib/elementary/efl_ui_text.eo4
-rw-r--r--src/lib/elementary/efl_ui_video.c4
-rw-r--r--src/lib/elementary/efl_ui_view_list.c10
-rw-r--r--src/lib/elementary/efl_ui_view_list.eo2
-rw-r--r--src/lib/elementary/efl_ui_widget.c48
-rw-r--r--src/lib/elementary/efl_ui_widget.eo10
-rw-r--r--src/lib/elementary/efl_ui_win.c20
-rw-r--r--src/lib/elementary/efl_ui_win.eo4
-rw-r--r--src/lib/elementary/elc_combobox.c4
-rw-r--r--src/lib/elementary/elc_ctxpopup.c8
-rw-r--r--src/lib/elementary/elc_fileselector.c4
-rw-r--r--src/lib/elementary/elc_fileselector_button.c4
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c4
-rw-r--r--src/lib/elementary/elc_hoversel.c6
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c20
-rw-r--r--src/lib/elementary/elc_naviframe.c12
-rw-r--r--src/lib/elementary/elc_player.c4
-rw-r--r--src/lib/elementary/elc_popup.c12
-rw-r--r--src/lib/elementary/elementary_config.h2
-rw-r--r--src/lib/elementary/elm_access.c6
-rw-r--r--src/lib/elementary/elm_access.eo2
-rw-r--r--src/lib/elementary/elm_actionslider.c4
-rw-r--r--src/lib/elementary/elm_atspi_app_object.c16
-rw-r--r--src/lib/elementary/elm_atspi_app_object.eo10
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c166
-rw-r--r--src/lib/elementary/elm_box.c6
-rw-r--r--src/lib/elementary/elm_bubble.c4
-rw-r--r--src/lib/elementary/elm_calendar.c4
-rw-r--r--src/lib/elementary/elm_clock.c4
-rw-r--r--src/lib/elementary/elm_color_item.eo4
-rw-r--r--src/lib/elementary/elm_colorselector.c18
-rw-r--r--src/lib/elementary/elm_colorselector.eo2
-rw-r--r--src/lib/elementary/elm_conform.c4
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo2
-rw-r--r--src/lib/elementary/elm_datetime.c2
-rw-r--r--src/lib/elementary/elm_dayselector.c4
-rw-r--r--src/lib/elementary/elm_diskselector.c4
-rw-r--r--src/lib/elementary/elm_entry.c28
-rw-r--r--src/lib/elementary/elm_entry.eo4
-rw-r--r--src/lib/elementary/elm_flipselector.c4
-rw-r--r--src/lib/elementary/elm_gengrid.c22
-rw-r--r--src/lib/elementary/elm_gengrid.eo4
-rw-r--r--src/lib/elementary/elm_gengrid_item.eo4
-rw-r--r--src/lib/elementary/elm_genlist.c22
-rw-r--r--src/lib/elementary/elm_genlist.eo4
-rw-r--r--src/lib/elementary/elm_genlist_item.eo4
-rw-r--r--src/lib/elementary/elm_glview.c4
-rw-r--r--src/lib/elementary/elm_grid.c4
-rw-r--r--src/lib/elementary/elm_hover.c8
-rw-r--r--src/lib/elementary/elm_hover.eo2
-rw-r--r--src/lib/elementary/elm_hoversel.eo2
-rw-r--r--src/lib/elementary/elm_icon.c4
-rw-r--r--src/lib/elementary/elm_index.c14
-rw-r--r--src/lib/elementary/elm_index.eo2
-rw-r--r--src/lib/elementary/elm_index_item.eo2
-rw-r--r--src/lib/elementary/elm_interfaces.h2
-rw-r--r--src/lib/elementary/elm_inwin.c4
-rw-r--r--src/lib/elementary/elm_label.c4
-rw-r--r--src/lib/elementary/elm_list.c28
-rw-r--r--src/lib/elementary/elm_list.eo4
-rw-r--r--src/lib/elementary/elm_list_item.eo4
-rw-r--r--src/lib/elementary/elm_map.c4
-rw-r--r--src/lib/elementary/elm_mapbuf.c4
-rw-r--r--src/lib/elementary/elm_menu.c40
-rw-r--r--src/lib/elementary/elm_menu.eo2
-rw-r--r--src/lib/elementary/elm_menu_item.eo8
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo10
-rw-r--r--src/lib/elementary/elm_multibuttonentry_item.eo4
-rw-r--r--src/lib/elementary/elm_naviframe_item.eo2
-rw-r--r--src/lib/elementary/elm_notify.c4
-rw-r--r--src/lib/elementary/elm_panel.c4
-rw-r--r--src/lib/elementary/elm_photo.c4
-rw-r--r--src/lib/elementary/elm_plug.c4
-rw-r--r--src/lib/elementary/elm_popup.eo4
-rw-r--r--src/lib/elementary/elm_prefs.c4
-rw-r--r--src/lib/elementary/elm_scroller.c4
-rw-r--r--src/lib/elementary/elm_segment_control.c4
-rw-r--r--src/lib/elementary/elm_separator.c4
-rw-r--r--src/lib/elementary/elm_slideshow.c4
-rw-r--r--src/lib/elementary/elm_spinner.c8
-rw-r--r--src/lib/elementary/elm_spinner.eo2
-rw-r--r--src/lib/elementary/elm_table.c4
-rw-r--r--src/lib/elementary/elm_thumb.c4
-rw-r--r--src/lib/elementary/elm_toolbar.c26
-rw-r--r--src/lib/elementary/elm_toolbar.eo6
-rw-r--r--src/lib/elementary/elm_toolbar_item.eo4
-rw-r--r--src/lib/elementary/elm_web2.c4
-rw-r--r--src/lib/elementary/elm_widget_item.eo6
-rw-r--r--src/tests/elementary/elm_test_actionslider.c4
-rw-r--r--src/tests/elementary/elm_test_atspi.c160
-rw-r--r--src/tests/elementary/elm_test_box.c4
-rw-r--r--src/tests/elementary/elm_test_bubble.c4
-rw-r--r--src/tests/elementary/elm_test_button.c6
-rw-r--r--src/tests/elementary/elm_test_calendar.c4
-rw-r--r--src/tests/elementary/elm_test_check.c4
-rw-r--r--src/tests/elementary/elm_test_clock.c4
-rw-r--r--src/tests/elementary/elm_test_colorselector.c4
-rw-r--r--src/tests/elementary/elm_test_config.c2
-rw-r--r--src/tests/elementary/elm_test_conformant.c4
-rw-r--r--src/tests/elementary/elm_test_ctxpopup.c4
-rw-r--r--src/tests/elementary/elm_test_datetime.c4
-rw-r--r--src/tests/elementary/elm_test_dayselector.c4
-rw-r--r--src/tests/elementary/elm_test_diskselector.c4
-rw-r--r--src/tests/elementary/elm_test_entry.c4
-rw-r--r--src/tests/elementary/elm_test_fileselector.c4
-rw-r--r--src/tests/elementary/elm_test_fileselector_button.c4
-rw-r--r--src/tests/elementary/elm_test_fileselector_entry.c4
-rw-r--r--src/tests/elementary/elm_test_flip.c4
-rw-r--r--src/tests/elementary/elm_test_flipselector.c4
-rw-r--r--src/tests/elementary/elm_test_focus_common.h2
-rw-r--r--src/tests/elementary/elm_test_frame.c4
-rw-r--r--src/tests/elementary/elm_test_gengrid.c8
-rw-r--r--src/tests/elementary/elm_test_genlist.c20
-rw-r--r--src/tests/elementary/elm_test_glview.c4
-rw-r--r--src/tests/elementary/elm_test_grid.c4
-rw-r--r--src/tests/elementary/elm_test_hover.c4
-rw-r--r--src/tests/elementary/elm_test_hoversel.c4
-rw-r--r--src/tests/elementary/elm_test_icon.c4
-rw-r--r--src/tests/elementary/elm_test_image.c4
-rw-r--r--src/tests/elementary/elm_test_index.c4
-rw-r--r--src/tests/elementary/elm_test_inwin.c4
-rw-r--r--src/tests/elementary/elm_test_label.c4
-rw-r--r--src/tests/elementary/elm_test_layout.c4
-rw-r--r--src/tests/elementary/elm_test_list.c12
-rw-r--r--src/tests/elementary/elm_test_map.c4
-rw-r--r--src/tests/elementary/elm_test_mapbuf.c4
-rw-r--r--src/tests/elementary/elm_test_menu.c4
-rw-r--r--src/tests/elementary/elm_test_multibuttonentry.c4
-rw-r--r--src/tests/elementary/elm_test_naviframe.c4
-rw-r--r--src/tests/elementary/elm_test_notify.c4
-rw-r--r--src/tests/elementary/elm_test_panel.c4
-rw-r--r--src/tests/elementary/elm_test_panes.c4
-rw-r--r--src/tests/elementary/elm_test_photo.c4
-rw-r--r--src/tests/elementary/elm_test_photocam.c4
-rw-r--r--src/tests/elementary/elm_test_player.c4
-rw-r--r--src/tests/elementary/elm_test_plug.c4
-rw-r--r--src/tests/elementary/elm_test_popup.c4
-rw-r--r--src/tests/elementary/elm_test_prefs.c4
-rw-r--r--src/tests/elementary/elm_test_progressbar.c4
-rw-r--r--src/tests/elementary/elm_test_radio.c4
-rw-r--r--src/tests/elementary/elm_test_scroller.c4
-rw-r--r--src/tests/elementary/elm_test_segmentcontrol.c4
-rw-r--r--src/tests/elementary/elm_test_separator.c4
-rw-r--r--src/tests/elementary/elm_test_slider.c4
-rw-r--r--src/tests/elementary/elm_test_slideshow.c4
-rw-r--r--src/tests/elementary/elm_test_spinner.c4
-rw-r--r--src/tests/elementary/elm_test_table.c4
-rw-r--r--src/tests/elementary/elm_test_thumb.c4
-rw-r--r--src/tests/elementary/elm_test_toolbar.c4
-rw-r--r--src/tests/elementary/elm_test_video.c4
-rw-r--r--src/tests/elementary/elm_test_web.c4
-rw-r--r--src/tests/elementary/elm_test_win.c4
183 files changed, 764 insertions, 764 deletions
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 = \
90 lib/elementary/efl_ui_scroller.eo \ 90 lib/elementary/efl_ui_scroller.eo \
91 lib/elementary/efl_ui_scroll_manager.eo \ 91 lib/elementary/efl_ui_scroll_manager.eo \
92 lib/elementary/efl_ui_pan.eo \ 92 lib/elementary/efl_ui_pan.eo \
93 lib/elementary/efl_access.eo \ 93 lib/elementary/efl_access_object.eo \
94 lib/elementary/efl_access_action.eo \ 94 lib/elementary/efl_access_action.eo \
95 lib/elementary/efl_access_component.eo \ 95 lib/elementary/efl_access_component.eo \
96 lib/elementary/efl_access_editable_text.eo \ 96 lib/elementary/efl_access_editable_text.eo \
@@ -305,7 +305,7 @@ includesdir = $(includedir)/elementary-@VMAJ@
305includesunstable_HEADERS = \ 305includesunstable_HEADERS = \
306 lib/elementary/elm_gen_common.h \ 306 lib/elementary/elm_gen_common.h \
307 lib/elementary/elm_atspi_bridge.h \ 307 lib/elementary/elm_atspi_bridge.h \
308 lib/elementary/efl_access.h \ 308 lib/elementary/efl_access_object.h \
309 lib/elementary/efl_access_text.h \ 309 lib/elementary/efl_access_text.h \
310 lib/elementary/efl_access_widget_action.h \ 310 lib/elementary/efl_access_widget_action.h \
311 lib/elementary/efl_access_window.h \ 311 lib/elementary/efl_access_window.h \
@@ -701,7 +701,7 @@ lib_elementary_libelementary_la_SOURCES = \
701 lib/elementary/elm_icon.c \ 701 lib/elementary/elm_icon.c \
702 lib/elementary/efl_ui_image.c \ 702 lib/elementary/efl_ui_image.c \
703 lib/elementary/elm_index.c \ 703 lib/elementary/elm_index.c \
704 lib/elementary/efl_access.c \ 704 lib/elementary/efl_access_object.c \
705 lib/elementary/efl_access_action.c \ 705 lib/elementary/efl_access_action.c \
706 lib/elementary/efl_access_component.c \ 706 lib/elementary/efl_access_component.c \
707 lib/elementary/efl_access_editable_text.c \ 707 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;
161# include <efl_ui_translatable.eo.h> 161# include <efl_ui_translatable.eo.h>
162# include <efl_ui_focus_composition.eo.h> 162# include <efl_ui_focus_composition.eo.h>
163# include <efl_ui_focus_layer.eo.h> 163# include <efl_ui_focus_layer.eo.h>
164# include <efl_access.h> 164# include <efl_access_object.h>
165# include <efl_access_text.h> 165# include <efl_access_text.h>
166# include <efl_access_window.h> 166# include <efl_access_window.h>
167 167
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 @@
4 4
5#define EFL_ACCESS_COMPONENT_PROTECTED 5#define EFL_ACCESS_COMPONENT_PROTECTED
6#define EFL_ACCESS_COMPONENT_BETA 6#define EFL_ACCESS_COMPONENT_BETA
7#define EFL_ACCESS_PROTECTED 7#define EFL_ACCESS_OBJECT_PROTECTED
8 8
9#include <Elementary.h> 9#include <Elementary.h>
10 10
@@ -47,7 +47,7 @@ _efl_access_component_accessible_at_point_get(Eo *obj, void *_pd EINA_UNUSED, Ei
47 Eina_List *l, *children; 47 Eina_List *l, *children;
48 Eo *ret = NULL, *child; 48 Eo *ret = NULL, *child;
49 49
50 children = efl_access_children_get(obj); 50 children = efl_access_object_access_children_get(obj);
51 51
52 EINA_LIST_FOREACH(children, l, child) 52 EINA_LIST_FOREACH(children, l, child)
53 { 53 {
diff --git a/src/lib/elementary/efl_access.c b/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 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_widget.h" 8#include "elm_widget.h"
@@ -121,7 +121,7 @@ struct _Efl_Access_Event_Handler
121 void *data; 121 void *data;
122}; 122};
123 123
124struct _Efl_Access_Data 124struct _Efl_Access_Object_Data
125{ 125{
126 Efl_Access_Relation_Set relations; 126 Efl_Access_Relation_Set relations;
127 Eina_List *attr_list; 127 Eina_List *attr_list;
@@ -133,23 +133,23 @@ struct _Efl_Access_Data
133 Efl_Access_Type type: 2; 133 Efl_Access_Type type: 2;
134}; 134};
135 135
136typedef struct _Efl_Access_Data Efl_Access_Data; 136typedef struct _Efl_Access_Object_Data Efl_Access_Object_Data;
137 137
138 138
139static Eina_List *global_callbacks; 139static Eina_List *global_callbacks;
140static Eo *root; 140static Eo *root;
141 141
142EOLIAN static int 142EOLIAN static int
143_efl_access_index_in_parent_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED) 143_efl_access_object_index_in_parent_get(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED)
144{ 144{
145 Eina_List *l, *children = NULL; 145 Eina_List *l, *children = NULL;
146 Eo *chld, *parent = NULL; 146 Eo *chld, *parent = NULL;
147 int ret = 0; 147 int ret = 0;
148 148
149 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN); 149 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN);
150 if (!parent) return -1; 150 if (!parent) return -1;
151 151
152 children = efl_access_children_get(parent); 152 children = efl_access_object_access_children_get(parent);
153 if (!children) return -1; 153 if (!children) return -1;
154 154
155 EINA_LIST_FOREACH(children, l, chld) 155 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)
169 169
170 170
171EOLIAN static Efl_Object * 171EOLIAN static Efl_Object *
172_efl_access_efl_object_provider_find(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED, const Efl_Object *klass) 172_efl_access_object_efl_object_provider_find(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED, const Efl_Object *klass)
173{ 173{
174 if (efl_isa(obj, klass)) 174 if (efl_isa(obj, klass))
175 { 175 {
176 if (klass == EFL_ACCESS_MIXIN) 176 if (klass == EFL_ACCESS_OBJECT_MIXIN)
177 { 177 {
178 Efl_Access_Type type = efl_access_type_get(obj); 178 Efl_Access_Type type = efl_access_object_access_type_get(obj);
179 if (type != EFL_ACCESS_TYPE_SKIPPED) return (Eo*)obj; 179 if (type != EFL_ACCESS_TYPE_SKIPPED) return (Eo*)obj;
180 } 180 }
181 else return (Eo*)obj; 181 else return (Eo*)obj;
182 } 182 }
183 return efl_provider_find(efl_super(obj, EFL_ACCESS_MIXIN), klass); 183 return efl_provider_find(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN), klass);
184} 184}
185 185
186EOLIAN Eina_List* 186EOLIAN Eina_List*
187_efl_access_attributes_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) 187_efl_access_object_attributes_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
188{ 188{
189 Eina_List *attr_list = NULL; 189 Eina_List *attr_list = NULL;
190 if (pd->attr_list) 190 if (pd->attr_list)
@@ -206,7 +206,7 @@ _efl_access_attributes_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
206} 206}
207 207
208EOLIAN static void 208EOLIAN static void
209_efl_access_attribute_append(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *key, const char *value) 209_efl_access_object_attribute_append(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd, const char *key, const char *value)
210{ 210{
211 Eina_List *l; 211 Eina_List *l;
212 Efl_Access_Attribute *attr = NULL; 212 Efl_Access_Attribute *attr = NULL;
@@ -232,7 +232,7 @@ _efl_access_attribute_append(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const cha
232 pd->attr_list = eina_list_append(pd->attr_list, attr); 232 pd->attr_list = eina_list_append(pd->attr_list, attr);
233} 233}
234 234
235EOLIAN static void _efl_access_attributes_clear(Eo *obj EINA_UNUSED, Efl_Access_Data *pd) 235EOLIAN static void _efl_access_object_attributes_clear(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
236{ 236{
237 if (!pd->attr_list) return; 237 if (!pd->attr_list) return;
238 Efl_Access_Attribute *attr; 238 Efl_Access_Attribute *attr;
@@ -246,7 +246,7 @@ EOLIAN static void _efl_access_attributes_clear(Eo *obj EINA_UNUSED, Efl_Access_
246} 246}
247 247
248EOLIAN static void 248EOLIAN static void
249_efl_access_reading_info_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Reading_Info_Type reading_info) 249_efl_access_object_reading_info_type_set(Eo *obj, Efl_Access_Object_Data *pd, Efl_Access_Reading_Info_Type reading_info)
250{ 250{
251 Eina_Strbuf *buf = NULL; 251 Eina_Strbuf *buf = NULL;
252 pd->reading_info = reading_info; 252 pd->reading_info = reading_info;
@@ -271,24 +271,24 @@ _efl_access_reading_info_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Readi
271 { 271 {
272 eina_strbuf_append(buf, "state"); 272 eina_strbuf_append(buf, "state");
273 } 273 }
274 efl_access_attribute_append(obj, "reading_info_type", eina_strbuf_string_get(buf)); 274 efl_access_object_attribute_append(obj, "reading_info_type", eina_strbuf_string_get(buf));
275 eina_strbuf_free(buf); 275 eina_strbuf_free(buf);
276} 276}
277 277
278EOLIAN Efl_Access_Reading_Info_Type 278EOLIAN Efl_Access_Reading_Info_Type
279_efl_access_reading_info_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) 279_efl_access_object_reading_info_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
280{ 280{
281 return pd->reading_info; 281 return pd->reading_info;
282} 282}
283 283
284EOLIAN static Efl_Access_Role 284EOLIAN static Efl_Access_Role
285_efl_access_role_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) 285_efl_access_object_role_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
286{ 286{
287 return pd->role; 287 return pd->role;
288} 288}
289 289
290EOLIAN static void 290EOLIAN static void
291_efl_access_role_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Role role) 291_efl_access_object_role_set(Eo *obj, Efl_Access_Object_Data *pd, Efl_Access_Role role)
292{ 292{
293 if (pd->role != role) 293 if (pd->role != role)
294 { 294 {
@@ -298,17 +298,17 @@ _efl_access_role_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Role role)
298} 298}
299 299
300EOLIAN const char * 300EOLIAN const char *
301_efl_access_role_name_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED) 301_efl_access_object_role_name_get(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED)
302{ 302{
303 Efl_Access_Role role; 303 Efl_Access_Role role;
304 304
305 role = efl_access_role_get(obj); 305 role = efl_access_object_role_get(obj);
306 306
307 return role > EFL_ACCESS_ROLE_LAST_DEFINED ? "" : Access_Name[role]; 307 return role > EFL_ACCESS_ROLE_LAST_DEFINED ? "" : Access_Name[role];
308} 308}
309 309
310EOLIAN const char * 310EOLIAN const char *
311_efl_access_i18n_name_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) 311_efl_access_object_i18n_name_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
312{ 312{
313#ifdef ENABLE_NLS 313#ifdef ENABLE_NLS
314 if (pd->translation_domain) 314 if (pd->translation_domain)
@@ -318,12 +318,12 @@ _efl_access_i18n_name_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
318} 318}
319 319
320EOLIAN static void 320EOLIAN static void
321_efl_access_i18n_name_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val) 321_efl_access_object_i18n_name_set(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd, const char *val)
322{ 322{
323 eina_stringshare_replace(&pd->name, val); 323 eina_stringshare_replace(&pd->name, val);
324} 324}
325 325
326const char * _efl_access_description_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) 326const char * _efl_access_object_description_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
327{ 327{
328#ifdef ENABLE_NLS 328#ifdef ENABLE_NLS
329 if (pd->translation_domain) 329 if (pd->translation_domain)
@@ -333,16 +333,16 @@ const char * _efl_access_description_get(const Eo *obj EINA_UNUSED, Efl_Access_D
333} 333}
334 334
335EOLIAN static void 335EOLIAN static void
336_efl_access_description_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val) 336_efl_access_object_description_set(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd, const char *val)
337{ 337{
338 eina_stringshare_replace(&pd->description, val); 338 eina_stringshare_replace(&pd->description, val);
339} 339}
340 340
341EOLIAN static const char * 341EOLIAN static const char *
342_efl_access_localized_role_name_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED) 342_efl_access_object_localized_role_name_get(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED)
343{ 343{
344 const char *ret = NULL; 344 const char *ret = NULL;
345 ret = efl_access_role_name_get(obj); 345 ret = efl_access_object_role_name_get(obj);
346#ifdef ENABLE_NLS 346#ifdef ENABLE_NLS
347 ret = gettext(ret); 347 ret = gettext(ret);
348#endif 348#endif
@@ -350,7 +350,7 @@ _efl_access_localized_role_name_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUS
350} 350}
351 351
352EOLIAN static Eina_List * 352EOLIAN static Eina_List *
353_efl_access_access_children_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED) 353_efl_access_object_access_children_get(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED)
354{ 354{
355 Eina_List *children = NULL; 355 Eina_List *children = NULL;
356 Eina_Iterator *iter = NULL; 356 Eina_Iterator *iter = NULL;
@@ -363,7 +363,7 @@ _efl_access_access_children_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED)
363 363
364 EINA_ITERATOR_FOREACH(iter, chld) 364 EINA_ITERATOR_FOREACH(iter, chld)
365 { 365 {
366 if (efl_isa(chld, EFL_ACCESS_MIXIN)) 366 if (efl_isa(chld, EFL_ACCESS_OBJECT_MIXIN))
367 children = eina_list_append(children, chld); 367 children = eina_list_append(children, chld);
368 } 368 }
369 eina_iterator_free(iter); 369 eina_iterator_free(iter);
@@ -372,13 +372,13 @@ _efl_access_access_children_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED)
372} 372}
373 373
374EOLIAN static Efl_Access_State_Set 374EOLIAN static Efl_Access_State_Set
375_efl_access_state_set_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED) 375_efl_access_object_state_set_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd EINA_UNUSED)
376{ 376{
377 return 0; 377 return 0;
378} 378}
379 379
380EOLIAN Efl_Access_Relation_Set 380EOLIAN Efl_Access_Relation_Set
381_efl_access_relation_set_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) 381_efl_access_object_relation_set_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
382{ 382{
383 return efl_access_relation_set_clone(pd->relations); 383 return efl_access_relation_set_clone(pd->relations);
384} 384}
@@ -395,26 +395,26 @@ EAPI void efl_access_attributes_list_free(Eina_List *list)
395} 395}
396 396
397EOLIAN void 397EOLIAN void
398_efl_access_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info) 398_efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info)
399{ 399{
400 Eina_List *l; 400 Eina_List *l;
401 Efl_Access_Event_Handler *hdl; 401 Efl_Access_Event_Handler *hdl;
402 Efl_Access_Type type; 402 Efl_Access_Type type;
403 403
404 if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_MIXIN)) 404 if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_OBJECT_MIXIN))
405 { 405 {
406 CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL"); 406 CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL");
407 return; 407 return;
408 } 408 }
409 409
410 type = efl_access_type_get(accessible); 410 type = efl_access_object_access_type_get(accessible);
411 if (type != EFL_ACCESS_TYPE_REGULAR) 411 if (type != EFL_ACCESS_TYPE_REGULAR)
412 return; 412 return;
413 413
414 if (event == EFL_ACCESS_EVENT_CHILDREN_CHANGED) 414 if (event == EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED)
415 { 415 {
416 Efl_Access_Event_Children_Changed_Data *event_data = event_info; 416 Efl_Access_Event_Children_Changed_Data *event_data = event_info;
417 type = efl_access_type_get(event_data->child); 417 type = efl_access_object_access_type_get(event_data->child);
418 if (type != EFL_ACCESS_TYPE_REGULAR) 418 if (type != EFL_ACCESS_TYPE_REGULAR)
419 return; 419 return;
420 } 420 }
@@ -431,7 +431,7 @@ _efl_access_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessib
431} 431}
432 432
433EOLIAN Efl_Access_Event_Handler * 433EOLIAN Efl_Access_Event_Handler *
434_efl_access_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data) 434_efl_access_object_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data)
435{ 435{
436 Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler)); 436 Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler));
437 437
@@ -444,7 +444,7 @@ _efl_access_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_E
444} 444}
445 445
446EOLIAN void 446EOLIAN void
447_efl_access_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Access_Event_Handler *handler) 447_efl_access_object_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Access_Event_Handler *handler)
448{ 448{
449 Eina_List *l, *l2; 449 Eina_List *l, *l2;
450 Efl_Access_Event_Handler *hdl; 450 Efl_Access_Event_Handler *hdl;
@@ -460,14 +460,14 @@ _efl_access_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_A
460} 460}
461 461
462EOLIAN void 462EOLIAN void
463_efl_access_translation_domain_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *domain) 463_efl_access_object_translation_domain_set(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd, const char *domain)
464{ 464{
465 eina_stringshare_replace(&pd->translation_domain, domain); 465 eina_stringshare_replace(&pd->translation_domain, domain);
466} 466}
467 467
468 468
469EOLIAN const char* 469EOLIAN const char*
470_efl_access_translation_domain_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) 470_efl_access_object_translation_domain_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
471{ 471{
472 return pd->translation_domain; 472 return pd->translation_domain;
473} 473}
@@ -519,7 +519,7 @@ efl_access_relation_set_relation_append(Efl_Access_Relation_Set *set, Efl_Access
519 Efl_Access_Relation *rel; 519 Efl_Access_Relation *rel;
520 Eina_List *l; 520 Eina_List *l;
521 521
522 if (!efl_isa(rel_obj, EFL_ACCESS_MIXIN)) 522 if (!efl_isa(rel_obj, EFL_ACCESS_OBJECT_MIXIN))
523 return EINA_FALSE; 523 return EINA_FALSE;
524 524
525 EINA_LIST_FOREACH(*set, l, rel) 525 EINA_LIST_FOREACH(*set, l, rel)
@@ -623,13 +623,13 @@ efl_access_relation_set_clone(const Efl_Access_Relation_Set set)
623} 623}
624 624
625EOLIAN static Eina_Bool 625EOLIAN static Eina_Bool
626_efl_access_relationship_append(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Access_Relation_Type type, const Efl_Access *relation_obj) 626_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)
627{ 627{
628 return efl_access_relation_set_relation_append(&sd->relations, type, relation_obj); 628 return efl_access_relation_set_relation_append(&sd->relations, type, relation_obj);
629} 629}
630 630
631EOLIAN static void 631EOLIAN static void
632_efl_access_relationship_remove(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Access_Relation_Type type, const Efl_Access *relation_obj) 632_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)
633{ 633{
634 if (relation_obj) 634 if (relation_obj)
635 efl_access_relation_set_relation_remove(&sd->relations, type, relation_obj); 635 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
638} 638}
639 639
640EOLIAN static void 640EOLIAN static void
641_efl_access_relationships_clear(Eo *obj EINA_UNUSED, Efl_Access_Data *sd) 641_efl_access_object_relationships_clear(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *sd)
642{ 642{
643 efl_access_relation_set_free(sd->relations); 643 efl_access_relation_set_free(sd->relations);
644 sd->relations = NULL; 644 sd->relations = NULL;
645} 645}
646 646
647EOLIAN Eo* 647EOLIAN Eo*
648_efl_access_access_root_get(const Eo *class EINA_UNUSED, void *pd EINA_UNUSED) 648_efl_access_object_access_root_get(const Eo *class EINA_UNUSED, void *pd EINA_UNUSED)
649{ 649{
650 if (!root) 650 if (!root)
651 root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 651 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)
654} 654}
655 655
656EOLIAN Efl_Access_Type 656EOLIAN Efl_Access_Type
657_efl_access_access_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd) 657_efl_access_object_access_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
658{ 658{
659 return pd->type; 659 return pd->type;
660} 660}
661 661
662EOLIAN void 662EOLIAN void
663_efl_access_access_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Type val) 663_efl_access_object_access_type_set(Eo *obj, Efl_Access_Object_Data *pd, Efl_Access_Type val)
664{ 664{
665 Efl_Access *parent; 665 Efl_Access_Object *parent;
666 if (val == pd->type) 666 if (val == pd->type)
667 return; 667 return;
668 668
669 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN); 669 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN);
670 670
671 switch (val) 671 switch (val)
672 { 672 {
@@ -683,14 +683,14 @@ _efl_access_access_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Type val)
683} 683}
684 684
685EOLIAN void 685EOLIAN void
686_efl_access_efl_object_destructor(Eo *obj, Efl_Access_Data *pd) 686_efl_access_object_efl_object_destructor(Eo *obj, Efl_Access_Object_Data *pd)
687{ 687{
688 eina_stringshare_del(pd->name); 688 eina_stringshare_del(pd->name);
689 eina_stringshare_del(pd->description); 689 eina_stringshare_del(pd->description);
690 eina_stringshare_del(pd->translation_domain); 690 eina_stringshare_del(pd->translation_domain);
691 efl_access_relation_set_free(pd->relations); 691 efl_access_relation_set_free(pd->relations);
692 692
693 efl_destructor(efl_super(obj, EFL_ACCESS_MIXIN)); 693 efl_destructor(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN));
694} 694}
695 695
696void 696void
@@ -704,4 +704,4 @@ _efl_access_shutdown(void)
704 ELM_SAFE_DEL(root); 704 ELM_SAFE_DEL(root);
705} 705}
706 706
707#include "efl_access.eo.c" 707#include "efl_access_object.eo.c"
diff --git a/src/lib/elementary/efl_access.eo b/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
244 244
245type Efl.Access.Relation_Set: list<ptr(Efl.Access.Relation)>; [[Elementary Accessibility relation set type]] 245type Efl.Access.Relation_Set: list<ptr(Efl.Access.Relation)>; [[Elementary Accessibility relation set type]]
246 246
247mixin Efl.Access (Efl.Interface, Efl.Object) 247mixin Efl.Access.Object (Efl.Interface, Efl.Object)
248{ 248{
249 [[Accessibility accessible mixin]] 249 [[Accessibility accessible mixin]]
250 eo_prefix: efl_access; 250 eo_prefix: efl_access_object;
251 data: Efl_Access_Data; 251 data: Efl_Access_Object_Data;
252 methods { 252 methods {
253 @property localized_role_name @protected @beta { 253 @property localized_role_name @protected @beta {
254 [[Gets an localized string describing accessible object role name.]] 254 [[Gets an localized string describing accessible object role name.]]
@@ -291,7 +291,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
291 get { 291 get {
292 } 292 }
293 values { 293 values {
294 children: list<Efl.Access> @owned; [[List of widget's children]] 294 children: list<Efl.Access.Object> @owned; [[List of widget's children]]
295 } 295 }
296 } 296 }
297 @property role_name @protected @beta { 297 @property role_name @protected @beta {
@@ -378,7 +378,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
378 event_emit @class @protected @beta { 378 event_emit @class @protected @beta {
379 [[Emit event]] 379 [[Emit event]]
380 params { 380 params {
381 @in accessible: Efl.Access; [[Accessibility object.]] 381 @in accessible: Efl.Access.Object; [[Accessibility object.]]
382 @cref event: Efl.Event.Description; [[Accessibility event type.]] 382 @cref event: Efl.Event.Description; [[Accessibility event type.]]
383 @in event_info: void_ptr; [[Accessibility event details.]] 383 @in event_info: void_ptr; [[Accessibility event details.]]
384 } 384 }
@@ -431,7 +431,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
431 return: bool; [[$true if relationship was successfully appended, $false otherwise]] 431 return: bool; [[$true if relationship was successfully appended, $false otherwise]]
432 params { 432 params {
433 @in type: Efl.Access.Relation_Type; [[Relation type]] 433 @in type: Efl.Access.Relation_Type; [[Relation type]]
434 @in relation_object: const(Efl.Access); [[Object to relate to]] 434 @in relation_object: const(Efl.Access.Object); [[Object to relate to]]
435 } 435 }
436 } 436 }
437 relationship_remove @beta { 437 relationship_remove @beta {
@@ -442,7 +442,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
442 ]] 442 ]]
443 params { 443 params {
444 @in type: Efl.Access.Relation_Type; [[Relation type]] 444 @in type: Efl.Access.Relation_Type; [[Relation type]]
445 @in relation_object: const(Efl.Access); [[Object to remove relation from]] 445 @in relation_object: const(Efl.Access.Object); [[Object to remove relation from]]
446 } 446 }
447 } 447 }
448 relationships_clear @beta { 448 relationships_clear @beta {
diff --git a/src/lib/elementary/efl_access.h b/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 @@
4#ifdef EFL_BETA_API_SUPPORT 4#ifdef EFL_BETA_API_SUPPORT
5 5
6#ifdef EFL_EO_API_SUPPORT 6#ifdef EFL_EO_API_SUPPORT
7#include "efl_access.eo.h" 7#include "efl_access_object.eo.h"
8#endif 8#endif
9#ifndef EFL_NOLEGACY_API_SUPPORT 9#ifndef EFL_NOLEGACY_API_SUPPORT
10#include "efl_access.eo.legacy.h" 10#include "efl_access_object.eo.legacy.h"
11#endif 11#endif
12 12
13/* 13/*
@@ -75,7 +75,7 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela
75 Efl_Access_Event_State_Changed_Data evinfo; \ 75 Efl_Access_Event_State_Changed_Data evinfo; \
76 evinfo.type = (tp); \ 76 evinfo.type = (tp); \
77 evinfo.new_value = (nvl); \ 77 evinfo.new_value = (nvl); \
78 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_STATE_CHANGED, (void*)&evinfo); \ 78 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \
79 } while(0); } 79 } while(0); }
80 80
81/** 81/**
@@ -84,38 +84,38 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela
84#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \ 84#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \
85 do { \ 85 do { \
86 Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \ 86 Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \
87 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \ 87 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \
88 } while(0); 88 } while(0);
89 89
90/** 90/**
91 * Emits Accessible 'PropertyChanged' signal for 'Name' property. 91 * Emits Accessible 'PropertyChanged' signal for 'Name' property.
92 */ 92 */
93#define efl_access_i18n_name_changed_signal_emit(obj) \ 93#define efl_access_i18n_name_changed_signal_emit(obj) \
94 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "i18n_name"); 94 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name");
95 95
96/** 96/**
97 * Emits Accessible 'PropertyChanged' signal for 'Description' property. 97 * Emits Accessible 'PropertyChanged' signal for 'Description' property.
98 */ 98 */
99#define efl_access_description_changed_signal_emit(obj) \ 99#define efl_access_description_changed_signal_emit(obj) \
100 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "description"); 100 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description");
101 101
102/** 102/**
103 * Emits Accessible 'PropertyChanged' signal for 'Parent' property. 103 * Emits Accessible 'PropertyChanged' signal for 'Parent' property.
104 */ 104 */
105#define efl_access_parent_changed_signal_emit(obj) \ 105#define efl_access_parent_changed_signal_emit(obj) \
106 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "parent"); 106 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent");
107 107
108/** 108/**
109 * Emits Accessible 'PropertyChanged' signal for 'Role' property. 109 * Emits Accessible 'PropertyChanged' signal for 'Role' property.
110 */ 110 */
111#define efl_access_role_changed_signal_emit(obj) \ 111#define efl_access_role_changed_signal_emit(obj) \
112 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "role"); 112 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role");
113 113
114/** 114/**
115 * Emits Accessible 'PropertyChanged' signal for 'Value' property. 115 * Emits Accessible 'PropertyChanged' signal for 'Value' property.
116 */ 116 */
117#define efl_access_value_changed_signal_emit(obj) \ 117#define efl_access_value_changed_signal_emit(obj) \
118 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "value"); 118 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value");
119 119
120/** 120/**
121 * Emits Accessible 'ChildrenChanged' signal with added child as argument. 121 * 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
123#define efl_access_children_changed_added_signal_emit(obj, child) \ 123#define efl_access_children_changed_added_signal_emit(obj, child) \
124 do { \ 124 do { \
125 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \ 125 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \
126 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_CHILDREN_CHANGED, &atspi_data); \ 126 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
127 } while(0); 127 } while(0);
128 128
129/** 129/**
@@ -132,32 +132,32 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela
132#define efl_access_children_changed_del_signal_emit(obj, child) \ 132#define efl_access_children_changed_del_signal_emit(obj, child) \
133 do { \ 133 do { \
134 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \ 134 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \
135 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_CHILDREN_CHANGED, &atspi_data); \ 135 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
136 } while(0); 136 } while(0);
137 137
138/** 138/**
139 * Emits Accessible 'ActiveDescendantChanged' signal. 139 * Emits Accessible 'ActiveDescendantChanged' signal.
140 */ 140 */
141#define efl_access_active_descendant_changed_signal_emit(obj, child) \ 141#define efl_access_active_descendant_changed_signal_emit(obj, child) \
142 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_ACTIVE_DESCENDANT_CHANGED, child); 142 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child);
143 143
144/** 144/**
145 * Emits Accessible 'VisibleDataChanged' signal. 145 * Emits Accessible 'VisibleDataChanged' signal.
146 */ 146 */
147#define efl_access_visible_data_changed_signal_emit(obj) \ 147#define efl_access_visible_data_changed_signal_emit(obj) \
148 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_VISIBLE_DATA_CHANGED, NULL); 148 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL);
149 149
150/** 150/**
151 * Emits Accessible 'AddAccessible' signal. 151 * Emits Accessible 'AddAccessible' signal.
152 */ 152 */
153#define efl_access_added(obj) \ 153#define efl_access_added(obj) \
154 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_ADDED, NULL); 154 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL);
155 155
156/** 156/**
157 * Emits Accessible 'RemoveAccessible' signal. 157 * Emits Accessible 'RemoveAccessible' signal.
158 */ 158 */
159#define efl_access_removed(obj) \ 159#define efl_access_removed(obj) \
160 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_REMOVED, NULL); 160 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL);
161 161
162#endif 162#endif
163 163
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 @@
14 * Emits 'Window:Activated' accessible signal. 14 * Emits 'Window:Activated' accessible signal.
15 */ 15 */
16#define efl_access_window_activated_signal_emit(obj) \ 16#define efl_access_window_activated_signal_emit(obj) \
17 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL); 17 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
18 18
19/** 19/**
20 * Emits 'Window:Deactivated' accessible signal. 20 * Emits 'Window:Deactivated' accessible signal.
21 */ 21 */
22#define efl_access_window_deactivated_signal_emit(obj) \ 22#define efl_access_window_deactivated_signal_emit(obj) \
23 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL); 23 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
24 24
25/** 25/**
26 * Emits 'Window:Created' accessible signal. 26 * Emits 'Window:Created' accessible signal.
27 */ 27 */
28#define efl_access_window_created_signal_emit(obj) \ 28#define efl_access_window_created_signal_emit(obj) \
29 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL); 29 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL);
30 30
31/** 31/**
32 * Emits 'Window:Destroyed' accessible signal. 32 * Emits 'Window:Destroyed' accessible signal.
33 */ 33 */
34#define efl_access_window_destroyed_signal_emit(obj) \ 34#define efl_access_window_destroyed_signal_emit(obj) \
35 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL); 35 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
36 36
37/** 37/**
38 * Emits 'Window:Maximized' accessible signal. 38 * Emits 'Window:Maximized' accessible signal.
39 */ 39 */
40#define efl_access_window_maximized_signal_emit(obj) \ 40#define efl_access_window_maximized_signal_emit(obj) \
41 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL); 41 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
42 42
43/** 43/**
44 * Emits 'Window:Minimized' accessible signal. 44 * Emits 'Window:Minimized' accessible signal.
45 */ 45 */
46#define efl_access_window_minimized_signal_emit(obj) \ 46#define efl_access_window_minimized_signal_emit(obj) \
47 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL); 47 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
48 48
49/** 49/**
50 * Emits 'Window:Restored' accessible signal. 50 * Emits 'Window:Restored' accessible signal.
51 */ 51 */
52#define efl_access_window_restored_signal_emit(obj) \ 52#define efl_access_window_restored_signal_emit(obj) \
53 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL); 53 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL);
54 54
55#endif 55#endif
56#endif 56#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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -48,7 +48,7 @@ _efl_ui_bg_widget_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Widget_Data *pd)
48 pd->file = NULL; 48 pd->file = NULL;
49 pd->key = NULL; 49 pd->key = NULL;
50 50
51 efl_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); 51 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
52 52
53 efl_ui_widget_focus_allow_set(obj, EINA_FALSE); 53 efl_ui_widget_focus_allow_set(obj, EINA_FALSE);
54 54
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)
161 obj = efl_constructor(efl_super(obj, MY_CLASS)); 161 obj = efl_constructor(efl_super(obj, MY_CLASS));
162 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 162 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
163 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 163 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
164 efl_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED); 164 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED);
165 efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); 165 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
166 166
167 pd->align.h = 0.5; 167 pd->align.h = 0.5;
168 pd->align.v = 0.5; 168 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 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 5#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
6#define EFL_ACCESS_PROTECTED 6#define EFL_ACCESS_OBJECT_PROTECTED
7#define ELM_LAYOUT_PROTECTED 7#define ELM_LAYOUT_PROTECTED
8 8
9#include <Elementary.h> 9#include <Elementary.h>
@@ -236,7 +236,7 @@ _efl_ui_button_efl_object_constructor(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS
236{ 236{
237 obj = efl_constructor(efl_super(obj, MY_CLASS)); 237 obj = efl_constructor(efl_super(obj, MY_CLASS));
238 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 238 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
239 efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); 239 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON);
240 240
241 return obj; 241 return obj;
242} 242}
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)
1028 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1028 obj = efl_constructor(efl_super(obj, MY_CLASS));
1029 sd->obj = obj; 1029 sd->obj = obj;
1030 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1030 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1031 efl_access_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR); 1031 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR);
1032 1032
1033 obj = _efl_ui_calendar_constructor_internal(obj, sd); 1033 obj = _efl_ui_calendar_constructor_internal(obj, sd);
1034 1034
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define ELM_LAYOUT_PROTECTED 7#define ELM_LAYOUT_PROTECTED
8#define EFL_UI_NSTATE_PROTECTED 8#define EFL_UI_NSTATE_PROTECTED
@@ -86,11 +86,11 @@ _activate(Evas_Object *obj)
86} 86}
87 87
88EOLIAN static Efl_Access_State_Set 88EOLIAN static Efl_Access_State_Set
89_efl_ui_check_efl_access_state_set_get(const Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED) 89_efl_ui_check_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED)
90{ 90{
91 Efl_Access_State_Set states = 0; 91 Efl_Access_State_Set states = 0;
92 92
93 states = efl_access_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS)); 93 states = efl_access_object_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS));
94 94
95 if (elm_check_state_get(obj)) 95 if (elm_check_state_get(obj))
96 STATE_TYPE_SET(states, EFL_ACCESS_STATE_CHECKED); 96 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)
287 efl_layout_signal_callback_add 287 efl_layout_signal_callback_add
288 (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj); 288 (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj);
289 289
290 efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX); 290 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX);
291 _elm_access_object_register(obj, wd->resize_obj); 291 _elm_access_object_register(obj, wd->resize_obj);
292 _elm_access_text_set 292 _elm_access_text_set
293 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Check")); 293 (_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)
27 Efl.Ui.Widget.widget_event; 27 Efl.Ui.Widget.widget_event;
28 Efl.Ui.Nstate.count { set; } 28 Efl.Ui.Nstate.count { set; }
29 Efl.Ui.Nstate.value { set; } 29 Efl.Ui.Nstate.value { set; }
30 Efl.Access.state_set { get; } 30 Efl.Access.Object.state_set { get; }
31 Efl.Access.Widget.Action.elm_actions { get; } 31 Efl.Access.Widget.Action.elm_actions { get; }
32 } 32 }
33} 33}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_UI_TRANSLATABLE_PROTECTED 6#define EFL_UI_TRANSLATABLE_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -933,7 +933,7 @@ _efl_ui_clock_efl_object_constructor(Eo *obj, Efl_Ui_Clock_Data *_pd EINA_UNUSED
933{ 933{
934 obj = efl_constructor(efl_super(obj, MY_CLASS)); 934 obj = efl_constructor(efl_super(obj, MY_CLASS));
935 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 935 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
936 efl_access_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR); 936 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR);
937 937
938 return obj; 938 return obj;
939} 939}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_priv.h" 8#include "elm_priv.h"
@@ -1868,7 +1868,7 @@ _efl_ui_flip_efl_object_constructor(Eo *obj, Efl_Ui_Flip_Data *sd)
1868 sd->obj = obj; 1868 sd->obj = obj;
1869 1869
1870 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1870 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1871 efl_access_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST); 1871 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST);
1872 1872
1873 return obj; 1873 return obj;
1874} 1874}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -132,7 +132,7 @@ _efl_ui_frame_efl_object_constructor(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UNUSED
132{ 132{
133 obj = efl_constructor(efl_super(obj, MY_CLASS)); 133 obj = efl_constructor(efl_super(obj, MY_CLASS));
134 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 134 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
135 efl_access_role_set(obj, EFL_ACCESS_ROLE_FRAME); 135 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FRAME);
136 136
137 return obj; 137 return obj;
138} 138}
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 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_IMAGE_PROTECTED 5#define EFL_ACCESS_IMAGE_PROTECTED
6#define EFL_ACCESS_PROTECTED 6#define EFL_ACCESS_OBJECT_PROTECTED
7#define EFL_ACCESS_COMPONENT_PROTECTED 7#define EFL_ACCESS_COMPONENT_PROTECTED
8#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 8#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
9#define EFL_LAYOUT_CALC_PROTECTED 9#define EFL_LAYOUT_CALC_PROTECTED
@@ -855,7 +855,7 @@ _efl_ui_image_efl_object_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
855{ 855{
856 obj = efl_constructor(efl_super(obj, MY_CLASS)); 856 obj = efl_constructor(efl_super(obj, MY_CLASS));
857 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 857 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
858 efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); 858 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE);
859 859
860 pd->scale_type = EFL_IMAGE_SCALE_TYPE_FIT_INSIDE; 860 pd->scale_type = EFL_IMAGE_SCALE_TYPE_FIT_INSIDE;
861 pd->self = obj; 861 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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define EFL_UI_SCROLL_MANAGER_PROTECTED 7#define EFL_UI_SCROLL_MANAGER_PROTECTED
8#define EFL_UI_SCROLLBAR_PROTECTED 8#define EFL_UI_SCROLLBAR_PROTECTED
@@ -1789,7 +1789,7 @@ _efl_ui_image_zoomable_efl_object_constructor(Eo *obj, Efl_Ui_Image_Zoomable_Dat
1789{ 1789{
1790 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1790 obj = efl_constructor(efl_super(obj, MY_CLASS));
1791 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1791 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1792 efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); 1792 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE);
1793 1793
1794 return obj; 1794 return obj;
1795} 1795}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7#define EFL_UI_WIDGET_PART_BG_PROTECTED 7#define EFL_UI_WIDGET_PART_BG_PROTECTED
8 8
@@ -2116,7 +2116,7 @@ _efl_ui_layout_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Data *sd)
2116 sd->obj = obj; 2116 sd->obj = obj;
2117 obj = efl_constructor(efl_super(obj, MY_CLASS)); 2117 obj = efl_constructor(efl_super(obj, MY_CLASS));
2118 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 2118 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
2119 efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); 2119 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
2120 2120
2121 return obj; 2121 return obj;
2122} 2122}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7#define EFL_GFX_SIZE_HINT_PROTECTED 7#define EFL_GFX_SIZE_HINT_PROTECTED
8 8
@@ -465,7 +465,7 @@ _efl_ui_panes_efl_object_constructor(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UNUSED
465{ 465{
466 obj = efl_constructor(efl_super(obj, MY_CLASS)); 466 obj = efl_constructor(efl_super(obj, MY_CLASS));
467 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 467 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
468 efl_access_role_set(obj, EFL_ACCESS_ROLE_SPLIT_PANE); 468 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SPLIT_PANE);
469 469
470 return obj; 470 return obj;
471} 471}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7#define EFL_ACCESS_VALUE_PROTECTED 7#define EFL_ACCESS_VALUE_PROTECTED
8 8
@@ -381,7 +381,7 @@ _efl_ui_progressbar_efl_object_constructor(Eo *obj, Efl_Ui_Progressbar_Data *_pd
381{ 381{
382 obj = efl_constructor(efl_super(obj, MY_CLASS)); 382 obj = efl_constructor(efl_super(obj, MY_CLASS));
383 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 383 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
384 efl_access_role_set(obj, EFL_ACCESS_ROLE_PROGRESS_BAR); 384 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PROGRESS_BAR);
385 efl_ui_range_min_max_set(obj, 0.0, 1.0); 385 efl_ui_range_min_max_set(obj, 0.0, 1.0);
386 return obj; 386 return obj;
387} 387}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define ELM_LAYOUT_PROTECTED 7#define ELM_LAYOUT_PROTECTED
8 8
@@ -196,7 +196,7 @@ _efl_ui_radio_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Data *pd)
196 196
197 elm_layout_sizing_eval(obj); 197 elm_layout_sizing_eval(obj);
198 198
199 efl_access_role_set(obj, EFL_ACCESS_ROLE_RADIO_BUTTON); 199 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_RADIO_BUTTON);
200 _elm_access_text_set 200 _elm_access_text_set
201 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Radio")); 201 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Radio"));
202 _elm_access_callback_set 202 _elm_access_callback_set
@@ -323,11 +323,11 @@ _efl_ui_radio_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED
323} 323}
324 324
325EOLIAN Efl_Access_State_Set 325EOLIAN Efl_Access_State_Set
326_efl_ui_radio_efl_access_state_set_get(const Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED) 326_efl_ui_radio_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED)
327{ 327{
328 Efl_Access_State_Set ret; 328 Efl_Access_State_Set ret;
329 329
330 ret = efl_access_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS)); 330 ret = efl_access_object_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS));
331 if (obj == elm_radio_selected_object_get(obj)) 331 if (obj == elm_radio_selected_object_get(obj))
332 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED); 332 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED);
333 333
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)
64 Efl.Ui.Widget.theme_apply; 64 Efl.Ui.Widget.theme_apply;
65 Efl.Ui.Widget.on_access_activate; 65 Efl.Ui.Widget.on_access_activate;
66 Efl.Ui.Widget.widget_event; 66 Efl.Ui.Widget.widget_event;
67 Efl.Access.state_set { get; } 67 Efl.Access.Object.state_set { get; }
68 Efl.Access.Widget.Action.elm_actions { get; } 68 Efl.Access.Widget.Action.elm_actions { get; }
69 Efl.Ui.Nstate.value { set; get; } 69 Efl.Ui.Nstate.value { set; get; }
70 } 70 }
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define EFL_ACCESS_VALUE_PROTECTED 7#define EFL_ACCESS_VALUE_PROTECTED
8#define ELM_LAYOUT_PROTECTED 8#define ELM_LAYOUT_PROTECTED
@@ -1216,7 +1216,7 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUS
1216{ 1216{
1217 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1217 obj = efl_constructor(efl_super(obj, MY_CLASS));
1218 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1218 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1219 efl_access_role_set(obj, EFL_ACCESS_ROLE_SLIDER); 1219 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SLIDER);
1220 1220
1221 return obj; 1221 return obj;
1222} 1222}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED 7#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
8 8
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_VALUE_PROTECTED 6#define EFL_ACCESS_VALUE_PROTECTED
7#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 7#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
8 8
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_VALUE_PROTECTED 6#define EFL_ACCESS_VALUE_PROTECTED
7#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 7#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
8#define EFL_UI_FOCUS_COMPOSITION_PROTECTED 8#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)
792 792
793 elm_widget_can_focus_set(obj, EINA_TRUE); 793 elm_widget_can_focus_set(obj, EINA_TRUE);
794 794
795 efl_access_role_set(obj, EFL_ACCESS_ROLE_SPIN_BUTTON); 795 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SPIN_BUTTON);
796 796
797 return obj; 797 return obj;
798} 798}
@@ -883,10 +883,10 @@ _efl_ui_spin_button_efl_access_value_increment_get(const Eo *obj EINA_UNUSED, Ef
883} 883}
884 884
885EOLIAN static const char* 885EOLIAN static const char*
886_efl_ui_spin_button_efl_access_i18n_name_get(const Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED) 886_efl_ui_spin_button_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED)
887{ 887{
888 const char *name; 888 const char *name;
889 name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS)); 889 name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS));
890 if (name) return name; 890 if (name) return name;
891 const char *ret = elm_layout_text_get(obj, "elm.text"); 891 const char *ret = elm_layout_text_get(obj, "elm.text");
892 return ret; 892 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,
68 Efl.Ui.Widget.widget_event; 68 Efl.Ui.Widget.widget_event;
69 Efl.Ui.Focus.Object.on_focus_update; 69 Efl.Ui.Focus.Object.on_focus_update;
70 Efl.Ui.Range.range_value { set; } 70 Efl.Ui.Range.range_value { set; }
71 Efl.Access.i18n_name { get; } 71 Efl.Access.Object.i18n_name { get; }
72 Efl.Access.Value.value_and_text { get; set; } 72 Efl.Access.Value.value_and_text { get; set; }
73 Efl.Access.Value.range { get; } 73 Efl.Access.Value.range { get; }
74 Efl.Access.Value.increment { get; } 74 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)
188{ 188{
189 obj = efl_constructor(efl_super(obj, MY_CLASS)); 189 obj = efl_constructor(efl_super(obj, MY_CLASS));
190 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 190 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
191 efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); 191 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
192 192
193 pd->dir1 = EFL_UI_DIR_RIGHT; 193 pd->dir1 = EFL_UI_DIR_RIGHT;
194 pd->dir2 = EFL_UI_DIR_DOWN; 194 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)
11 11
12 obj = efl_constructor(efl_super(obj, MY_CLASS)); 12 obj = efl_constructor(efl_super(obj, MY_CLASS));
13 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 13 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
14 efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); 14 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
15 15
16 gd = efl_data_scope_get(obj, EFL_UI_TABLE_CLASS); 16 gd = efl_data_scope_get(obj, EFL_UI_TABLE_CLASS);
17 gd->req_cols = 100; 17 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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_TEXT_PROTECTED 6#define EFL_ACCESS_TEXT_PROTECTED
7#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED 7#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
8#define ELM_LAYOUT_PROTECTED 8#define ELM_LAYOUT_PROTECTED
@@ -2130,14 +2130,14 @@ _entry_changed_user_signal_cb(void *data,
2130 atspi_info.content = edje_info->change.insert.content; 2130 atspi_info.content = edje_info->change.insert.content;
2131 atspi_info.pos = edje_info->change.insert.pos; 2131 atspi_info.pos = edje_info->change.insert.pos;
2132 atspi_info.len = edje_info->change.insert.plain_length; 2132 atspi_info.len = edje_info->change.insert.plain_length;
2133 efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); 2133 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
2134 } 2134 }
2135 else if (edje_info && !edje_info->insert) 2135 else if (edje_info && !edje_info->insert)
2136 { 2136 {
2137 atspi_info.content = edje_info->change.del.content; 2137 atspi_info.content = edje_info->change.del.content;
2138 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); 2138 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
2139 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; 2139 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
2140 efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); 2140 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
2141 } 2141 }
2142 } 2142 }
2143} 2143}
@@ -2192,7 +2192,7 @@ _entry_cursor_changed_signal_cb(void *data,
2192 _decoration_defer(obj); 2192 _decoration_defer(obj);
2193 2193
2194 if (_elm_config->atspi_mode) 2194 if (_elm_config->atspi_mode)
2195 efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2195 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2196} 2196}
2197 2197
2198static void 2198static void
@@ -2203,7 +2203,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
2203{ 2203{
2204 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL); 2204 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL);
2205 if (_elm_config->atspi_mode) 2205 if (_elm_config->atspi_mode)
2206 efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2206 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2207} 2207}
2208 2208
2209static void 2209static void
@@ -3010,7 +3010,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd)
3010 elm_widget_sub_object_parent_add(obj); 3010 elm_widget_sub_object_parent_add(obj);
3011 3011
3012 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 3012 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
3013 efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); 3013 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
3014 efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL); 3014 efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL);
3015 efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL); 3015 efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL);
3016 3016
@@ -3317,7 +3317,7 @@ _efl_ui_text_password_mode_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password
3317 sd->single_line = EINA_TRUE; 3317 sd->single_line = EINA_TRUE;
3318 sd->line_wrap = ELM_WRAP_NONE; 3318 sd->line_wrap = ELM_WRAP_NONE;
3319 efl_ui_text_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA)); 3319 efl_ui_text_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA));
3320 efl_access_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT); 3320 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT);
3321 } 3321 }
3322 else 3322 else
3323 { 3323 {
@@ -3329,7 +3329,7 @@ _efl_ui_text_password_mode_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password
3329 _dnd_drop_cb, NULL); 3329 _dnd_drop_cb, NULL);
3330 3330
3331 efl_ui_text_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA)); 3331 efl_ui_text_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA));
3332 efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); 3332 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
3333 } 3333 }
3334 3334
3335 efl_ui_widget_theme_apply(obj); 3335 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
4460} 4460}
4461 4461
4462EOLIAN static Efl_Access_State_Set 4462EOLIAN static Efl_Access_State_Set
4463_efl_ui_text_efl_access_state_set_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 4463_efl_ui_text_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
4464{ 4464{
4465 Efl_Access_State_Set ret; 4465 Efl_Access_State_Set ret;
4466 ret = efl_access_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS)); 4466 ret = efl_access_object_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS));
4467 4467
4468 if (efl_ui_text_interactive_editable_get(obj)) 4468 if (efl_ui_text_interactive_editable_get(obj))
4469 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE); 4469 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_
4472} 4472}
4473 4473
4474EOLIAN static const char* 4474EOLIAN static const char*
4475_efl_ui_text_efl_access_i18n_name_get(const Eo *obj, Efl_Ui_Text_Data *pd) 4475_efl_ui_text_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Text_Data *pd)
4476{ 4476{
4477 const char *name; 4477 const char *name;
4478 name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_TEXT_CLASS)); 4478 name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_TEXT_CLASS));
4479 if (name && strncmp("", name, 1)) return name; 4479 if (name && strncmp("", name, 1)) return name;
4480 const char *ret = edje_object_part_text_get(pd->entry_edje, "elm.guide"); 4480 const char *ret = edje_object_part_text_get(pd->entry_edje, "elm.guide");
4481 return ret; 4481 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,
337 Efl.Ui.Widget.widget_sub_object_del; 337 Efl.Ui.Widget.widget_sub_object_del;
338 Elm.Interface_Scrollable.policy { set; } 338 Elm.Interface_Scrollable.policy { set; }
339 Elm.Interface_Scrollable.bounce_allow { set; } 339 Elm.Interface_Scrollable.bounce_allow { set; }
340 Efl.Access.state_set { get; } 340 Efl.Access.Object.state_set { get; }
341 Efl.Access.i18n_name { get; } 341 Efl.Access.Object.i18n_name { get; }
342 Efl.Access.Text.access_text { get; } 342 Efl.Access.Text.access_text { get; }
343 Efl.Access.Text.string { get; } 343 Efl.Access.Text.string { get; }
344 Efl.Access.Text.attribute { get; } 344 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 @@
4 4
5#include <Emotion.h> 5#include <Emotion.h>
6 6
7#define EFL_ACCESS_PROTECTED 7#define EFL_ACCESS_OBJECT_PROTECTED
8#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 8#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
9 9
10#include <Elementary.h> 10#include <Elementary.h>
@@ -261,7 +261,7 @@ _efl_ui_video_efl_object_constructor(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED
261{ 261{
262 obj = efl_constructor(efl_super(obj, MY_CLASS)); 262 obj = efl_constructor(efl_super(obj, MY_CLASS));
263 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 263 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
264 efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION); 264 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ANIMATION);
265 265
266 return obj; 266 return obj;
267} 267}
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 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4#define EFL_ACCESS_PROTECTED 4#define EFL_ACCESS_OBJECT_PROTECTED
5#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 5#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
6#define EFL_ACCESS_SELECTION_PROTECTED 6#define EFL_ACCESS_SELECTION_PROTECTED
7#define EFL_UI_SCROLL_MANAGER_PROTECTED 7#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)
657 657
658 efl_gfx_visible_set(pd->pan_obj, EINA_TRUE); 658 efl_gfx_visible_set(pd->pan_obj, EINA_TRUE);
659 659
660 efl_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); 660 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
661 661
662 edje_object_size_min_calc(wd->resize_obj, &min.w, &min.h); 662 edje_object_size_min_calc(wd->resize_obj, &min.w, &min.h);
663 efl_gfx_size_hint_restricted_min_set(obj, min); 663 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)
719 pd->obj = obj; 719 pd->obj = obj;
720 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 720 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
721 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 721 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
722 efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST); 722 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST);
723 723
724 pd->segarray = efl_add(EFL_UI_VIEW_LIST_SEGARRAY_CLASS, obj, efl_ui_view_list_segarray_setup(efl_added, 32)); 724 pd->segarray = efl_add(EFL_UI_VIEW_LIST_SEGARRAY_CLASS, obj, efl_ui_view_list_segarray_setup(efl_added, 32));
725 725
@@ -970,12 +970,12 @@ _efl_ui_view_list_efl_ui_focus_composition_prepare(Eo *obj, Efl_Ui_View_List_Dat
970} 970}
971 971
972EOLIAN Eina_List* 972EOLIAN Eina_List*
973_efl_ui_view_list_efl_access_access_children_get(const Eo *obj, Efl_Ui_View_List_Data *pd) 973_efl_ui_view_list_efl_access_object_access_children_get(const Eo *obj, Efl_Ui_View_List_Data *pd)
974{ 974{
975 Eina_List *ret = NULL, *ret2 = NULL; 975 Eina_List *ret = NULL, *ret2 = NULL;
976 976
977 ret = efl_ui_view_list_relayout_elements_get(pd->relayout); 977 ret = efl_ui_view_list_relayout_elements_get(pd->relayout);
978 ret2 = efl_access_children_get(efl_super(obj, EFL_UI_VIEW_LIST_CLASS)); 978 ret2 = efl_access_object_access_children_get(efl_super(obj, EFL_UI_VIEW_LIST_CLASS));
979 979
980 return eina_list_merge(ret, ret2); 980 return eina_list_merge(ret, ret2);
981} 981}
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
92// Elm.Interface.Atspi_Accessible.children { get; } 92// Elm.Interface.Atspi_Accessible.children { get; }
93// Elm.Interface.Atspi_Widget.Action.elm_actions { get; } 93// Elm.Interface.Atspi_Widget.Action.elm_actions { get; }
94// Efl.Access.Widget.Action.elm_actions { get; } 94// Efl.Access.Widget.Action.elm_actions { get; }
95 Efl.Access.access_children { get; } 95 Efl.Access.Object.access_children { get; }
96 Efl.Access.Selection.selected_children_count { get; } 96 Efl.Access.Selection.selected_children_count { get; }
97 Efl.Access.Selection.selected_child { get; } 97 Efl.Access.Selection.selected_child { get; }
98 Efl.Access.Selection.selected_child_deselect; 98 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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_COMPONENT_PROTECTED 6#define EFL_ACCESS_COMPONENT_PROTECTED
7#define ELM_WIDGET_PROTECTED 7#define ELM_WIDGET_PROTECTED
8#define ELM_WIDGET_ITEM_PROTECTED 8#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
1565 evas_object_size_hint_display_mode_get(obj)); 1565 evas_object_size_hint_display_mode_get(obj));
1566 if (_elm_config->atspi_mode && !sd->on_create) 1566 if (_elm_config->atspi_mode && !sd->on_create)
1567 { 1567 {
1568 Efl_Access *aparent; 1568 Efl_Access_Object *aparent;
1569 aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_MIXIN); 1569 aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_MIXIN);
1570 if (aparent) 1570 if (aparent)
1571 efl_access_children_changed_added_signal_emit(aparent, sobj); 1571 efl_access_children_changed_added_signal_emit(aparent, sobj);
1572 } 1572 }
@@ -1643,8 +1643,8 @@ _efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Ob
1643 } 1643 }
1644 if (_elm_config->atspi_mode && !sd->on_destroy) 1644 if (_elm_config->atspi_mode && !sd->on_destroy)
1645 { 1645 {
1646 Efl_Access *aparent; 1646 Efl_Access_Object *aparent;
1647 aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_MIXIN); 1647 aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_MIXIN);
1648 if (aparent) 1648 if (aparent)
1649 efl_access_children_changed_del_signal_emit(aparent, sobj); 1649 efl_access_children_changed_del_signal_emit(aparent, sobj);
1650 } 1650 }
@@ -3967,7 +3967,7 @@ _elm_widget_item_efl_object_destructor(Eo *eo_item, Elm_Widget_Item_Data *item)
3967 } 3967 }
3968 eina_hash_free(item->labels); 3968 eina_hash_free(item->labels);
3969 3969
3970 efl_access_attributes_clear(eo_item); 3970 efl_access_object_attributes_clear(eo_item);
3971 efl_access_removed(eo_item); 3971 efl_access_removed(eo_item);
3972 3972
3973 EINA_MAGIC_SET(item, EINA_MAGIC_NONE); 3973 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
4184} 4184}
4185 4185
4186EOLIAN static Efl_Access_State_Set 4186EOLIAN static Efl_Access_State_Set
4187_elm_widget_item_efl_access_state_set_get(const Eo *eo_item, 4187_elm_widget_item_efl_access_object_state_set_get(const Eo *eo_item,
4188 Elm_Widget_Item_Data *item EINA_UNUSED) 4188 Elm_Widget_Item_Data *item EINA_UNUSED)
4189{ 4189{
4190 Efl_Access_State_Set states = 0; 4190 Efl_Access_State_Set states = 0;
4191 4191
@@ -5258,7 +5258,7 @@ _efl_ui_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UN
5258 efl_ui_widget_parent_set(obj, parent); 5258 efl_ui_widget_parent_set(obj, parent);
5259 sd->on_create = EINA_FALSE; 5259 sd->on_create = EINA_FALSE;
5260 5260
5261 efl_access_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN); 5261 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN);
5262 5262
5263 efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _focus_event_changed, NULL); 5263 efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _focus_event_changed, NULL);
5264 5264
@@ -5286,7 +5286,7 @@ _efl_ui_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd)
5286 efl_event_callback_del(sd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed_cb, obj); 5286 efl_event_callback_del(sd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed_cb, obj);
5287 sd->manager.provider = NULL; 5287 sd->manager.provider = NULL;
5288 } 5288 }
5289 efl_access_attributes_clear(obj); 5289 efl_access_object_attributes_clear(obj);
5290 efl_access_removed(obj); 5290 efl_access_removed(obj);
5291 if (sd->logical.parent) 5291 if (sd->logical.parent)
5292 { 5292 {
@@ -5371,10 +5371,10 @@ _efl_ui_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *p
5371} 5371}
5372 5372
5373EOLIAN static const char* 5373EOLIAN static const char*
5374_efl_ui_widget_efl_access_i18n_name_get(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) 5374_efl_ui_widget_efl_access_object_i18n_name_get(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
5375{ 5375{
5376 const char *ret, *name; 5376 const char *ret, *name;
5377 name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); 5377 name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
5378 5378
5379 if (name) return name; 5379 if (name) return name;
5380 5380
@@ -5385,7 +5385,7 @@ _efl_ui_widget_efl_access_i18n_name_get(const Eo *obj, Elm_Widget_Smart_Data *_p
5385} 5385}
5386 5386
5387EOLIAN static Eina_List* 5387EOLIAN static Eina_List*
5388_efl_ui_widget_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd) 5388_efl_ui_widget_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd)
5389{ 5389{
5390 Eina_List *l, *accs = NULL; 5390 Eina_List *l, *accs = NULL;
5391 Evas_Object *widget; 5391 Evas_Object *widget;
@@ -5394,13 +5394,13 @@ _efl_ui_widget_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Wid
5394 EINA_LIST_FOREACH(pd->subobjs, l, widget) 5394 EINA_LIST_FOREACH(pd->subobjs, l, widget)
5395 { 5395 {
5396 if (!elm_object_widget_check(widget)) continue; 5396 if (!elm_object_widget_check(widget)) continue;
5397 if (!efl_isa(widget, EFL_ACCESS_MIXIN)) continue; 5397 if (!efl_isa(widget, EFL_ACCESS_OBJECT_MIXIN)) continue;
5398 type = efl_access_type_get(widget); 5398 type = efl_access_object_access_type_get(widget);
5399 if (type == EFL_ACCESS_TYPE_DISABLED) continue; 5399 if (type == EFL_ACCESS_TYPE_DISABLED) continue;
5400 if (type == EFL_ACCESS_TYPE_SKIPPED) 5400 if (type == EFL_ACCESS_TYPE_SKIPPED)
5401 { 5401 {
5402 Eina_List *children; 5402 Eina_List *children;
5403 children = efl_access_children_get(widget); 5403 children = efl_access_object_access_children_get(widget);
5404 accs = eina_list_merge(accs, children); 5404 accs = eina_list_merge(accs, children);
5405 continue; 5405 continue;
5406 } 5406 }
@@ -5410,11 +5410,11 @@ _efl_ui_widget_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Wid
5410} 5410}
5411 5411
5412EOLIAN static Efl_Access_State_Set 5412EOLIAN static Efl_Access_State_Set
5413_efl_ui_widget_efl_access_state_set_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) 5413_efl_ui_widget_efl_access_object_state_set_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
5414{ 5414{
5415 Efl_Access_State_Set states = 0; 5415 Efl_Access_State_Set states = 0;
5416 5416
5417 states = efl_access_state_set_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); 5417 states = efl_access_object_state_set_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
5418 5418
5419 if (evas_object_visible_get(obj)) 5419 if (evas_object_visible_get(obj))
5420 { 5420 {
@@ -5439,14 +5439,14 @@ _efl_ui_widget_efl_access_state_set_get(const Eo *obj, Elm_Widget_Smart_Data *pd
5439} 5439}
5440 5440
5441EOLIAN static Eina_List* 5441EOLIAN static Eina_List*
5442_efl_ui_widget_efl_access_attributes_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) 5442_efl_ui_widget_efl_access_object_attributes_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
5443{ 5443{
5444 const char *type = NULL; 5444 const char *type = NULL;
5445 const char *style = NULL; 5445 const char *style = NULL;
5446 Eina_List *attr_list = NULL; 5446 Eina_List *attr_list = NULL;
5447 Efl_Access_Attribute *attr = NULL; 5447 Efl_Access_Attribute *attr = NULL;
5448 5448
5449 attr_list = efl_access_attributes_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); 5449 attr_list = efl_access_object_attributes_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
5450 5450
5451 //Add type and style information in addition. 5451 //Add type and style information in addition.
5452 type = elm_widget_type_get(obj); 5452 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
5477} 5477}
5478 5478
5479EOLIAN static Eina_List * 5479EOLIAN static Eina_List *
5480_elm_widget_item_efl_access_attributes_get(const Eo *eo_item, Elm_Widget_Item_Data *pd EINA_UNUSED) 5480_elm_widget_item_efl_access_object_attributes_get(const Eo *eo_item, Elm_Widget_Item_Data *pd EINA_UNUSED)
5481{ 5481{
5482 const char *style = NULL; 5482 const char *style = NULL;
5483 Eina_List *attr_list = NULL; 5483 Eina_List *attr_list = NULL;
5484 Efl_Access_Attribute *attr = NULL; 5484 Efl_Access_Attribute *attr = NULL;
5485 5485
5486 attr_list = efl_access_attributes_get(efl_super(eo_item, ELM_WIDGET_ITEM_CLASS)); 5486 attr_list = efl_access_object_attributes_get(efl_super(eo_item, ELM_WIDGET_ITEM_CLASS));
5487 5487
5488 style = elm_object_item_style_get(eo_item); 5488 style = elm_object_item_style_get(eo_item);
5489 if (style) 5489 if (style)
@@ -5542,9 +5542,9 @@ _efl_ui_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd
5542 if ((klass == EFL_CONFIG_INTERFACE) || (klass == EFL_CONFIG_GLOBAL_CLASS)) 5542 if ((klass == EFL_CONFIG_INTERFACE) || (klass == EFL_CONFIG_GLOBAL_CLASS))
5543 return _efl_config_obj; 5543 return _efl_config_obj;
5544 5544
5545 if (klass == EFL_ACCESS_MIXIN) 5545 if (klass == EFL_ACCESS_OBJECT_MIXIN)
5546 { 5546 {
5547 Efl_Access_Type type = efl_access_type_get(obj); 5547 Efl_Access_Type type = efl_access_object_access_type_get(obj);
5548 if (type != EFL_ACCESS_TYPE_SKIPPED) 5548 if (type != EFL_ACCESS_TYPE_SKIPPED)
5549 return (Eo*)obj; 5549 return (Eo*)obj;
5550 } 5550 }
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 {
13 logical : bool; [[$true if this is registered as logical currently]] 13 logical : bool; [[$true if this is registered as logical currently]]
14} 14}
15 15
16abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access, 16abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object,
17 Efl.Access.Component, Efl.Part, Efl.Ui.Focus.Object, 17 Efl.Access.Component, Efl.Part, Efl.Ui.Focus.Object,
18 Efl.Ui.Base, Efl.Ui.Cursor, Efl.Ui.Translatable, 18 Efl.Ui.Base, Efl.Ui.Cursor, Efl.Ui.Translatable,
19 Efl.Selection, Efl.Ui.Dnd) 19 Efl.Selection, Efl.Ui.Dnd)
@@ -585,10 +585,10 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access,
585 Efl.Canvas.Group.group_calculate; 585 Efl.Canvas.Group.group_calculate;
586 Efl.Canvas.Group.group_member_del; 586 Efl.Canvas.Group.group_member_del;
587 Efl.Canvas.Group.group_member_add; 587 Efl.Canvas.Group.group_member_add;
588 Efl.Access.i18n_name { get; } 588 Efl.Access.Object.i18n_name { get; }
589 Efl.Access.state_set { get; } 589 Efl.Access.Object.state_set { get; }
590 Efl.Access.access_children { get; } 590 Efl.Access.Object.access_children { get; }
591 Efl.Access.attributes { get; } 591 Efl.Access.Object.attributes { get; }
592 Efl.Access.Component.focus_grab; 592 Efl.Access.Component.focus_grab;
593 Efl.Ui.Focus.Object.focus_manager { get; } 593 Efl.Ui.Focus.Object.focus_manager { get; }
594 Efl.Ui.Focus.Object.focus_parent { get; } 594 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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_COMPONENT_PROTECTED 6#define EFL_ACCESS_COMPONENT_PROTECTED
7#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 7#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
8#define EFL_INPUT_EVENT_PROTECTED 8#define EFL_INPUT_EVENT_PROTECTED
@@ -2271,7 +2271,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
2271 { 2271 {
2272 Eo *root; 2272 Eo *root;
2273 efl_access_window_created_signal_emit(obj); 2273 efl_access_window_created_signal_emit(obj);
2274 root = efl_access_root_get(EFL_ACCESS_MIXIN); 2274 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
2275 if (root) 2275 if (root)
2276 efl_access_children_changed_added_signal_emit(root, obj); 2276 efl_access_children_changed_added_signal_emit(root, obj);
2277 } 2277 }
@@ -2325,7 +2325,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
2325 if (_elm_config->atspi_mode) 2325 if (_elm_config->atspi_mode)
2326 { 2326 {
2327 Eo *root; 2327 Eo *root;
2328 root = efl_access_root_get(EFL_ACCESS_MIXIN); 2328 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
2329 efl_access_window_destroyed_signal_emit(obj); 2329 efl_access_window_destroyed_signal_emit(obj);
2330 if (root) 2330 if (root)
2331 efl_access_children_changed_del_signal_emit(root, obj); 2331 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)
4324 efreet_desktop_free(d); 4324 efreet_desktop_free(d);
4325 } 4325 }
4326 } 4326 }
4327 efl_access_type_set(sd->icon, EFL_ACCESS_TYPE_DISABLED); 4327 efl_access_object_access_type_set(sd->icon, EFL_ACCESS_TYPE_DISABLED);
4328 } 4328 }
4329 4329
4330 edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon); 4330 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
5376 elm_win_focus_highlight_animate_set(obj, EINA_TRUE); 5376 elm_win_focus_highlight_animate_set(obj, EINA_TRUE);
5377 } 5377 }
5378 5378
5379 efl_access_role_set(obj, EFL_ACCESS_ROLE_WINDOW); 5379 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_WINDOW);
5380 if (_elm_config->atspi_mode) 5380 if (_elm_config->atspi_mode)
5381 efl_access_window_created_signal_emit(obj); 5381 efl_access_window_created_signal_emit(obj);
5382 5382
@@ -6955,10 +6955,10 @@ _efl_ui_win_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED,
6955} 6955}
6956 6956
6957EOLIAN static Efl_Access_State_Set 6957EOLIAN static Efl_Access_State_Set
6958_efl_ui_win_efl_access_state_set_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) 6958_efl_ui_win_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
6959{ 6959{
6960 Efl_Access_State_Set ret; 6960 Efl_Access_State_Set ret;
6961 ret = efl_access_state_set_get(efl_super(obj, MY_CLASS)); 6961 ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS));
6962 6962
6963 if (elm_win_focus_get(obj)) 6963 if (elm_win_focus_get(obj))
6964 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_ACTIVE); 6964 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
6967} 6967}
6968 6968
6969EOLIAN static const char* 6969EOLIAN static const char*
6970_efl_ui_win_efl_access_i18n_name_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) 6970_efl_ui_win_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
6971{ 6971{
6972 const char *ret; 6972 const char *ret;
6973 ret = efl_access_i18n_name_get(efl_super(obj, EFL_UI_WIN_CLASS)); 6973 ret = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_WIN_CLASS));
6974 if (ret) return ret; 6974 if (ret) return ret;
6975 const char *name = elm_win_title_get(obj); 6975 const char *name = elm_win_title_get(obj);
6976 return name; 6976 return name;
@@ -7024,7 +7024,7 @@ _efl_ui_win_efl_object_provider_find(const Eo *obj,
7024 return (Eo *)obj; 7024 return (Eo *)obj;
7025 7025
7026 // attach all kinds of windows directly to ATSPI application root object 7026 // attach all kinds of windows directly to ATSPI application root object
7027 if (klass == EFL_ACCESS_MIXIN) return efl_access_root_get(EFL_ACCESS_MIXIN); 7027 if (klass == EFL_ACCESS_OBJECT_MIXIN) return efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
7028 7028
7029 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE) 7029 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE)
7030 return pd->provider; 7030 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
788 Efl.Ui.Focus.Object.on_focus_update; 788 Efl.Ui.Focus.Object.on_focus_update;
789 Efl.Ui.Widget.widget_event; 789 Efl.Ui.Widget.widget_event;
790 Efl.Ui.Widget.focus_manager_create; 790 Efl.Ui.Widget.focus_manager_create;
791 Efl.Access.state_set { get; } 791 Efl.Access.Object.state_set { get; }
792 Efl.Access.i18n_name { get; } 792 Efl.Access.Object.i18n_name { get; }
793 Efl.Access.Component.extents { get; } 793 Efl.Access.Component.extents { get; }
794 Efl.Access.Widget.Action.elm_actions { get; } 794 Efl.Access.Widget.Action.elm_actions { get; }
795 Efl.Input.State.modifier_enabled { get; } 795 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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define ELM_WIDGET_PROTECTED 7#define ELM_WIDGET_PROTECTED
8#define EFL_UI_TRANSLATABLE_PROTECTED 8#define EFL_UI_TRANSLATABLE_PROTECTED
@@ -373,7 +373,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
373 373
374 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 374 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
375 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 375 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
376 efl_access_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE); 376 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE);
377 377
378 //hover-parent 378 //hover-parent
379 sd->hover_parent = elm_object_top_widget_get(obj); 379 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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define EFL_UI_WIDGET_PROTECTED 7#define EFL_UI_WIDGET_PROTECTED
8//#define EFL_UI_WIDGET_BETA 8//#define EFL_UI_WIDGET_BETA
@@ -1145,7 +1145,7 @@ _elm_ctxpopup_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED
1145 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1145 obj = efl_constructor(efl_super(obj, MY_CLASS));
1146 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1146 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1147 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1147 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1148 efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU); 1148 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU);
1149 1149
1150 return obj; 1150 return obj;
1151} 1151}
@@ -1532,10 +1532,10 @@ _elm_ctxpopup_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED
1532} 1532}
1533 1533
1534EOLIAN static Efl_Access_State_Set 1534EOLIAN static Efl_Access_State_Set
1535_elm_ctxpopup_efl_access_state_set_get(const Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED) 1535_elm_ctxpopup_efl_access_object_state_set_get(const Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED)
1536{ 1536{
1537 Efl_Access_State_Set ret; 1537 Efl_Access_State_Set ret;
1538 ret = efl_access_state_set_get(efl_super(obj, MY_CLASS)); 1538 ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS));
1539 1539
1540 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL); 1540 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL);
1541 1541
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 @@
9# include "elementary_config.h" 9# include "elementary_config.h"
10#endif 10#endif
11 11
12#define EFL_ACCESS_PROTECTED 12#define EFL_ACCESS_OBJECT_PROTECTED
13#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 13#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
14 14
15#include <Elementary.h> 15#include <Elementary.h>
@@ -2051,7 +2051,7 @@ _elm_fileselector_efl_object_constructor(Eo *obj, Elm_Fileselector_Data *sd)
2051 sd->obj = obj; 2051 sd->obj = obj;
2052 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 2052 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
2053 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 2053 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
2054 efl_access_role_set(obj, EFL_ACCESS_ROLE_FILE_CHOOSER); 2054 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILE_CHOOSER);
2055 2055
2056 return obj; 2056 return obj;
2057} 2057}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_priv.h" 8#include "elm_priv.h"
@@ -274,7 +274,7 @@ _elm_fileselector_button_efl_object_constructor(Eo *obj, Elm_Fileselector_Button
274 274
275 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 275 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
276 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 276 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
277 efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); 277 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON);
278 278
279 return obj; 279 return obj;
280} 280}
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 @@
3# include "elementary_config.h" 3# include "elementary_config.h"
4#endif 4#endif
5 5
6#define EFL_ACCESS_PROTECTED 6#define EFL_ACCESS_OBJECT_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
9#include "elm_priv.h" 9#include "elm_priv.h"
@@ -338,7 +338,7 @@ _elm_fileselector_entry_efl_object_constructor(Eo *obj, Elm_Fileselector_Entry_D
338 obj = efl_constructor(efl_super(obj, MY_CLASS)); 338 obj = efl_constructor(efl_super(obj, MY_CLASS));
339 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 339 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
340 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 340 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
341 efl_access_role_set(obj, EFL_ACCESS_ROLE_GROUPING); 341 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_GROUPING);
342 342
343 return obj; 343 return obj;
344} 344}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define ELM_WIDGET_PROTECTED 7#define ELM_WIDGET_PROTECTED
8#define ELM_WIDGET_ITEM_PROTECTED 8#define ELM_WIDGET_ITEM_PROTECTED
@@ -705,7 +705,7 @@ _elm_hoversel_efl_object_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED
705 obj = efl_constructor(efl_super(obj, MY_CLASS)); 705 obj = efl_constructor(efl_super(obj, MY_CLASS));
706 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 706 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
707 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 707 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
708 efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); 708 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON);
709 709
710 return obj; 710 return obj;
711} 711}
@@ -1042,7 +1042,7 @@ _elm_hoversel_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED
1042} 1042}
1043 1043
1044EOLIAN Eina_List* 1044EOLIAN Eina_List*
1045_elm_hoversel_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Hoversel_Data *pd) 1045_elm_hoversel_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Hoversel_Data *pd)
1046{ 1046{
1047 return eina_list_clone(pd->items); 1047 return eina_list_clone(pd->items);
1048} 1048}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define ELM_WIDGET_ITEM_PROTECTED 6#define ELM_WIDGET_ITEM_PROTECTED
7//#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 7//#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
8#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 8#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
@@ -748,12 +748,12 @@ _item_new(Elm_Multibuttonentry_Data *sd,
748 return NULL; 748 return NULL;
749 WIDGET_ITEM_DATA_SET(eo_item, data); 749 WIDGET_ITEM_DATA_SET(eo_item, data);
750 750
751 efl_access_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON); 751 efl_access_object_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON);
752 752
753 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item); 753 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item);
754 VIEW(item) = elm_layout_add(obj); 754 VIEW(item) = elm_layout_add(obj);
755 755
756 efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_DISABLED); 756 efl_access_object_access_type_set(VIEW(item), EFL_ACCESS_TYPE_DISABLED);
757 757
758 if (!elm_layout_theme_set(VIEW(item), "multibuttonentry", PART_NAME_BUTTON, 758 if (!elm_layout_theme_set(VIEW(item), "multibuttonentry", PART_NAME_BUTTON,
759 elm_widget_style_get(obj))) 759 elm_widget_style_get(obj)))
@@ -1683,7 +1683,7 @@ _elm_multibuttonentry_efl_object_constructor(Eo *obj, Elm_Multibuttonentry_Data
1683 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1683 obj = efl_constructor(efl_super(obj, MY_CLASS));
1684 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1684 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1685 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1685 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1686 efl_access_role_set(obj, EFL_ACCESS_ROLE_PANEL); 1686 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PANEL);
1687 1687
1688 //listen to manager changes here 1688 //listen to manager changes here
1689 efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _legacy_manager_changed_cb, NULL); 1689 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)
1977} 1977}
1978 1978
1979EOLIAN static Eina_List* 1979EOLIAN static Eina_List*
1980_elm_multibuttonentry_efl_access_access_children_get(const Eo *obj, Elm_Multibuttonentry_Data *sd) 1980_elm_multibuttonentry_efl_access_object_access_children_get(const Eo *obj, Elm_Multibuttonentry_Data *sd)
1981{ 1981{
1982 Eina_List *ret; 1982 Eina_List *ret;
1983 ret = efl_access_children_get(efl_super(obj, ELM_MULTIBUTTONENTRY_CLASS)); 1983 ret = efl_access_object_access_children_get(efl_super(obj, ELM_MULTIBUTTONENTRY_CLASS));
1984 return eina_list_merge(eina_list_clone(sd->items), ret); 1984 return eina_list_merge(eina_list_clone(sd->items), ret);
1985} 1985}
1986 1986
1987EOLIAN static const char* 1987EOLIAN static const char*
1988_elm_multibuttonentry_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Multibuttonentry_Item_Data *item) 1988_elm_multibuttonentry_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_Multibuttonentry_Item_Data *item)
1989{ 1989{
1990 const char *ret; 1990 const char *ret;
1991 ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); 1991 ret = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
1992 if (ret) return ret; 1992 if (ret) return ret;
1993 1993
1994 ret = elm_object_part_text_get(VIEW(item), "elm.btn.text"); 1994 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
1996} 1996}
1997 1997
1998EOLIAN static Efl_Access_State_Set 1998EOLIAN static Efl_Access_State_Set
1999_elm_multibuttonentry_item_efl_access_state_set_get(const Eo *eo_it, Elm_Multibuttonentry_Item_Data *sd EINA_UNUSED) 1999_elm_multibuttonentry_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Multibuttonentry_Item_Data *sd EINA_UNUSED)
2000{ 2000{
2001 Efl_Access_State_Set ret; 2001 Efl_Access_State_Set ret;
2002 Eina_Bool sel; 2002 Eina_Bool sel;
2003 2003
2004 ret = efl_access_state_set_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); 2004 ret = efl_access_object_state_set_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
2005 2005
2006 sel = elm_obj_multibuttonentry_item_selected_get(eo_it); 2006 sel = elm_obj_multibuttonentry_item_selected_get(eo_it);
2007 2007
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define ELM_WIDGET_ITEM_PROTECTED 7#define ELM_WIDGET_ITEM_PROTECTED
8#define ELM_WIDGET_PROTECTED 8#define ELM_WIDGET_PROTECTED
@@ -544,7 +544,7 @@ _elm_naviframe_item_elm_widget_item_part_text_set(Eo *eo_it,
544 if (nit->title_label) strncat(buf, " ", 1); 544 if (nit->title_label) strncat(buf, " ", 1);
545 strncat(buf, nit->subtitle_label, sizeof(buf) - strlen(buf) - 2); 545 strncat(buf, nit->subtitle_label, sizeof(buf) - strlen(buf) - 2);
546 } 546 }
547 efl_access_i18n_name_set(eo_it, buf); 547 efl_access_object_i18n_name_set(eo_it, buf);
548 548
549 elm_layout_sizing_eval(WIDGET(nit)); 549 elm_layout_sizing_eval(WIDGET(nit));
550} 550}
@@ -1267,8 +1267,8 @@ _item_new(Evas_Object *obj,
1267 ELM_NAVIFRAME_DATA_GET(obj, sd); 1267 ELM_NAVIFRAME_DATA_GET(obj, sd);
1268 1268
1269 eo_item = efl_add(ELM_NAVIFRAME_ITEM_CLASS, obj); 1269 eo_item = efl_add(ELM_NAVIFRAME_ITEM_CLASS, obj);
1270 efl_access_role_set(eo_item, EFL_ACCESS_ROLE_PAGE_TAB); 1270 efl_access_object_role_set(eo_item, EFL_ACCESS_ROLE_PAGE_TAB);
1271 efl_access_i18n_name_set(eo_item, (char*)title_label); 1271 efl_access_object_i18n_name_set(eo_item, (char*)title_label);
1272 1272
1273 if (!eo_item) 1273 if (!eo_item)
1274 { 1274 {
@@ -1593,7 +1593,7 @@ _elm_naviframe_efl_object_constructor(Eo *obj, Elm_Naviframe_Data *sd)
1593 sd->obj = obj; 1593 sd->obj = obj;
1594 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1594 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1595 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1595 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1596 efl_access_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST); 1596 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST);
1597 1597
1598 return obj; 1598 return obj;
1599} 1599}
@@ -1950,7 +1950,7 @@ _elm_naviframe_item_pop_cb_set(Eo *eo_item EINA_UNUSED,
1950} 1950}
1951 1951
1952EOLIAN static Eina_List* 1952EOLIAN static Eina_List*
1953_elm_naviframe_item_efl_access_access_children_get(const Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit) 1953_elm_naviframe_item_efl_access_object_access_children_get(const Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit)
1954{ 1954{
1955 Eina_List *ret = NULL; 1955 Eina_List *ret = NULL;
1956 1956
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 @@
4 4
5#include <Emotion.h> 5#include <Emotion.h>
6 6
7#define EFL_ACCESS_PROTECTED 7#define EFL_ACCESS_OBJECT_PROTECTED
8#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 8#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
9 9
10#include <Elementary.h> 10#include <Elementary.h>
@@ -667,7 +667,7 @@ _elm_player_efl_object_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
667 obj = efl_constructor(efl_super(obj, MY_CLASS)); 667 obj = efl_constructor(efl_super(obj, MY_CLASS));
668 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 668 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
669 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 669 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
670 efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION); 670 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ANIMATION);
671 671
672 return obj; 672 return obj;
673} 673}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define ELM_WIDGET_PROTECTED 7#define ELM_WIDGET_PROTECTED
8#define ELM_WIDGET_ITEM_PROTECTED 8#define ELM_WIDGET_ITEM_PROTECTED
@@ -1523,7 +1523,7 @@ _elm_popup_efl_object_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED)
1523 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1523 obj = efl_constructor(efl_super(obj, MY_CLASS));
1524 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1524 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1525 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1525 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1526 efl_access_role_set(obj, EFL_ACCESS_ROLE_DIALOG); 1526 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_DIALOG);
1527 1527
1528 return obj; 1528 return obj;
1529} 1529}
@@ -1794,10 +1794,10 @@ _elm_popup_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, E
1794} 1794}
1795 1795
1796EOLIAN static Efl_Access_State_Set 1796EOLIAN static Efl_Access_State_Set
1797_elm_popup_efl_access_state_set_get(const Eo *obj, Elm_Popup_Data *sd EINA_UNUSED) 1797_elm_popup_efl_access_object_state_set_get(const Eo *obj, Elm_Popup_Data *sd EINA_UNUSED)
1798{ 1798{
1799 Efl_Access_State_Set ret; 1799 Efl_Access_State_Set ret;
1800 ret = efl_access_state_set_get(efl_super(obj, MY_CLASS)); 1800 ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS));
1801 1801
1802 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL); 1802 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL);
1803 1803
@@ -1805,12 +1805,12 @@ _elm_popup_efl_access_state_set_get(const Eo *obj, Elm_Popup_Data *sd EINA_UNUSE
1805} 1805}
1806 1806
1807EOLIAN static const char* 1807EOLIAN static const char*
1808_elm_popup_efl_access_i18n_name_get(const Eo *obj, Elm_Popup_Data *sd) 1808_elm_popup_efl_access_object_i18n_name_get(const Eo *obj, Elm_Popup_Data *sd)
1809{ 1809{
1810 const char *name = NULL; 1810 const char *name = NULL;
1811 Eina_Strbuf *buf; 1811 Eina_Strbuf *buf;
1812 1812
1813 name = efl_access_i18n_name_get(efl_super(obj, ELM_POPUP_CLASS)); 1813 name = efl_access_object_i18n_name_get(efl_super(obj, ELM_POPUP_CLASS));
1814 if (name) return name; 1814 if (name) return name;
1815 1815
1816 buf = eina_strbuf_new(); 1816 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 @@
15#define EFL_CANVAS_OBJECT_PROTECTED 15#define EFL_CANVAS_OBJECT_PROTECTED
16#define EFL_CANVAS_GROUP_PROTECTED 16#define EFL_CANVAS_GROUP_PROTECTED
17#define EFL_CANVAS_GROUP_BETA 17#define EFL_CANVAS_GROUP_BETA
18#define EFL_ACCESS_BETA 18#define EFL_ACCESS_OBJECT_BETA
19#define EFL_ACCESS_COMPONENT_BETA 19#define EFL_ACCESS_COMPONENT_BETA
20#define EFL_ACCESS_EDITABLE_TEXT_BETA 20#define EFL_ACCESS_EDITABLE_TEXT_BETA
21#define EFL_ACCESS_IMAGE_BETA 21#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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -1522,10 +1522,10 @@ _elm_access_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED,
1522} 1522}
1523 1523
1524EOLIAN static Efl_Access_State_Set 1524EOLIAN static Efl_Access_State_Set
1525_elm_access_efl_access_state_set_get(const Eo *obj, void *pd EINA_UNUSED) 1525_elm_access_efl_access_object_state_set_get(const Eo *obj, void *pd EINA_UNUSED)
1526{ 1526{
1527 Efl_Access_State_Set ret; 1527 Efl_Access_State_Set ret;
1528 ret = efl_access_state_set_get(efl_super(obj, ELM_ACCESS_CLASS)); 1528 ret = efl_access_object_state_set_get(efl_super(obj, ELM_ACCESS_CLASS));
1529 1529
1530 Elm_Access_Info *info = _elm_access_info_get(obj); 1530 Elm_Access_Info *info = _elm_access_info_get(obj);
1531 if (info && !evas_object_visible_get(info->part_object)) 1531 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)
10 Efl.Ui.Widget.on_access_activate; 10 Efl.Ui.Widget.on_access_activate;
11 Efl.Ui.Focus.Object.on_focus_update; 11 Efl.Ui.Focus.Object.on_focus_update;
12 Efl.Access.Widget.Action.elm_actions { get; } 12 Efl.Access.Widget.Action.elm_actions { get; }
13 Efl.Access.state_set { get; } 13 Efl.Access.Object.state_set { get; }
14 } 14 }
15} 15}
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -548,7 +548,7 @@ _elm_actionslider_efl_object_constructor(Eo *obj, Elm_Actionslider_Data *_pd EIN
548 obj = efl_constructor(efl_super(obj, MY_CLASS)); 548 obj = efl_constructor(efl_super(obj, MY_CLASS));
549 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 549 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
550 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 550 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
551 efl_access_role_set(obj, EFL_ACCESS_ROLE_SLIDER); 551 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SLIDER);
552 552
553 return obj; 553 return obj;
554} 554}
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 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_widget.h" 8#include "elm_widget.h"
@@ -26,7 +26,7 @@ _elm_atspi_app_object_efl_object_destructor(Eo *obj EINA_UNUSED, Elm_Atspi_App_O
26} 26}
27 27
28EOLIAN static Eina_List* 28EOLIAN static Eina_List*
29_elm_atspi_app_object_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) 29_elm_atspi_app_object_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
30{ 30{
31 Eina_List *l, *accs = NULL; 31 Eina_List *l, *accs = NULL;
32 Evas_Object *win; 32 Evas_Object *win;
@@ -34,9 +34,9 @@ _elm_atspi_app_object_efl_access_access_children_get(const Eo *obj EINA_UNUSED,
34 EINA_LIST_FOREACH(_elm_win_list, l, win) 34 EINA_LIST_FOREACH(_elm_win_list, l, win)
35 { 35 {
36 Efl_Access_Type type; 36 Efl_Access_Type type;
37 if (!efl_isa(win, EFL_ACCESS_MIXIN)) 37 if (!efl_isa(win, EFL_ACCESS_OBJECT_MIXIN))
38 continue; 38 continue;
39 type = efl_access_type_get(win); 39 type = efl_access_object_access_type_get(win);
40 if (type == EFL_ACCESS_TYPE_REGULAR) 40 if (type == EFL_ACCESS_TYPE_REGULAR)
41 accs = eina_list_append(accs, win); 41 accs = eina_list_append(accs, win);
42 } 42 }
@@ -45,7 +45,7 @@ _elm_atspi_app_object_efl_access_access_children_get(const Eo *obj EINA_UNUSED,
45} 45}
46 46
47EOLIAN static const char* 47EOLIAN static const char*
48_elm_atspi_app_object_efl_access_i18n_name_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) 48_elm_atspi_app_object_efl_access_object_i18n_name_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
49{ 49{
50 const char *ret; 50 const char *ret;
51 ret = elm_app_name_get(); 51 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
53} 53}
54 54
55EOLIAN static const char* 55EOLIAN static const char*
56_elm_atspi_app_object_efl_access_description_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd) 56_elm_atspi_app_object_efl_access_object_description_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd)
57{ 57{
58 return _pd->descr; 58 return _pd->descr;
59} 59}
60 60
61EOLIAN static void 61EOLIAN static void
62_elm_atspi_app_object_efl_access_description_set(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED, const char *descr) 62_elm_atspi_app_object_efl_access_object_description_set(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED, const char *descr)
63{ 63{
64 eina_stringshare_replace(&_pd->descr, descr); 64 eina_stringshare_replace(&_pd->descr, descr);
65} 65}
66 66
67EOLIAN static Efl_Access_Role 67EOLIAN static Efl_Access_Role
68_elm_atspi_app_object_efl_access_role_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) 68_elm_atspi_app_object_efl_access_object_role_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
69{ 69{
70 return EFL_ACCESS_ROLE_APPLICATION; 70 return EFL_ACCESS_ROLE_APPLICATION;
71} 71}
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 @@
1class Elm.Atspi.App.Object (Efl.Object, Efl.Access) 1class Elm.Atspi.App.Object (Efl.Object, Efl.Access.Object)
2{ 2{
3 [[AT-SPI application object class]] 3 [[AT-SPI application object class]]
4 legacy_prefix: elm_atspi_app_object; 4 legacy_prefix: elm_atspi_app_object;
5 data: Elm_Atspi_App_Object_Data; 5 data: Elm_Atspi_App_Object_Data;
6 implements { 6 implements {
7 Efl.Object.destructor; 7 Efl.Object.destructor;
8 Efl.Access.i18n_name { get; } 8 Efl.Access.Object.i18n_name { get; }
9 Efl.Access.description { get; set; } 9 Efl.Access.Object.description { get; set; }
10 Efl.Access.role { get; } 10 Efl.Access.Object.role { get; }
11 Efl.Access.access_children { get; } 11 Efl.Access.Object.access_children { get; }
12 } 12 }
13} 13}
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 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_COMPONENT_PROTECTED 5#define EFL_ACCESS_COMPONENT_PROTECTED
6#define EFL_ACCESS_PROTECTED 6#define EFL_ACCESS_OBJECT_PROTECTED
7#define EFL_ACCESS_ACTION_PROTECTED 7#define EFL_ACCESS_ACTION_PROTECTED
8#define EFL_ACCESS_VALUE_PROTECTED 8#define EFL_ACCESS_VALUE_PROTECTED
9#define EFL_ACCESS_SELECTION_PROTECTED 9#define EFL_ACCESS_SELECTION_PROTECTED
@@ -151,14 +151,14 @@ typedef struct {
151} Elm_Atspi_Bridge_Event_Handler; 151} Elm_Atspi_Bridge_Event_Handler;
152 152
153static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = { 153static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = {
154 { EFL_ACCESS_EVENT_CHILDREN_CHANGED, _children_changed_signal_send}, 154 { EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, _children_changed_signal_send},
155 { EFL_ACCESS_EVENT_PROPERTY_CHANGED, _property_changed_signal_send}, 155 { EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, _property_changed_signal_send},
156 { EFL_ACCESS_EVENT_BOUNDS_CHANGED, _bounds_changed_signal_send}, 156 { EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, _bounds_changed_signal_send},
157 { EFL_ACCESS_EVENT_STATE_CHANGED, _state_changed_signal_send}, 157 { EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, _state_changed_signal_send},
158 { EFL_ACCESS_EVENT_VISIBLE_DATA_CHANGED, _visible_data_changed_signal_send}, 158 { EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, _visible_data_changed_signal_send},
159 { EFL_ACCESS_EVENT_ACTIVE_DESCENDANT_CHANGED, _active_descendant_changed_signal_send}, 159 { EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, _active_descendant_changed_signal_send},
160 { EFL_ACCESS_EVENT_ADDED, _on_object_add}, 160 { EFL_ACCESS_OBJECT_EVENT_ADDED, _on_object_add},
161 { EFL_ACCESS_EVENT_REMOVED, _on_object_del}, 161 { EFL_ACCESS_OBJECT_EVENT_REMOVED, _on_object_del},
162 { EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, _window_signal_send}, 162 { EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, _window_signal_send},
163 { EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, _window_signal_send}, 163 { EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, _window_signal_send},
164 { EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, _window_signal_send}, 164 { EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, _window_signal_send},
@@ -487,9 +487,9 @@ _accessible_get_role(const Eldbus_Service_Interface *iface, const Eldbus_Message
487 AtspiRole atspi_role = ATSPI_ROLE_INVALID; 487 AtspiRole atspi_role = ATSPI_ROLE_INVALID;
488 Efl_Access_Role role; 488 Efl_Access_Role role;
489 489
490 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 490 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
491 491
492 role = efl_access_role_get(obj); 492 role = efl_access_object_role_get(obj);
493 493
494 Eldbus_Message *ret = eldbus_message_method_return_new(msg); 494 Eldbus_Message *ret = eldbus_message_method_return_new(msg);
495 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 495 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -506,9 +506,9 @@ _accessible_get_role_name(const Eldbus_Service_Interface *iface, const Eldbus_Me
506 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 506 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
507 Eo *obj = _bridge_object_from_path(bridge, obj_path); 507 Eo *obj = _bridge_object_from_path(bridge, obj_path);
508 508
509 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 509 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
510 510
511 role_name = efl_access_role_name_get(obj); 511 role_name = efl_access_object_role_name_get(obj);
512 512
513 Eldbus_Message *ret = eldbus_message_method_return_new(msg); 513 Eldbus_Message *ret = eldbus_message_method_return_new(msg);
514 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 514 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -524,9 +524,9 @@ _accessible_get_localized_role_name(const Eldbus_Service_Interface *iface, const
524 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 524 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
525 Eo *obj = _bridge_object_from_path(bridge, obj_path); 525 Eo *obj = _bridge_object_from_path(bridge, obj_path);
526 526
527 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 527 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
528 528
529 l_role_name = efl_access_localized_role_name_get(obj); 529 l_role_name = efl_access_object_localized_role_name_get(obj);
530 EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL); 530 EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL);
531 531
532 Eldbus_Message *ret = eldbus_message_method_return_new(msg); 532 Eldbus_Message *ret = eldbus_message_method_return_new(msg);
@@ -547,9 +547,9 @@ _accessible_get_children(const Eldbus_Service_Interface *iface, const Eldbus_Mes
547 Eldbus_Message_Iter *iter, *iter_array; 547 Eldbus_Message_Iter *iter, *iter_array;
548 Eo *children; 548 Eo *children;
549 549
550 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 550 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
551 551
552 children_list = efl_access_children_get(obj); 552 children_list = efl_access_object_access_children_get(obj);
553 553
554 ret = eldbus_message_method_return_new(msg); 554 ret = eldbus_message_method_return_new(msg);
555 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 555 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -582,13 +582,13 @@ _accessible_get_application(const Eldbus_Service_Interface *iface, const Eldbus_
582 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 582 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
583 Eo *root, *obj = _bridge_object_from_path(bridge, obj_path); 583 Eo *root, *obj = _bridge_object_from_path(bridge, obj_path);
584 584
585 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 585 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
586 586
587 ret = eldbus_message_method_return_new(msg); 587 ret = eldbus_message_method_return_new(msg);
588 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 588 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
589 589
590 Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret); 590 Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret);
591 root = efl_access_root_get(EFL_ACCESS_MIXIN); 591 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
592 _bridge_iter_object_reference_append(bridge, iter, root); 592 _bridge_iter_object_reference_append(bridge, iter, root);
593 593
594 return ret; 594 return ret;
@@ -606,12 +606,12 @@ _accessible_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_M
606 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 606 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
607 Eo *obj = _bridge_object_from_path(bridge, obj_path); 607 Eo *obj = _bridge_object_from_path(bridge, obj_path);
608 608
609 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 609 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
610 610
611 ret = eldbus_message_method_return_new(msg); 611 ret = eldbus_message_method_return_new(msg);
612 if (!ret) goto error; 612 if (!ret) goto error;
613 613
614 attrs = efl_access_attributes_get(obj); 614 attrs = efl_access_object_attributes_get(obj);
615 615
616 iter = eldbus_message_iter_get(ret); 616 iter = eldbus_message_iter_get(ret);
617 if (!iter) goto error; 617 if (!iter) goto error;
@@ -648,7 +648,7 @@ _accessible_interfaces_get(const Eldbus_Service_Interface *iface, const Eldbus_M
648 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 648 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
649 Eo *obj = _bridge_object_from_path(bridge, obj_path); 649 Eo *obj = _bridge_object_from_path(bridge, obj_path);
650 650
651 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 651 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
652 652
653 ret = eldbus_message_method_return_new(msg); 653 ret = eldbus_message_method_return_new(msg);
654 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 654 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -718,7 +718,7 @@ _accessible_get_state(const Eldbus_Service_Interface *iface, const Eldbus_Messag
718 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 718 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
719 Eo *obj = _bridge_object_from_path(bridge, obj_path); 719 Eo *obj = _bridge_object_from_path(bridge, obj_path);
720 720
721 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 721 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
722 722
723 ret = eldbus_message_method_return_new(msg); 723 ret = eldbus_message_method_return_new(msg);
724 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 724 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -727,7 +727,7 @@ _accessible_get_state(const Eldbus_Service_Interface *iface, const Eldbus_Messag
727 iter_array = eldbus_message_iter_container_new(iter, 'a', "u"); 727 iter_array = eldbus_message_iter_container_new(iter, 'a', "u");
728 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); 728 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
729 729
730 states = efl_access_state_set_get(obj); 730 states = efl_access_object_state_set_get(obj);
731 731
732 atspi_states = _elm_atspi_state_set_to_atspi_state_set(states); 732 atspi_states = _elm_atspi_state_set_to_atspi_state_set(states);
733 733
@@ -754,12 +754,12 @@ _accessible_get_index_in_parent(const Eldbus_Service_Interface *iface EINA_UNUSE
754 Eldbus_Message *ret; 754 Eldbus_Message *ret;
755 int idx = -1; 755 int idx = -1;
756 756
757 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 757 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
758 758
759 ret = eldbus_message_method_return_new(msg); 759 ret = eldbus_message_method_return_new(msg);
760 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 760 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
761 761
762 idx = efl_access_index_in_parent_get(obj); 762 idx = efl_access_object_index_in_parent_get(obj);
763 763
764 eldbus_message_arguments_append(ret, "i", idx); 764 eldbus_message_arguments_append(ret, "i", idx);
765 765
@@ -778,7 +778,7 @@ _accessible_child_at_index(const Eldbus_Service_Interface *iface EINA_UNUSED, co
778 Eldbus_Message *ret; 778 Eldbus_Message *ret;
779 Eldbus_Message_Iter *iter; 779 Eldbus_Message_Iter *iter;
780 780
781 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 781 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
782 782
783 if (!eldbus_message_arguments_get(msg, "i", &idx)) 783 if (!eldbus_message_arguments_get(msg, "i", &idx))
784 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 784 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
787 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 787 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
788 788
789 iter = eldbus_message_iter_get(ret); 789 iter = eldbus_message_iter_get(ret);
790 children = efl_access_children_get(obj); 790 children = efl_access_object_access_children_get(obj);
791 791
792 child = eina_list_nth(children, idx); 792 child = eina_list_nth(children, idx);
793 _bridge_iter_object_reference_append(bridge, iter, child); 793 _bridge_iter_object_reference_append(bridge, iter, child);
@@ -809,7 +809,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED,
809 Eina_List *l, *l2; 809 Eina_List *l, *l2;
810 Efl_Access_Relation_Set rels; 810 Efl_Access_Relation_Set rels;
811 811
812 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 812 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
813 813
814 ret = eldbus_message_method_return_new(msg); 814 ret = eldbus_message_method_return_new(msg);
815 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 815 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -818,7 +818,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED,
818 iter_array = eldbus_message_iter_container_new(iter, 'a', "(ua(so))"); 818 iter_array = eldbus_message_iter_container_new(iter, 'a', "(ua(so))");
819 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); 819 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
820 820
821 rels = efl_access_relation_set_get(obj); 821 rels = efl_access_object_relation_set_get(obj);
822 822
823 EINA_LIST_FOREACH(rels, l, rel) 823 EINA_LIST_FOREACH(rels, l, rel)
824 { 824 {
@@ -1221,7 +1221,7 @@ _image_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *
1221 Eo *obj = _bridge_object_from_path(bridge, obj_path); 1221 Eo *obj = _bridge_object_from_path(bridge, obj_path);
1222 Eina_Rect r; 1222 Eina_Rect r;
1223 1223
1224 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 1224 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
1225 1225
1226 if (!eldbus_message_arguments_get(msg, "u", &type)) 1226 if (!eldbus_message_arguments_get(msg, "u", &type))
1227 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 1227 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
1247 int x = -1, y = -1; 1247 int x = -1, y = -1;
1248 Eina_Bool screen_coords; 1248 Eina_Bool screen_coords;
1249 1249
1250 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 1250 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
1251 1251
1252 if (!eldbus_message_arguments_get(msg, "u", &type)) 1252 if (!eldbus_message_arguments_get(msg, "u", &type))
1253 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 1253 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
1275 Eo *obj = _bridge_object_from_path(bridge, obj_path); 1275 Eo *obj = _bridge_object_from_path(bridge, obj_path);
1276 int w = -1, h = -1; 1276 int w = -1, h = -1;
1277 1277
1278 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 1278 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
1279 1279
1280 ret = eldbus_message_method_return_new(msg); 1280 ret = eldbus_message_method_return_new(msg);
1281 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1281 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -2029,7 +2029,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
2029 tmp = path + len; /* Skip over the prefix */ 2029 tmp = path + len; /* Skip over the prefix */
2030 if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp)) 2030 if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp))
2031 { 2031 {
2032 root = efl_access_root_get(EFL_ACCESS_MIXIN); 2032 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
2033 return root; 2033 return root;
2034 } 2034 }
2035 2035
@@ -2043,7 +2043,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
2043 return NULL; 2043 return NULL;
2044 } 2044 }
2045 2045
2046 ret = efl_isa(eo, EFL_ACCESS_MIXIN) ? eo : NULL; 2046 ret = efl_isa(eo, EFL_ACCESS_OBJECT_MIXIN) ? eo : NULL;
2047 2047
2048 return ret; 2048 return ret;
2049} 2049}
@@ -2056,7 +2056,7 @@ _path_from_object(const Eo *eo)
2056 2056
2057 if (!eo) 2057 if (!eo)
2058 return ATSPI_DBUS_PATH_NULL; 2058 return ATSPI_DBUS_PATH_NULL;
2059 root = efl_access_root_get(EFL_ACCESS_MIXIN); 2059 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
2060 2060
2061 if (eo == root) 2061 if (eo == root)
2062 snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT); 2062 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 *
2074 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); 2074 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
2075 Eo *ret_obj = NULL, *obj = _bridge_object_from_path(bridge, obj_path); 2075 Eo *ret_obj = NULL, *obj = _bridge_object_from_path(bridge, obj_path);
2076 2076
2077 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, request_msg, error); 2077 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, request_msg, error);
2078 2078
2079 if (!strcmp(property, "Name")) 2079 if (!strcmp(property, "Name"))
2080 { 2080 {
2081 ret = efl_access_i18n_name_get(obj); 2081 ret = efl_access_object_i18n_name_get(obj);
2082 if (!ret) 2082 if (!ret)
2083 ret = ""; 2083 ret = "";
2084 eldbus_message_iter_basic_append(iter, 's', ret); 2084 eldbus_message_iter_basic_append(iter, 's', ret);
@@ -2086,7 +2086,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
2086 } 2086 }
2087 else if (!strcmp(property, "Description")) 2087 else if (!strcmp(property, "Description"))
2088 { 2088 {
2089 ret = efl_access_description_get(obj); 2089 ret = efl_access_object_description_get(obj);
2090 if (!ret) 2090 if (!ret)
2091 ret = ""; 2091 ret = "";
2092 eldbus_message_iter_basic_append(iter, 's', ret); 2092 eldbus_message_iter_basic_append(iter, 's', ret);
@@ -2094,9 +2094,9 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
2094 } 2094 }
2095 else if (!strcmp(property, "Parent")) 2095 else if (!strcmp(property, "Parent"))
2096 { 2096 {
2097 ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN); 2097 ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN);
2098 Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID; 2098 Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID;
2099 role = efl_access_role_get(obj); 2099 role = efl_access_object_role_get(obj);
2100 if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role)) 2100 if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role))
2101 _object_desktop_reference_append(iter); 2101 _object_desktop_reference_append(iter);
2102 else 2102 else
@@ -2106,7 +2106,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
2106 else if (!strcmp(property, "ChildCount")) 2106 else if (!strcmp(property, "ChildCount"))
2107 { 2107 {
2108 Eina_List *l = NULL; 2108 Eina_List *l = NULL;
2109 l = efl_access_children_get(obj); 2109 l = efl_access_object_access_children_get(obj);
2110 eldbus_message_iter_basic_append(iter, 'i', eina_list_count(l)); 2110 eldbus_message_iter_basic_append(iter, 'i', eina_list_count(l));
2111 eina_list_free(l); 2111 eina_list_free(l);
2112 return EINA_TRUE; 2112 return EINA_TRUE;
@@ -2234,18 +2234,18 @@ _image_properties_get(const Eldbus_Service_Interface *interface, const char *pro
2234 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); 2234 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
2235 Eo *obj = _bridge_object_from_path(bridge, obj_path); 2235 Eo *obj = _bridge_object_from_path(bridge, obj_path);
2236 2236
2237 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, request_msg, error); 2237 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, request_msg, error);
2238 2238
2239 if (!strcmp(property, "ImageDescription")) 2239 if (!strcmp(property, "ImageDescription"))
2240 { 2240 {
2241 value = efl_access_description_get(obj); 2241 value = efl_access_object_description_get(obj);
2242 value = value ? value : ""; 2242 value = value ? value : "";
2243 eldbus_message_iter_basic_append(iter, 's', value); 2243 eldbus_message_iter_basic_append(iter, 's', value);
2244 return EINA_TRUE; 2244 return EINA_TRUE;
2245 } 2245 }
2246 if (!strcmp(property, "ImageLocale")) 2246 if (!strcmp(property, "ImageLocale"))
2247 { 2247 {
2248 value = efl_access_translation_domain_get(obj); 2248 value = efl_access_object_translation_domain_get(obj);
2249 value = value ? value : ""; 2249 value = value ? value : "";
2250 eldbus_message_iter_basic_append(iter, 's', value); 2250 eldbus_message_iter_basic_append(iter, 's', value);
2251 return EINA_TRUE; 2251 return EINA_TRUE;
@@ -2575,7 +2575,7 @@ _collection_match_states_lookup(Eo *obj, struct collection_match_rule *rule)
2575 Eina_Bool ret = EINA_FALSE; 2575 Eina_Bool ret = EINA_FALSE;
2576 Efl_Access_State_Set ss; 2576 Efl_Access_State_Set ss;
2577 2577
2578 ss = efl_access_state_set_get(obj); 2578 ss = efl_access_object_state_set_get(obj);
2579 2579
2580 switch (rule->statematchtype) 2580 switch (rule->statematchtype)
2581 { 2581 {
@@ -2605,7 +2605,7 @@ _collection_match_roles_lookup(Eo *obj, struct collection_match_rule *rule)
2605 Efl_Access_Role role; 2605 Efl_Access_Role role;
2606 int64_t role_set; 2606 int64_t role_set;
2607 2607
2608 role = efl_access_role_get(obj); 2608 role = efl_access_object_role_get(obj);
2609 2609
2610 if (role >= 64) 2610 if (role >= 64)
2611 { 2611 {
@@ -2725,7 +2725,7 @@ _collection_match_attributes_lookup(Eo *obj, struct collection_match_rule *rule)
2725 Eina_Bool ret = EINA_FALSE; 2725 Eina_Bool ret = EINA_FALSE;
2726 Eina_List *obj_attribs; 2726 Eina_List *obj_attribs;
2727 2727
2728 obj_attribs = efl_access_attributes_get(obj); 2728 obj_attribs = efl_access_object_attributes_get(obj);
2729 2729
2730 switch (rule->attributematchtype) 2730 switch (rule->attributematchtype)
2731 { 2731 {
@@ -2756,7 +2756,7 @@ _collection_sort_order_canonical(struct collection_match_rule *rule, Eina_List *
2756{ 2756{
2757 int i = index; 2757 int i = index;
2758 Eina_List *children; 2758 Eina_List *children;
2759 children = efl_access_children_get(obj); 2759 children = efl_access_object_access_children_get(obj);
2760 long acount = eina_list_count(children); 2760 long acount = eina_list_count(children);
2761 Eina_Bool prev = pobj ? EINA_TRUE : EINA_FALSE; 2761 Eina_Bool prev = pobj ? EINA_TRUE : EINA_FALSE;
2762 2762
@@ -2820,21 +2820,21 @@ _collection_sort_order_reverse_canonical(struct collection_match_rule *rule, Ein
2820 flag = EINA_TRUE; 2820 flag = EINA_TRUE;
2821 2821
2822 /* Get the current nodes index in it's parent and the parent object. */ 2822 /* Get the current nodes index in it's parent and the parent object. */
2823 indexinparent = efl_access_index_in_parent_get(obj); 2823 indexinparent = efl_access_object_index_in_parent_get(obj);
2824 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN); 2824 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN);
2825 2825
2826 if ((indexinparent > 0) && ((max == 0) || (count < max))) 2826 if ((indexinparent > 0) && ((max == 0) || (count < max)))
2827 { 2827 {
2828 /* there are still some siblings to visit so get the previous sibling 2828 /* there are still some siblings to visit so get the previous sibling
2829 and get it's last descendant. 2829 and get it's last descendant.
2830 First, get the previous sibling */ 2830 First, get the previous sibling */
2831 children = efl_access_children_get(parent); 2831 children = efl_access_object_access_children_get(parent);
2832 nextobj = eina_list_nth(children, indexinparent - 1); 2832 nextobj = eina_list_nth(children, indexinparent - 1);
2833 eina_list_free(children); 2833 eina_list_free(children);
2834 2834
2835 /* Now, drill down the right side to the last descendant */ 2835 /* Now, drill down the right side to the last descendant */
2836 do { 2836 do {
2837 children = efl_access_children_get(nextobj); 2837 children = efl_access_object_access_children_get(nextobj);
2838 if (children) nextobj = eina_list_last_data_get(children); 2838 if (children) nextobj = eina_list_last_data_get(children);
2839 eina_list_free(children); 2839 eina_list_free(children);
2840 } while (children); 2840 } while (children);
@@ -2877,8 +2877,8 @@ _collection_inorder(Eo *collection, struct collection_match_rule *rule, Eina_Lis
2877 while ((max == 0 || count < max) && obj && obj != collection) 2877 while ((max == 0 || count < max) && obj && obj != collection)
2878 { 2878 {
2879 Eo *parent; 2879 Eo *parent;
2880 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN); 2880 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN);
2881 idx = efl_access_index_in_parent_get(obj); 2881 idx = efl_access_object_index_in_parent_get(obj);
2882 count = _collection_sort_order_canonical(rule, list, count, max, parent, 2882 count = _collection_sort_order_canonical(rule, list, count, max, parent,
2883 idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse); 2883 idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse);
2884 obj = parent; 2884 obj = parent;
@@ -2954,8 +2954,8 @@ _collection_get_matches_from_handle(Eo *collection, Eo *current, struct collecti
2954 result = eina_list_reverse(result); 2954 result = eina_list_reverse(result);
2955 break; 2955 break;
2956 case ATSPI_Collection_TREE_RESTRICT_CHILDREN: 2956 case ATSPI_Collection_TREE_RESTRICT_CHILDREN:
2957 idx = efl_access_index_in_parent_get(current); 2957 idx = efl_access_object_index_in_parent_get(current);
2958 parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_MIXIN); 2958 parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_OBJECT_MIXIN);
2959 _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse); 2959 _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse);
2960 break; 2960 break;
2961 case ATSPI_Collection_TREE_RESTRICT_SIBLING: 2961 case ATSPI_Collection_TREE_RESTRICT_SIBLING:
@@ -2983,7 +2983,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED,
2983 AtspiCollectionSortOrder sortby; 2983 AtspiCollectionSortOrder sortby;
2984 Eina_List *result = NULL; 2984 Eina_List *result = NULL;
2985 2985
2986 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 2986 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
2987 2987
2988 iter = eldbus_message_iter_get(msg); 2988 iter = eldbus_message_iter_get(msg);
2989 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); 2989 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
@@ -2995,7 +2995,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED,
2995 2995
2996 current = _bridge_object_from_path(bridge, obj_path); 2996 current = _bridge_object_from_path(bridge, obj_path);
2997 2997
2998 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_MIXIN, msg); 2998 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_MIXIN, msg);
2999 2999
3000 if (!_collection_iter_match_rule_get(rule_iter, &rule)) 3000 if (!_collection_iter_match_rule_get(rule_iter, &rule))
3001 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters."); 3001 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_
3016 Eo *collection = obj; 3016 Eo *collection = obj;
3017 3017
3018 if (limit) 3018 if (limit)
3019 collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN); 3019 collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN);
3020 3020
3021 switch (tree) 3021 switch (tree)
3022 { 3022 {
@@ -3055,7 +3055,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co
3055 Eina_List *result = NULL; 3055 Eina_List *result = NULL;
3056 Eina_Bool limit; 3056 Eina_Bool limit;
3057 3057
3058 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 3058 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
3059 3059
3060 iter = eldbus_message_iter_get(msg); 3060 iter = eldbus_message_iter_get(msg);
3061 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); 3061 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
@@ -3067,7 +3067,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co
3067 3067
3068 current = _bridge_object_from_path(bridge, obj_path); 3068 current = _bridge_object_from_path(bridge, obj_path);
3069 3069
3070 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_MIXIN, msg); 3070 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_MIXIN, msg);
3071 3071
3072 if (!_collection_iter_match_rule_get(rule_iter, &rule)) 3072 if (!_collection_iter_match_rule_get(rule_iter, &rule))
3073 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters."); 3073 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
3095 AtspiCollectionSortOrder sortby; 3095 AtspiCollectionSortOrder sortby;
3096 Eina_List *result = NULL; 3096 Eina_List *result = NULL;
3097 3097
3098 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); 3098 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
3099 3099
3100 iter = eldbus_message_iter_get(msg); 3100 iter = eldbus_message_iter_get(msg);
3101 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); 3101 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
@@ -3169,7 +3169,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
3169 iter_array = eldbus_message_iter_container_new(iter, 'a', "s"); 3169 iter_array = eldbus_message_iter_container_new(iter, 'a', "s");
3170 if (!iter_array) return; 3170 if (!iter_array) return;
3171 3171
3172 if (efl_isa(obj, EFL_ACCESS_MIXIN)) 3172 if (efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN))
3173 { 3173 {
3174 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE); 3174 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE);
3175 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION); 3175 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)
3182 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT); 3182 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT);
3183 if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE)) 3183 if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE))
3184 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT); 3184 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
3185 if (efl_isa(obj, EFL_ACCESS_MIXIN)) 3185 if (efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN))
3186 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE); 3186 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE);
3187 if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE)) 3187 if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE))
3188 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION); 3188 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_
3204 Efl_Access_State_Set states; 3204 Efl_Access_State_Set states;
3205 Efl_Access_Role role; 3205 Efl_Access_Role role;
3206 Eo *root; 3206 Eo *root;
3207 root = efl_access_root_get(EFL_ACCESS_MIXIN); 3207 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
3208 3208
3209 role = efl_access_role_get(data); 3209 role = efl_access_object_role_get(data);
3210 3210
3211 iter_struct = eldbus_message_iter_container_new(iter_array, 'r', NULL); 3211 iter_struct = eldbus_message_iter_container_new(iter_array, 'r', NULL);
3212 EINA_SAFETY_ON_NULL_RETURN_VAL(iter_struct, EINA_TRUE); 3212 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_
3218 _bridge_iter_object_reference_append(bridge, iter_struct, root); 3218 _bridge_iter_object_reference_append(bridge, iter_struct, root);
3219 3219
3220 Eo *parent = NULL; 3220 Eo *parent = NULL;
3221 parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_MIXIN); 3221 parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_OBJECT_MIXIN);
3222 /* Marshall parent */ 3222 /* Marshall parent */
3223 if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role)) 3223 if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role))
3224 _object_desktop_reference_append(iter_struct); 3224 _object_desktop_reference_append(iter_struct);
@@ -3229,7 +3229,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
3229 Eina_List *children_list = NULL, *l; 3229 Eina_List *children_list = NULL, *l;
3230 Eo *child; 3230 Eo *child;
3231 3231
3232 children_list = efl_access_children_get(data); 3232 children_list = efl_access_object_access_children_get(data);
3233 iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "(so)"); 3233 iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "(so)");
3234 EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail); 3234 EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail);
3235 3235
@@ -3244,7 +3244,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
3244 3244
3245 /* Marshall name */ 3245 /* Marshall name */
3246 const char *name = NULL; 3246 const char *name = NULL;
3247 name = efl_access_i18n_name_get(data); 3247 name = efl_access_object_i18n_name_get(data);
3248 if (!name) 3248 if (!name)
3249 name = ""; 3249 name = "";
3250 3250
@@ -3255,7 +3255,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
3255 3255
3256 /* Marshall description */ 3256 /* Marshall description */
3257 const char* description = NULL; 3257 const char* description = NULL;
3258 description = efl_access_description_get(data); 3258 description = efl_access_object_description_get(data);
3259 if (!description) 3259 if (!description)
3260 description = ""; 3260 description = "";
3261 eldbus_message_iter_basic_append(iter_struct, 's', description); 3261 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_
3264 iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "u"); 3264 iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "u");
3265 EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail); 3265 EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail);
3266 3266
3267 states = efl_access_state_set_get(data); 3267 states = efl_access_object_state_set_get(data);
3268 3268
3269 unsigned int s1 = states & 0xFFFFFFFF; 3269 unsigned int s1 = states & 0xFFFFFFFF;
3270 unsigned int s2 = (states >> 32) & 0xFFFFFFFF; 3270 unsigned int s2 = (states >> 32) & 0xFFFFFFFF;
@@ -3301,7 +3301,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
3301 iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE); 3301 iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE);
3302 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); 3302 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
3303 3303
3304 root = efl_access_root_get(EFL_ACCESS_MIXIN); 3304 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
3305 to_process = eina_list_append(NULL, root); 3305 to_process = eina_list_append(NULL, root);
3306 3306
3307 while (to_process) 3307 while (to_process)
@@ -3312,7 +3312,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
3312 _bridge_object_register(bridge, obj); 3312 _bridge_object_register(bridge, obj);
3313 3313
3314 Eina_List *children; 3314 Eina_List *children;
3315 children = efl_access_children_get(obj); 3315 children = efl_access_object_access_children_get(obj);
3316 to_process = eina_list_merge(to_process, children); 3316 to_process = eina_list_merge(to_process, children);
3317 } 3317 }
3318 3318
@@ -3706,7 +3706,7 @@ _elm_atspi_bridge_app_register(Eo *bridge)
3706 "Embed"); 3706 "Embed");
3707 Eldbus_Message_Iter *iter = eldbus_message_iter_get(message); 3707 Eldbus_Message_Iter *iter = eldbus_message_iter_get(message);
3708 3708
3709 root = efl_access_root_get(EFL_ACCESS_MIXIN); 3709 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
3710 _bridge_iter_object_reference_append(bridge, iter, root); 3710 _bridge_iter_object_reference_append(bridge, iter, root);
3711 eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1); 3711 eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1);
3712 3712
@@ -3719,7 +3719,7 @@ _elm_atspi_bridge_app_unregister(Eo *bridge)
3719 Eo *root; 3719 Eo *root;
3720 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE); 3720 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE);
3721 3721
3722 root = efl_access_root_get(EFL_ACCESS_MIXIN); 3722 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
3723 3723
3724 Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY, 3724 Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY,
3725 ATSPI_DBUS_PATH_ROOT, 3725 ATSPI_DBUS_PATH_ROOT,
@@ -4004,7 +4004,7 @@ _active_descendant_changed_signal_send(void *data, const Efl_Event *event)
4004 return; 4004 return;
4005 } 4005 }
4006 4006
4007 idx = efl_access_index_in_parent_get(child); 4007 idx = efl_access_object_index_in_parent_get(child);
4008 4008
4009 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4009 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4010 &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "", 4010 &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "",
@@ -4038,7 +4038,7 @@ _children_changed_signal_send(void *data, const Efl_Event *event)
4038 return; 4038 return;
4039 } 4039 }
4040 4040
4041 idx = efl_access_index_in_parent_get(ev_data->child); 4041 idx = efl_access_object_index_in_parent_get(ev_data->child);
4042 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4042 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4043 &_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc, 4043 &_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc,
4044 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child); 4044 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
4119 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); 4119 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
4120 4120
4121 path = _path_from_object(obj); 4121 path = _path_from_object(obj);
4122 root = efl_access_root_get(EFL_ACCESS_MIXIN); 4122 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
4123 4123
4124 msg = eldbus_message_signal_new(path, infc, signal->name); 4124 msg = eldbus_message_signal_new(path, infc, signal->name);
4125 if (!msg) return; 4125 if (!msg) return;
@@ -4369,7 +4369,7 @@ _a11y_connection_shutdown(Eo *bridge)
4369 if (pd->event_hash) eina_hash_free(pd->event_hash); 4369 if (pd->event_hash) eina_hash_free(pd->event_hash);
4370 pd->event_hash = NULL; 4370 pd->event_hash = NULL;
4371 4371
4372 efl_access_event_handler_del(EFL_ACCESS_MIXIN, pd->event_hdlr); 4372 efl_access_object_event_handler_del(EFL_ACCESS_OBJECT_MIXIN, pd->event_hdlr);
4373 pd->event_hdlr = NULL; 4373 pd->event_hdlr = NULL;
4374 4374
4375 efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL); 4375 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)
4461 _elm_atspi_bridge_app_register(obj); 4461 _elm_atspi_bridge_app_register(obj);
4462 4462
4463 // register accessible object event listener 4463 // register accessible object event listener
4464 pd->event_hdlr = efl_access_event_handler_add(EFL_ACCESS_MIXIN, _bridge_accessible_event_dispatch, obj); 4464 pd->event_hdlr = efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _bridge_accessible_event_dispatch, obj);
4465} 4465}
4466 4466
4467static void 4467static void
@@ -4539,9 +4539,9 @@ static void _bridge_object_register(Eo *bridge, Eo *obj)
4539{ 4539{
4540 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); 4540 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
4541 4541
4542 if (!efl_isa(obj, EFL_ACCESS_MIXIN)) 4542 if (!efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN))
4543 { 4543 {
4544 WRN("Unable to register class w/o Efl_Access!"); 4544 WRN("Unable to register class w/o Efl_Access_Object!");
4545 return; 4545 return;
4546 } 4546 }
4547 4547
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif