From: Tom Hacohen <tom@stosb.com>
Date: Thu, 3 Apr 2014 15:33:52 +0000 (+0100)
Subject: map: Adjusted to Eo2.
X-Git-Tag: v1.10.0-alpha1~126^2~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0dc9297c0f76c56107c84f65c89e7dfc7ddc0977;p=platform%2Fupstream%2Felementary.git

map: Adjusted to Eo2.
---

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 33e983b..d784137 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -479,7 +479,7 @@ _viewport_coord_get(Elm_Map_Data *sd,
                     Evas_Coord *vw,
                     Evas_Coord *vh)
 {
-   Evas_Coord x, y, w, h;
+   Evas_Coord x = 0, y = 0, w = 0, h = 0;
 
    EINA_SAFETY_ON_NULL_RETURN(sd);
 
@@ -3759,7 +3759,7 @@ _elm_map_elm_widget_on_focus(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret));
+   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus());
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj))
@@ -3797,7 +3797,7 @@ EOLIAN static Eina_Bool
 _elm_map_elm_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret));
+   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
    if (!int_ret) return EINA_FALSE;
 
    _sizing_eval(obj);
@@ -4091,7 +4091,7 @@ _elm_map_eo_base_constructor(Eo *obj, Elm_Map_Data *sd)
    eo_do_super(obj, MY_CLASS, eo_constructor());
    eo_do(obj,
          evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
+         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
 }
 
 EOLIAN static void