hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=608c853b442c38dd6129598b8e60e623cbb13540
commit 608c853b442c38dd6129598b8e60e623cbb13540 Author: Taehyub Kim <[email protected]> Date: Wed Dec 4 19:12:48 2019 +0900 fix the wrong method signature for evas_textgrid Summary: fix the wrong method signature famliy font get and font size get for evas_textgrid the method parameter should be changed to return type @fix Reviewers: Hermet, ali.alzyod, woohyun Reviewed By: Hermet Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10794 --- src/lib/evas/canvas/evas_object_textgrid.c | 12 ++++++------ src/lib/evas/canvas/evas_textgrid_eo.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index e73609668a..504e8c1ffa 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -1224,10 +1224,10 @@ _evas_textgrid_efl_text_font_font_family_set(Eo *eo_obj, _evas_textgrid_font_reload(eo_obj, o); } -EOLIAN static void -_evas_textgrid_efl_text_font_font_family_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, const char **font_name) +EOLIAN static const char * +_evas_textgrid_efl_text_font_font_family_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o) { - if (font_name) *font_name = o->cur.font_name; + return o->cur.font_name; } EOLIAN static void @@ -1244,10 +1244,10 @@ _evas_textgrid_efl_text_font_font_size_set(Eo *eo_obj, _evas_textgrid_font_reload(eo_obj, o); } -EOLIAN static void -_evas_textgrid_efl_text_font_font_size_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, Evas_Font_Size *font_size) +EOLIAN static Evas_Font_Size +_evas_textgrid_efl_text_font_font_size_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o) { - if (font_size) *font_size = o->cur.font_size; + return o->cur.font_size; } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_textgrid_eo.c b/src/lib/evas/canvas/evas_textgrid_eo.c index ce49c063b9..306ea8af00 100644 --- a/src/lib/evas/canvas/evas_textgrid_eo.c +++ b/src/lib/evas/canvas/evas_textgrid_eo.c @@ -48,13 +48,13 @@ void _evas_textgrid_efl_object_destructor(Eo *obj, Evas_Textgrid_Data *pd); void _evas_textgrid_efl_text_font_font_family_set(Eo *obj, Evas_Textgrid_Data *pd, const char *font); -void _evas_textgrid_efl_text_font_font_family_get(const Eo *obj, Evas_Textgrid_Data *pd, const char **font); +const char * _evas_textgrid_efl_text_font_font_family_get(const Eo *obj, Evas_Textgrid_Data *pd); void _evas_textgrid_efl_text_font_font_size_set(Eo *obj, Evas_Textgrid_Data *pd, Efl_Font_Size size); -void _evas_textgrid_efl_text_font_font_size_get(const Eo *obj, Evas_Textgrid_Data *pd, Efl_Font_Size *size); +Evas_Font_Size _evas_textgrid_efl_text_font_font_size_get(const Eo *obj, Evas_Textgrid_Data *pd); void _evas_textgrid_efl_text_font_font_source_set(Eo *obj, Evas_Textgrid_Data *pd, const char *font_source); --
