summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-23 13:24:51 -0400
committerCedric Bail <cedric.bail@free.fr>2019-09-24 13:56:11 -0700
commit105f016fc92324de903d501d9ffeac55855ea3da (patch)
tree12e8747dd6801f6b020fc36eb63b154725309176
parentf13b3a882e1e58765bf2a0ff9e8594280ec925f3 (diff)
elm: rename layout part aliasing functions/macros
these are internal apis for managing part aliasing on the C side, but they apply to efl_ui_layout and not elm_layout no functional changes Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D10090
-rw-r--r--src/lib/elementary/efl_ui_bg.c4
-rw-r--r--src/lib/elementary/efl_ui_button.c4
-rw-r--r--src/lib/elementary/efl_ui_check.c8
-rw-r--r--src/lib/elementary/efl_ui_layout.c16
-rw-r--r--src/lib/elementary/efl_ui_panes.c4
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c4
-rw-r--r--src/lib/elementary/efl_ui_radio.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/elm_actionslider.c4
-rw-r--r--src/lib/elementary/elm_bubble.c8
-rw-r--r--src/lib/elementary/elm_conform.c4
-rw-r--r--src/lib/elementary/elm_entry.c8
-rw-r--r--src/lib/elementary/elm_hover.c6
-rw-r--r--src/lib/elementary/elm_priv.h18
-rw-r--r--src/lib/elementary/elm_slider.c4
15 files changed, 49 insertions, 49 deletions
diff --git a/src/lib/elementary/efl_ui_bg.c b/src/lib/elementary/efl_ui_bg.c
index d5932d3..614896d 100644
--- a/src/lib/elementary/efl_ui_bg.c
+++ b/src/lib/elementary/efl_ui_bg.c
@@ -267,10 +267,10 @@ _efl_ui_bg_efl_object_finalize(Eo *obj, Efl_Ui_Bg_Data *sd)
267 267
268/* Internal EO APIs and hidden overrides */ 268/* Internal EO APIs and hidden overrides */
269 269
270ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 270EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
271 271
272#define EFL_UI_BG_EXTRA_OPS \ 272#define EFL_UI_BG_EXTRA_OPS \
273 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX) 273 EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX)
274 274
275#include "efl_ui_bg.eo.c" 275#include "efl_ui_bg.eo.c"
276 276
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index f71fb3e..4bcbc11 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -374,10 +374,10 @@ elm_button_autorepeat_get(const Evas_Object *obj)
374 374
375/* Internal EO APIs and hidden overrides */ 375/* Internal EO APIs and hidden overrides */
376 376
377ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 377EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
378 378
379#define EFL_UI_BUTTON_EXTRA_OPS \ 379#define EFL_UI_BUTTON_EXTRA_OPS \
380 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \ 380 EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
381 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button) 381 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button)
382 382
383#include "efl_ui_button.eo.c" 383#include "efl_ui_button.eo.c"
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index df53247..190242e 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -413,15 +413,15 @@ _efl_ui_check_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED
413ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_check, Efl_Ui_Check_Data) 413ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_check, Efl_Ui_Check_Data)
414ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_check, Efl_Ui_Check_Data) 414ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_check, Efl_Ui_Check_Data)
415ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_check, Efl_Ui_Check_Data) 415ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_check, Efl_Ui_Check_Data)
416ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 416EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
417 417
418/* Internal EO APIs and hidden overrides */ 418/* Internal EO APIs and hidden overrides */
419 419
420ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 420EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
421 421
422#define EFL_UI_CHECK_EXTRA_OPS \ 422#define EFL_UI_CHECK_EXTRA_OPS \
423 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \ 423 EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
424 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX) 424 EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
425 425
426 426
427#include "efl_ui_check.eo.c" 427#include "efl_ui_check.eo.c"
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index fd52af6..46aaebc 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -660,9 +660,9 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj,
660 } 660 }
661 661
662 if (is_text) 662 if (is_text)
663 aliases = elm_layout_text_aliases_get(obj); 663 aliases = efl_ui_layout_text_aliases_get(obj);
664 else 664 else
665 aliases = elm_layout_content_aliases_get(obj); 665 aliases = efl_ui_layout_content_aliases_get(obj);
666 666
667 while (aliases && aliases->alias && aliases->real_part) 667 while (aliases && aliases->alias && aliases->real_part)
668 { 668 {
@@ -2847,18 +2847,18 @@ _efl_ui_layout_base_theme_rotation_apply(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UN
2847 2847
2848/* Internal EO APIs and hidden overrides */ 2848/* Internal EO APIs and hidden overrides */
2849 2849
2850EFL_FUNC_BODY_CONST(elm_layout_text_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL) 2850EFL_FUNC_BODY_CONST(efl_ui_layout_text_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL)
2851EFL_FUNC_BODY_CONST(elm_layout_content_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL) 2851EFL_FUNC_BODY_CONST(efl_ui_layout_content_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL)
2852 2852
2853ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 2853EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
2854ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 2854EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
2855 2855
2856#define EFL_UI_LAYOUT_BASE_EXTRA_OPS \ 2856#define EFL_UI_LAYOUT_BASE_EXTRA_OPS \
2857 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_layout_base), \ 2857 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_layout_base), \
2858 ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_layout_base), \ 2858 ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_layout_base), \
2859 ELM_PART_TEXT_DEFAULT_OPS(efl_ui_layout_base), \ 2859 ELM_PART_TEXT_DEFAULT_OPS(efl_ui_layout_base), \
2860 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \ 2860 EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
2861 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \ 2861 EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
2862 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_layout_base_efl_object_dbg_info_get) 2862 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_layout_base_efl_object_dbg_info_get)
2863 2863
2864 2864
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 3b6db20..ea1c9fe 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -695,11 +695,11 @@ _efl_ui_panes_part_split_ratio_min_set(Eo *obj, void *_pd EINA_UNUSED, double ra
695 695
696/* Internal EO APIs and hidden overrides */ 696/* Internal EO APIs and hidden overrides */
697 697
698ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_panes) 698EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_panes)
699 699
700#define EFL_UI_PANES_EXTRA_OPS \ 700#define EFL_UI_PANES_EXTRA_OPS \
701 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_panes), \ 701 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_panes), \
702 ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_panes) 702 EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_panes)
703 703
704#include "efl_ui_panes.eo.c" 704#include "efl_ui_panes.eo.c"
705#include "efl_ui_panes_eo.legacy.c" 705#include "efl_ui_panes_eo.legacy.c"
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 4ea4b26..61c6ece 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -780,10 +780,10 @@ ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
780ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data) 780ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
781ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data) 781ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
782 782
783ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar) 783EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar)
784 784
785#define EFL_UI_PROGRESSBAR_EXTRA_OPS \ 785#define EFL_UI_PROGRESSBAR_EXTRA_OPS \
786 ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_progressbar), \ 786 EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_progressbar), \
787 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar) 787 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar)
788 788
789#include "efl_ui_progressbar.eo.c" 789#include "efl_ui_progressbar.eo.c"
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index a7106a3..18f0c6b 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -306,10 +306,10 @@ _efl_ui_radio_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Radio_Data *
306/* Internal EO APIs and hidden overrides */ 306/* Internal EO APIs and hidden overrides */
307 307
308ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_radio, Efl_Ui_Radio_Data) 308ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_radio, Efl_Ui_Radio_Data)
309ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 309EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
310 310
311#define EFL_UI_RADIO_EXTRA_OPS \ 311#define EFL_UI_RADIO_EXTRA_OPS \
312 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX) 312 EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
313 313
314#include "efl_ui_radio.eo.c" 314#include "efl_ui_radio.eo.c"
315#include "efl_ui_radio_group.eo.c" 315#include "efl_ui_radio_group.eo.c"
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 7b29f3e..a57ca7e 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -4082,7 +4082,7 @@ ELM_PART_OVERRIDE_TEXT_GET(efl_ui_text, EFL_UI_TEXT, Efl_Ui_Text_Data)
4082 4082
4083/* Internal EO APIs and hidden overrides */ 4083/* Internal EO APIs and hidden overrides */
4084 4084
4085//ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 4085//EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
4086 4086
4087#include "efl_ui_text.eo.c" 4087#include "efl_ui_text.eo.c"
4088 4088
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 05036fe..4537cd9 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -636,10 +636,10 @@ ELM_PART_OVERRIDE_TEXT_GET(elm_actionslider, ELM_ACTIONSLIDER, Elm_Actionslider_
636 636
637/* Internal EO APIs and hidden overrides */ 637/* Internal EO APIs and hidden overrides */
638 638
639ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 639EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
640 640
641#define ELM_ACTIONSLIDER_EXTRA_OPS \ 641#define ELM_ACTIONSLIDER_EXTRA_OPS \
642 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \ 642 EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
643 EFL_CANVAS_GROUP_ADD_OPS(elm_actionslider) 643 EFL_CANVAS_GROUP_ADD_OPS(elm_actionslider)
644 644
645#include "elm_actionslider_eo.c" 645#include "elm_actionslider_eo.c"
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index df39583..06ebba6 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -223,12 +223,12 @@ ELM_PART_OVERRIDE_TEXT_SET(elm_bubble, ELM_BUBBLE, Elm_Bubble_Data)
223 223
224/* Internal EO APIs and hidden overrides */ 224/* Internal EO APIs and hidden overrides */
225 225
226ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 226EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
227ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 227EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
228 228
229#define ELM_BUBBLE_EXTRA_OPS \ 229#define ELM_BUBBLE_EXTRA_OPS \
230 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \ 230 EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
231 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \ 231 EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
232 EFL_CANVAS_GROUP_ADD_OPS(elm_bubble) 232 EFL_CANVAS_GROUP_ADD_OPS(elm_bubble)
233 233
234#include "elm_bubble_eo.c" 234#include "elm_bubble_eo.c"
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index 55c6bc8..3852142 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -1025,10 +1025,10 @@ _elm_conformant_class_constructor(Efl_Class *klass)
1025 1025
1026/* Internal EO APIs and hidden overrides */ 1026/* Internal EO APIs and hidden overrides */
1027 1027
1028ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 1028EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
1029 1029
1030#define ELM_CONFORMANT_EXTRA_OPS \ 1030#define ELM_CONFORMANT_EXTRA_OPS \
1031 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \ 1031 EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
1032 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_conformant) 1032 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_conformant)
1033 1033
1034#include "elm_conformant_eo.c" 1034#include "elm_conformant_eo.c"
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index c186bde..28fcd55 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -6265,14 +6265,14 @@ ELM_PART_CONTENT_DEFAULT_GET(elm_entry, "icon")
6265 6265
6266/* Internal EO APIs and hidden overrides */ 6266/* Internal EO APIs and hidden overrides */
6267 6267
6268ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 6268EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
6269ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 6269EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
6270 6270
6271#define ELM_ENTRY_EXTRA_OPS \ 6271#define ELM_ENTRY_EXTRA_OPS \
6272 ELM_PART_CONTENT_DEFAULT_OPS(elm_entry), \ 6272 ELM_PART_CONTENT_DEFAULT_OPS(elm_entry), \
6273 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_entry), \ 6273 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_entry), \
6274 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \ 6274 EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
6275 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \ 6275 EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
6276 EFL_CANVAS_GROUP_CALC_OPS(elm_entry) 6276 EFL_CANVAS_GROUP_CALC_OPS(elm_entry)
6277 6277
6278#include "elm_entry_eo.c" 6278#include "elm_entry_eo.c"
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 17691a0..0a46903 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -872,12 +872,12 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_hover, ELM_HOVER, Elm_Hover_Data)
872 872
873/* Internal EO APIs and hidden overrides */ 873/* Internal EO APIs and hidden overrides */
874 874
875// ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) is overridden with an if() 875// EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) is overridden with an if()
876// ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX) somehow doesn't compile!? 876// EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX) somehow doesn't compile!?
877 877
878#define ELM_HOVER_EXTRA_OPS \ 878#define ELM_HOVER_EXTRA_OPS \
879 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hover), \ 879 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hover), \
880 EFL_CANVAS_GROUP_CALC_OPS(elm_hover), \ 880 EFL_CANVAS_GROUP_CALC_OPS(elm_hover), \
881 _ELM_LAYOUT_ALIASES_OPS(elm_hover, content) 881 _EFL_UI_LAYOUT_ALIASES_OPS(elm_hover, content)
882 882
883#include "elm_hover_eo.c" 883#include "elm_hover_eo.c"
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index f7223ae..3361fb2 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -935,29 +935,29 @@ void *_elm_entry_signal_callback_del_legacy(Eo *obj, const char *emission, const
935void efl_ui_win_inlined_parent_set(Eo *obj, Efl_Canvas_Object *parent); 935void efl_ui_win_inlined_parent_set(Eo *obj, Efl_Canvas_Object *parent);
936 936
937/* Internal EO APIs */ 937/* Internal EO APIs */
938const Elm_Layout_Part_Alias_Description *elm_layout_content_aliases_get(const Eo *obj); 938const Elm_Layout_Part_Alias_Description *efl_ui_layout_content_aliases_get(const Eo *obj);
939const Elm_Layout_Part_Alias_Description *elm_layout_text_aliases_get(const Eo *obj); 939const Elm_Layout_Part_Alias_Description *efl_ui_layout_text_aliases_get(const Eo *obj);
940void efl_ui_slider_val_fetch(Evas_Object *obj, Eina_Bool user_event); 940void efl_ui_slider_val_fetch(Evas_Object *obj, Eina_Bool user_event);
941void efl_ui_slider_val_set(Evas_Object *obj); 941void efl_ui_slider_val_set(Evas_Object *obj);
942void efl_ui_slider_down_knob(Evas_Object *obj, double button_x, double button_y); 942void efl_ui_slider_down_knob(Evas_Object *obj, double button_x, double button_y);
943void efl_ui_slider_move_knob(Evas_Object *obj, double button_x, double button_y); 943void efl_ui_slider_move_knob(Evas_Object *obj, double button_x, double button_y);
944//void elm_layout_sizing_eval_eoapi(Eo *obj); 944//void elm_layout_sizing_eval_eoapi(Eo *obj);
945 945
946# define _ELM_LAYOUT_ALIASES_IMPLEMENT(_pfx, _typ) \ 946# define _EFL_UI_LAYOUT_ALIASES_IMPLEMENT(_pfx, _typ) \
947 static const Elm_Layout_Part_Alias_Description * \ 947 static const Elm_Layout_Part_Alias_Description * \
948 _##_pfx##_##_typ##_aliases_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) \ 948 _##_pfx##_##_typ##_aliases_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) \
949 { \ 949 { \
950 return _##_typ##_aliases; \ 950 return _##_typ##_aliases; \
951 } 951 }
952 952
953# define _ELM_LAYOUT_ALIASES_OPS(_pfx, _typ) \ 953# define _EFL_UI_LAYOUT_ALIASES_OPS(_pfx, _typ) \
954 EFL_OBJECT_OP_FUNC(elm_layout_##_typ##_aliases_get, _##_pfx##_##_typ##_aliases_get) 954 EFL_OBJECT_OP_FUNC(efl_ui_layout_##_typ##_aliases_get, _##_pfx##_##_typ##_aliases_get)
955 955
956# define ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(_pfx) _ELM_LAYOUT_ALIASES_IMPLEMENT(_pfx, content) 956# define EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(_pfx) _EFL_UI_LAYOUT_ALIASES_IMPLEMENT(_pfx, content)
957# define ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(_pfx) _ELM_LAYOUT_ALIASES_IMPLEMENT(_pfx, text) 957# define EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(_pfx) _EFL_UI_LAYOUT_ALIASES_IMPLEMENT(_pfx, text)
958 958
959# define ELM_LAYOUT_CONTENT_ALIASES_OPS(_pfx) _ELM_LAYOUT_ALIASES_OPS(_pfx, content) 959# define EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(_pfx) _EFL_UI_LAYOUT_ALIASES_OPS(_pfx, content)
960# define ELM_LAYOUT_TEXT_ALIASES_OPS(_pfx) _ELM_LAYOUT_ALIASES_OPS(_pfx, text) 960# define EFL_UI_LAYOUT_TEXT_ALIASES_OPS(_pfx) _EFL_UI_LAYOUT_ALIASES_OPS(_pfx, text)
961 961
962# define EFL_CANVAS_GROUP_CALC_OPS(_pfx) \ 962# define EFL_CANVAS_GROUP_CALC_OPS(_pfx) \
963 EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _##_pfx##_efl_canvas_group_group_calculate) 963 EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _##_pfx##_efl_canvas_group_group_calculate)
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index cc09ed1..8542638 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -1726,9 +1726,9 @@ void _elm_slider_efl_ui_format_apply_formatted_value(Eo *obj EINA_UNUSED, Elm_Sl
1726 1726
1727/* Internal EO APIs and hidden overrides */ 1727/* Internal EO APIs and hidden overrides */
1728 1728
1729ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(elm_slider) 1729EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(elm_slider)
1730 1730
1731#define ELM_SLIDER_EXTRA_OPS \ 1731#define ELM_SLIDER_EXTRA_OPS \
1732 ELM_LAYOUT_CONTENT_ALIASES_OPS(elm_slider) 1732 EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(elm_slider)
1733 1733
1734#include "elm_slider_eo.c" 1734#include "elm_slider_eo.c"