diff options
author | Xavi Artigas <xavierartigas@yahoo.es> | 2020-04-07 11:11:13 +0000 |
---|---|---|
committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-04-14 12:25:55 +0200 |
commit | f526ad8c26aef17ff1af444217d065d33ba2387a (patch) | |
tree | d2ee22ec668bd26c64bc980c1c869dbed9a2db74 /src/bin | |
parent | 8a155aecb6c98bccd92a3986d9224c600e08cbe5 (diff) | |
download | efl-f526ad8c26aef17ff1af444217d065d33ba2387a.tar.gz |
Fix namespace clashes for Efl.Text.Cursor
Three renames are applied here:
Efl.Text.Cursor -> Efl.Text_Cursor.Object (class)
Efl.Text.Cursor_Type -> Efl.Text_Cursor.Type (enum)
Efl.Text.Cursor_Move_Type -> Efl.Text_Cursor.Move_Type (enum)
Nothing changes for the enums on the C side. For the class... Well,
the method names are a bit more verbose now.
These renames are required to avoid clashing with the Efl.Text interface.
This did not cause trouble to C# because interfaces are prefixed with "I",
but it did cause trouble to Eolian when the EO files were installed and
somebody tried to use them.
Ref T8648
Differential Revision: https://phab.enlightenment.org/D11663
Diffstat (limited to 'src/bin')
-rw-r--r-- | src/bin/elementary/test_efl_ui_text.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c index 53914831e7..49cfff589f 100644 --- a/src/bin/elementary/test_efl_ui_text.c +++ b/src/bin/elementary/test_efl_ui_text.c @@ -8,13 +8,13 @@ static void _apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style) { - Efl_Text_Cursor *start, *end; + Efl_Text_Cursor_Object *start, *end; start = efl_ui_textbox_cursor_create(obj); end = efl_ui_textbox_cursor_create(obj); - efl_text_cursor_position_set(start, start_pos); - efl_text_cursor_position_set(end, end_pos); + efl_text_cursor_object_position_set(start, start_pos); + efl_text_cursor_object_position_set(end, end_pos); efl_text_formatter_attribute_insert(start, end, style); @@ -101,15 +101,15 @@ typedef struct static void _on_bt3_clicked(void *data, const Efl_Event *event EINA_UNUSED) { - Efl_Text_Cursor *sel_start, *sel_end; + Efl_Text_Cursor_Object *sel_start, *sel_end; Eo *en = data; efl_text_interactive_selection_cursors_get(en, &sel_start, &sel_end); - const char *s = efl_text_cursor_range_text_get(sel_start, sel_end); + const char *s = efl_text_cursor_object_range_text_get(sel_start, sel_end); printf("SELECTION REGION: %d - %d\n", - efl_text_cursor_position_get( sel_start), - efl_text_cursor_position_get(sel_end)); + efl_text_cursor_object_position_get( sel_start), + efl_text_cursor_object_position_get(sel_end)); printf("SELECTION:\n"); if (s) printf("%s\n", s); } |