elm: rename Elm.Interface.Atspi_Action => Efl.Access.Action

Reviewers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D5166

9 files changed, 46 insertions, 47 deletions

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 975a35ce01..119668dcd6 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -29,7 +29,7 @@ elm_public_eolian_files = \
 	lib/elementary/efl_ui_image.eo \
 	lib/elementary/elm_index.eo \
 	lib/elementary/elm_interface_atspi_accessible.eo \
-	lib/elementary/elm_interface_atspi_action.eo \
+	lib/elementary/efl_access_action.eo \
 	lib/elementary/efl_access_component.eo \
 	lib/elementary/elm_interface_atspi_text_editable.eo \
 	lib/elementary/efl_access_image.eo \
@@ -612,7 +612,7 @@ lib_elementary_libelementary_la_SOURCES = \
 	lib/elementary/efl_ui_image.c \
 	lib/elementary/elm_index.c \
 	lib/elementary/elm_interface_atspi_accessible.c \
-	lib/elementary/elm_interface_atspi_action.c \
+	lib/elementary/efl_access_action.c \
 	lib/elementary/efl_access_component.c \
 	lib/elementary/elm_interface_atspi_text_editable.c \
 	lib/elementary/efl_access_image.c \
diff --git a/src/lib/elementary/elm_interface_atspi_action.c b/src/lib/elementary/efl_access_action.c
index 551f1cadb6..92b62f8b9f 100644
--- a/src/lib/elementary/elm_interface_atspi_action.c
+++ b/src/lib/elementary/efl_access_action.c
@@ -2,22 +2,22 @@
   #include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED
+#define EFL_ACCESS_ACTION_PROTECTED
 
 #include <Elementary.h>
 #include "elm_widget.h"
 #include "elm_priv.h"
 
 EOLIAN const char *
-_elm_interface_atspi_action_localized_name_get(Eo *obj, void *pd EINA_UNUSED, int id)
+_efl_access_action_localized_name_get(Eo *obj, void *pd EINA_UNUSED, int id)
 {
    const char *ret = NULL;
 
-   ret = elm_interface_atspi_action_name_get(obj, id);
+   ret = efl_access_action_name_get(obj, id);
 #ifdef ENABLE_NLS
    ret = gettext(ret);
 #endif
    return ret;
 }
 
-#include "elm_interface_atspi_action.eo.c"
+#include "efl_access_action.eo.c"
diff --git a/src/lib/elementary/elm_interface_atspi_action.eo b/src/lib/elementary/efl_access_action.eo
index 9cdb190c6a..577464cc93 100644
--- a/src/lib/elementary/elm_interface_atspi_action.eo
+++ b/src/lib/elementary/efl_access_action.eo
@@ -1,7 +1,6 @@
-mixin Elm.Interface.Atspi_Action ()
+mixin Efl.Access.Action ()
 {
-   [[AT-SPI action mixin]]
-   eo_prefix: elm_interface_atspi_action;
+   [[Accessible action mixin]]
    data: null;
    methods {
       @property name @protected @pure_virtual {
diff --git a/src/lib/elementary/elementary_js.cc b/src/lib/elementary/elementary_js.cc
index 1d3d165384..93744c8363 100644
--- a/src/lib/elementary/elementary_js.cc
+++ b/src/lib/elementary/elementary_js.cc
@@ -36,7 +36,7 @@
 
 EAPI void register_elm_atspi_app_object(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_accessible(v8::Handle<v8::Object> global, v8::Isolate* isolate);
-EAPI void register_elm_interface_atspi_action(v8::Handle<v8::Object> global, v8::Isolate* isolate);
+EAPI void register_efl_access_action(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_efl_access_component(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_text_editable(v8::Handle<v8::Object> global, v8::Isolate* isolate);
 EAPI void register_elm_interface_atspi_image(v8::Handle<v8::Object> global, v8::Isolate* isolate);
@@ -201,7 +201,7 @@ void init(v8::Handle<v8::Object> exports)
       elm::register_image(exports, v8::Isolate::GetCurrent());
       elm::register_index(exports, v8::Isolate::GetCurrent());
       ::register_elm_interface_atspi_accessible(exports, v8::Isolate::GetCurrent());
-      ::register_elm_interface_atspi_action(exports, v8::Isolate::GetCurrent());
+      ::register_efl_access_action(exports, v8::Isolate::GetCurrent());
       ::register_efl_access_component(exports, v8::Isolate::GetCurrent());
       ::register_elm_interface_atspi_text_editable(exports, v8::Isolate::GetCurrent());
       ::register_elm_interface_atspi_image(exports, v8::Isolate::GetCurrent());
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index a00d009c8a..56b27c24f2 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -4,7 +4,7 @@
 
 #define EFL_ACCESS_COMPONENT_PROTECTED
 #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
-#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED
+#define EFL_ACCESS_ACTION_PROTECTED
 #define EFL_ACCESS_VALUE_PROTECTED
 #define EFL_ACCESS_IMAGE_PROTECTED
 #define EFL_ACCESS_SELECTION_PROTECTED
@@ -1042,7 +1042,7 @@ _action_description_get(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    int idx;
    Eldbus_Message *ret;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_ACTION_MIXIN, msg);
 
    if (!eldbus_message_arguments_get(msg, "i", &idx))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -1050,7 +1050,7 @@ _action_description_get(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   description = elm_interface_atspi_action_description_get(obj, idx);
+   description = efl_access_action_description_get(obj, idx);
    description = description ? description : "";
    eldbus_message_arguments_append(ret, "s", description);
 
@@ -1066,7 +1066,7 @@ _action_name_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
    int idx;
    Eldbus_Message *ret;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_ACTION_MIXIN, msg);
 
    if (!eldbus_message_arguments_get(msg, "i", &idx))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -1074,7 +1074,7 @@ _action_name_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   name = elm_interface_atspi_action_name_get(obj, idx);
+   name = efl_access_action_name_get(obj, idx);
    name = name ? name : "";
    eldbus_message_arguments_append(ret, "s", name);
 
@@ -1090,7 +1090,7 @@ _action_localized_name_get(const Eldbus_Service_Interface *iface, const Eldbus_M
    int idx;
    Eldbus_Message *ret;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_ACTION_MIXIN, msg);
 
    if (!eldbus_message_arguments_get(msg, "i", &idx))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -1098,7 +1098,7 @@ _action_localized_name_get(const Eldbus_Service_Interface *iface, const Eldbus_M
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   name = elm_interface_atspi_action_localized_name_get(obj, idx);
+   name = efl_access_action_localized_name_get(obj, idx);
    name = name ? name : "";
    eldbus_message_arguments_append(ret, "s", name);
 
@@ -1115,7 +1115,7 @@ _action_key_binding_get(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    int idx;
    Eldbus_Message *ret;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_ACTION_MIXIN, msg);
 
    if (!eldbus_message_arguments_get(msg, "i", &idx))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -1123,7 +1123,7 @@ _action_key_binding_get(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   key = elm_interface_atspi_action_keybinding_get(obj, idx);
+   key = efl_access_action_keybinding_get(obj, idx);
    eldbus_message_arguments_append(ret, "s", key ? key : "");
    if (key) free(key);
 
@@ -1140,7 +1140,7 @@ _action_actions_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
    Eldbus_Message *ret;
    Eldbus_Message_Iter *iter, *iter_array = NULL;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_ACTION_MIXIN, msg);
 
    ret = eldbus_message_method_return_new(msg);
    if (!ret) goto error;
@@ -1151,7 +1151,7 @@ _action_actions_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
    iter_array = eldbus_message_iter_container_new(iter, 'a', "sss");
    if (!iter_array) goto error;
 
-   actions = elm_interface_atspi_action_actions_get(obj);
+   actions = efl_access_action_actions_get(obj);
 
    int id = 0;
    EINA_LIST_FREE(actions, action)
@@ -1159,8 +1159,8 @@ _action_actions_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
         const char *descr;
         char *key;
 
-        key = elm_interface_atspi_action_keybinding_get(obj, id);
-        descr = elm_interface_atspi_action_description_get(obj, id);
+        key = efl_access_action_keybinding_get(obj, id);
+        descr = efl_access_action_description_get(obj, id);
         descr = descr ? descr : "";
         eldbus_message_iter_arguments_append(iter_array, "sss", action, descr, key ? key : "");
         if (key) free(key);
@@ -1184,7 +1184,7 @@ _action_action_do(const Eldbus_Service_Interface *iface, const Eldbus_Message *m
    Eldbus_Message *ret;
    Eina_Bool result;
 
-   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN, msg);
+   ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_ACTION_MIXIN, msg);
 
    if (!eldbus_message_arguments_get(msg, "i", &idx))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -1192,7 +1192,7 @@ _action_action_do(const Eldbus_Service_Interface *iface, const Eldbus_Message *m
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   result = elm_interface_atspi_action_do(obj, idx);
+   result = efl_access_action_do(obj, idx);
    eldbus_message_arguments_append(ret, "b", result);
 
    return ret;
@@ -2142,11 +2142,11 @@ _action_property_get(const Eldbus_Service_Interface *interface, const char *prop
    Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
    Eo *obj = _bridge_object_from_path(bridge, obj_path);
 
-   ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN, request_msg, error);
+   ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_ACTION_MIXIN, request_msg, error);
 
    if (!strcmp(property, "NActions"))
      {
-        actions = elm_interface_atspi_action_actions_get(obj);
+        actions = efl_access_action_actions_get(obj);
         eldbus_message_iter_basic_append(iter, 'i', eina_list_count(actions));
         eina_list_free(actions);
         return EINA_TRUE;
@@ -2500,7 +2500,7 @@ _collection_iter_match_rule_get(Eldbus_Message_Iter *iter, struct collection_mat
      {
         const Efl_Class *class = NULL;
         if (!strcmp(ifc_name, "action"))
-          class = ELM_INTERFACE_ATSPI_ACTION_MIXIN;
+          class = EFL_ACCESS_ACTION_MIXIN;
         else if (!strcmp(ifc_name, "component"))
           class = EFL_ACCESS_COMPONENT_MIXIN;
         else if (!strcmp(ifc_name, "editabletext"))
@@ -3120,7 +3120,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
        eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE);
        eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION);
     }
-  if (efl_isa(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN))
+  if (efl_isa(obj, EFL_ACCESS_ACTION_MIXIN))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACTION);
   if (efl_isa(obj, ELM_ATSPI_APP_OBJECT_CLASS))
     eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_APPLICATION);
diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.c b/src/lib/elementary/elm_interface_atspi_widget_action.c
index 05b895dcdd..66f3891a13 100644
--- a/src/lib/elementary/elm_interface_atspi_widget_action.c
+++ b/src/lib/elementary/elm_interface_atspi_widget_action.c
@@ -2,7 +2,7 @@
   #include "elementary_config.h"
 #endif
 
-#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED
+#define EFL_ACCESS_ACTION_PROTECTED
 #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
 
 #include <Elementary.h>
@@ -12,7 +12,7 @@
 extern Eina_Hash *_elm_key_bindings;
 
 EOLIAN static Eina_Bool
-_elm_interface_atspi_widget_action_elm_interface_atspi_action_action_do(Eo *obj, void *pd EINA_UNUSED, int id)
+_elm_interface_atspi_widget_action_efl_access_action_action_do(Eo *obj, void *pd EINA_UNUSED, int id)
 {
    const Elm_Atspi_Action *actions = NULL;
    const char *param;
@@ -40,7 +40,7 @@ _elm_interface_atspi_widget_action_elm_interface_atspi_action_action_do(Eo *obj,
 }
 
 EOLIAN static char*
-_elm_interface_atspi_widget_action_elm_interface_atspi_action_keybinding_get(Eo *obj, void *pd EINA_UNUSED, int id)
+_elm_interface_atspi_widget_action_efl_access_action_keybinding_get(Eo *obj, void *pd EINA_UNUSED, int id)
 {
    const Elm_Atspi_Action *actions = NULL;
    Eina_List *l1, *binding_list;
@@ -93,7 +93,7 @@ _elm_interface_atspi_widget_action_elm_interface_atspi_action_keybinding_get(Eo
 }
 
 EOLIAN static const char *
-_elm_interface_atspi_widget_action_elm_interface_atspi_action_name_get(Eo *obj, void *pd EINA_UNUSED, int id)
+_elm_interface_atspi_widget_action_efl_access_action_name_get(Eo *obj, void *pd EINA_UNUSED, int id)
 {
    const Elm_Atspi_Action *actions = NULL;
    int tmp = 0;
@@ -110,19 +110,19 @@ _elm_interface_atspi_widget_action_elm_interface_atspi_action_name_get(Eo *obj,
 }
 
 EOLIAN static Eina_Bool
-_elm_interface_atspi_widget_action_elm_interface_atspi_action_description_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED, const char *description EINA_UNUSED)
+_elm_interface_atspi_widget_action_efl_access_action_description_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED, const char *description EINA_UNUSED)
 {
    return EINA_FALSE;
 }
 
 EOLIAN static const char *
-_elm_interface_atspi_widget_action_elm_interface_atspi_action_description_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED)
+_elm_interface_atspi_widget_action_efl_access_action_description_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED)
 {
    return NULL;
 }
 
 EOLIAN static Eina_List*
-_elm_interface_atspi_widget_action_elm_interface_atspi_action_actions_get(Eo *obj, void *pd EINA_UNUSED)
+_elm_interface_atspi_widget_action_efl_access_action_actions_get(Eo *obj, void *pd EINA_UNUSED)
 {
    const Elm_Atspi_Action *actions = NULL;
    Eina_List *ret = NULL;
diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.eo b/src/lib/elementary/elm_interface_atspi_widget_action.eo
index 6919e4924a..061d7e78e8 100644
--- a/src/lib/elementary/elm_interface_atspi_widget_action.eo
+++ b/src/lib/elementary/elm_interface_atspi_widget_action.eo
@@ -1,6 +1,6 @@
 type Elm_Atspi_Action: __undefined_type; [[Elementary AT-SPI action type]]
 
-mixin Elm.Interface.Atspi_Widget_Action (Elm.Interface.Atspi_Action)
+mixin Elm.Interface.Atspi_Widget_Action (Efl.Access.Action)
 {
    [[AT-SPI widget action mixin]]
    eo_prefix: elm_interface_atspi_widget_action;
@@ -16,10 +16,10 @@ mixin Elm.Interface.Atspi_Widget_Action (Elm.Interface.Atspi_Action)
       }
    }
    implements {
-      Elm.Interface.Atspi_Action.action_do;
-      Elm.Interface.Atspi_Action.keybinding_get;
-      Elm.Interface.Atspi_Action.name { get; }
-      Elm.Interface.Atspi_Action.description { get; set; }
-      Elm.Interface.Atspi_Action.actions { get; }
+      Efl.Access.Action.action_do;
+      Efl.Access.Action.keybinding_get;
+      Efl.Access.Action.name { get; }
+      Efl.Access.Action.description { get; set; }
+      Efl.Access.Action.actions { get; }
    }
 }
diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h
index f0d730803f..32ae95ea5d 100644
--- a/src/lib/elementary/elm_interfaces.h
+++ b/src/lib/elementary/elm_interfaces.h
@@ -6,7 +6,7 @@
 #ifdef EFL_EO_API_SUPPORT
 #include "elm_interface_scrollable.h"
 #ifdef EFL_BETA_API_SUPPORT
-#include "elm_interface_atspi_action.eo.h"
+#include "efl_access_action.eo.h"
 #include "efl_access_component.eo.h"
 #include "elm_interface_atspi_text_editable.eo.h"
 #include "efl_access_image.eo.h"
@@ -16,7 +16,7 @@
 #endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #ifdef EFL_BETA_API_SUPPORT
-#include "elm_interface_atspi_action.eo.legacy.h"
+#include "efl_access_action.eo.legacy.h"
 #include "efl_access_component.eo.legacy.h"
 #include "elm_interface_atspi_text_editable.eo.legacy.h"
 #include "efl_access_image.eo.legacy.h"
diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c
index 16c72591a1..a07abc41c2 100644
--- a/src/tests/elementary/elm_test_button.c
+++ b/src/tests/elementary/elm_test_button.c
@@ -4,7 +4,7 @@
 
 #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
 #define EFL_ACCESS_COMPONENT_PROTECTED
-#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED
+#define EFL_ACCESS_ACTION_PROTECTED
 #include <Elementary.h>
 #include "elm_suite.h"
 
@@ -36,7 +36,7 @@ START_TEST (elm_atspi_interfaces_check)
 
    ck_assert(efl_isa(button, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN));
    ck_assert(efl_isa(button, EFL_ACCESS_COMPONENT_MIXIN));
-   ck_assert(efl_isa(button, ELM_INTERFACE_ATSPI_ACTION_MIXIN));
+   ck_assert(efl_isa(button, EFL_ACCESS_ACTION_MIXIN));
 
    elm_shutdown();
 }