summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-14 21:14:52 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-15 13:28:49 -0500
commitd17b8a23d975037170538aafbe9ace35aaaf17b0 (patch)
tree0a77ff16db51cf9dcf4988b440752bf5728102eb
parent654656e69d1c2d1b04ad23416d6ea2ae752b48a4 (diff)
Efl.Access.Text: resolve more name conflicts
text -> access_text attributes -> text_attributes selection -> access_selection
-rw-r--r--src/lib/elementary/efl_access_text.eo6
-rw-r--r--src/lib/elementary/efl_ui_text.c8
-rw-r--r--src/lib/elementary/efl_ui_text.eo6
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c4
-rw-r--r--src/lib/elementary/elm_entry.c8
-rw-r--r--src/lib/elementary/elm_entry.eo6
-rw-r--r--src/tests/elementary/elm_test_entry.c4
7 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/elementary/efl_access_text.eo b/src/lib/elementary/efl_access_text.eo
index 7e04fac834..798f5a228a 100644
--- a/src/lib/elementary/efl_access_text.eo
+++ b/src/lib/elementary/efl_access_text.eo
@@ -72,7 +72,7 @@ interface Efl.Access.Text ()
72 string: mstring @owned; [[Newly allocated UTF-8 encoded string. Must be free by a user.]] 72 string: mstring @owned; [[Newly allocated UTF-8 encoded string. Must be free by a user.]]
73 } 73 }
74 } 74 }
75 @property text @protected @beta { 75 @property access_text @protected @beta {
76 get { 76 get {
77 [[Gets text of accessible widget.]] 77 [[Gets text of accessible widget.]]
78 } 78 }
@@ -110,7 +110,7 @@ interface Efl.Access.Text ()
110 value: mstring @owned; [[Value of text attribute. Should be free()]] 110 value: mstring @owned; [[Value of text attribute. Should be free()]]
111 } 111 }
112 } 112 }
113 @property attributes @protected @beta { 113 @property text_attributes @protected @beta {
114 get { 114 get {
115 [[Gets list of all text attributes.]] 115 [[Gets list of all text attributes.]]
116 } 116 }
@@ -200,7 +200,7 @@ interface Efl.Access.Text ()
200 count: int; [[Selection counter]] 200 count: int; [[Selection counter]]
201 } 201 }
202 } 202 }
203 @property selection @protected @beta { 203 @property access_selection @protected @beta {
204 [[Selection property]] 204 [[Selection property]]
205 get { 205 get {
206 } 206 }
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index cb46df142e..98dda2afea 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -4041,7 +4041,7 @@ fail:
4041} 4041}
4042 4042
4043EOLIAN static char* 4043EOLIAN static char*
4044_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) 4044_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)
4045{ 4045{
4046 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL; 4046 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
4047 char *ret = NULL; 4047 char *ret = NULL;
@@ -4097,7 +4097,7 @@ _efl_ui_text_efl_access_text_selections_count_get(Eo *obj, Efl_Ui_Text_Data *_pd
4097} 4097}
4098 4098
4099EOLIAN static void 4099EOLIAN static void
4100_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) 4100_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)
4101{ 4101{
4102 if (selection_number != 0) return; 4102 if (selection_number != 0) return;
4103 4103
@@ -4105,7 +4105,7 @@ _efl_ui_text_efl_access_text_selection_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_U
4105} 4105}
4106 4106
4107EOLIAN static Eina_Bool 4107EOLIAN static Eina_Bool
4108_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) 4108_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)
4109{ 4109{
4110 if (selection_number != 0) return EINA_FALSE; 4110 if (selection_number != 0) return EINA_FALSE;
4111 4111
@@ -4314,7 +4314,7 @@ _efl_ui_text_efl_access_text_attribute_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_U
4314} 4314}
4315 4315
4316EOLIAN static Eina_List* 4316EOLIAN static Eina_List*
4317_efl_ui_text_efl_access_text_attributes_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int *start_offset, int *end_offset) 4317_efl_ui_text_efl_access_text_text_attributes_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int *start_offset, int *end_offset)
4318{ 4318{
4319 Evas_Textblock_Cursor *cur1, *cur2; 4319 Evas_Textblock_Cursor *cur1, *cur2;
4320 Eina_List *ret = NULL; 4320 Eina_List *ret = NULL;
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 52b05917bb..67ba1e3bb2 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -339,10 +339,10 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
339 Elm.Interface_Scrollable.bounce_allow { set; } 339 Elm.Interface_Scrollable.bounce_allow { set; }
340 Efl.Access.state_set { get; } 340 Efl.Access.state_set { get; }
341 Efl.Access.i18n_name { get; } 341 Efl.Access.i18n_name { get; }
342 Efl.Access.Text.text { get; } 342 Efl.Access.Text.access_text { get; }
343 Efl.Access.Text.string { get; } 343 Efl.Access.Text.string { get; }
344 Efl.Access.Text.attribute { get; } 344 Efl.Access.Text.attribute { get; }
345 Efl.Access.Text.attributes { get; } 345 Efl.Access.Text.text_attributes { get; }
346 Efl.Access.Text.default_attributes { get; } 346 Efl.Access.Text.default_attributes { get; }
347 Efl.Access.Text.caret_offset { get; set; } 347 Efl.Access.Text.caret_offset { get; set; }
348 Efl.Access.Text.character { get; } 348 Efl.Access.Text.character { get; }
@@ -351,7 +351,7 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
351 Efl.Access.Text.offset_at_point { get; } 351 Efl.Access.Text.offset_at_point { get; }
352 Efl.Access.Text.bounded_ranges { get; } 352 Efl.Access.Text.bounded_ranges { get; }
353 Efl.Access.Text.range_extents { get; } 353 Efl.Access.Text.range_extents { get; }
354 Efl.Access.Text.selection { get; set; } 354 Efl.Access.Text.access_selection { get; set; }
355 Efl.Access.Text.selections_count { get; } 355 Efl.Access.Text.selections_count { get; }
356 Efl.Access.Text.selection_add; 356 Efl.Access.Text.selection_add;
357 Efl.Access.Text.selection_remove; 357 Efl.Access.Text.selection_remove;
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index b8131ffed8..0e4f89abcd 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -1604,7 +1604,7 @@ _text_selection_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
1604 ret = eldbus_message_method_return_new(msg); 1604 ret = eldbus_message_method_return_new(msg);
1605 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1605 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1606 1606
1607 efl_access_text_selection_get(obj, sel_num, &start, &end); 1607 efl_access_text_access_selection_get(obj, sel_num, &start, &end);
1608 1608
1609 eldbus_message_arguments_append(ret, "ii", start, end); 1609 eldbus_message_arguments_append(ret, "ii", start, end);
1610 1610
@@ -1679,7 +1679,7 @@ _text_selection_set(const Eldbus_Service_Interface *iface, const Eldbus_Message
1679 ret = eldbus_message_method_return_new(msg); 1679 ret = eldbus_message_method_return_new(msg);
1680 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1680 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1681 1681
1682 res = efl_access_text_selection_set(obj, sel_num, start, end); 1682 res = efl_access_text_access_selection_set(obj, sel_num, start, end);
1683 1683
1684 eldbus_message_arguments_append(ret, "b", res); 1684 eldbus_message_arguments_append(ret, "b", res);
1685 1685
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 7278f3f33c..9a91acbdaa 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -5602,7 +5602,7 @@ fail:
5602} 5602}
5603 5603
5604EOLIAN static char* 5604EOLIAN static char*
5605_elm_entry_efl_access_text_text_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset) 5605_elm_entry_efl_access_text_access_text_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset)
5606{ 5606{
5607 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL; 5607 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
5608 Evas_Object *tblk; 5608 Evas_Object *tblk;
@@ -5661,7 +5661,7 @@ _elm_entry_efl_access_text_selections_count_get(Eo *obj, Elm_Entry_Data *_pd EIN
5661} 5661}
5662 5662
5663EOLIAN static void 5663EOLIAN static void
5664_elm_entry_efl_access_text_selection_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset) 5664_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)
5665{ 5665{
5666 if (selection_number != 0) return; 5666 if (selection_number != 0) return;
5667 5667
@@ -5669,7 +5669,7 @@ _elm_entry_efl_access_text_selection_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSE
5669} 5669}
5670 5670
5671EOLIAN static Eina_Bool 5671EOLIAN static Eina_Bool
5672_elm_entry_efl_access_text_selection_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset) 5672_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)
5673{ 5673{
5674 if (selection_number != 0) return EINA_FALSE; 5674 if (selection_number != 0) return EINA_FALSE;
5675 5675
@@ -5893,7 +5893,7 @@ _elm_entry_efl_access_text_attribute_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSE
5893} 5893}
5894 5894
5895EOLIAN static Eina_List* 5895EOLIAN static Eina_List*
5896_elm_entry_efl_access_text_attributes_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int *start_offset, int *end_offset) 5896_elm_entry_efl_access_text_text_attributes_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int *start_offset, int *end_offset)
5897{ 5897{
5898 Evas_Object *txtblk; 5898 Evas_Object *txtblk;
5899 Evas_Textblock_Cursor *cur1, *cur2; 5899 Evas_Textblock_Cursor *cur1, *cur2;
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index c61ba350ac..7a14086b6a 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -852,10 +852,10 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
852 Elm.Interface_Scrollable.bounce_allow { set; } 852 Elm.Interface_Scrollable.bounce_allow { set; }
853 Efl.Access.state_set { get; } 853 Efl.Access.state_set { get; }
854 Efl.Access.i18n_name { get; } 854 Efl.Access.i18n_name { get; }
855 Efl.Access.Text.text { get; } 855 Efl.Access.Text.access_text { get; }
856 Efl.Access.Text.string { get; } 856 Efl.Access.Text.string { get; }
857 Efl.Access.Text.attribute { get; } 857 Efl.Access.Text.attribute { get; }
858 Efl.Access.Text.attributes { get; } 858 Efl.Access.Text.text_attributes { get; }
859 Efl.Access.Text.default_attributes { get; } 859 Efl.Access.Text.default_attributes { get; }
860 Efl.Access.Text.caret_offset { get; set; } 860 Efl.Access.Text.caret_offset { get; set; }
861 Efl.Access.Text.character { get; } 861 Efl.Access.Text.character { get; }
@@ -864,7 +864,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
864 Efl.Access.Text.offset_at_point { get; } 864 Efl.Access.Text.offset_at_point { get; }
865 Efl.Access.Text.bounded_ranges { get; } 865 Efl.Access.Text.bounded_ranges { get; }
866 Efl.Access.Text.range_extents { get; } 866 Efl.Access.Text.range_extents { get; }
867 Efl.Access.Text.selection { get; set; } 867 Efl.Access.Text.access_selection { get; set; }
868 Efl.Access.Text.selections_count { get; } 868 Efl.Access.Text.selections_count { get; }
869 Efl.Access.Text.selection_add; 869 Efl.Access.Text.selection_add;
870 Efl.Access.Text.selection_remove; 870 Efl.Access.Text.selection_remove;
diff --git a/src/tests/elementary/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c
index 05aa0d3464..1ca310a8e2 100644
--- a/src/tests/elementary/elm_test_entry.c
+++ b/src/tests/elementary/elm_test_entry.c
@@ -374,14 +374,14 @@ START_TEST (elm_entry_atspi_text_selections)
374 elm_entry_select_region_set(entry, 2, 4); 374 elm_entry_select_region_set(entry, 2, 4);
375 val = efl_access_text_selections_count_get(entry); 375 val = efl_access_text_selections_count_get(entry);
376 ck_assert(val == 1); 376 ck_assert(val == 1);
377 efl_access_text_selection_get(entry, 0, &start, &end); 377 efl_access_text_access_selection_get(entry, 0, &start, &end);
378 ck_assert(start == 2); 378 ck_assert(start == 2);
379 ck_assert(end == 4); 379 ck_assert(end == 4);
380 380
381 elm_entry_select_region_set(entry, 6, 10); 381 elm_entry_select_region_set(entry, 6, 10);
382 val = efl_access_text_selections_count_get(entry); 382 val = efl_access_text_selections_count_get(entry);
383 ck_assert(val == 1); 383 ck_assert(val == 1);
384 efl_access_text_selection_get(entry, 0, &start, &end); 384 efl_access_text_access_selection_get(entry, 0, &start, &end);
385 ck_assert(start == 6); 385 ck_assert(start == 6);
386 ck_assert(end == 10); 386 ck_assert(end == 10);
387 387