From 8fe3776f8a23185f299c13f9cfe92b5d54b0fa68 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Mon, 11 Jul 2011 08:56:13 +0000 Subject: [PATCH] Evas textblock: Deprecated evas_textblock_cursor_set_at_format. This was a duplicate of evas_textblock_cursor_at_format_set. The only difference is the name, and this one doesn't conform to the naming conventions. SVN revision: 61231 --- legacy/evas/src/lib/Evas.h | 3 ++- legacy/evas/src/lib/canvas/evas_object_textblock.c | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/legacy/evas/src/lib/Evas.h b/legacy/evas/src/lib/Evas.h index 1b084297e8..11372ecc20 100644 --- a/legacy/evas/src/lib/Evas.h +++ b/legacy/evas/src/lib/Evas.h @@ -7439,8 +7439,9 @@ EAPI void evas_textblock_node_format_remove_pair(Evas_Ob * * @param cur the cursor to update. * @param n the format node to update according. + * @deprecated duplicate of evas_textblock_cursor_at_format_set */ -EAPI void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1, 2); +EINA_DEPRECATED EAPI void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1, 2); /** * Return the format node at the position pointed by cur. diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index ef68c9c138..dcd461db29 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -5404,7 +5404,7 @@ evas_textblock_node_format_remove_pair(Evas_Object *obj, eina_ustrbuf_remove(n->text_node->unicode, ind, ind + 1); if (format && _IS_PARAGRAPH_SEPARATOR(o, format)) { - evas_textblock_cursor_set_at_format(&cur, n); + evas_textblock_cursor_at_format_set(&cur, n); _evas_textblock_cursor_nodes_merge(&cur); } _evas_textblock_cursors_update_offset(&cur, n->text_node, ind, -1); @@ -5522,9 +5522,7 @@ evas_textblock_cursor_paragraph_prev(Evas_Textblock_Cursor *cur) EAPI void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n) { - if (!cur || !n) return; - cur->node = n->text_node; - cur->pos = _evas_textblock_node_format_pos_get(n); + evas_textblock_cursor_at_format_set(cur, n); } EAPI Eina_Bool