diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c index d67a8945af..2662a01c56 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.c +++ b/legacy/elementary/src/lib/elc_ctxpopup.c @@ -1153,8 +1153,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c index 68baa04495..f1fecf9246 100644 --- a/legacy/elementary/src/lib/elc_fileselector.c +++ b/legacy/elementary/src/lib/elc_fileselector.c @@ -914,9 +914,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elc_fileselector_button.c b/legacy/elementary/src/lib/elc_fileselector_button.c index de244e93e3..549d75ac2d 100644 --- a/legacy/elementary/src/lib/elc_fileselector_button.c +++ b/legacy/elementary/src/lib/elc_fileselector_button.c @@ -218,9 +218,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/legacy/elementary/src/lib/elc_fileselector_entry.c index db063564dc..b3a57f24e2 100644 --- a/legacy/elementary/src/lib/elc_fileselector_entry.c +++ b/legacy/elementary/src/lib/elc_fileselector_entry.c @@ -417,8 +417,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elc_hoversel.c b/legacy/elementary/src/lib/elc_hoversel.c index 3c5caa45b7..bc9faa4647 100644 --- a/legacy/elementary/src/lib/elc_hoversel.c +++ b/legacy/elementary/src/lib/elc_hoversel.c @@ -264,9 +264,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c index 81763e3465..82d672f43b 100644 --- a/legacy/elementary/src/lib/elc_multibuttonentry.c +++ b/legacy/elementary/src/lib/elc_multibuttonentry.c @@ -1674,8 +1674,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Evas_Object * diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index e2410f4f13..1943780f7d 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -1283,8 +1283,7 @@ _elm_naviframe_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) _on_obj_size_hints_changed, obj); elm_widget_can_focus_set(obj, EINA_TRUE); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } static Eina_Bool diff --git a/legacy/elementary/src/lib/elc_player.c b/legacy/elementary/src/lib/elc_player.c index 2e6257ae0c..7fe372ef87 100644 --- a/legacy/elementary/src/lib/elc_player.c +++ b/legacy/elementary/src/lib/elc_player.c @@ -580,9 +580,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); #else eo_error_set(obj); #endif diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c index 045b9acb08..74b3ff3a39 100644 --- a/legacy/elementary/src/lib/elc_popup.c +++ b/legacy/elementary/src/lib/elc_popup.c @@ -1453,8 +1453,7 @@ _elm_popup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) (wd->resize_obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set (wd->resize_obj, EVAS_HINT_FILL, EVAS_HINT_FILL); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); if (!elm_layout_theme_set(obj, "popup", "base", elm_widget_style_get(obj))) CRITICAL("Failed to set layout!"); diff --git a/legacy/elementary/src/lib/elm_access.c b/legacy/elementary/src/lib/elm_access.c index 5c170fae41..a672beeff6 100644 --- a/legacy/elementary/src/lib/elm_access.c +++ b/legacy/elementary/src/lib/elm_access.c @@ -918,9 +918,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Evas_Object * diff --git a/legacy/elementary/src/lib/elm_actionslider.c b/legacy/elementary/src/lib/elm_actionslider.c index 3aa218a729..ee7a9bff1a 100644 --- a/legacy/elementary/src/lib/elm_actionslider.c +++ b/legacy/elementary/src/lib/elm_actionslider.c @@ -441,9 +441,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_bg.c b/legacy/elementary/src/lib/elm_bg.c index 7accd31b78..6260224e3a 100644 --- a/legacy/elementary/src/lib/elm_bg.c +++ b/legacy/elementary/src/lib/elm_bg.c @@ -103,10 +103,7 @@ _elm_bg_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); - + elm_widget_sub_object_add(eo_parent_get(obj), obj); elm_widget_can_focus_set(obj, EINA_FALSE); priv->option = ELM_BG_OPTION_SCALE; diff --git a/legacy/elementary/src/lib/elm_box.c b/legacy/elementary/src/lib/elm_box.c index 61efce41f1..9e8dfc75cd 100644 --- a/legacy/elementary/src/lib/elm_box.c +++ b/legacy/elementary/src/lib/elm_box.c @@ -462,8 +462,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do(obj, evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_bubble.c b/legacy/elementary/src/lib/elm_bubble.c index 7a651da84f..3af00fb335 100644 --- a/legacy/elementary/src/lib/elm_bubble.c +++ b/legacy/elementary/src/lib/elm_bubble.c @@ -250,9 +250,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c index ec30cba3c9..869b110223 100644 --- a/legacy/elementary/src/lib/elm_button.c +++ b/legacy/elementary/src/lib/elm_button.c @@ -294,9 +294,7 @@ _elm_button_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); edje_object_signal_callback_add (wd->resize_obj, "elm,action,click", "", diff --git a/legacy/elementary/src/lib/elm_calendar.c b/legacy/elementary/src/lib/elm_calendar.c index de9a8ada46..b7d4287173 100644 --- a/legacy/elementary/src/lib/elm_calendar.c +++ b/legacy/elementary/src/lib/elm_calendar.c @@ -1181,9 +1181,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_check.c b/legacy/elementary/src/lib/elm_check.c index 2558c4e8bf..9f07db3f25 100644 --- a/legacy/elementary/src/lib/elm_check.c +++ b/legacy/elementary/src/lib/elm_check.c @@ -345,9 +345,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_clock.c b/legacy/elementary/src/lib/elm_clock.c index 37a50f31de..9b7a4ba5b9 100644 --- a/legacy/elementary/src/lib/elm_clock.c +++ b/legacy/elementary/src/lib/elm_clock.c @@ -830,9 +830,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } static void diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c index 02c809a442..9321ca3521 100644 --- a/legacy/elementary/src/lib/elm_colorselector.c +++ b/legacy/elementary/src/lib/elm_colorselector.c @@ -1772,9 +1772,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_conform.c b/legacy/elementary/src/lib/elm_conform.c index 76fe7e459e..aa5ef144e2 100644 --- a/legacy/elementary/src/lib/elm_conform.c +++ b/legacy/elementary/src/lib/elm_conform.c @@ -985,9 +985,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); Elm_Conformant_Smart_Data *sd = _pd; diff --git a/legacy/elementary/src/lib/elm_datetime.c b/legacy/elementary/src/lib/elm_datetime.c index 12724d2ae1..663220e3b5 100644 --- a/legacy/elementary/src/lib/elm_datetime.c +++ b/legacy/elementary/src/lib/elm_datetime.c @@ -850,9 +850,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI const char * diff --git a/legacy/elementary/src/lib/elm_dayselector.c b/legacy/elementary/src/lib/elm_dayselector.c index ded2350516..5d61b4d60b 100644 --- a/legacy/elementary/src/lib/elm_dayselector.c +++ b/legacy/elementary/src/lib/elm_dayselector.c @@ -473,9 +473,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_diskselector.c b/legacy/elementary/src/lib/elm_diskselector.c index 69aef041e3..bf52f0c4bd 100644 --- a/legacy/elementary/src/lib/elm_diskselector.c +++ b/legacy/elementary/src/lib/elm_diskselector.c @@ -1468,9 +1468,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Eina_Bool diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index 253a3fc7ef..aa16c4dd0f 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -3094,9 +3094,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_flip.c b/legacy/elementary/src/lib/elm_flip.c index 223ad516ec..adf3024ee2 100644 --- a/legacy/elementary/src/lib/elm_flip.c +++ b/legacy/elementary/src/lib/elm_flip.c @@ -1871,8 +1871,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Eina_Bool diff --git a/legacy/elementary/src/lib/elm_flipselector.c b/legacy/elementary/src/lib/elm_flipselector.c index daecc9f9a6..e23cc239d2 100644 --- a/legacy/elementary/src/lib/elm_flipselector.c +++ b/legacy/elementary/src/lib/elm_flipselector.c @@ -611,9 +611,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_frame.c b/legacy/elementary/src/lib/elm_frame.c index 4ad00eb668..9d0875d2a7 100644 --- a/legacy/elementary/src/lib/elm_frame.c +++ b/legacy/elementary/src/lib/elm_frame.c @@ -217,9 +217,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index 57b8d78e6d..dd1d7895cc 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -2534,9 +2534,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index 47c05db5f1..d9317c3bf9 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -4915,9 +4915,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } static void diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/legacy/elementary/src/lib/elm_gesture_layer.c index 2349739cd8..c19e498596 100644 --- a/legacy/elementary/src/lib/elm_gesture_layer.c +++ b/legacy/elementary/src/lib/elm_gesture_layer.c @@ -3659,8 +3659,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Eina_Bool diff --git a/legacy/elementary/src/lib/elm_glview.c b/legacy/elementary/src/lib/elm_glview.c index 29ed414d86..e181b782ab 100644 --- a/legacy/elementary/src/lib/elm_glview.c +++ b/legacy/elementary/src/lib/elm_glview.c @@ -291,8 +291,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) return; } - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Evas_GL_API * diff --git a/legacy/elementary/src/lib/elm_grid.c b/legacy/elementary/src/lib/elm_grid.c index d456305d62..e1a22b32bd 100644 --- a/legacy/elementary/src/lib/elm_grid.c +++ b/legacy/elementary/src/lib/elm_grid.c @@ -176,8 +176,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_hover.c b/legacy/elementary/src/lib/elm_hover.c index 92e058dc29..5f63480e19 100644 --- a/legacy/elementary/src/lib/elm_hover.c +++ b/legacy/elementary/src/lib/elm_hover.c @@ -648,9 +648,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_icon.c b/legacy/elementary/src/lib/elm_icon.c index 2075ce336c..ef04191188 100644 --- a/legacy/elementary/src/lib/elm_icon.c +++ b/legacy/elementary/src/lib/elm_icon.c @@ -759,8 +759,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Eina_Bool diff --git a/legacy/elementary/src/lib/elm_image.c b/legacy/elementary/src/lib/elm_image.c index 4cf3bb86e6..535e50caf3 100644 --- a/legacy/elementary/src/lib/elm_image.c +++ b/legacy/elementary/src/lib/elm_image.c @@ -1103,8 +1103,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Eina_Bool diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c index dec16947e2..92c702088e 100644 --- a/legacy/elementary/src/lib/elm_index.c +++ b/legacy/elementary/src/lib/elm_index.c @@ -1117,8 +1117,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_inwin.c b/legacy/elementary/src/lib/elm_inwin.c index 55616979fd..88468786a2 100644 --- a/legacy/elementary/src/lib/elm_inwin.c +++ b/legacy/elementary/src/lib/elm_inwin.c @@ -120,8 +120,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(parent, obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_label.c b/legacy/elementary/src/lib/elm_label.c index 90deac4ee6..2616697970 100644 --- a/legacy/elementary/src/lib/elm_label.c +++ b/legacy/elementary/src/lib/elm_label.c @@ -378,9 +378,7 @@ _elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); priv->linewrap = ELM_WRAP_NONE; priv->wrap_w = -1; diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c index 06a7b6f805..4049bd5698 100644 --- a/legacy/elementary/src/lib/elm_layout.c +++ b/legacy/elementary/src/lib/elm_layout.c @@ -797,10 +797,7 @@ _elm_layout_smart_content_set(Eo *obj, void *_pd, va_list *list) if (content) { if (!elm_widget_sub_object_add(obj, content)) - { - ERR("could not add %p as sub object of %p", content, obj); - return; - } + return; if (!edje_object_part_swallow (wd->resize_obj, part, content)) @@ -914,7 +911,6 @@ _elm_layout_smart_box_append(Eo *obj, void *_pd, va_list *list) if (!elm_widget_sub_object_add(obj, child)) { - ERR("could not add %p as sub object of %p", child, obj); edje_object_part_box_remove (wd->resize_obj, part, child); return; @@ -955,7 +951,6 @@ _elm_layout_smart_box_prepend(Eo *obj, void *_pd, va_list *list) if (!elm_widget_sub_object_add(obj, child)) { - ERR("could not add %p as sub object of %p", child, obj); edje_object_part_box_remove (wd->resize_obj, part, child); return; @@ -1008,7 +1003,6 @@ _elm_layout_smart_box_insert_before(Eo *obj, void *_pd, va_list *list) if (!elm_widget_sub_object_add(obj, child)) { - ERR("could not add %p as sub object of %p", child, obj); edje_object_part_box_remove (wd->resize_obj, part, child); return; @@ -1055,7 +1049,6 @@ _elm_layout_smart_box_insert_at(Eo *obj, void *_pd, va_list *list) if (!elm_widget_sub_object_add(obj, child)) { - ERR("could not add %p as sub object of %p", child, obj); edje_object_part_box_remove (wd->resize_obj, part, child); return; @@ -1212,7 +1205,6 @@ _elm_layout_smart_table_pack(Eo *obj, void *_pd, va_list *list) if (!elm_widget_sub_object_add(obj, child)) { - ERR("could not add %p as sub object of %p", child, obj); edje_object_part_table_unpack (wd->resize_obj, part, child); return; @@ -2157,8 +2149,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do(obj, evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } static void diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index 382db09e37..f9bfcdd5f8 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -1755,9 +1755,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c index cb7121a852..99de4b9280 100644 --- a/legacy/elementary/src/lib/elm_map.c +++ b/legacy/elementary/src/lib/elm_map.c @@ -4199,9 +4199,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); #else eo_error_set(obj); #endif diff --git a/legacy/elementary/src/lib/elm_mapbuf.c b/legacy/elementary/src/lib/elm_mapbuf.c index 7f2598a64f..3a6157d72c 100644 --- a/legacy/elementary/src/lib/elm_mapbuf.c +++ b/legacy/elementary/src/lib/elm_mapbuf.c @@ -266,8 +266,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_menu.c b/legacy/elementary/src/lib/elm_menu.c index 2dcccc4ed9..c42e3d0eea 100644 --- a/legacy/elementary/src/lib/elm_menu.c +++ b/legacy/elementary/src/lib/elm_menu.c @@ -678,8 +678,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); elm_menu_parent_set(obj, eo_parent_get(obj)); elm_hover_target_set(sd->hv, sd->location); diff --git a/legacy/elementary/src/lib/elm_notify.c b/legacy/elementary/src/lib/elm_notify.c index 365fd6201e..ccc036a9f1 100644 --- a/legacy/elementary/src/lib/elm_notify.c +++ b/legacy/elementary/src/lib/elm_notify.c @@ -486,8 +486,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c index 10760e6d72..dd12461bc0 100644 --- a/legacy/elementary/src/lib/elm_panel.c +++ b/legacy/elementary/src/lib/elm_panel.c @@ -414,8 +414,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_panes.c b/legacy/elementary/src/lib/elm_panes.c index bb91377c8b..ee9aabc06f 100644 --- a/legacy/elementary/src/lib/elm_panes.c +++ b/legacy/elementary/src/lib/elm_panes.c @@ -228,9 +228,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EINA_DEPRECATED EAPI void diff --git a/legacy/elementary/src/lib/elm_photocam.c b/legacy/elementary/src/lib/elm_photocam.c index 71c386c956..e59b66a27d 100644 --- a/legacy/elementary/src/lib/elm_photocam.c +++ b/legacy/elementary/src/lib/elm_photocam.c @@ -1443,9 +1443,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Evas_Load_Error diff --git a/legacy/elementary/src/lib/elm_plug.c b/legacy/elementary/src/lib/elm_plug.c index ba259fd906..d48a9b947d 100644 --- a/legacy/elementary/src/lib/elm_plug.c +++ b/legacy/elementary/src/lib/elm_plug.c @@ -124,9 +124,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Evas_Object * diff --git a/legacy/elementary/src/lib/elm_prefs.c b/legacy/elementary/src/lib/elm_prefs.c index cb3983ea47..f235ba2f69 100644 --- a/legacy/elementary/src/lib/elm_prefs.c +++ b/legacy/elementary/src/lib/elm_prefs.c @@ -527,10 +527,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_smart_callbacks_descriptions_set(_elm_prefs_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } static Eina_Bool diff --git a/legacy/elementary/src/lib/elm_progressbar.c b/legacy/elementary/src/lib/elm_progressbar.c index 411301a78b..3cd0bee120 100644 --- a/legacy/elementary/src/lib/elm_progressbar.c +++ b/legacy/elementary/src/lib/elm_progressbar.c @@ -312,9 +312,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_radio.c b/legacy/elementary/src/lib/elm_radio.c index cf507e31a7..7ebd092a47 100644 --- a/legacy/elementary/src/lib/elm_radio.c +++ b/legacy/elementary/src/lib/elm_radio.c @@ -334,9 +334,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_route.c b/legacy/elementary/src/lib/elm_route.c index c7354e9f5a..b6fe1bf07c 100644 --- a/legacy/elementary/src/lib/elm_route.c +++ b/legacy/elementary/src/lib/elm_route.c @@ -189,8 +189,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } #ifdef ELM_EMAP diff --git a/legacy/elementary/src/lib/elm_scroller.c b/legacy/elementary/src/lib/elm_scroller.c index bfac38287b..39a581adca 100644 --- a/legacy/elementary/src/lib/elm_scroller.c +++ b/legacy/elementary/src/lib/elm_scroller.c @@ -841,9 +841,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } /* deprecated */ diff --git a/legacy/elementary/src/lib/elm_segment_control.c b/legacy/elementary/src/lib/elm_segment_control.c index ecef2a53cc..c10a953171 100644 --- a/legacy/elementary/src/lib/elm_segment_control.c +++ b/legacy/elementary/src/lib/elm_segment_control.c @@ -699,9 +699,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Elm_Object_Item * diff --git a/legacy/elementary/src/lib/elm_separator.c b/legacy/elementary/src/lib/elm_separator.c index 3d28e3910b..0e1e1a2c7a 100644 --- a/legacy/elementary/src/lib/elm_separator.c +++ b/legacy/elementary/src/lib/elm_separator.c @@ -73,9 +73,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_slider.c b/legacy/elementary/src/lib/elm_slider.c index 2878416613..cc8d81ec28 100644 --- a/legacy/elementary/src/lib/elm_slider.c +++ b/legacy/elementary/src/lib/elm_slider.c @@ -872,9 +872,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/legacy/elementary/src/lib/elm_slideshow.c index 58c489c4df..fcc07a5e4d 100644 --- a/legacy/elementary/src/lib/elm_slideshow.c +++ b/legacy/elementary/src/lib/elm_slideshow.c @@ -377,9 +377,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Elm_Object_Item * diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c index db31af28a0..f0a97d5184 100644 --- a/legacy/elementary/src/lib/elm_spinner.c +++ b/legacy/elementary/src/lib/elm_spinner.c @@ -805,9 +805,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_table.c b/legacy/elementary/src/lib/elm_table.c index 9975fa85dc..e159647b08 100644 --- a/legacy/elementary/src/lib/elm_table.c +++ b/legacy/elementary/src/lib/elm_table.c @@ -236,8 +236,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_thumb.c b/legacy/elementary/src/lib/elm_thumb.c index c869e12d97..7cf9b07ea4 100644 --- a/legacy/elementary/src/lib/elm_thumb.c +++ b/legacy/elementary/src/lib/elm_thumb.c @@ -636,8 +636,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) Elm_Thumb_Smart_Data *sd = _pd; sd->obj = obj; - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c index 3d3d178bc2..36cc59dedc 100644 --- a/legacy/elementary/src/lib/elm_toolbar.c +++ b/legacy/elementary/src/lib/elm_toolbar.c @@ -2548,9 +2548,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI void diff --git a/legacy/elementary/src/lib/elm_video.c b/legacy/elementary/src/lib/elm_video.c index ab6c40bb91..5e1a7b044a 100644 --- a/legacy/elementary/src/lib/elm_video.c +++ b/legacy/elementary/src/lib/elm_video.c @@ -308,9 +308,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do(obj, evas_obj_type_set(MY_CLASS_NAME)); - Evas_Object *parent = eo_parent_get(obj); - if (!elm_widget_sub_object_add(parent, obj)) - ERR("could not add %p as sub object of %p", obj, parent); + elm_widget_sub_object_add(eo_parent_get(obj), obj); #else eo_error_set(obj); #endif diff --git a/legacy/elementary/src/lib/elm_web.c b/legacy/elementary/src/lib/elm_web.c index 13652328a9..5f52c4d0a2 100644 --- a/legacy/elementary/src/lib/elm_web.c +++ b/legacy/elementary/src/lib/elm_web.c @@ -1223,8 +1223,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do(obj, evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_elm_web_smart_callbacks, NULL)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Evas_Object * diff --git a/legacy/elementary/src/lib/elm_web2.c b/legacy/elementary/src/lib/elm_web2.c index 8c207cc837..3f106016ba 100644 --- a/legacy/elementary/src/lib/elm_web2.c +++ b/legacy/elementary/src/lib/elm_web2.c @@ -143,8 +143,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do(obj, evas_obj_type_set(MY_CLASS_NAME), evas_obj_smart_callbacks_descriptions_set(_elm_web_smart_callbacks, NULL)); - if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) - ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); + elm_widget_sub_object_add(eo_parent_get(obj), obj); } EAPI Evas_Object * diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index 7a62a8a20e..13b5ff2499 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -934,11 +934,16 @@ elm_widget_sub_object_add(Evas_Object *obj, ELM_WIDGET_CHECK(obj) EINA_FALSE; EINA_SAFETY_ON_TRUE_RETURN_VAL(obj == sobj, EINA_FALSE); - if (!sobj) return EINA_FALSE; + if (!sobj) goto err; Eina_Bool ret = EINA_FALSE; eo_do(obj, elm_wdg_sub_object_add(sobj, &ret)); - return ret; + + if (ret) return EINA_TRUE; + +err: + ERR("could not add %p as sub object of %p", obj, sobj); + return EINA_FALSE; } static void diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index e7fe5d7db5..eeef06e72f 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -3033,8 +3033,7 @@ _resize_object_add(Eo *obj, void *_pd, va_list *list) Elm_Win_Smart_Data *sd = _pd; - if (!elm_widget_sub_object_add(obj, subobj)) - ERR("could not add %p as sub object of %p", subobj, obj); + elm_widget_sub_object_add(obj, subobj); if (!evas_object_box_append(sd->box, subobj)) ERR("could not append %p to box", subobj);