From 01fc7eae356db03b497ad092bfb07ad56db3a2ad Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 21 Aug 2019 12:22:21 -0400 Subject: [PATCH] elm: fix macro for group_calc function naming this should be efl_canvas_group_group_calculate to match eolian function naming no functional changes Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D9685 --- src/lib/elementary/efl_ui_widget_scrollable_content.c | 2 +- src/lib/elementary/elc_ctxpopup.c | 2 +- src/lib/elementary/elc_naviframe.c | 2 +- src/lib/elementary/elc_popup.c | 2 +- src/lib/elementary/elm_colorselector.c | 2 +- src/lib/elementary/elm_entry.c | 2 +- src/lib/elementary/elm_flipselector.c | 2 +- src/lib/elementary/elm_gengrid.c | 2 +- src/lib/elementary/elm_genlist.c | 2 +- src/lib/elementary/elm_hover.c | 2 +- src/lib/elementary/elm_inwin.c | 2 +- src/lib/elementary/elm_label.c | 2 +- src/lib/elementary/elm_list.c | 2 +- src/lib/elementary/elm_panel.c | 2 +- src/lib/elementary/elm_priv.h | 2 +- src/lib/elementary/elm_scroller.c | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lib/elementary/efl_ui_widget_scrollable_content.c b/src/lib/elementary/efl_ui_widget_scrollable_content.c index 7fee7f670d..cf3ccd8130 100644 --- a/src/lib/elementary/efl_ui_widget_scrollable_content.c +++ b/src/lib/elementary/efl_ui_widget_scrollable_content.c @@ -150,7 +150,7 @@ _sizing_eval(Eo *obj, Efl_Ui_Widget_Scrollable_Content_Data *pd) } EOLIAN static void -_efl_ui_widget_scrollable_content_efl_canvas_group_calculate(Eo *obj, Efl_Ui_Widget_Scrollable_Content_Data *pd) +_efl_ui_widget_scrollable_content_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Widget_Scrollable_Content_Data *pd) { pd->did_group_calc = EINA_FALSE; if (!pd->scroller) diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index a9721ea0c0..c99ccaeeed 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -532,7 +532,7 @@ _elm_ctxpopup_efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Ctxpopup_Data *_p } EOLIAN static void -_elm_ctxpopup_efl_canvas_group_calculate(Eo *obj, Elm_Ctxpopup_Data *sd) +_elm_ctxpopup_efl_canvas_group_group_calculate(Eo *obj, Elm_Ctxpopup_Data *sd) { Eina_Rectangle rect = { 0, 0, 1, 1 }; Evas_Coord_Point list_size = { 0, 0 }, parent_size = {0, 0}; diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index b14f67932d..58a7bfce3b 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -908,7 +908,7 @@ _elm_naviframe_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED, } EOLIAN static void -_elm_naviframe_efl_canvas_group_calculate(Eo *obj, Elm_Naviframe_Data *sd) +_elm_naviframe_efl_canvas_group_group_calculate(Eo *obj, Elm_Naviframe_Data *sd) { Evas_Coord minw = 0, minh = 0; Elm_Naviframe_Item_Data *it, *top; diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 7e04f6be4d..8117d15b9b 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -458,7 +458,7 @@ _item_sizing_eval(Elm_Popup_Item_Data *it) } EOLIAN static void -_elm_popup_efl_canvas_group_calculate(Eo *obj, Elm_Popup_Data *sd) +_elm_popup_efl_canvas_group_group_calculate(Eo *obj, Elm_Popup_Data *sd) { Eina_List *elist; Elm_Popup_Item_Data *it; diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index eee8ea076d..67d8d59715 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -1499,7 +1499,7 @@ _picker_sizing_eval(Evas_Object *obj) } EOLIAN static void -_elm_colorselector_efl_canvas_group_calculate(Eo *obj, Elm_Colorselector_Data *sd) +_elm_colorselector_efl_canvas_group_group_calculate(Eo *obj, Elm_Colorselector_Data *sd) { Evas_Coord minw = -1, minh = -1; diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 7e9e838d97..582762f7b2 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -1145,7 +1145,7 @@ _deferred_recalc_job(void *data) } EOLIAN static void -_elm_entry_efl_canvas_group_calculate(Eo *obj, Elm_Entry_Data *sd) +_elm_entry_efl_canvas_group_group_calculate(Eo *obj, Elm_Entry_Data *sd) { Evas_Coord minw = -1, minh = -1; Evas_Coord resw, resh; diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index 2fb5c98d6b..d7c5741221 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -62,7 +62,7 @@ static const Elm_Action key_actions[] = { }; EOLIAN static void -_elm_flipselector_efl_canvas_group_calculate(Eo *obj, Elm_Flipselector_Data *sd) +_elm_flipselector_efl_canvas_group_group_calculate(Eo *obj, Elm_Flipselector_Data *sd) { char *tmp = NULL; Evas_Coord minw = -1, minh = -1, w, h; diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 210e46e4ba..2cc089abf0 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -4056,7 +4056,7 @@ _elm_gengrid_item_new(Elm_Gengrid_Data *sd, } EOLIAN static void -_elm_gengrid_efl_canvas_group_calculate(Eo *obj, Elm_Gengrid_Data *sd) +_elm_gengrid_efl_canvas_group_group_calculate(Eo *obj, Elm_Gengrid_Data *sd) { Evas_Coord minw = 0, minh = 0, maxw = -1, maxh = -1, vw = 0, vh = 0; diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 55b3b1d601..37ebc34575 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -925,7 +925,7 @@ _calc_job(void *data) } EOLIAN static void -_elm_genlist_efl_canvas_group_calculate(Eo *obj, Elm_Genlist_Data *sd) +_elm_genlist_efl_canvas_group_group_calculate(Eo *obj, Elm_Genlist_Data *sd) { Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; Evas_Coord vmw = 0, vmh = 0; diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index 899ffef3ac..17691a0fcf 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -315,7 +315,7 @@ _elm_hover_efl_ui_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd) } EOLIAN static void -_elm_hover_efl_canvas_group_calculate(Eo *obj, Elm_Hover_Data *sd) +_elm_hover_efl_canvas_group_group_calculate(Eo *obj, Elm_Hover_Data *sd) { Evas_Coord ofs_x, x = 0, y = 0, w = 0, h = 0, x2 = 0, y2 = 0, w2 = 0, h2 = 0; diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c index 872d89d64c..0dcf6edc2f 100644 --- a/src/lib/elementary/elm_inwin.c +++ b/src/lib/elementary/elm_inwin.c @@ -26,7 +26,7 @@ typedef struct { } Elm_Inwin_Data; EOLIAN static void -_elm_inwin_efl_canvas_group_calculate(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED) +_elm_inwin_efl_canvas_group_group_calculate(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED) { if (elm_layout_content_get(obj, NULL)) efl_canvas_group_calculate(efl_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index c052cfef1c..3d3e2a6af4 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -208,7 +208,7 @@ _elm_label_efl_ui_widget_theme_apply(Eo *obj, Elm_Label_Data *sd) } EOLIAN static void -_elm_label_efl_canvas_group_calculate(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED) +_elm_label_efl_canvas_group_group_calculate(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED) { Evas_Coord minw = -1, minh = -1; Evas_Coord resw, resh; diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 0c758f9e1c..04831372c5 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -691,7 +691,7 @@ _elm_list_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_List_Data *sd) } EOLIAN static void -_elm_list_efl_canvas_group_calculate(Eo *obj, Elm_List_Data *sd) +_elm_list_efl_canvas_group_group_calculate(Eo *obj, Elm_List_Data *sd) { Evas_Coord vw = 0, vh = 0; Evas_Coord minw = 0, minh = 0, maxw = 0, maxh = 0, w = 0, h = 0, vmw = 0, vmh = 0; diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 1f6ce2e890..b8262b3a16 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -56,7 +56,7 @@ _mirrored_set(Evas_Object *obj, } EOLIAN static void -_elm_panel_efl_canvas_group_calculate(Eo *obj, Elm_Panel_Data *sd) +_elm_panel_efl_canvas_group_group_calculate(Eo *obj, Elm_Panel_Data *sd) { if (sd->delete_me) return; diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index f621576d2a..3598a67fb3 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -958,7 +958,7 @@ void efl_ui_slider_move_knob(Evas_Object *obj, double button_x, double button_y) # define ELM_LAYOUT_TEXT_ALIASES_OPS(_pfx) _ELM_LAYOUT_ALIASES_OPS(_pfx, text) # define EFL_CANVAS_GROUP_CALC_OPS(_pfx) \ - EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _##_pfx##_efl_canvas_group_calculate) + EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _##_pfx##_efl_canvas_group_group_calculate) # define ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(_pfx, _typ) \ EOLIAN static Eina_Bool \ diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index f22939f6a4..e0880f82f1 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -326,7 +326,7 @@ _elm_scroller_efl_ui_widget_on_access_activate(Eo *obj, Elm_Scroller_Data *_pd E } EOLIAN static void -_elm_scroller_efl_canvas_group_calculate(Eo *obj, Elm_Scroller_Data *sd) +_elm_scroller_efl_canvas_group_group_calculate(Eo *obj, Elm_Scroller_Data *sd) { Evas_Coord vw = 0, vh = 0, minw = 0, minh = 0, maxw = 0, maxh = 0, w, h, vmw, vmh;