dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Efl.Access.Text: resolve more name conflicts 

text -> access_text
attributes -> text_attributes
selection -> access_selection
This commit is contained in:
Mike Blumenkrantz 2018-02-14 21:14:52 -05:00
parent 654656e69d
commit d17b8a23d9
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/elementary/efl_access_text.eo
View File

@ -72,7 +72,7 @@ interface Efl.Access.Text ()
string: mstring @owned; [[Newly allocated UTF-8 encoded string. Must be free by a user.]]
}
}
@property text @protected @beta {
@property access_text @protected @beta {
get {
[[Gets text of accessible widget.]]
}
@ -110,7 +110,7 @@ interface Efl.Access.Text ()
value: mstring @owned; [[Value of text attribute. Should be free()]]
}
}
@property attributes @protected @beta {
@property text_attributes @protected @beta {
get {
[[Gets list of all text attributes.]]
}
@ -200,7 +200,7 @@ interface Efl.Access.Text ()
count: int; [[Selection counter]]
}
}
@property selection @protected @beta {
@property access_selection @protected @beta {
[[Selection property]]
get {
}

8
src/lib/elementary/efl_ui_text.c
View File

@ -4041,7 +4041,7 @@ fail:
}
EOLIAN static char*
_efl_ui_text_efl_access_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset)
_efl_ui_text_efl_access_text_access_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset)
{
Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
char *ret = NULL;
@ -4097,7 +4097,7 @@ _efl_ui_text_efl_access_text_selections_count_get(Eo *obj, Efl_Ui_Text_Data *_pd
}
EOLIAN static void
_efl_ui_text_efl_access_text_selection_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset)
_efl_ui_text_efl_access_text_access_selection_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset)
{
if (selection_number != 0) return;
@ -4105,7 +4105,7 @@ _efl_ui_text_efl_access_text_selection_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_U
}
EOLIAN static Eina_Bool
_efl_ui_text_efl_access_text_selection_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset)
_efl_ui_text_efl_access_text_access_selection_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset)
{
if (selection_number != 0) return EINA_FALSE;
@ -4314,7 +4314,7 @@ _efl_ui_text_efl_access_text_attribute_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_U
}
EOLIAN static Eina_List*
_efl_ui_text_efl_access_text_attributes_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int *start_offset, int *end_offset)
_efl_ui_text_efl_access_text_text_attributes_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int *start_offset, int *end_offset)
{
Evas_Textblock_Cursor *cur1, *cur2;
Eina_List *ret = NULL;

6
src/lib/elementary/efl_ui_text.eo
View File

@ -339,10 +339,10 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Interface_Scrollable.bounce_allow { set; }
Efl.Access.state_set { get; }
Efl.Access.i18n_name { get; }
Efl.Access.Text.text { get; }
Efl.Access.Text.access_text { get; }
Efl.Access.Text.string { get; }
Efl.Access.Text.attribute { get; }
Efl.Access.Text.attributes { get; }
Efl.Access.Text.text_attributes { get; }
Efl.Access.Text.default_attributes { get; }
Efl.Access.Text.caret_offset { get; set; }
Efl.Access.Text.character { get; }
@ -351,7 +351,7 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Efl.Access.Text.offset_at_point { get; }
Efl.Access.Text.bounded_ranges { get; }
Efl.Access.Text.range_extents { get; }
Efl.Access.Text.selection { get; set; }
Efl.Access.Text.access_selection { get; set; }
Efl.Access.Text.selections_count { get; }
Efl.Access.Text.selection_add;
Efl.Access.Text.selection_remove;

4
src/lib/elementary/elm_atspi_bridge.c
View File

@ -1604,7 +1604,7 @@ _text_selection_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
ret = eldbus_message_method_return_new(msg);
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
efl_access_text_selection_get(obj, sel_num, &start, &end);
efl_access_text_access_selection_get(obj, sel_num, &start, &end);
eldbus_message_arguments_append(ret, "ii", start, end);
@ -1679,7 +1679,7 @@ _text_selection_set(const Eldbus_Service_Interface *iface, const Eldbus_Message
ret = eldbus_message_method_return_new(msg);
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
res = efl_access_text_selection_set(obj, sel_num, start, end);
res = efl_access_text_access_selection_set(obj, sel_num, start, end);
eldbus_message_arguments_append(ret, "b", res);

8
src/lib/elementary/elm_entry.c
View File

@ -5602,7 +5602,7 @@ fail:
}
EOLIAN static char*
_elm_entry_efl_access_text_text_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset)
_elm_entry_efl_access_text_access_text_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset)
{
Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
Evas_Object *tblk;
@ -5661,7 +5661,7 @@ _elm_entry_efl_access_text_selections_count_get(Eo *obj, Elm_Entry_Data *_pd EIN
}
EOLIAN static void
_elm_entry_efl_access_text_selection_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset)
_elm_entry_efl_access_text_access_selection_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset)
{
if (selection_number != 0) return;
@ -5669,7 +5669,7 @@ _elm_entry_efl_access_text_selection_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSE
}
EOLIAN static Eina_Bool
_elm_entry_efl_access_text_selection_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset)
_elm_entry_efl_access_text_access_selection_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset)
{
if (selection_number != 0) return EINA_FALSE;
@ -5893,7 +5893,7 @@ _elm_entry_efl_access_text_attribute_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSE
}
EOLIAN static Eina_List*
_elm_entry_efl_access_text_attributes_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int *start_offset, int *end_offset)
_elm_entry_efl_access_text_text_attributes_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int *start_offset, int *end_offset)
{
Evas_Object *txtblk;
Evas_Textblock_Cursor *cur1, *cur2;

6
src/lib/elementary/elm_entry.eo
View File

@ -852,10 +852,10 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Interface_Scrollable.bounce_allow { set; }
Efl.Access.state_set { get; }
Efl.Access.i18n_name { get; }
Efl.Access.Text.text { get; }
Efl.Access.Text.access_text { get; }
Efl.Access.Text.string { get; }
Efl.Access.Text.attribute { get; }
Efl.Access.Text.attributes { get; }
Efl.Access.Text.text_attributes { get; }
Efl.Access.Text.default_attributes { get; }
Efl.Access.Text.caret_offset { get; set; }
Efl.Access.Text.character { get; }
@ -864,7 +864,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Efl.Access.Text.offset_at_point { get; }
Efl.Access.Text.bounded_ranges { get; }
Efl.Access.Text.range_extents { get; }
Efl.Access.Text.selection { get; set; }
Efl.Access.Text.access_selection { get; set; }
Efl.Access.Text.selections_count { get; }
Efl.Access.Text.selection_add;
Efl.Access.Text.selection_remove;

4
src/tests/elementary/elm_test_entry.c
View File

@ -374,14 +374,14 @@ START_TEST (elm_entry_atspi_text_selections)
elm_entry_select_region_set(entry, 2, 4);
val = efl_access_text_selections_count_get(entry);
ck_assert(val == 1);
efl_access_text_selection_get(entry, 0, &start, &end);
efl_access_text_access_selection_get(entry, 0, &start, &end);
ck_assert(start == 2);
ck_assert(end == 4);
elm_entry_select_region_set(entry, 6, 10);
val = efl_access_text_selections_count_get(entry);
ck_assert(val == 1);
efl_access_text_selection_get(entry, 0, &start, &end);
efl_access_text_access_selection_get(entry, 0, &start, &end);
ck_assert(start == 6);
ck_assert(end == 10);