summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-05 17:00:37 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-06 13:02:41 -0800
commitc7b27506eacb86e44bbc9b6c27b9ee84b340d6a8 (patch)
tree4c4593a128b7aa9f307b6e6ca63d42eb568b3af1 /src
parent461c45df468aa284feac46e291036201fc88f413 (diff)
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 <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8121
Diffstat (limited to 'src')
-rw-r--r--src/lib/efl/interfaces/efl_text_format.eo1
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c16
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 {
9 9
10enum Efl.Text_Format_Horizontal_Alignment_Auto_Type { 10enum Efl.Text_Format_Horizontal_Alignment_Auto_Type {
11 [[Auto-horizontal alignment of the text]] 11 [[Auto-horizontal alignment of the text]]
12 legacy: efl_text_horizontal_alignment_auto;
13 none, [[No auto-alignment rule]] 12 none, [[No auto-alignment rule]]
14 normal, [[Respects LTR/RTL (bidirectional) settings]] 13 normal, [[Respects LTR/RTL (bidirectional) settings]]
15 locale, [[Respects locale's langauge settings]] 14 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
16169_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) 16169_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)
16170{ 16170{
16171 ASYNC_BLOCK; 16171 ASYNC_BLOCK;
16172 if (type == EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_NONE) 16172 if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE)
16173 { 16173 {
16174 _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_NONE); 16174 _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_NONE);
16175 } 16175 }
16176 else if (type == EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_NORMAL) 16176 else if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NORMAL)
16177 { 16177 {
16178 _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL); 16178 _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL);
16179 } 16179 }
16180 else if (type == EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_LOCALE) 16180 else if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_LOCALE)
16181 { 16181 {
16182 _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_LOCALE); 16182 _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_LOCALE);
16183 } 16183 }
16184 else if (type == EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_END) 16184 else if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_END)
16185 { 16185 {
16186 _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_END); 16186 _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_END);
16187 } 16187 }
@@ -16191,19 +16191,19 @@ static Efl_Text_Format_Horizontal_Alignment_Auto_Type
16191_efl_canvas_text_efl_text_format_halign_auto_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o) 16191_efl_canvas_text_efl_text_format_halign_auto_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o)
16192{ 16192{
16193 Efl_Text_Format_Horizontal_Alignment_Auto_Type ret = 16193 Efl_Text_Format_Horizontal_Alignment_Auto_Type ret =
16194 EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_NONE; 16194 EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE;
16195 16195
16196 if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL) 16196 if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL)
16197 { 16197 {
16198 ret = EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_NORMAL; 16198 ret = EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NORMAL;
16199 } 16199 }
16200 else if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_END) 16200 else if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_END)
16201 { 16201 {
16202 ret = EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_END; 16202 ret = EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_END;
16203 } 16203 }
16204 else if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_LOCALE) 16204 else if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_LOCALE)
16205 { 16205 {
16206 ret = EFL_TEXT_HORIZONTAL_ALIGNMENT_AUTO_LOCALE; 16206 ret = EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_LOCALE;
16207 } 16207 }
16208 return ret; 16208 return ret;
16209} 16209}