jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9f7786544ecf2d3ec8a88aa756433ee8aedb3190
commit 9f7786544ecf2d3ec8a88aa756433ee8aedb3190 Author: Lukasz Stanislawski <[email protected]> Date: Tue Sep 12 15:36:24 2017 +0900 elm: rename Elm.Interface.Atspi.Value => Efl.Access.Value Reviewers: jpeg, cedric, stanluk Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5161 --- src/Makefile_Elementary.am | 4 ++-- ...lm_interface_atspi_value.c => efl_access_value.c} | 4 ++-- ..._interface_atspi_value.eo => efl_access_value.eo} | 5 ++--- src/lib/elementary/efl_ui_slider.c | 10 +++++----- src/lib/elementary/efl_ui_slider.eo | 8 ++++---- src/lib/elementary/elm_atspi_bridge.c | 20 ++++++++++---------- src/lib/elementary/elm_interface_atspi_selection.c | 2 +- src/lib/elementary/elm_interfaces.h | 4 ++-- src/lib/elementary/elm_spinner.c | 10 +++++----- src/lib/elementary/elm_spinner.eo | 8 ++++---- 10 files changed, 37 insertions(+), 38 deletions(-) diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index ad50ab466b..514ec64b87 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -35,7 +35,7 @@ elm_public_eolian_files = \ lib/elementary/elm_interface_atspi_image.eo \ lib/elementary/elm_interface_atspi_selection.eo \ lib/elementary/elm_interface_atspi_text.eo \ - lib/elementary/elm_interface_atspi_value.eo \ + lib/elementary/efl_access_value.eo \ lib/elementary/elm_interface_atspi_widget_action.eo \ lib/elementary/elm_interface_atspi_window.eo \ lib/elementary/elm_interface_fileselector.eo \ @@ -616,7 +616,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_interface_atspi_image.c \ lib/elementary/elm_interface_atspi_selection.c \ lib/elementary/elm_interface_atspi_text.c \ - lib/elementary/elm_interface_atspi_value.c \ + lib/elementary/efl_access_value.c \ lib/elementary/elm_interface_atspi_widget_action.c \ lib/elementary/elm_interface_atspi_window.c \ lib/elementary/elm_interface_fileselector.c \ diff --git a/src/lib/elementary/elm_interface_atspi_value.c b/src/lib/elementary/efl_access_value.c similarity index 60% rename from src/lib/elementary/elm_interface_atspi_value.c rename to src/lib/elementary/efl_access_value.c index f51a0a9a43..76e52864a8 100644 --- a/src/lib/elementary/elm_interface_atspi_value.c +++ b/src/lib/elementary/efl_access_value.c @@ -2,10 +2,10 @@ #include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED +#define EFL_ACCESS_VALUE_PROTECTED #include <Elementary.h> #include "elm_widget.h" #include "elm_priv.h" -#include "elm_interface_atspi_value.eo.c" +#include "efl_access_value.eo.c" diff --git a/src/lib/elementary/elm_interface_atspi_value.eo b/src/lib/elementary/efl_access_value.eo similarity index 89% rename from src/lib/elementary/elm_interface_atspi_value.eo rename to src/lib/elementary/efl_access_value.eo index ece76937a9..c6c344496b 100644 --- a/src/lib/elementary/elm_interface_atspi_value.eo +++ b/src/lib/elementary/efl_access_value.eo @@ -1,7 +1,6 @@ -interface Elm.Interface.Atspi.Value () +interface Efl.Access.Value () { - [[Elementary AT-SPI value interface]] - eo_prefix: elm_interface_atspi_value; + [[Elementary Access value interface]] methods { @property value_and_text @protected { [[Value and text property]] diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index 4382bdc43c..9279ed9bda 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -4,7 +4,7 @@ #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED +#define EFL_ACCESS_VALUE_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -1500,14 +1500,14 @@ _efl_ui_slider_class_constructor(Efl_Class *klass) // A11Y Accessibility EOLIAN static void -_efl_ui_slider_elm_interface_atspi_value_value_and_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *value, const char **text) +_efl_ui_slider_efl_access_value_value_and_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *value, const char **text) { if (value) *value = sd->val; if (text) *text = NULL; } EOLIAN static Eina_Bool -_efl_ui_slider_elm_interface_atspi_value_value_and_text_set(Eo *obj, Efl_Ui_Slider_Data *sd, double value, const char *text EINA_UNUSED) +_efl_ui_slider_efl_access_value_value_and_text_set(Eo *obj, Efl_Ui_Slider_Data *sd, double value, const char *text EINA_UNUSED) { double oldval = sd->val; @@ -1525,7 +1525,7 @@ _efl_ui_slider_elm_interface_atspi_value_value_and_text_set(Eo *obj, Efl_Ui_Slid } EOLIAN static void -_efl_ui_slider_elm_interface_atspi_value_range_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *lower, double *upper, const char **descr) +_efl_ui_slider_efl_access_value_range_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *lower, double *upper, const char **descr) { if (lower) *lower = sd->val_min; if (upper) *upper = sd->val_max; @@ -1533,7 +1533,7 @@ _efl_ui_slider_elm_interface_atspi_value_range_get(Eo *obj EINA_UNUSED, Efl_Ui_S } EOLIAN static double -_efl_ui_slider_elm_interface_atspi_value_increment_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) +_efl_ui_slider_efl_access_value_increment_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) { return sd->step; } diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo index 5aae88fb00..fafaf2ba0e 100644 --- a/src/lib/elementary/efl_ui_slider.eo +++ b/src/lib/elementary/efl_ui_slider.eo @@ -2,7 +2,7 @@ type slider_func_type: __undefined_type; [[Elementary slider function type]] type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]] class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction, - Elm.Interface.Atspi.Value, + Efl.Access.Value, Elm.Interface.Atspi_Widget_Action) { [[Elementary slider class]] @@ -128,9 +128,9 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction, Efl.Ui.Range.range_interval_enabled { get; set; } Efl.Ui.Range.range_interval { get; set; } Efl.Ui.Direction.direction { get; set; } - Elm.Interface.Atspi.Value.value_and_text { get; set; } - Elm.Interface.Atspi.Value.range { get; } - Elm.Interface.Atspi.Value.increment { get; } + Efl.Access.Value.value_and_text { get; set; } + Efl.Access.Value.range { get; } + Efl.Access.Value.increment { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } Efl.Part.part; } diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index 7d004cd23e..07c6462fcf 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c @@ -5,7 +5,7 @@ #define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #define ELM_INTERFACE_ATSPI_ACTION_PROTECTED -#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED +#define EFL_ACCESS_VALUE_PROTECTED #define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED #define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED #define ELM_INTERFACE_ATSPI_TEXT_PROTECTED @@ -2164,7 +2164,7 @@ _value_properties_set(const Eldbus_Service_Interface *interface, const char *pro Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_VALUE_INTERFACE, request_msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_VALUE_INTERFACE, request_msg); if (!eldbus_message_iter_arguments_get(iter, "d", &value)) { @@ -2173,7 +2173,7 @@ _value_properties_set(const Eldbus_Service_Interface *interface, const char *pro if (!strcmp(property, "CurrentValue")) { - ret = elm_interface_atspi_value_and_text_set(obj, value, NULL); + ret = efl_access_value_and_text_set(obj, value, NULL); Eldbus_Message *answer = eldbus_message_method_return_new(request_msg); eldbus_message_arguments_append(answer, "b", ret); return answer; @@ -2192,29 +2192,29 @@ _value_properties_get(const Eldbus_Service_Interface *interface, const char *pro Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_VALUE_INTERFACE, request_msg, error); + ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_VALUE_INTERFACE, request_msg, error); if (!strcmp(property, "CurrentValue")) { - elm_interface_atspi_value_and_text_get(obj, &value, NULL); + efl_access_value_and_text_get(obj, &value, NULL); eldbus_message_iter_basic_append(iter, 'd', value); return EINA_TRUE; } if (!strcmp(property, "MinimumValue")) { - elm_interface_atspi_value_range_get(obj, &value, NULL, NULL); + efl_access_value_range_get(obj, &value, NULL, NULL); eldbus_message_iter_basic_append(iter, 'd', value); return EINA_TRUE; } if (!strcmp(property, "MaximumValue")) { - elm_interface_atspi_value_range_get(obj, NULL, &value, NULL); + efl_access_value_range_get(obj, NULL, &value, NULL); eldbus_message_iter_basic_append(iter, 'd', value); return EINA_TRUE; } if (!strcmp(property, "MinimumIncrement")) { - value = elm_interface_atspi_value_increment_get(obj); + value = efl_access_value_increment_get(obj); eldbus_message_iter_basic_append(iter, 'd', value); return EINA_TRUE; } @@ -2510,7 +2510,7 @@ _collection_iter_match_rule_get(Eldbus_Message_Iter *iter, struct collection_mat else if (!strcmp(ifc_name, "image")) class = ELM_INTERFACE_ATSPI_SELECTION_INTERFACE; else if (!strcmp(ifc_name, "value")) - class = ELM_INTERFACE_ATSPI_VALUE_INTERFACE; + class = EFL_ACCESS_VALUE_INTERFACE; if (class) rule->ifaces = eina_list_append(rule->ifaces, class); @@ -3134,7 +3134,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION); if (efl_isa(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_TEXT); - if (efl_isa(obj, ELM_INTERFACE_ATSPI_VALUE_INTERFACE)) + if (efl_isa(obj, EFL_ACCESS_VALUE_INTERFACE)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_VALUE); eldbus_message_iter_container_close(iter, iter_array); diff --git a/src/lib/elementary/elm_interface_atspi_selection.c b/src/lib/elementary/elm_interface_atspi_selection.c index 5e2c1e70f5..8129ae6b28 100644 --- a/src/lib/elementary/elm_interface_atspi_selection.c +++ b/src/lib/elementary/elm_interface_atspi_selection.c @@ -2,7 +2,7 @@ #include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED +#define EFL_ACCESS_VALUE_PROTECTED #include <Elementary.h> #include "elm_widget.h" diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h index 58ce5c0bae..2bc3ad7ad6 100644 --- a/src/lib/elementary/elm_interfaces.h +++ b/src/lib/elementary/elm_interfaces.h @@ -11,7 +11,7 @@ #include "elm_interface_atspi_text_editable.eo.h" #include "elm_interface_atspi_image.eo.h" #include "elm_interface_atspi_selection.eo.h" -#include "elm_interface_atspi_value.eo.h" +#include "efl_access_value.eo.h" #endif #endif #ifndef EFL_NOLEGACY_API_SUPPORT @@ -21,6 +21,6 @@ #include "elm_interface_atspi_text_editable.eo.legacy.h" #include "elm_interface_atspi_image.eo.legacy.h" #include "elm_interface_atspi_selection.eo.legacy.h" -#include "elm_interface_atspi_value.eo.legacy.h" +#include "efl_access_value.eo.legacy.h" #endif #endif diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index d6f0591288..f83b19a6ac 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -3,7 +3,7 @@ #endif #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED +#define EFL_ACCESS_VALUE_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #include <Elementary.h> @@ -1719,14 +1719,14 @@ _elm_spinner_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUS // A11Y Accessibility EOLIAN static void -_elm_spinner_elm_interface_atspi_value_value_and_text_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *value, const char **text) +_elm_spinner_efl_access_value_value_and_text_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *value, const char **text) { if (value) *value = sd->val; if (text) *text = NULL; } EOLIAN static Eina_Bool -_elm_spinner_elm_interface_atspi_value_value_and_text_set(Eo *obj, Elm_Spinner_Data *sd, double value, const char *text EINA_UNUSED) +_elm_spinner_efl_access_value_value_and_text_set(Eo *obj, Elm_Spinner_Data *sd, double value, const char *text EINA_UNUSED) { if (sd->val_min > value) return EINA_FALSE; if (sd->val_max < value) return EINA_FALSE; @@ -1738,7 +1738,7 @@ _elm_spinner_elm_interface_atspi_value_value_and_text_set(Eo *obj, Elm_Spinner_D } EOLIAN static void -_elm_spinner_elm_interface_atspi_value_range_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *lower, double *upper, const char **descr) +_elm_spinner_efl_access_value_range_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *lower, double *upper, const char **descr) { if (lower) *lower = sd->val_min; if (upper) *upper = sd->val_max; @@ -1746,7 +1746,7 @@ _elm_spinner_elm_interface_atspi_value_range_get(Eo *obj EINA_UNUSED, Elm_Spinne } EOLIAN static double -_elm_spinner_elm_interface_atspi_value_increment_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) +_elm_spinner_efl_access_value_increment_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) { return sd->step; } diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo index f9454bdbae..78973c53ae 100644 --- a/src/lib/elementary/elm_spinner.eo +++ b/src/lib/elementary/elm_spinner.eo @@ -1,5 +1,5 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Spin, - Elm.Interface.Atspi.Value, Elm.Interface.Atspi_Widget_Action) + Efl.Access.Value, Elm.Interface.Atspi_Widget_Action) { [[Elementary spinner class]] legacy_prefix: elm_spinner; @@ -159,9 +159,9 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Spin, Efl.Ui.Spin.value { get; set; } Efl.Ui.Spin.interval { get; set; } Elm.Interface.Atspi_Accessible.name { get; } - Elm.Interface.Atspi.Value.value_and_text { get; set; } - Elm.Interface.Atspi.Value.range { get; } - Elm.Interface.Atspi.Value.increment { get; } + Efl.Access.Value.value_and_text { get; set; } + Efl.Access.Value.range { get; } + Efl.Access.Value.increment { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } events { --
