elm: remove access type API

13 files changed, 4 insertions, 117 deletions

diff --git a/src/lib/elementary/efl_access.c b/src/lib/elementary/efl_access.c
index 2ed5dde41c..3f620c7c96 100644
--- a/src/lib/elementary/efl_access.c
+++ b/src/lib/elementary/efl_access.c
@@ -130,7 +130,6 @@ struct _Efl_Access_Data
    const char    *translation_domain;
    Efl_Access_Role role;
    Efl_Access_Reading_Info_Type reading_info;
-   Efl_Access_Type type: 2;
 };
 
 typedef struct _Efl_Access_Data Efl_Access_Data;
@@ -170,18 +169,7 @@ _efl_access_index_in_parent_get(Eo *obj, Efl_Access_Data *pd EINA_UNUSED)
 EOLIAN static Efl_Access *
 _efl_access_parent_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
 {
-   Efl_Access_Type type;
-   Eo *parent = obj;
-
-   do {
-      parent = efl_parent_get(obj);
-      if (efl_isa(parent, EFL_ACCESS_MIXIN))
-        {
-           type = efl_access_type_get(parent);
-           if (type != EFL_ACCESS_TYPE_SKIPPED) break;
-        }
-   } while (parent);
-
+   Eo *parent = efl_parent_get(obj);
    return efl_isa(parent, EFL_ACCESS_MIXIN) ? parent : NULL;
 }
 
@@ -407,7 +395,6 @@ _efl_access_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessib
 {
    Eina_List *l;
    Efl_Access_Event_Handler *hdl;
-   Efl_Access_Type type;
 
    if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_MIXIN))
      {
@@ -415,18 +402,6 @@ _efl_access_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessib
         return;
      }
 
-   type = efl_access_type_get(accessible);
-   if (type != EFL_ACCESS_TYPE_REGULAR)
-     return;
-
-   if (event == EFL_ACCESS_EVENT_CHILDREN_CHANGED)
-     {
-        Efl_Access_Event_Children_Changed_Data *event_data = event_info;
-        type = efl_access_type_get(event_data->child);
-        if (type != EFL_ACCESS_TYPE_REGULAR)
-          return;
-     }
-
    Efl_Event ev;
    ev.object = accessible;
    ev.desc = event;
@@ -661,35 +636,6 @@ _efl_access_root_get(Eo *class EINA_UNUSED, void *pd EINA_UNUSED)
    return root;
 }
 
-EOLIAN Efl_Access_Type
-_efl_access_type_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
-{
-   return pd->type;
-}
-
-EOLIAN void
-_efl_access_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Type val)
-{
-   Efl_Access *parent;
-   if (val == pd->type)
-     return;
-
-   parent = efl_access_parent_get(obj);
-
-   switch (val)
-     {
-      case EFL_ACCESS_TYPE_DISABLED:
-      case EFL_ACCESS_TYPE_SKIPPED:
-         if (parent) efl_access_children_changed_del_signal_emit(parent, obj);
-         efl_access_removed(obj);
-         break;
-      case EFL_ACCESS_TYPE_REGULAR:
-         if (parent) efl_access_children_changed_added_signal_emit(parent, obj);
-         efl_access_added(obj);
-     }
-   pd->type = val;
-}
-
 EOLIAN void
 _efl_access_efl_object_destructor(Eo *obj, Efl_Access_Data *pd)
 {
diff --git a/src/lib/elementary/efl_access.eo b/src/lib/elementary/efl_access.eo
index d32be85faa..634e8fde3f 100644
--- a/src/lib/elementary/efl_access.eo
+++ b/src/lib/elementary/efl_access.eo
@@ -1,14 +1,6 @@
 /* FIXME: This definitely shouldn't be here. */
 type Efl_Event_Cb: __undefined_type; [[Efl event callback type]]
 
-enum Efl.Access.Type
-{
-   [[Type of accessibility object]]
-   regular, [[default accessibile object]]
-   disabled, [[skip object and its children in accessibility hierarchy]]
-   skipped [[skip object in accessibility hierarchy]]
-}
-
 enum Efl.Access.Role
 {
    [[Describes the role of an object visible to Accessibility Clients.]]
@@ -415,16 +407,6 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
             domain: string; [[Translation domain]]
          }
       }
-      @property type @beta {
-           [[Type of accessibility object]]
-           get {
-           }
-           set {
-           }
-           values {
-               type: Efl.Access.Type; [[Object type]]
-           }
-      }
       relationship_append @beta {
          [[Defines the relationship between two accessible objects.
 
diff --git a/src/lib/elementary/efl_ui_bg.c b/src/lib/elementary/efl_ui_bg.c
index 79991a2179..c545d37990 100644
--- a/src/lib/elementary/efl_ui_bg.c
+++ b/src/lib/elementary/efl_ui_bg.c
@@ -132,7 +132,6 @@ _efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *_pd EINA_UNUSED)
 {
    obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
-   efl_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
 
    efl_ui_widget_focus_allow_set(obj, EINA_FALSE);
 
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 9274b5666b..24f2ca992e 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -161,7 +161,6 @@ _efl_ui_box_efl_object_constructor(Eo *obj, Efl_Ui_Box_Data *pd)
    obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
-   efl_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED);
    efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
 
    pd->align.h = 0.5;
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 1b3d8ce9ee..597e4caf27 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -302,7 +302,6 @@ _efl_ui_list_efl_canvas_group_group_add(Eo *obj, Efl_Ui_List_Data *pd)
 
    pd->mode = ELM_LIST_COMPRESS;
 
-   efl_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
    pd->pan_obj = efl_add(MY_PAN_CLASS, evas_object_evas_get(obj));
    pan_data = efl_data_scope_get(pd->pan_obj, MY_PAN_CLASS);
    pan_data->wobj = obj;
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c
index c5304f1246..d74bd7d8fb 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -753,8 +753,6 @@ _item_new(Efl_Ui_Multibuttonentry_Data *sd,
    ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item);
    VIEW(item) = elm_layout_add(obj);
 
-   efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_DISABLED);
-
    if (!elm_widget_element_update(obj, VIEW(item), PART_NAME_BUTTON))
      CRI("Failed to set layout!");
 
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 54945cb699..b1ebeddc04 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4358,7 +4358,6 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
                   efreet_desktop_free(d);
                }
           }
-        efl_access_type_set(sd->icon, EFL_ACCESS_TYPE_DISABLED);
      }
 
    edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon);
diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c
index b1d45c1960..19b9ac4ac5 100644
--- a/src/lib/elementary/elm_atspi_app_object.c
+++ b/src/lib/elementary/elm_atspi_app_object.c
@@ -33,12 +33,9 @@ _elm_atspi_app_object_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Atspi_App
 
    EINA_LIST_FOREACH(_elm_win_list, l, win)
      {
-        Efl_Access_Type type;
         if (!efl_isa(win, EFL_ACCESS_MIXIN))
           continue;
-        type = efl_access_type_get(win);
-        if (type == EFL_ACCESS_TYPE_REGULAR)
-          accs = eina_list_append(accs, win);
+        accs = eina_list_append(accs, win);
      }
 
    return accs;
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 6b4a8868d7..5cfeacc633 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -375,7 +375,6 @@ _elm_box_efl_object_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
    obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
-   efl_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED);
    efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
 
    return obj;
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 9a5631c76e..0929a26047 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -2312,7 +2312,6 @@ _item_new(Evas_Object *obj,
         evas_object_event_callback_add
           (it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb,
           obj);
-        efl_access_type_set(it->icon, EFL_ACCESS_TYPE_DISABLED);
         elm_widget_tree_unfocusable_set(it->icon, EINA_TRUE);
      }
    if (it->end)
@@ -2321,7 +2320,6 @@ _item_new(Evas_Object *obj,
         evas_object_event_callback_add
           (it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb,
           obj);
-        efl_access_type_set(it->end, EFL_ACCESS_TYPE_DISABLED);
         elm_widget_tree_unfocusable_set(it->end, EINA_TRUE);
      }
 
@@ -2391,7 +2389,6 @@ _elm_list_efl_canvas_group_group_add(Eo *obj, Elm_List_Data *priv)
    priv->box = elm_box_add(obj);
    evas_object_size_hint_weight_set(priv->box, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(priv->box, EVAS_HINT_FILL, 0.0);
-   efl_access_type_set(priv->box, EFL_ACCESS_TYPE_DISABLED);
 
    /* FIXME: change this ugly code path later */
    elm_widget_on_show_region_hook_set(priv->box, obj, _show_region_hook, NULL);
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 446f58e362..95cd8a796a 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -580,7 +580,6 @@ static void
 _item_obj_create(Elm_Menu_Item_Data *item)
 {
    VIEW(item) = elm_layout_add(WIDGET(item));
-   efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED);
    evas_object_size_hint_weight_set
      (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -604,7 +603,6 @@ static void
 _item_separator_obj_create(Elm_Menu_Item_Data *item)
 {
    VIEW(item) = elm_layout_add(WIDGET(item));
-   efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED);
    evas_object_size_hint_weight_set
      (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -627,9 +625,7 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
    char style[1024];
 
    item->submenu.location = elm_icon_add(sd->bx);
-   efl_access_type_set(item->submenu.location, EFL_ACCESS_TYPE_DISABLED);
    item->submenu.hv = hv = elm_hover_add(sd->bx);
-   efl_access_type_set(item->submenu.hv, EFL_ACCESS_TYPE_SKIPPED);
    efl_ui_mirrored_set(hv, EINA_FALSE);
    elm_hover_target_set(hv, item->submenu.location);
    elm_hover_parent_set(hv, sd->parent);
@@ -695,10 +691,8 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv)
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
    priv->location = elm_icon_add(obj);
-   efl_access_type_set(priv->location, EFL_ACCESS_TYPE_DISABLED);
 
    priv->hv = elm_hover_add(obj);
-   efl_access_type_set(priv->hv, EFL_ACCESS_TYPE_SKIPPED);
    efl_ui_mirrored_set(priv->hv, EINA_FALSE);
 
    elm_object_style_set(priv->hv, "menu/default");
@@ -706,7 +700,6 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv)
      (priv->hv, ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj);
 
    priv->bx = elm_box_add(obj);
-   efl_access_type_set(priv->bx, EFL_ACCESS_TYPE_SKIPPED);
    efl_ui_mirrored_set(priv->bx, EINA_FALSE);
    evas_object_size_hint_weight_set
      (priv->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -1115,7 +1108,6 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch
    Evas_Object *icon_obj;
 
    icon_obj = elm_icon_add(obj);
-   efl_access_type_set(icon_obj, EFL_ACCESS_TYPE_DISABLED);
    if (!icon_obj) return NULL;
 
    eo_item = efl_add(ELM_MENU_ITEM_CLASS, obj);
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index aa86ec8e06..e244418e3a 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -2398,7 +2398,6 @@ _item_new(Evas_Object *obj,
    VIEW(it) = elm_layout_add(obj);
    elm_widget_tree_unfocusable_set(VIEW(it), EINA_TRUE);
    evas_object_data_set(VIEW(it), "item", it);
-   efl_access_type_set(VIEW(it), EFL_ACCESS_TYPE_DISABLED);
 
    icon_obj = elm_icon_add(VIEW(it));
 
@@ -2786,7 +2785,6 @@ _elm_toolbar_efl_canvas_group_group_add(Eo *obj, Elm_Toolbar_Data *priv)
    else
      elm_object_signal_emit(priv->more, "elm,orient,horizontal", "elm");
 
-   efl_access_type_set(priv->more, EFL_ACCESS_TYPE_DISABLED);
    elm_widget_sub_object_add(obj, priv->more);
    evas_object_show(priv->more);
 
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index bf983bc8d9..c42b3df9c1 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -5308,38 +5308,20 @@ _elm_widget_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *
 {
    Eina_List *l, *accs = NULL;
    Evas_Object *widget;
-   Efl_Access_Type type;
 
    EINA_LIST_FOREACH(pd->subobjs, l, widget)
      {
         if (!elm_object_widget_check(widget)) continue;
         if (!efl_isa(widget, EFL_ACCESS_MIXIN)) continue;
-        type = efl_access_type_get(widget);
-        if (type == EFL_ACCESS_TYPE_DISABLED) continue;
-        if (type == EFL_ACCESS_TYPE_SKIPPED)
-          {
-             Eina_List *children;
-             children = efl_access_children_get(widget);
-             accs = eina_list_merge(accs, children);
-             continue;
-          }
         accs = eina_list_append(accs, widget);
      }
    return accs;
 }
 
 EOLIAN static Eo*
-_elm_widget_efl_access_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
+_elm_widget_efl_access_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd)
 {
-   Efl_Access_Type type;
-   Efl_Access *parent = obj;
-
-   do {
-        ELM_WIDGET_DATA_GET_OR_RETURN(parent, wd, NULL);
-        parent = wd->parent_obj;
-        type = efl_access_type_get(parent);
-   } while (parent && (type == EFL_ACCESS_TYPE_SKIPPED));
-
+   Efl_Access *parent = pd->parent_obj;
    return efl_isa(parent, EFL_ACCESS_MIXIN) ? parent : NULL;
 }