xartigas pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b4f5b78550f10531fc9b5fc04e1a77327908b580
commit b4f5b78550f10531fc9b5fc04e1a77327908b580 Author: Marcel Hollerbach <[email protected]> Date: Mon Jul 29 16:07:25 2019 +0200 efl_ui_item: remove self field Summary: there is no reason to have this field, pd of a item is always passed with the object. Reviewers: segfaultxavi, zmike, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9423 --- src/lib/elementary/efl_ui_item.c | 5 ++--- src/lib/elementary/efl_ui_item_private.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/elementary/efl_ui_item.c b/src/lib/elementary/efl_ui_item.c index 5119568773..7b9beab362 100644 --- a/src/lib/elementary/efl_ui_item.c +++ b/src/lib/elementary/efl_ui_item.c @@ -302,7 +302,7 @@ _sizing_eval(Evas_Object *obj, Efl_Ui_Item_Data *pd) { Evas_Coord minh = -1, minw = -1; Evas_Coord rest_w = 0, rest_h = 0; - ELM_WIDGET_DATA_GET_OR_RETURN(pd->obj, wd); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); edje_object_size_min_restricted_calc(wd->resize_obj, &minw, &minh, rest_w, rest_h); @@ -331,9 +331,8 @@ _efl_ui_item_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Item_Data *pd) } EOLIAN static Eo * -_efl_ui_item_efl_object_constructor(Eo *obj, Efl_Ui_Item_Data *pd) +_efl_ui_item_efl_object_constructor(Eo *obj, Efl_Ui_Item_Data *pd EINA_UNUSED) { - pd->obj = obj; obj = efl_constructor(efl_super(obj, MY_CLASS)); return obj; diff --git a/src/lib/elementary/efl_ui_item_private.h b/src/lib/elementary/efl_ui_item_private.h index ea8ac073c9..bb09c2e509 100644 --- a/src/lib/elementary/efl_ui_item_private.h +++ b/src/lib/elementary/efl_ui_item_private.h @@ -6,7 +6,6 @@ typedef struct _Efl_Ui_Item_Data { // Eo Objects - Eo *obj; /* Self-Object */ Eo *parent; /* Parent Widget */ Ecore_Timer *longpress_timer; /* Timer for longpress handle */ --
