summaryrefslogtreecommitdiff
path: root/src/lib/elementary/elm_interface_atspi_accessible.c
diff options
context:
space:
mode:
authorLukasz Stanislawski <lukasz.stanislawski@gmail.com>2017-10-19 10:13:54 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-10-19 10:13:54 +0900
commit57aefc53c18c14ada19dcd09d3e5b5612b277b16 (patch)
tree897745eb7c2d9ccbbde1bc0cf4dd2971c2e625f4 /src/lib/elementary/elm_interface_atspi_accessible.c
parent98622623a0865c525ede12ef5759ab6f5b3af407 (diff)
elm: rename Elm_Interface_Atspi_Accessible interface
Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5341
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/efl_access.c (renamed from src/lib/elementary/elm_interface_atspi_accessible.c)220
1 files changed, 110 insertions, 110 deletions
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/efl_access.c
index 22a18ba231..4586012b77 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/efl_access.c
@@ -2,13 +2,13 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_widget.h" 8#include "elm_widget.h"
9#include "elm_priv.h" 9#include "elm_priv.h"
10 10
11const char* Atspi_Name[] = { 11const char* Access_Name[] = {
12 "invalid", 12 "invalid",
13 "accelerator label", 13 "accelerator label",
14 "alert", 14 "alert",
@@ -115,39 +115,39 @@ const char* Atspi_Name[] = {
115 "last defined" 115 "last defined"
116}; 116};
117 117
118struct _Elm_Atspi_Event_Handler 118struct _Efl_Access_Event_Handler
119{ 119{
120 Efl_Event_Cb cb; 120 Efl_Event_Cb cb;
121 void *data; 121 void *data;
122}; 122};
123 123
124struct _Elm_Interface_Atspi_Accessible_Data 124struct _Efl_Access_Data
125{ 125{
126 Elm_Atspi_Role role; 126 Efl_Access_Role role;
127 const char *name; 127 const char *name;
128 const char *description; 128 const char *description;
129 const char *translation_domain; 129 const char *translation_domain;
130 Elm_Atspi_Relation_Set relations; 130 Efl_Access_Relation_Set relations;
131 Elm_Atspi_Type type: 2; 131 Efl_Access_Type type: 2;
132}; 132};
133 133
134typedef struct _Elm_Interface_Atspi_Accessible_Data Elm_Interface_Atspi_Accessible_Data; 134typedef struct _Efl_Access_Data Efl_Access_Data;
135 135
136 136
137static Eina_List *global_callbacks; 137static Eina_List *global_callbacks;
138static Eo *root; 138static Eo *root;
139 139
140EOLIAN static int 140EOLIAN static int
141_elm_interface_atspi_accessible_index_in_parent_get(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 141_efl_access_index_in_parent_get(Eo *obj, Efl_Access_Data *pd EINA_UNUSED)
142{ 142{
143 Eina_List *l, *children = NULL; 143 Eina_List *l, *children = NULL;
144 Eo *chld, *parent = NULL; 144 Eo *chld, *parent = NULL;
145 int ret = 0; 145 int ret = 0;
146 146
147 parent = elm_interface_atspi_accessible_parent_get(obj); 147 parent = efl_access_parent_get(obj);
148 if (!parent) return -1; 148 if (!parent) return -1;
149 149
150 children = elm_interface_atspi_accessible_children_get(parent); 150 children = efl_access_children_get(parent);
151 if (!children) return -1; 151 if (!children) return -1;
152 152
153 EINA_LIST_FOREACH(children, l, chld) 153 EINA_LIST_FOREACH(children, l, chld)
@@ -165,67 +165,67 @@ _elm_interface_atspi_accessible_index_in_parent_get(Eo *obj, Elm_Interface_Atspi
165 return ret; 165 return ret;
166} 166}
167 167
168EOLIAN static Elm_Interface_Atspi_Accessible * 168EOLIAN static Efl_Access *
169_elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 169_efl_access_parent_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
170{ 170{
171 Elm_Atspi_Type type; 171 Efl_Access_Type type;
172 Eo *parent = obj; 172 Eo *parent = obj;
173 173
174 do { 174 do {
175 parent = efl_parent_get(obj); 175 parent = efl_parent_get(obj);
176 if (efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) 176 if (efl_isa(parent, EFL_ACCESS_MIXIN))
177 { 177 {
178 type = elm_interface_atspi_accessible_type_get(parent); 178 type = efl_access_type_get(parent);
179 if (type != ELM_ATSPI_TYPE_SKIPPED) break; 179 if (type != EFL_ACCESS_TYPE_SKIPPED) break;
180 } 180 }
181 } while (parent); 181 } while (parent);
182 182
183 return efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL; 183 return efl_isa(parent, EFL_ACCESS_MIXIN) ? parent : NULL;
184} 184}
185 185
186EOLIAN static void 186EOLIAN static void
187_elm_interface_atspi_accessible_parent_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED, Elm_Interface_Atspi_Accessible *new_parent EINA_UNUSED) 187_efl_access_parent_set(Eo *obj, Efl_Access_Data *pd EINA_UNUSED, Efl_Access *new_parent EINA_UNUSED)
188{ 188{
189 WRN("The %s object does not implement the \"accessible_parent_set\" function.", 189 WRN("The %s object does not implement the \"accessible_parent_set\" function.",
190 efl_class_name_get(efl_class_get(obj))); 190 efl_class_name_get(efl_class_get(obj)));
191} 191}
192 192
193EOLIAN Eina_List* 193EOLIAN Eina_List*
194_elm_interface_atspi_accessible_attributes_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 194_efl_access_attributes_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
195{ 195{
196 WRN("The %s object does not implement the \"accessible_attributes_set\" function.", 196 WRN("The %s object does not implement the \"accessible_attributes_set\" function.",
197 efl_class_name_get(efl_class_get(obj))); 197 efl_class_name_get(efl_class_get(obj)));
198 return NULL; 198 return NULL;
199} 199}
200 200
201EOLIAN static Elm_Atspi_Role 201EOLIAN static Efl_Access_Role
202_elm_interface_atspi_accessible_role_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 202_efl_access_role_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
203{ 203{
204 return pd->role; 204 return pd->role;
205} 205}
206 206
207EOLIAN static void 207EOLIAN static void
208_elm_interface_atspi_accessible_role_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED, Elm_Atspi_Role role) 208_efl_access_role_set(Eo *obj, Efl_Access_Data *pd EINA_UNUSED, Efl_Access_Role role)
209{ 209{
210 if (pd->role != role) 210 if (pd->role != role)
211 { 211 {
212 pd->role = role; 212 pd->role = role;
213 elm_interface_atspi_accessible_role_changed_signal_emit(obj); 213 efl_access_role_changed_signal_emit(obj);
214 } 214 }
215} 215}
216 216
217EOLIAN const char * 217EOLIAN const char *
218_elm_interface_atspi_accessible_role_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 218_efl_access_role_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
219{ 219{
220 Elm_Atspi_Role role; 220 Efl_Access_Role role;
221 221
222 role = elm_interface_atspi_accessible_role_get(obj); 222 role = efl_access_role_get(obj);
223 223
224 return role > ELM_ATSPI_ROLE_LAST_DEFINED ? "" : Atspi_Name[role]; 224 return role > EFL_ACCESS_ROLE_LAST_DEFINED ? "" : Access_Name[role];
225} 225}
226 226
227EOLIAN const char * 227EOLIAN const char *
228_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd) 228_efl_access_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
229{ 229{
230#ifdef ENABLE_NLS 230#ifdef ENABLE_NLS
231 if (pd->translation_domain) 231 if (pd->translation_domain)
@@ -235,12 +235,12 @@ _elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atsp
235} 235}
236 236
237EOLIAN static void 237EOLIAN static void
238_elm_interface_atspi_accessible_name_set(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd, const char *val) 238_efl_access_name_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val)
239{ 239{
240 eina_stringshare_replace(&pd->name, val); 240 eina_stringshare_replace(&pd->name, val);
241} 241}
242 242
243const char * _elm_interface_atspi_accessible_description_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd) 243const char * _efl_access_description_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
244{ 244{
245#ifdef ENABLE_NLS 245#ifdef ENABLE_NLS
246 if (pd->translation_domain) 246 if (pd->translation_domain)
@@ -250,16 +250,16 @@ const char * _elm_interface_atspi_accessible_description_get(Eo *obj EINA_UNUSED
250} 250}
251 251
252EOLIAN static void 252EOLIAN static void
253_elm_interface_atspi_accessible_description_set(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd, const char *val) 253_efl_access_description_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val)
254{ 254{
255 eina_stringshare_replace(&pd->description, val); 255 eina_stringshare_replace(&pd->description, val);
256} 256}
257 257
258EOLIAN static const char * 258EOLIAN static const char *
259_elm_interface_atspi_accessible_localized_role_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 259_efl_access_localized_role_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
260{ 260{
261 const char *ret = NULL; 261 const char *ret = NULL;
262 ret = elm_interface_atspi_accessible_role_name_get(obj); 262 ret = efl_access_role_name_get(obj);
263#ifdef ENABLE_NLS 263#ifdef ENABLE_NLS
264 ret = gettext(ret); 264 ret = gettext(ret);
265#endif 265#endif
@@ -267,7 +267,7 @@ _elm_interface_atspi_accessible_localized_role_name_get(Eo *obj EINA_UNUSED, Elm
267} 267}
268 268
269EOLIAN static Eina_List * 269EOLIAN static Eina_List *
270_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 270_efl_access_children_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
271{ 271{
272 Eina_List *children = NULL; 272 Eina_List *children = NULL;
273 Eina_Iterator *iter = NULL; 273 Eina_Iterator *iter = NULL;
@@ -279,7 +279,7 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_
279 279
280 EINA_ITERATOR_FOREACH(iter, chld) 280 EINA_ITERATOR_FOREACH(iter, chld)
281 { 281 {
282 if (efl_isa(chld, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) 282 if (efl_isa(chld, EFL_ACCESS_MIXIN))
283 children = eina_list_append(children, chld); 283 children = eina_list_append(children, chld);
284 } 284 }
285 eina_iterator_free(iter); 285 eina_iterator_free(iter);
@@ -287,21 +287,21 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_
287 return children; 287 return children;
288} 288}
289 289
290EOLIAN static Elm_Atspi_State_Set 290EOLIAN static Efl_Access_State_Set
291_elm_interface_atspi_accessible_state_set_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 291_efl_access_state_set_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
292{ 292{
293 return 0; 293 return 0;
294} 294}
295 295
296EOLIAN Elm_Atspi_Relation_Set 296EOLIAN Efl_Access_Relation_Set
297_elm_interface_atspi_accessible_relation_set_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 297_efl_access_relation_set_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
298{ 298{
299 return elm_atspi_relation_set_clone(pd->relations); 299 return efl_access_relation_set_clone(pd->relations);
300} 300}
301 301
302EAPI void elm_atspi_attributes_list_free(Eina_List *list) 302EAPI void efl_access_attributes_list_free(Eina_List *list)
303{ 303{
304 Elm_Atspi_Attribute *attr; 304 Efl_Access_Attribute *attr;
305 EINA_LIST_FREE(list, attr) 305 EINA_LIST_FREE(list, attr)
306 { 306 {
307 eina_stringshare_del(attr->key); 307 eina_stringshare_del(attr->key);
@@ -311,27 +311,27 @@ EAPI void elm_atspi_attributes_list_free(Eina_List *list)
311} 311}
312 312
313EOLIAN void 313EOLIAN void
314_elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info) 314_efl_access_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info)
315{ 315{
316 Eina_List *l; 316 Eina_List *l;
317 Elm_Atspi_Event_Handler *hdl; 317 Efl_Access_Event_Handler *hdl;
318 Elm_Atspi_Type type; 318 Efl_Access_Type type;
319 319
320 if (!accessible || !event || !efl_isa(accessible, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) 320 if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_MIXIN))
321 { 321 {
322 CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL"); 322 CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL");
323 return; 323 return;
324 } 324 }
325 325
326 type = elm_interface_atspi_accessible_type_get(accessible); 326 type = efl_access_type_get(accessible);
327 if (type != ELM_ATSPI_TYPE_REGULAR) 327 if (type != EFL_ACCESS_TYPE_REGULAR)
328 return; 328 return;
329 329
330 if (event == ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED) 330 if (event == EFL_ACCESS_EVENT_CHILDREN_CHANGED)
331 { 331 {
332 Elm_Atspi_Event_Children_Changed_Data *atspi_data = event_info; 332 Efl_Access_Event_Children_Changed_Data *event_data = event_info;
333 type = elm_interface_atspi_accessible_type_get(atspi_data->child); 333 type = efl_access_type_get(event_data->child);
334 if (type != ELM_ATSPI_TYPE_REGULAR) 334 if (type != EFL_ACCESS_TYPE_REGULAR)
335 return; 335 return;
336 } 336 }
337 337
@@ -346,10 +346,10 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
346 } 346 }
347} 347}
348 348
349EOLIAN Elm_Atspi_Event_Handler * 349EOLIAN Efl_Access_Event_Handler *
350_elm_interface_atspi_accessible_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data) 350_efl_access_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data)
351{ 351{
352 Elm_Atspi_Event_Handler *ret = calloc(1, sizeof(Elm_Atspi_Event_Handler)); 352 Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler));
353 353
354 ret->cb = cb; 354 ret->cb = cb;
355 ret->data = data; 355 ret->data = data;
@@ -360,10 +360,10 @@ _elm_interface_atspi_accessible_event_handler_add(Eo *class EINA_UNUSED, void *p
360} 360}
361 361
362EOLIAN void 362EOLIAN void
363_elm_interface_atspi_accessible_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Elm_Atspi_Event_Handler *handler) 363_efl_access_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Access_Event_Handler *handler)
364{ 364{
365 Eina_List *l, *l2; 365 Eina_List *l, *l2;
366 Elm_Atspi_Event_Handler *hdl; 366 Efl_Access_Event_Handler *hdl;
367 EINA_LIST_FOREACH_SAFE(global_callbacks, l, l2, hdl) 367 EINA_LIST_FOREACH_SAFE(global_callbacks, l, l2, hdl)
368 { 368 {
369 if (hdl == handler) 369 if (hdl == handler)
@@ -376,29 +376,29 @@ _elm_interface_atspi_accessible_event_handler_del(Eo *class EINA_UNUSED, void *p
376} 376}
377 377
378EOLIAN void 378EOLIAN void
379_elm_interface_atspi_accessible_translation_domain_set(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd, const char *domain) 379_efl_access_translation_domain_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *domain)
380{ 380{
381 eina_stringshare_replace(&pd->translation_domain, domain); 381 eina_stringshare_replace(&pd->translation_domain, domain);
382} 382}
383 383
384 384
385EOLIAN const char* 385EOLIAN const char*
386_elm_interface_atspi_accessible_translation_domain_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd) 386_efl_access_translation_domain_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
387{ 387{
388 return pd->translation_domain; 388 return pd->translation_domain;
389} 389}
390 390
391EAPI void 391EAPI void
392elm_atspi_relation_free(Elm_Atspi_Relation *relation) 392efl_access_relation_free(Efl_Access_Relation *relation)
393{ 393{
394 eina_list_free(relation->objects); 394 eina_list_free(relation->objects);
395 free(relation); 395 free(relation);
396} 396}
397 397
398EAPI Elm_Atspi_Relation * 398EAPI Efl_Access_Relation *
399elm_atspi_relation_clone(const Elm_Atspi_Relation *relation) 399efl_access_relation_clone(const Efl_Access_Relation *relation)
400{ 400{
401 Elm_Atspi_Relation *ret = calloc(1, sizeof(Elm_Atspi_Relation)); 401 Efl_Access_Relation *ret = calloc(1, sizeof(Efl_Access_Relation));
402 if (!ret) return NULL; 402 if (!ret) return NULL;
403 403
404 ret->type = relation->type; 404 ret->type = relation->type;
@@ -409,8 +409,8 @@ elm_atspi_relation_clone(const Elm_Atspi_Relation *relation)
409static void 409static void
410_on_rel_obj_del(void *data, const Efl_Event *event) 410_on_rel_obj_del(void *data, const Efl_Event *event)
411{ 411{
412 Elm_Atspi_Relation_Set *set = data; 412 Efl_Access_Relation_Set *set = data;
413 Elm_Atspi_Relation *rel; 413 Efl_Access_Relation *rel;
414 Eina_List *l, *l2, *p, *p2; 414 Eina_List *l, *l2, *p, *p2;
415 Eo *rel_obj; 415 Eo *rel_obj;
416 416
@@ -430,12 +430,12 @@ _on_rel_obj_del(void *data, const Efl_Event *event)
430} 430}
431 431
432EAPI Eina_Bool 432EAPI Eina_Bool
433elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Relation_Type type, const Eo *rel_obj) 433efl_access_relation_set_relation_append(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type, const Eo *rel_obj)
434{ 434{
435 Elm_Atspi_Relation *rel; 435 Efl_Access_Relation *rel;
436 Eina_List *l; 436 Eina_List *l;
437 437
438 if (!efl_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) 438 if (!efl_isa(rel_obj, EFL_ACCESS_MIXIN))
439 return EINA_FALSE; 439 return EINA_FALSE;
440 440
441 EINA_LIST_FOREACH(*set, l, rel) 441 EINA_LIST_FOREACH(*set, l, rel)
@@ -451,7 +451,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
451 } 451 }
452 } 452 }
453 453
454 rel = calloc(1, sizeof(Elm_Atspi_Relation)); 454 rel = calloc(1, sizeof(Efl_Access_Relation));
455 if (!rel) return EINA_FALSE; 455 if (!rel) return EINA_FALSE;
456 456
457 rel->type = type; 457 rel->type = type;
@@ -463,10 +463,10 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
463} 463}
464 464
465EAPI void 465EAPI void
466elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Relation_Type type, const Eo *rel_obj) 466efl_access_relation_set_relation_remove(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type, const Eo *rel_obj)
467{ 467{
468 Eina_List *l; 468 Eina_List *l;
469 Elm_Atspi_Relation *rel; 469 Efl_Access_Relation *rel;
470 470
471 EINA_LIST_FOREACH(*set, l, rel) 471 EINA_LIST_FOREACH(*set, l, rel)
472 { 472 {
@@ -480,7 +480,7 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
480 if (!rel->objects) 480 if (!rel->objects)
481 { 481 {
482 *set = eina_list_remove(*set, rel); 482 *set = eina_list_remove(*set, rel);
483 elm_atspi_relation_free(rel); 483 efl_access_relation_free(rel);
484 } 484 }
485 return; 485 return;
486 } 486 }
@@ -488,10 +488,10 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
488} 488}
489 489
490EAPI void 490EAPI void
491elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Relation_Type type) 491efl_access_relation_set_relation_type_remove(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type)
492{ 492{
493 Eina_List *l; 493 Eina_List *l;
494 Elm_Atspi_Relation *rel; 494 Efl_Access_Relation *rel;
495 Eo *obj; 495 Eo *obj;
496 496
497 EINA_LIST_FOREACH(*set, l, rel) 497 EINA_LIST_FOREACH(*set, l, rel)
@@ -501,16 +501,16 @@ elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *set, Elm_Ats
501 EINA_LIST_FOREACH(rel->objects, l, obj) 501 EINA_LIST_FOREACH(rel->objects, l, obj)
502 efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set); 502 efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
503 *set = eina_list_remove(*set, rel); 503 *set = eina_list_remove(*set, rel);
504 elm_atspi_relation_free(rel); 504 efl_access_relation_free(rel);
505 return; 505 return;
506 } 506 }
507 } 507 }
508} 508}
509 509
510EAPI void 510EAPI void
511elm_atspi_relation_set_free(Elm_Atspi_Relation_Set set) 511efl_access_relation_set_free(Efl_Access_Relation_Set set)
512{ 512{
513 Elm_Atspi_Relation *rel; 513 Efl_Access_Relation *rel;
514 Eina_List *l; 514 Eina_List *l;
515 Eo *obj; 515 Eo *obj;
516 516
@@ -518,20 +518,20 @@ elm_atspi_relation_set_free(Elm_Atspi_Relation_Set set)
518 { 518 {
519 EINA_LIST_FOREACH(rel->objects, l, obj) 519 EINA_LIST_FOREACH(rel->objects, l, obj)
520 efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set); 520 efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
521 elm_atspi_relation_free(rel); 521 efl_access_relation_free(rel);
522 } 522 }
523} 523}
524 524
525EAPI Elm_Atspi_Relation_Set 525EAPI Efl_Access_Relation_Set
526elm_atspi_relation_set_clone(const Elm_Atspi_Relation_Set set) 526efl_access_relation_set_clone(const Efl_Access_Relation_Set set)
527{ 527{
528 Elm_Atspi_Relation_Set ret = NULL; 528 Efl_Access_Relation_Set ret = NULL;
529 Eina_List *l; 529 Eina_List *l;
530 Elm_Atspi_Relation *rel; 530 Efl_Access_Relation *rel;
531 531
532 EINA_LIST_FOREACH(set, l, rel) 532 EINA_LIST_FOREACH(set, l, rel)
533 { 533 {
534 Elm_Atspi_Relation *cpy = elm_atspi_relation_clone(rel); 534 Efl_Access_Relation *cpy = efl_access_relation_clone(rel);
535 ret = eina_list_append(ret, cpy); 535 ret = eina_list_append(ret, cpy);
536 } 536 }
537 537
@@ -539,29 +539,29 @@ elm_atspi_relation_set_clone(const Elm_Atspi_Relation_Set set)
539} 539}
540 540
541EOLIAN static Eina_Bool 541EOLIAN static Eina_Bool
542_elm_interface_atspi_accessible_relationship_append(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *sd, Elm_Atspi_Relation_Type type, const Elm_Interface_Atspi_Accessible *relation_obj) 542_efl_access_relationship_append(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Access_Relation_Type type, const Efl_Access *relation_obj)
543{ 543{
544 return elm_atspi_relation_set_relation_append(&sd->relations, type, relation_obj); 544 return efl_access_relation_set_relation_append(&sd->relations, type, relation_obj);
545} 545}
546 546
547EOLIAN static void 547EOLIAN static void
548_elm_interface_atspi_accessible_relationship_remove(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *sd, Elm_Atspi_Relation_Type type, const Elm_Interface_Atspi_Accessible *relation_obj) 548_efl_access_relationship_remove(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Access_Relation_Type type, const Efl_Access *relation_obj)
549{ 549{
550 if (relation_obj) 550 if (relation_obj)
551 elm_atspi_relation_set_relation_remove(&sd->relations, type, relation_obj); 551 efl_access_relation_set_relation_remove(&sd->relations, type, relation_obj);
552 else 552 else
553 elm_atspi_relation_set_relation_type_remove(&sd->relations, type); 553 efl_access_relation_set_relation_type_remove(&sd->relations, type);
554} 554}
555 555
556EOLIAN static void 556EOLIAN static void
557_elm_interface_atspi_accessible_relationships_clear(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *sd) 557_efl_access_relationships_clear(Eo *obj EINA_UNUSED, Efl_Access_Data *sd)
558{ 558{
559 elm_atspi_relation_set_free(sd->relations); 559 efl_access_relation_set_free(sd->relations);
560 sd->relations = NULL; 560 sd->relations = NULL;
561} 561}
562 562
563EOLIAN Eo* 563EOLIAN Eo*
564_elm_interface_atspi_accessible_root_get(Eo *class EINA_UNUSED, void *pd EINA_UNUSED) 564_efl_access_root_get(Eo *class EINA_UNUSED, void *pd EINA_UNUSED)
565{ 565{
566 if (!root) 566 if (!root)
567 root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL); 567 root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
@@ -569,50 +569,50 @@ _elm_interface_atspi_accessible_root_get(Eo *class EINA_UNUSED, void *pd EINA_UN
569 return root; 569 return root;
570} 570}
571 571
572EOLIAN Elm_Atspi_Type 572EOLIAN Efl_Access_Type
573_elm_interface_atspi_accessible_type_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd) 573_efl_access_type_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
574{ 574{
575 return pd->type; 575 return pd->type;
576} 576}
577 577
578EOLIAN void 578EOLIAN void
579_elm_interface_atspi_accessible_type_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd, Elm_Atspi_Type val) 579_efl_access_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Type val)
580{ 580{
581 Elm_Interface_Atspi_Accessible *parent; 581 Efl_Access *parent;
582 if (val == pd->type) 582 if (val == pd->type)
583 return; 583 return;
584 584
585 parent = elm_interface_atspi_accessible_parent_get(obj); 585 parent = efl_access_parent_get(obj);
586 586
587 switch (val) 587 switch (val)
588 { 588 {
589 case ELM_ATSPI_TYPE_DISABLED: 589 case EFL_ACCESS_TYPE_DISABLED:
590 case ELM_ATSPI_TYPE_SKIPPED: 590 case EFL_ACCESS_TYPE_SKIPPED:
591 if (parent) elm_interface_atspi_accessible_children_changed_del_signal_emit(parent, obj); 591 if (parent) efl_access_children_changed_del_signal_emit(parent, obj);
592 elm_interface_atspi_accessible_removed(obj); 592 efl_access_removed(obj);
593 break; 593 break;
594 case ELM_ATSPI_TYPE_REGULAR: 594 case EFL_ACCESS_TYPE_REGULAR:
595 if (parent) elm_interface_atspi_accessible_children_changed_added_signal_emit(parent, obj); 595 if (parent) efl_access_children_changed_added_signal_emit(parent, obj);
596 elm_interface_atspi_accessible_added(obj); 596 efl_access_added(obj);
597 } 597 }
598 pd->type = val; 598 pd->type = val;
599} 599}
600 600
601EOLIAN void 601EOLIAN void
602_elm_interface_atspi_accessible_efl_object_destructor(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd) 602_efl_access_efl_object_destructor(Eo *obj, Efl_Access_Data *pd)
603{ 603{
604 eina_stringshare_del(pd->name); 604 eina_stringshare_del(pd->name);
605 eina_stringshare_del(pd->description); 605 eina_stringshare_del(pd->description);
606 eina_stringshare_del(pd->translation_domain); 606 eina_stringshare_del(pd->translation_domain);
607 elm_atspi_relation_set_free(pd->relations); 607 efl_access_relation_set_free(pd->relations);
608 608
609 efl_destructor(efl_super(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)); 609 efl_destructor(efl_super(obj, EFL_ACCESS_MIXIN));
610} 610}
611 611
612void 612void
613_elm_interface_atspi_shutdown(void) 613_efl_access_shutdown(void)
614{ 614{
615 Elm_Atspi_Event_Handler *hdl; 615 Efl_Access_Event_Handler *hdl;
616 616
617 EINA_LIST_FREE(global_callbacks, hdl) 617 EINA_LIST_FREE(global_callbacks, hdl)
618 free(hdl); 618 free(hdl);
@@ -620,4 +620,4 @@ _elm_interface_atspi_shutdown(void)
620 ELM_SAFE_DEL(root); 620 ELM_SAFE_DEL(root);
621} 621}
622 622
623#include "elm_interface_atspi_accessible.eo.c" 623#include "efl_access.eo.c"