From bb0290edbe1b75a82293fc9774e96dd412bdd3ff Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Tue, 19 Mar 2019 16:28:10 -0400 Subject: [PATCH] efl_ui_widget: resolve warning about multiple defines Summary: the difference here is, that the macro before did not print ERR's the one now does. Hence this commit remove two error messages. Reviewers: devilhorns Reviewed By: devilhorns Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8415 --- src/lib/elementary/efl_ui_widget.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 11f0cc30a1..5eb1431a6b 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -480,12 +480,7 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s { if (efl_isa(pd->logical.parent, EFL_UI_WIDGET_CLASS)) { - ELM_WIDGET_DATA_GET(pd->logical.parent, logical_wd); - if (!logical_wd) - { - ERR("Widget parent has the wrong type!"); - return NULL; - } + ELM_WIDGET_DATA_GET_OR_RETURN(pd->logical.parent, logical_wd, NULL); logical_wd->logical.child_count --; } old = pd->logical.parent; @@ -496,12 +491,7 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s { if (efl_isa(parent, EFL_UI_WIDGET_CLASS)) { - ELM_WIDGET_DATA_GET(parent, parent_wd); - if (!parent_wd) - { - ERR("Widget parent has the wrong type!"); - return NULL; - } + ELM_WIDGET_DATA_GET_OR_RETURN(parent, parent_wd, NULL); parent_wd->logical.child_count ++; } pd->logical.parent = parent;