From 021a9e0468ccb6cdae6e99e00e06c55249b60d69 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 9 Mar 2016 16:01:26 +0000 Subject: [PATCH] Combobox: Semi automatic migration to the new eo_add. --- legacy/elementary/src/lib/elc_combobox.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/legacy/elementary/src/lib/elc_combobox.c b/legacy/elementary/src/lib/elc_combobox.c index af79c72f94..4227cea41a 100644 --- a/legacy/elementary/src/lib/elc_combobox.c +++ b/legacy/elementary/src/lib/elc_combobox.c @@ -309,7 +309,8 @@ EAPI Evas_Object * elm_combobox_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = eo_add(MY_CLASS, parent); + Evas_Object *obj = NULL; + eo_add(&obj, MY_CLASS, parent); return obj; } @@ -332,7 +333,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd) sd->hover_parent = elm_object_parent_widget_get(obj); //hover - sd->hover = eo_add(ELM_HOVER_CLASS, sd->hover_parent); + eo_add(&sd->hover, ELM_HOVER_CLASS, sd->hover_parent); elm_widget_mirrored_automatic_set(sd->hover, EINA_FALSE); elm_hover_target_set(sd->hover, obj); elm_widget_sub_object_add(obj, sd->hover); @@ -358,7 +359,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd) elm_table_pack(sd->tbl, sd->spacer, 0, 0, 1, 1); // This is the genlist object that will take over the genlist call - sd->genlist = gl = eo_add(ELM_GENLIST_CLASS, obj); + sd->genlist = gl = eo_add(&gl, ELM_GENLIST_CLASS, obj); elm_genlist_filter_set(gl, NULL); elm_widget_mirrored_automatic_set(gl, EINA_FALSE); elm_widget_mirrored_set(gl, elm_widget_mirrored_get(obj)); @@ -372,7 +373,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd) elm_table_pack(sd->tbl, gl, 0, 0, 1, 1); // This is the entry object that will take over the entry call - sd->entry = entry = eo_add(ELM_ENTRY_CLASS, obj); + sd->entry = entry = eo_add(&entry, ELM_ENTRY_CLASS, obj); elm_widget_mirrored_automatic_set(entry, EINA_FALSE); elm_widget_mirrored_set(entry, elm_widget_mirrored_get(obj)); elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,