From 4f9cfc22bcb872a77261258cde91c9414b3fd37e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Wed, 5 Jul 2017 19:44:30 +0900 Subject: [PATCH] edje: Fix some API issues (missing const) --- src/lib/edje/Edje_Legacy.h | 8 ++++---- src/lib/edje/edje_legacy.c | 24 ++++++++++-------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h index b2e8dae..c37c906 100644 --- a/src/lib/edje/Edje_Legacy.h +++ b/src/lib/edje/Edje_Legacy.h @@ -1591,7 +1591,7 @@ EAPI Eina_Bool edje_object_part_text_hide_visible_password(Edje_Object *obj, con * * @ingroup Edje_Object */ -EAPI Eina_Bool edje_object_part_text_cursor_is_format_get(Edje_Object *obj, const char * part, Edje_Cursor cur); +EAPI Eina_Bool edje_object_part_text_cursor_is_format_get(const Edje_Object *obj, const char * part, Edje_Cursor cur); /** * @brief Returns @c true if the cursor points to a visible format For example @@ -1605,7 +1605,7 @@ EAPI Eina_Bool edje_object_part_text_cursor_is_format_get(Edje_Object *obj, cons * * @ingroup Edje_Object */ -EAPI Eina_Bool edje_object_part_text_cursor_is_visible_format_get(Edje_Object *obj, const char * part, Edje_Cursor cur); +EAPI Eina_Bool edje_object_part_text_cursor_is_visible_format_get(const Edje_Object *obj, const char * part, Edje_Cursor cur); /** * @brief Returns a list of Evas_Textblock_Rectangle anchor rectangles. @@ -1620,7 +1620,7 @@ EAPI Eina_Bool edje_object_part_text_cursor_is_visible_format_get(Edje_Object *o * * @ingroup Edje_Object */ -EAPI const Eina_List *edje_object_part_text_anchor_geometry_get(Edje_Object *obj, const char * part, const char * anchor); +EAPI const Eina_List *edje_object_part_text_anchor_geometry_get(const Edje_Object *obj, const char * part, const char * anchor); /** * @brief Returns a list of char anchor names. @@ -1633,7 +1633,7 @@ EAPI const Eina_List *edje_object_part_text_anchor_geometry_get(Edje_Object *obj * * @ingroup Edje_Object */ -EAPI const Eina_List *edje_object_part_text_anchor_list_get(Edje_Object *obj, const char * part); +EAPI const Eina_List *edje_object_part_text_anchor_list_get(const Edje_Object *obj, const char * part); /** * @brief Returns the text of the object part. diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c index 7658608..256f468 100644 --- a/src/lib/edje/edje_legacy.c +++ b/src/lib/edje/edje_legacy.c @@ -341,14 +341,13 @@ edje_object_part_text_hide_visible_password(Eo *obj, const char *part) return int_ret; } -EOLIAN Eina_Bool -edje_object_part_text_cursor_is_format_get(Eo *obj, const char *part, Edje_Cursor cur) +EAPI Eina_Bool +edje_object_part_text_cursor_is_format_get(const Eo *obj, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); - + ed = _edje_fetch(obj); if ((!ed) || (!part)) return EINA_FALSE; rp = _edje_real_part_recursive_get(&ed, part); if (!rp) return EINA_FALSE; @@ -359,14 +358,13 @@ edje_object_part_text_cursor_is_format_get(Eo *obj, const char *part, Edje_Curso return EINA_FALSE; } -EOLIAN Eina_Bool -edje_object_part_text_cursor_is_visible_format_get(Eo *obj EINA_UNUSED, const char *part, Edje_Cursor cur) +EAPI Eina_Bool +edje_object_part_text_cursor_is_visible_format_get(const Eo *obj, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); - + ed = _edje_fetch(obj); if ((!ed) || (!part)) return EINA_FALSE; rp = _edje_real_part_recursive_get(&ed, part); if (!rp) return EINA_FALSE; @@ -379,13 +377,12 @@ edje_object_part_text_cursor_is_visible_format_get(Eo *obj EINA_UNUSED, const ch } EAPI const Eina_List * -edje_object_part_text_anchor_list_get(Eo *obj EINA_UNUSED, const char *part) +edje_object_part_text_anchor_list_get(const Eo *obj, const char *part) { Edje_Real_Part *rp; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); - + ed = _edje_fetch(obj); if ((!ed) || (!part)) return NULL; rp = _edje_real_part_recursive_get(&ed, part); if (!rp) return NULL; @@ -396,13 +393,12 @@ edje_object_part_text_anchor_list_get(Eo *obj EINA_UNUSED, const char *part) } EAPI const Eina_List * -edje_object_part_text_anchor_geometry_get(Eo *obj EINA_UNUSED, const char *part, const char *anchor) +edje_object_part_text_anchor_geometry_get(const Eo *obj, const char *part, const char *anchor) { Edje_Real_Part *rp; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); - + ed = _edje_fetch(obj); if ((!ed) || (!part)) return NULL; rp = _edje_real_part_recursive_get(&ed, part); if (!rp) return NULL; -- 2.7.4