cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=105f016fc92324de903d501d9ffeac55855ea3da
commit 105f016fc92324de903d501d9ffeac55855ea3da
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Mon Sep 23 13:24:51 2019 -0400
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 <xavierarti...@yahoo.es>
Differential Revision: https://phab.enlightenment.org/D10090
---
src/lib/elementary/efl_ui_bg.c | 4 ++--
src/lib/elementary/efl_ui_button.c | 4 ++--
src/lib/elementary/efl_ui_check.c | 8 ++++----
src/lib/elementary/efl_ui_layout.c | 16 ++++++++--------
src/lib/elementary/efl_ui_panes.c | 4 ++--
src/lib/elementary/efl_ui_progressbar.c | 4 ++--
src/lib/elementary/efl_ui_radio.c | 4 ++--
src/lib/elementary/efl_ui_text.c | 2 +-
src/lib/elementary/elm_actionslider.c | 4 ++--
src/lib/elementary/elm_bubble.c | 8 ++++----
src/lib/elementary/elm_conform.c | 4 ++--
src/lib/elementary/elm_entry.c | 8 ++++----
src/lib/elementary/elm_hover.c | 6 +++---
src/lib/elementary/elm_priv.h | 18 +++++++++---------
src/lib/elementary/elm_slider.c | 4 ++--
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 d5932d331f..614896dd2c 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)
/* Internal EO APIs and hidden overrides */
-ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_BG_EXTRA_OPS \
- ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX)
+ EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX)
#include "efl_ui_bg.eo.c"
diff --git a/src/lib/elementary/efl_ui_button.c
b/src/lib/elementary/efl_ui_button.c
index f71fb3e0ad..4bcbc11380 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)
/* Internal EO APIs and hidden overrides */
-ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_BUTTON_EXTRA_OPS \
- ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
+ EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button)
#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 df53247259..190242e3ef 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
ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_check, Efl_Ui_Check_Data)
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_check, Efl_Ui_Check_Data)
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_check, Efl_Ui_Check_Data)
-ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
/* Internal EO APIs and hidden overrides */
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_CHECK_EXTRA_OPS \
- ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
- ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
+ EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
+ EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
#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 fd52af6f16..46aaebcc5d 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,
}
if (is_text)
- aliases = elm_layout_text_aliases_get(obj);
+ aliases = efl_ui_layout_text_aliases_get(obj);
else
- aliases = elm_layout_content_aliases_get(obj);
+ aliases = efl_ui_layout_content_aliases_get(obj);
while (aliases && aliases->alias && aliases->real_part)
{
@@ -2847,18 +2847,18 @@ _efl_ui_layout_base_theme_rotation_apply(Eo *obj,
Efl_Ui_Layout_Data *pd EINA_UN
/* Internal EO APIs and hidden overrides */
-EFL_FUNC_BODY_CONST(elm_layout_text_aliases_get, const
Elm_Layout_Part_Alias_Description *, NULL)
-EFL_FUNC_BODY_CONST(elm_layout_content_aliases_get, const
Elm_Layout_Part_Alias_Description *, NULL)
+EFL_FUNC_BODY_CONST(efl_ui_layout_text_aliases_get, const
Elm_Layout_Part_Alias_Description *, NULL)
+EFL_FUNC_BODY_CONST(efl_ui_layout_content_aliases_get, const
Elm_Layout_Part_Alias_Description *, NULL)
-ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_LAYOUT_BASE_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_layout_base), \
ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_layout_base), \
ELM_PART_TEXT_DEFAULT_OPS(efl_ui_layout_base), \
- ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
- ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
+ EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
+ EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
EFL_OBJECT_OP_FUNC(efl_dbg_info_get,
_efl_ui_layout_base_efl_object_dbg_info_get)
diff --git a/src/lib/elementary/efl_ui_panes.c
b/src/lib/elementary/efl_ui_panes.c
index 3b6db20f40..ea1c9fe06a 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
/* Internal EO APIs and hidden overrides */
-ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_panes)
+EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_panes)
#define EFL_UI_PANES_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_panes), \
- ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_panes)
+ EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_panes)
#include "efl_ui_panes.eo.c"
#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 4ea4b26482..61c6ece78b 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)
ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
-ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar)
+EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar)
#define EFL_UI_PROGRESSBAR_EXTRA_OPS \
- ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_progressbar), \
+ EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_progressbar), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar)
#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 a7106a3643..18f0c6b3c3 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 *
/* Internal EO APIs and hidden overrides */
ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_radio, Efl_Ui_Radio_Data)
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_RADIO_EXTRA_OPS \
- ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
+ EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
#include "efl_ui_radio.eo.c"
#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 7b29f3e41e..a57ca7e4f9 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)
/* Internal EO APIs and hidden overrides */
-//ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+//EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#include "efl_ui_text.eo.c"
diff --git a/src/lib/elementary/elm_actionslider.c
b/src/lib/elementary/elm_actionslider.c
index 05036fea8e..4537cd9255 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_
/* Internal EO APIs and hidden overrides */
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define ELM_ACTIONSLIDER_EXTRA_OPS \
- ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
+ EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
EFL_CANVAS_GROUP_ADD_OPS(elm_actionslider)
#include "elm_actionslider_eo.c"
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index df395831a4..06ebba6d43 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)
/* Internal EO APIs and hidden overrides */
-ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define ELM_BUBBLE_EXTRA_OPS \
- ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
- ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
+ EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
+ EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
EFL_CANVAS_GROUP_ADD_OPS(elm_bubble)
#include "elm_bubble_eo.c"
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index 55c6bc8488..38521427a3 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)
/* Internal EO APIs and hidden overrides */
-ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define ELM_CONFORMANT_EXTRA_OPS \
- ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
+ EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_conformant)
#include "elm_conformant_eo.c"
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index c186bdebc3..28fcd55542 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")
/* Internal EO APIs and hidden overrides */
-ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
+EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define ELM_ENTRY_EXTRA_OPS \
ELM_PART_CONTENT_DEFAULT_OPS(elm_entry), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_entry), \
- ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
- ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
+ EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
+ EFL_UI_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
EFL_CANVAS_GROUP_CALC_OPS(elm_entry)
#include "elm_entry_eo.c"
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 17691a0fcf..0a46903d99 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)
/* Internal EO APIs and hidden overrides */
-// ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) is overridden with an
if()
-// ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX) somehow doesn't compile!?
+// EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) is overridden with an
if()
+// EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX) somehow doesn't compile!?
#define ELM_HOVER_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hover), \
EFL_CANVAS_GROUP_CALC_OPS(elm_hover), \
- _ELM_LAYOUT_ALIASES_OPS(elm_hover, content)
+ _EFL_UI_LAYOUT_ALIASES_OPS(elm_hover, content)
#include "elm_hover_eo.c"
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index f7223ae6b4..3361fb23d0 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
void efl_ui_win_inlined_parent_set(Eo *obj, Efl_Canvas_Object *parent);
/* Internal EO APIs */
-const Elm_Layout_Part_Alias_Description *elm_layout_content_aliases_get(const
Eo *obj);
-const Elm_Layout_Part_Alias_Description *elm_layout_text_aliases_get(const Eo
*obj);
+const Elm_Layout_Part_Alias_Description
*efl_ui_layout_content_aliases_get(const Eo *obj);
+const Elm_Layout_Part_Alias_Description *efl_ui_layout_text_aliases_get(const
Eo *obj);
void efl_ui_slider_val_fetch(Evas_Object *obj, Eina_Bool user_event);
void efl_ui_slider_val_set(Evas_Object *obj);
void efl_ui_slider_down_knob(Evas_Object *obj, double button_x, double
button_y);
void efl_ui_slider_move_knob(Evas_Object *obj, double button_x, double
button_y);
//void elm_layout_sizing_eval_eoapi(Eo *obj);
-# define _ELM_LAYOUT_ALIASES_IMPLEMENT(_pfx, _typ) \
+# define _EFL_UI_LAYOUT_ALIASES_IMPLEMENT(_pfx, _typ) \
static const Elm_Layout_Part_Alias_Description * \
_##_pfx##_##_typ##_aliases_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) \
{ \
return _##_typ##_aliases; \
}
-# define _ELM_LAYOUT_ALIASES_OPS(_pfx, _typ) \
- EFL_OBJECT_OP_FUNC(elm_layout_##_typ##_aliases_get,
_##_pfx##_##_typ##_aliases_get)
+# define _EFL_UI_LAYOUT_ALIASES_OPS(_pfx, _typ) \
+ EFL_OBJECT_OP_FUNC(efl_ui_layout_##_typ##_aliases_get,
_##_pfx##_##_typ##_aliases_get)
-# define ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(_pfx)
_ELM_LAYOUT_ALIASES_IMPLEMENT(_pfx, content)
-# define ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(_pfx)
_ELM_LAYOUT_ALIASES_IMPLEMENT(_pfx, text)
+# define EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(_pfx)
_EFL_UI_LAYOUT_ALIASES_IMPLEMENT(_pfx, content)
+# define EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(_pfx)
_EFL_UI_LAYOUT_ALIASES_IMPLEMENT(_pfx, text)
-# define ELM_LAYOUT_CONTENT_ALIASES_OPS(_pfx) _ELM_LAYOUT_ALIASES_OPS(_pfx,
content)
-# define ELM_LAYOUT_TEXT_ALIASES_OPS(_pfx) _ELM_LAYOUT_ALIASES_OPS(_pfx, text)
+# define EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(_pfx)
_EFL_UI_LAYOUT_ALIASES_OPS(_pfx, content)
+# define EFL_UI_LAYOUT_TEXT_ALIASES_OPS(_pfx) _EFL_UI_LAYOUT_ALIASES_OPS(_pfx,
text)
# define EFL_CANVAS_GROUP_CALC_OPS(_pfx) \
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 cc09ed14b7..85426386e2 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
/* Internal EO APIs and hidden overrides */
-ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(elm_slider)
+EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(elm_slider)
#define ELM_SLIDER_EXTRA_OPS \
- ELM_LAYOUT_CONTENT_ALIASES_OPS(elm_slider)
+ EFL_UI_LAYOUT_CONTENT_ALIASES_OPS(elm_slider)
#include "elm_slider_eo.c"
--
