From 6760e05968a5f2939a484dd962ec48d44100dd0b Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Thu, 12 May 2016 11:43:52 +0100 Subject: [PATCH] Elm interface atspi editable text: Fix namespacing. --- src/Makefile_Elementary.am | 4 +-- src/lib/elementary/Makefile.am | 4 +-- src/lib/elementary/elementary_js.cc | 4 +-- src/lib/elementary/elm_atspi_bridge.c | 30 +++++++++---------- src/lib/elementary/elm_entry.c | 14 ++++----- src/lib/elementary/elm_entry.eo | 14 ++++----- ....c => elm_interface_atspi_text_editable.c} | 4 +-- ...o => elm_interface_atspi_text_editable.eo} | 4 +-- src/lib/elementary/elm_interfaces.h | 4 +-- 9 files changed, 41 insertions(+), 41 deletions(-) rename src/lib/elementary/{elm_interface_atspi_editable_text.c => elm_interface_atspi_text_editable.c} (56%) rename src/lib/elementary/{elm_interface_atspi_editable_text.eo => elm_interface_atspi_text_editable.eo} (90%) diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 95b833409b..83dac45cb1 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -44,7 +44,7 @@ elm_public_eolian_files = \ lib/elementary/elm_interface_atspi_accessible.eo \ lib/elementary/elm_interface_atspi_action.eo \ lib/elementary/elm_interface_atspi_component.eo \ - lib/elementary/elm_interface_atspi_editable_text.eo \ + lib/elementary/elm_interface_atspi_text_editable.eo \ lib/elementary/elm_interface_atspi_image.eo \ lib/elementary/elm_interface_atspi_selection.eo \ lib/elementary/elm_interface_atspi_text.eo \ @@ -573,7 +573,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_interface_atspi_accessible.c \ lib/elementary/elm_interface_atspi_action.c \ lib/elementary/elm_interface_atspi_component.c \ - lib/elementary/elm_interface_atspi_editable_text.c \ + lib/elementary/elm_interface_atspi_text_editable.c \ lib/elementary/elm_interface_atspi_image.c \ lib/elementary/elm_interface_atspi_selection.c \ lib/elementary/elm_interface_atspi_text.c \ diff --git a/src/lib/elementary/Makefile.am b/src/lib/elementary/Makefile.am index 9138607f80..837229794a 100644 --- a/src/lib/elementary/Makefile.am +++ b/src/lib/elementary/Makefile.am @@ -49,7 +49,7 @@ elm_eolian_files = \ elm_interface_atspi_accessible.eo \ elm_interface_atspi_action.eo \ elm_interface_atspi_component.eo \ - elm_interface_atspi_editable_text.eo \ + elm_interface_atspi_text_editable.eo \ elm_interface_atspi_image.eo \ elm_interface_atspi_selection.eo \ elm_interface_atspi_text.eo \ @@ -559,7 +559,7 @@ libelementary_la_SOURCES = \ elm_interface_atspi_accessible.c \ elm_interface_atspi_action.c \ elm_interface_atspi_component.c \ - elm_interface_atspi_editable_text.c \ + elm_interface_atspi_text_editable.c \ elm_interface_atspi_image.c \ elm_interface_atspi_selection.c \ elm_interface_atspi_text.c \ diff --git a/src/lib/elementary/elementary_js.cc b/src/lib/elementary/elementary_js.cc index 7837adca67..268555afef 100644 --- a/src/lib/elementary/elementary_js.cc +++ b/src/lib/elementary/elementary_js.cc @@ -42,7 +42,7 @@ EAPI void register_elm_atspi_app_object(v8::Handle global, v8::Isola EAPI void register_elm_interface_atspi_accessible(v8::Handle global, v8::Isolate* isolate); EAPI void register_elm_interface_atspi_action(v8::Handle global, v8::Isolate* isolate); EAPI void register_elm_interface_atspi_component(v8::Handle global, v8::Isolate* isolate); -EAPI void register_elm_interface_atspi_editable_text(v8::Handle global, v8::Isolate* isolate); +EAPI void register_elm_interface_atspi_text_editable(v8::Handle global, v8::Isolate* isolate); EAPI void register_elm_interface_atspi_image(v8::Handle global, v8::Isolate* isolate); EAPI void register_elm_interface_atspi_selection(v8::Handle global, v8::Isolate* isolate); EAPI void register_elm_interface_atspi_text(v8::Handle global, v8::Isolate* isolate); @@ -211,7 +211,7 @@ void init(v8::Handle exports) ::register_elm_interface_atspi_accessible(exports, v8::Isolate::GetCurrent()); ::register_elm_interface_atspi_action(exports, v8::Isolate::GetCurrent()); ::register_elm_interface_atspi_component(exports, v8::Isolate::GetCurrent()); - ::register_elm_interface_atspi_editable_text(exports, v8::Isolate::GetCurrent()); + ::register_elm_interface_atspi_text_editable(exports, v8::Isolate::GetCurrent()); ::register_elm_interface_atspi_image(exports, v8::Isolate::GetCurrent()); ::register_elm_interface_atspi_selection(exports, v8::Isolate::GetCurrent()); ::register_elm_interface_atspi_text(exports, v8::Isolate::GetCurrent()); diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index 9c78137de7..54ded2d8cb 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c @@ -9,7 +9,7 @@ #define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED #define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED #define ELM_INTERFACE_ATSPI_TEXT_PROTECTED -#define ELM_INTERFACE_ATSPI_EDITABLE_TEXT_PROTECTED +#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED #include "atspi/atspi-constants.h" @@ -1846,7 +1846,7 @@ _editable_text_text_content_set(const Eldbus_Service_Interface *iface, const Eld Eldbus_Message *ret; Eina_Bool res; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_INTERFACE, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg); if (!eldbus_message_arguments_get(msg, "s", &content)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "String expected."); @@ -1854,7 +1854,7 @@ _editable_text_text_content_set(const Eldbus_Service_Interface *iface, const Eld ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); - res = elm_interface_atspi_editable_text_content_set(obj, content); + res = elm_interface_atspi_text_editable_content_set(obj, content); eldbus_message_arguments_append(ret, "b", res); @@ -1872,7 +1872,7 @@ _editable_text_text_insert(const Eldbus_Service_Interface *iface, const Eldbus_M int pos, len; Eina_Bool res; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_INTERFACE, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg); if (!eldbus_message_arguments_get(msg, "isi", &pos, &text, &len)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Postion, string, length expected."); @@ -1880,7 +1880,7 @@ _editable_text_text_insert(const Eldbus_Service_Interface *iface, const Eldbus_M ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); - res = elm_interface_atspi_editable_text_insert(obj, text, pos); + res = elm_interface_atspi_text_editable_insert(obj, text, pos); eldbus_message_arguments_append(ret, "b", res); @@ -1897,7 +1897,7 @@ _editable_text_text_copy(const Eldbus_Service_Interface *iface, const Eldbus_Mes int start, end; Eina_Bool res; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_INTERFACE, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg); if (!eldbus_message_arguments_get(msg, "ii", &start, &end)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected."); @@ -1905,7 +1905,7 @@ _editable_text_text_copy(const Eldbus_Service_Interface *iface, const Eldbus_Mes ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); - res = elm_interface_atspi_editable_text_copy(obj, start, end); + res = elm_interface_atspi_text_editable_copy(obj, start, end); eldbus_message_arguments_append(ret, "b", res); @@ -1922,7 +1922,7 @@ _editable_text_text_cut(const Eldbus_Service_Interface *iface, const Eldbus_Mess int start, end; Eina_Bool res; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_INTERFACE, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg); if (!eldbus_message_arguments_get(msg, "ii", &start, &end)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected."); @@ -1930,7 +1930,7 @@ _editable_text_text_cut(const Eldbus_Service_Interface *iface, const Eldbus_Mess ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); - res = elm_interface_atspi_editable_text_cut(obj, start, end); + res = elm_interface_atspi_text_editable_cut(obj, start, end); eldbus_message_arguments_append(ret, "b", res); @@ -1947,7 +1947,7 @@ _editable_text_text_delete(const Eldbus_Service_Interface *iface, const Eldbus_M int start, end; Eina_Bool res; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_INTERFACE, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg); if (!eldbus_message_arguments_get(msg, "ii", &start, &end)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected."); @@ -1955,7 +1955,7 @@ _editable_text_text_delete(const Eldbus_Service_Interface *iface, const Eldbus_M ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); - res = elm_interface_atspi_editable_text_delete(obj, start, end); + res = elm_interface_atspi_text_editable_delete(obj, start, end); eldbus_message_arguments_append(ret, "b", res); @@ -1972,7 +1972,7 @@ _editable_text_text_paste(const Eldbus_Service_Interface *iface, const Eldbus_Me int pos; Eina_Bool res; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_INTERFACE, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg); if (!eldbus_message_arguments_get(msg, "i", &pos)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected."); @@ -1980,7 +1980,7 @@ _editable_text_text_paste(const Eldbus_Service_Interface *iface, const Eldbus_Me ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); - res = elm_interface_atspi_editable_text_paste(obj, pos); + res = elm_interface_atspi_text_editable_paste(obj, pos); eldbus_message_arguments_append(ret, "b", res); @@ -2493,7 +2493,7 @@ _collection_iter_match_rule_get(Eldbus_Message_Iter *iter, struct collection_mat else if (!strcmp(ifc_name, "component")) class = ELM_INTERFACE_ATSPI_COMPONENT_MIXIN; else if (!strcmp(ifc_name, "editabletext")) - class = ELM_INTERFACE_ATSPI_EDITABLE_TEXT_INTERFACE; + class = ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE; else if (!strcmp(ifc_name, "text")) class = ELM_INTERFACE_ATSPI_TEXT_INTERFACE; else if (!strcmp(ifc_name, "image")) @@ -3115,7 +3115,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_APPLICATION); if (eo_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT); - if (eo_isa(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_INTERFACE)) + if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT); if (eo_isa(obj, ELM_INTERFACE_ATSPI_IMAGE_MIXIN)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE); diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 583f206ed9..75fb2c26d2 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -4,7 +4,7 @@ #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #define ELM_INTERFACE_ATSPI_TEXT_PROTECTED -#define ELM_INTERFACE_ATSPI_EDITABLE_TEXT_PROTECTED +#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED #define ELM_LAYOUT_PROTECTED #include @@ -5824,14 +5824,14 @@ _elm_entry_elm_interface_atspi_text_default_attributes_get(Eo *obj EINA_UNUSED, } EOLIAN static Eina_Bool -_elm_entry_elm_interface_atspi_editable_text_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *content) +_elm_entry_elm_interface_atspi_text_editable_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *content) { elm_entry_entry_set(obj, content); return EINA_TRUE; } EOLIAN static Eina_Bool -_elm_entry_elm_interface_atspi_editable_text_insert(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *string, int position) +_elm_entry_elm_interface_atspi_text_editable_insert(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *string, int position) { elm_entry_cursor_pos_set(obj, position); elm_entry_entry_insert(obj, string); @@ -5840,7 +5840,7 @@ _elm_entry_elm_interface_atspi_editable_text_insert(Eo *obj, Elm_Entry_Data *_pd } EOLIAN static Eina_Bool -_elm_entry_elm_interface_atspi_editable_text_copy(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start, int end) +_elm_entry_elm_interface_atspi_text_editable_copy(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start, int end) { elm_entry_select_region_set(obj, start, end); elm_entry_selection_copy(obj); @@ -5849,7 +5849,7 @@ _elm_entry_elm_interface_atspi_editable_text_copy(Eo *obj, Elm_Entry_Data *_pd E } EOLIAN static Eina_Bool -_elm_entry_elm_interface_atspi_editable_text_delete(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset) +_elm_entry_elm_interface_atspi_text_editable_delete(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset) { Evas_Object *txtblk; Evas_Textblock_Cursor *cur1, *cur2; @@ -5881,7 +5881,7 @@ _elm_entry_elm_interface_atspi_editable_text_delete(Eo *obj, Elm_Entry_Data *_pd } EOLIAN static Eina_Bool -_elm_entry_elm_interface_atspi_editable_text_paste(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int position) +_elm_entry_elm_interface_atspi_text_editable_paste(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int position) { elm_entry_cursor_pos_set(obj, position); elm_entry_selection_paste(obj); @@ -5889,7 +5889,7 @@ _elm_entry_elm_interface_atspi_editable_text_paste(Eo *obj, Elm_Entry_Data *_pd } EOLIAN static Eina_Bool -_elm_entry_elm_interface_atspi_editable_text_cut(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start, int end) +_elm_entry_elm_interface_atspi_text_editable_cut(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start, int end) { elm_entry_select_region_set(obj, start, end); elm_entry_selection_cut(obj); diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index 10c3bc4a01..8ddcca82c1 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -115,7 +115,7 @@ enum Elm.Cnp_Mode } class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface, - Elm.Interface.Atspi.Text, Elm.Interface.Atspi_Editable_Text, Efl.File, + Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File, Evas.Selectable_Interface, Evas.Scrollable_Interface) { eo_prefix: elm_obj_entry; @@ -980,12 +980,12 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface, Elm.Interface.Atspi.Text.selection_add; Elm.Interface.Atspi.Text.selection_remove; Elm.Interface.Atspi.Text.selection.set; - Elm.Interface.Atspi_Editable_Text.content.set; - Elm.Interface.Atspi_Editable_Text.insert; - Elm.Interface.Atspi_Editable_Text.copy; - Elm.Interface.Atspi_Editable_Text.cut; - Elm.Interface.Atspi_Editable_Text.delete; - Elm.Interface.Atspi_Editable_Text.paste; + Elm.Interface.Atspi.Text.Editable.content.set; + Elm.Interface.Atspi.Text.Editable.insert; + Elm.Interface.Atspi.Text.Editable.copy; + Elm.Interface.Atspi.Text.Editable.cut; + Elm.Interface.Atspi.Text.Editable.delete; + Elm.Interface.Atspi.Text.Editable.paste; Efl.File.file.set; Efl.File.file.get; } diff --git a/src/lib/elementary/elm_interface_atspi_editable_text.c b/src/lib/elementary/elm_interface_atspi_text_editable.c similarity index 56% rename from src/lib/elementary/elm_interface_atspi_editable_text.c rename to src/lib/elementary/elm_interface_atspi_text_editable.c index bebe223dbe..6f7ec68075 100644 --- a/src/lib/elementary/elm_interface_atspi_editable_text.c +++ b/src/lib/elementary/elm_interface_atspi_text_editable.c @@ -2,10 +2,10 @@ #include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_EDITABLE_TEXT_PROTECTED +#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED #include #include "elm_widget.h" #include "elm_priv.h" -#include "elm_interface_atspi_editable_text.eo.c" +#include "elm_interface_atspi_text_editable.eo.c" diff --git a/src/lib/elementary/elm_interface_atspi_editable_text.eo b/src/lib/elementary/elm_interface_atspi_text_editable.eo similarity index 90% rename from src/lib/elementary/elm_interface_atspi_editable_text.eo rename to src/lib/elementary/elm_interface_atspi_text_editable.eo index c06e59751e..a6bc8adf09 100644 --- a/src/lib/elementary/elm_interface_atspi_editable_text.eo +++ b/src/lib/elementary/elm_interface_atspi_text_editable.eo @@ -1,7 +1,7 @@ -interface Elm.Interface.Atspi_Editable_Text () +interface Elm.Interface.Atspi.Text.Editable () { legacy_prefix: null; - eo_prefix: elm_interface_atspi_editable_text; + eo_prefix: elm_interface_atspi_text_editable; methods { @property content @protected { set { diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h index 78e262f092..58ce5c0bae 100644 --- a/src/lib/elementary/elm_interfaces.h +++ b/src/lib/elementary/elm_interfaces.h @@ -8,7 +8,7 @@ #ifdef EFL_BETA_API_SUPPORT #include "elm_interface_atspi_action.eo.h" #include "elm_interface_atspi_component.eo.h" -#include "elm_interface_atspi_editable_text.eo.h" +#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" @@ -18,7 +18,7 @@ #ifdef EFL_BETA_API_SUPPORT #include "elm_interface_atspi_action.eo.legacy.h" #include "elm_interface_atspi_component.eo.legacy.h" -#include "elm_interface_atspi_editable_text.eo.legacy.h" +#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"