Efl.Text.Cursor: cursor -> text_cursor

diff --git a/src/lib/edje/edje_part_invalid.c b/src/lib/edje/edje_part_invalid.c
index 7e59bbb..56f3016 100644 (file)
--- a/src/lib/edje/edje_part_invalid.c
+++ b/src/lib/edje/edje_part_invalid.c
@@ -51,7 +51,7 @@ EDJE_PART_INVALID_VOID(efl_text_set, _efl_canvas_layout_part_invalid_efl_text_te
 EDJE_PART_INVALID(const char *, 0, efl_text_get, _efl_canvas_layout_part_invalid_efl_text_text_get)
 EDJE_PART_INVALID_VOID(efl_text_markup_set, _efl_canvas_layout_part_invalid_efl_text_markup_markup_set, const char *text)
 EDJE_PART_INVALID(const char *, 0, efl_text_markup_get, _efl_canvas_layout_part_invalid_efl_text_markup_markup_get)
-EDJE_PART_INVALID(Efl_Text_Cursor_Cursor *, 0, efl_text_cursor_get, _efl_canvas_layout_part_invalid_efl_text_cursor_cursor_get, Efl_Text_Cursor_Cursor_Get_Type get_type)
+EDJE_PART_INVALID(Efl_Text_Cursor_Cursor *, 0, efl_text_cursor_get, _efl_canvas_layout_part_invalid_efl_text_cursor_text_cursor_get, Efl_Text_Cursor_Cursor_Get_Type get_type)
 EDJE_PART_INVALID_VOID(efl_text_cursor_paragraph_first, _efl_canvas_layout_part_invalid_efl_text_cursor_cursor_paragraph_first, Efl_Text_Cursor_Cursor *cur)
 EDJE_PART_INVALID_VOID(efl_text_cursor_paragraph_last, _efl_canvas_layout_part_invalid_efl_text_cursor_cursor_paragraph_last, Efl_Text_Cursor_Cursor *cur)
 EDJE_PART_INVALID_VOID(efl_text_cursor_position_set, _efl_canvas_layout_part_invalid_efl_text_cursor_cursor_position_set, Efl_Text_Cursor_Cursor *cur, int position)

diff --git a/src/lib/edje/edje_part_text.c b/src/lib/edje/edje_part_text.c
index 3ad1c99..752f767 100644 (file)
--- a/src/lib/edje/edje_part_text.c
+++ b/src/lib/edje/edje_part_text.c
@@ -40,7 +40,7 @@ _efl_canvas_layout_part_text_efl_text_markup_markup_set(Eo *obj,
 
 
 EOLIAN static Efl_Text_Cursor_Cursor *
-_efl_canvas_layout_part_text_efl_text_cursor_cursor_get(Eo *obj,
+_efl_canvas_layout_part_text_efl_text_cursor_text_cursor_get(Eo *obj,
       void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Get_Type get_type)
 {
    PROXY_DATA_GET(obj, pd);

diff --git a/src/lib/edje/efl_canvas_layout_part_invalid.eo b/src/lib/edje/efl_canvas_layout_part_invalid.eo
index 3288ed0..3901223 100644 (file)
--- a/src/lib/edje/efl_canvas_layout_part_invalid.eo
+++ b/src/lib/edje/efl_canvas_layout_part_invalid.eo
@@ -33,7 +33,7 @@ class Efl.Canvas.Layout.Part_Invalid (Efl.Canvas.Layout.Part, Efl.Content,
       // Efl.Canvas.Layout.Part_Text
       Efl.Text.text { set; get; }
       Efl.Text.Markup.markup { get; set; }
-      Efl.Text.Cursor.cursor { get; }
+      Efl.Text.Cursor.text_cursor { get; }
       Efl.Text.Cursor.cursor_paragraph_first;
       Efl.Text.Cursor.cursor_paragraph_last;
       Efl.Text.Cursor.cursor_position { set; get; }

diff --git a/src/lib/edje/efl_canvas_layout_part_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo
index 0ba5bb2..edcfcae 100644 (file)
--- a/src/lib/edje/efl_canvas_layout_part_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -10,7 +10,7 @@ Efl.Text.Markup, Efl.Text.Cursor)
    implements {
       Efl.Text.text { set; get; }
       Efl.Text.Markup.markup { get; set; }
-      Efl.Text.Cursor.cursor { get; }
+      Efl.Text.Cursor.text_cursor { get; }
       Efl.Text.Cursor.cursor_paragraph_first;
       Efl.Text.Cursor.cursor_paragraph_last;
       Efl.Text.Cursor.cursor_position { set; get; }

diff --git a/src/lib/efl/interfaces/efl_text_cursor.eo b/src/lib/efl/interfaces/efl_text_cursor.eo
index 448028b..06835cd 100644 (file)
--- a/src/lib/efl/interfaces/efl_text_cursor.eo
+++ b/src/lib/efl/interfaces/efl_text_cursor.eo
@@ -29,7 +29,7 @@ interface Efl.Text.Cursor {
    ]]
    methods {
       // Cursor
-      @property cursor {
+      @property text_cursor {
          [[The object's main cursor.
 
            @since 1.18

diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index 87eac29..4053374 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -316,7 +316,7 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
       Efl.Text.Format.tabstops { get; set; }
       Efl.Text.Format.password { get; set; }
       Efl.Text.Format.replacement_char { get; set; }
-      Efl.Text.Cursor.cursor { get; }
+      Efl.Text.Cursor.text_cursor { get; }
       Efl.Text.Cursor.cursor_position { set; get; }
       Efl.Text.Cursor.cursor_content { get; }
       Efl.Text.Cursor.cursor_geometry { get; }

diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index c13b54b..0b6825e 100644 (file)
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -17214,7 +17214,7 @@ ppar(Evas_Object_Textblock_Paragraph *par)
    EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_text_efl_object_dbg_info_get)
 
 EOLIAN static Efl_Text_Cursor_Cursor *
-_efl_canvas_text_efl_text_cursor_cursor_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, Efl_Text_Cursor_Cursor_Get_Type get_type)
+_efl_canvas_text_efl_text_cursor_text_cursor_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, Efl_Text_Cursor_Cursor_Get_Type get_type)
 {
    if (get_type > EFL_TEXT_CURSOR_GET_MAIN)
      {