[EGIT] [core/elementary] master 03/04: Revert "Combobox: Semi automatic migration to the new eo_add."

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=c32d0bc58f1e6e1f5e4721f0dd2a359c79170b4d

commit c32d0bc58f1e6e1f5e4721f0dd2a359c79170b4d
Author: Tom Hacohen <t...@stosb.com>
Date:   Fri Mar 11 12:34:19 2016 +0000

    Revert "Combobox: Semi automatic migration to the new eo_add."
    
    Reverted eo_add() changes following the return to the old eo_add()
    syntax.
    
    This reverts commit 90e465317d10ca01ff39824e56828ee983f7ae41.
---
 src/lib/elc_combobox.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c
index 0c552b5..fe3f4a3 100644
--- a/src/lib/elc_combobox.c
+++ b/src/lib/elc_combobox.c
@@ -409,8 +409,7 @@ EAPI Evas_Object *
 elm_combobox_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = NULL;
-   eo_add(&obj, MY_CLASS, parent);
+   Evas_Object *obj = eo_add(MY_CLASS, parent);
    return obj;
 }
 
@@ -433,7 +432,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, 
Elm_Combobox_Data *sd)
    sd->hover_parent = elm_object_parent_widget_get(obj);
 
    //hover
-   eo_add(&sd->hover, ELM_HOVER_CLASS, sd->hover_parent);
+   sd->hover = eo_add(ELM_HOVER_CLASS, sd->hover_parent);
    elm_widget_mirrored_automatic_set(sd->hover, EINA_FALSE);
    elm_hover_target_set(sd->hover, obj);
    snprintf(buf, sizeof(buf), "combobox_vertical/%s",
@@ -458,7 +457,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(&gl, ELM_GENLIST_CLASS, obj);
+   sd->genlist = gl = eo_add(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));
@@ -472,7 +471,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(&entry, ELM_ENTRY_CLASS, obj);
+   sd->entry = entry = eo_add(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,

--