From c7b27506eacb86e44bbc9b6c27b9ee84b340d6a8 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 5 Mar 2019 17:00:37 -0500 Subject: [PATCH] efl_text_format: remove all legacy usage from eo files this takes the current generated output from eolian for legacy code in evas and adds it to the tree, then removes legacy references from the corresponding eo files. in the case where the entire eo file was for a legacy object, that eo file has been removed from the tree ref T7724 Reviewed-by: Cedric BAIL Differential Revision: https://phab.enlightenment.org/D8121 --- src/lib/efl/interfaces/efl_text_format.eo | 1 - src/lib/evas/canvas/evas_object_textblock.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/lib/efl/interfaces/efl_text_format.eo b/src/lib/efl/interfaces/efl_text_format.eo index 04a99ac582..f474258c55 100644 --- a/src/lib/efl/interfaces/efl_text_format.eo +++ b/src/lib/efl/interfaces/efl_text_format.eo @@ -9,7 +9,6 @@ enum Efl.Text_Format_Wrap { enum Efl.Text_Format_Horizontal_Alignment_Auto_Type { [[Auto-horizontal alignment of the text]] - legacy: efl_text_horizontal_alignment_auto; none, [[No auto-alignment rule]] normal, [[Respects LTR/RTL (bidirectional) settings]] locale, [[Respects locale's langauge settings]] diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index db5d94672b..ce96dc9997 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -16169,19 +16169,19 @@ static void _efl_canvas_text_efl_text_format_halign_auto_type_set(Eo *obj, Efl_Canvas_Text_Data *o, Efl_Text_Format_Horizontal_Alignment_Auto_Type type) { ASYNC_BLOCK; - if (type == EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_NONE) + if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE) { _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_NONE); } - else if (type == EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_NORMAL) + else if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NORMAL) { _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL); } - else if (type == EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_LOCALE) + else if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_LOCALE) { _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_LOCALE); } - else if (type == EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_END) + else if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_END) { _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_END); } @@ -16191,19 +16191,19 @@ static Efl_Text_Format_Horizontal_Alignment_Auto_Type _efl_canvas_text_efl_text_format_halign_auto_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o) { Efl_Text_Format_Horizontal_Alignment_Auto_Type ret = - EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_NONE; + EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE; if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL) { - ret = EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_NORMAL; + ret = EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NORMAL; } else if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_END) { - ret = EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_END; + ret = EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_END; } else if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_LOCALE) { - ret = EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_LOCALE; + ret = EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_LOCALE; } return ret; }