From 211c88f53d81bc52c1b71c50a4960d87f2faa38d Mon Sep 17 00:00:00 2001
From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Sat, 16 Oct 2010 11:48:50 +0900
Subject: [PATCH] remove some warnings

---
 src/bin/test_launcher.c                   |  6 +++---
 src/bin/test_panes.c                      |  2 --
 src/bin/test_photo.c                      |  2 +-
 src/bin/test_slideshow.c                  |  2 +-
 src/lib/elm_analogclock.c                 |  4 ++--
 src/lib/elm_colorpalette.c                |  2 +-
 src/lib/elm_colorpicker.c                 |  2 +-
 src/lib/elm_conform.c                     |  6 +++---
 src/lib/elm_genlist.c                     | 10 ++++++----
 src/lib/elm_gridbox.c                     |  8 ++++----
 src/lib/elm_map.c                         |  2 +-
 src/lib/elm_picker.c                      |  2 ++
 src/lib/elm_searchbar.c                   | 14 +++++++-------
 src/lib/elm_softkey.c                     |  4 ++--
 src/lib/elm_stackedicon.c                 |  7 ++++---
 src/lib/elm_viewflipper.c                 |  4 ++--
 src/lib/elm_xml_animator.c                |  2 +-
 src/lib/els_hor_scroller.c                | 16 +++++-----------
 src/modules/popup_copypasteUI/copypaste.c |  2 +-
 19 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/src/bin/test_launcher.c b/src/bin/test_launcher.c
index 1f52b5e..3ef31e3 100644
--- a/src/bin/test_launcher.c
+++ b/src/bin/test_launcher.c
@@ -378,8 +378,8 @@ test_launcher(void *data, Evas_Object *obj, void *event_info)
 void
 test_launcher2(void *data, Evas_Object *obj, void *event_info)
 {
-   Evas_Object *win, *bg, *sc, *tb, *pad, *bt, *ic, *lb, *tb2, *mb, *ck, *bx, *rc, *ly;
-   int i, j, k, n, m;
+   Evas_Object *win, *bg, *sc, *bt, *tb2, *mb, *ck, *bx, *ly;
+   int k;
    char buf[PATH_MAX];
    Eina_List *mbs = NULL;
    
@@ -706,7 +706,7 @@ l3_ic_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 void
 test_launcher3(void *data, Evas_Object *obj, void *event_info)
 {
-   Evas_Object *win, *bg, *sc, *tb, *pad, *bt, *ic, *lb, *tb2, *mb, *ck, *bx, *bx2, *ly, *ly2;
+   Evas_Object *win, *bg, *sc, *tb, *pad, *bt, *ic, *tb2, *mb, *ck, *bx, *bx2, *ly, *ly2;
    int i, j, k, n, m;
    char buf[PATH_MAX];
    const char *names[] =
diff --git a/src/bin/test_panes.c b/src/bin/test_panes.c
index e236946..44db9a7 100644
--- a/src/bin/test_panes.c
+++ b/src/bin/test_panes.c
@@ -40,8 +40,6 @@ void
 test_panes(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *panes, *panes_h, *bt;
-   char buf[PATH_MAX];
-   Evas_Object *list;
 
    win = elm_win_add(NULL, "panes", ELM_WIN_BASIC);
    elm_win_title_set(win, "Panes");
diff --git a/src/bin/test_photo.c b/src/bin/test_photo.c
index 3c30f09..2764fd8 100644
--- a/src/bin/test_photo.c
+++ b/src/bin/test_photo.c
@@ -67,7 +67,7 @@ test_photo(void *data, Evas_Object *obj, void *event_info)
 
              if(n == 2 || n == 3) {
             	 elm_photo_fill_inside_set(ph, EINA_TRUE);
-            	 elm_widget_style_set(ph, "shadow");
+            	 elm_object_style_set(ph, "shadow");
              }
              elm_table_pack(tb, ph, i, j, 1, 1);
              evas_object_show(ph);
diff --git a/src/bin/test_slideshow.c b/src/bin/test_slideshow.c
index ce893b2..51ab2da 100644
--- a/src/bin/test_slideshow.c
+++ b/src/bin/test_slideshow.c
@@ -93,7 +93,7 @@ _get(void *data, Evas_Object *obj)
    Evas_Object *photo = elm_photo_add(obj);
    elm_photo_file_set(photo, data);
    elm_photo_fill_inside_set(photo, EINA_TRUE);
-   elm_widget_style_set(photo, "shadow");
+   elm_object_style_set(photo, "shadow");
 
    return photo;
 }
diff --git a/src/lib/elm_analogclock.c b/src/lib/elm_analogclock.c
index e02ead6..c5b6b04 100644
--- a/src/lib/elm_analogclock.c
+++ b/src/lib/elm_analogclock.c
@@ -37,7 +37,7 @@ static void _del_hook(Evas_Object *obj);
 static void _theme_hook(Evas_Object *obj);
 static void _disable_hook(Evas_Object *obj);
 static void _sizing_eval(Evas_Object *obj);
-static int  _ticker(void *data);
+static Eina_Bool _ticker(void *data);
 static void _time_update(Evas_Object *obj);
 
 static void
@@ -49,7 +49,7 @@ _del_hook(Evas_Object *obj)
 	free(wd);
 }
 
-static int
+static Eina_Bool
 _ticker(void *data)
 {
 	Widget_Data *wd = elm_widget_data_get(data);
diff --git a/src/lib/elm_colorpalette.c b/src/lib/elm_colorpalette.c
index 35e0c98..6c2f2c2 100644
--- a/src/lib/elm_colorpalette.c
+++ b/src/lib/elm_colorpalette.c
@@ -149,7 +149,7 @@ static void _colorpalette_object_resize(void *data, Evas *e, Evas_Object *obj, v
 	DBG("%s", __func__);
 
 	Widget_Data *wd;
-	Colorpalette_Item *item;
+	Colorpalette_Item *item = NULL;
 	Evas_Coord w, h;
 	Evas_Coord tab_w, tab_h;
 	double pad_x, pad_y;
diff --git a/src/lib/elm_colorpicker.c b/src/lib/elm_colorpicker.c
index 006a094..6392b09 100644
--- a/src/lib/elm_colorpicker.c
+++ b/src/lib/elm_colorpicker.c
@@ -311,7 +311,7 @@ static void
 _hsl_to_rgb(void *data)
 {
    Widget_Data *wd = (Widget_Data *) data;
-   double r, g, b;
+   double r = 0.0, g = 0.0, b = 0.0;
    double _h, _s, _l;
    int i;
    double sv, vsf, f, p, q, t, v;
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index a215e10..f75ddda 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -129,7 +129,7 @@ _imp_region_show(void *data, Evas_Object *obj)
 }
 
 static void
-_imp_region_changed_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_imp_region_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
    _imp_region_show(data, obj);
 }
@@ -206,7 +206,7 @@ _autoscroll_mode_enable(void *data)
    bool ret = EINA_FALSE;
    
    Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd) return EINA_FALSE;
+   if (!wd) return;
    focused_object=_focus_object_get(data);
    if(focused_object)
     {
@@ -227,7 +227,7 @@ static void
 _autoscroll_mode_disable(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd) return EINA_FALSE;
+   if (!wd) return;
    evas_object_event_callback_del(wd->scroller, EVAS_CALLBACK_RESIZE, _scroller_resize_event_cb);
    evas_object_smart_callback_del(wd->focus_obj, SIG_IMPREGION_CHANGED, _imp_region_changed_cb);
    wd->scroller = NULL;
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 75e9e9a..bc34e8c 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -5417,8 +5417,9 @@ elm_genlist_longpress_timeout_get(const Evas_Object *obj)
 
 // added for item moving animation.
 static Eina_Bool
-_group_item_contract_moving_effect_timer_cb(Evas_Object *obj)
+_group_item_contract_moving_effect_timer_cb(void *data)
 {
+	Evas_Object *obj = (Evas_Object *)data;
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);   
    
@@ -5603,10 +5604,11 @@ _group_item_contract_moving_effect_timer_cb(Evas_Object *obj)
 
 // added for item moving animation.
 static Eina_Bool
-_group_item_expand_moving_effect_timer_cb(Evas_Object *data)
+_group_item_expand_moving_effect_timer_cb(void *data)
 {
-	ELM_CHECK_WIDTYPE(data, widtype);
-	Widget_Data *wd = elm_widget_data_get(data);
+	Evas_Object *obj = (Evas_Object *)data;
+	ELM_CHECK_WIDTYPE(obj, widtype);
+	Widget_Data *wd = elm_widget_data_get(obj);
 	Elm_Genlist_GroupItem *git, *tmp_git;
 	Item_Block *itb = NULL;   
 	Elm_Genlist_Item *it;
diff --git a/src/lib/elm_gridbox.c b/src/lib/elm_gridbox.c
index 90552e0..917fbae 100644
--- a/src/lib/elm_gridbox.c
+++ b/src/lib/elm_gridbox.c
@@ -30,7 +30,7 @@ static void _changed_size_min(void *data, Evas * e, Evas_Object * obj,
 			      void *event_info);
 static void _sub_del(void *data, Evas_Object * obj, void *event_info);
 
-static void _show_event(void *data, Evas_Object * obj, void *event_info);
+static void _show_event(void *data, Evas *e, Evas_Object * obj, void *event_info);
 
 static void
 _del_pre_hook(Evas_Object * obj)
@@ -136,13 +136,13 @@ _sizing_eval(Evas_Object * obj, int mode)
 }
 
 static void
-_changed_size_hints(void *data, Evas * e, Evas_Object * obj, void *event_info)
+_changed_size_hints(void *data, Evas *e, Evas_Object * obj, void *event_info)
 {
    _sizing_eval(data, 0);
 }
 
 static void
-_changed_size_min(void *data, Evas * e, Evas_Object * obj, void *event_info)
+_changed_size_min(void *data, Evas *e, Evas_Object * obj, void *event_info)
 {
    _sizing_eval(data, 0);
 }
@@ -154,7 +154,7 @@ _sub_del(void *data, Evas_Object * obj, void *event_info)
 }
 
 static void
-_show_event(void *data, Evas_Object * obj, void *event_info)
+_show_event(void *data, Evas *e, Evas_Object * obj, void *event_info)
 {
    _sizing_eval(data, 0);
 }
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 5dbc85d..5e86383 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -348,7 +348,7 @@ static void _group_bubble_content_free(Marker_Group *group);
 static void marker_place(Evas_Object *obj, Grid *g, Evas_Coord px, Evas_Coord py, Evas_Coord ox, Evas_Coord oy, Evas_Coord ow, Evas_Coord oh);
 static void _bubble_sc_hits_changed_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
 
-static int
+static Eina_Bool
 hold_timer_cb(void *data)
 {
   struct event_t *ev0 = (struct event_t *)data;
diff --git a/src/lib/elm_picker.c b/src/lib/elm_picker.c
index eec4aa2..5163b4f 100644
--- a/src/lib/elm_picker.c
+++ b/src/lib/elm_picker.c
@@ -293,10 +293,12 @@ _mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
 	if ((dur && dur > 1000) || (distance < 10 && distance > -10)) {
 		if (wd->ani_lock)
+        {
 			if ((int)evas_object_data_get(wd->base, "ani_cnt") < 0)
 				evas_object_data_set(wd->base, "ani_cnt", (void *)-1);
 			else
 				evas_object_data_set(wd->base, "ani_cnt", (void *)1);
+        }
 		return;
 	}
 	_flick(data, (float)distance / dur);
diff --git a/src/lib/elm_searchbar.c b/src/lib/elm_searchbar.c
index c63ba6f..456d2f1 100644
--- a/src/lib/elm_searchbar.c
+++ b/src/lib/elm_searchbar.c
@@ -25,9 +25,9 @@ struct _Widget_Data
 static void _del_hook(Evas_Object *obj);
 static void _theme_hook(Evas_Object *obj);
 static void _sizing_eval(Evas_Object *obj);
-static void _clicked(void *data, Evas_Object *obj, const char *emission, const char *source);
-static void _changed(void *data, Evas_Object *obj, const char *emission, const char *source);
-static void _cancel_clicked(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _clicked(void *data, Evas_Object *obj, void *event_info); //const char *emission, const char *source);
+static void _changed(void *data, Evas_Object *obj, void *event_info); //const char *emission, const char *source);
+static void _cancel_clicked(void *data, Evas_Object *obj, void *event_info); //const char *emission, const char *source);
 
 static void _del_hook(Evas_Object *obj)
 {
@@ -67,7 +67,7 @@ static void _sizing_eval(Evas_Object *obj)
    evas_object_size_hint_max_set(obj, maxw, maxh);
 }
 
-static void _clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
+static void _clicked(void *data, Evas_Object *obj, void *event_info) //const char *emission, const char *source)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
@@ -85,7 +85,7 @@ static void _clicked(void *data, Evas_Object *obj, const char *emission, const c
    evas_object_smart_callback_call(data, "clicked", NULL);
 }
 
-static void _changed(void *data, Evas_Object *obj, const char *emission, const char *source)
+static void _changed(void *data, Evas_Object *obj, void *event_info) //const char *emission, const char *source)
 {
    Widget_Data *wd = elm_widget_data_get(data);
 
@@ -95,7 +95,7 @@ static void _changed(void *data, Evas_Object *obj, const char *emission, const c
 //   evas_object_smart_callback_call(data, "changed", NULL);
 }
 
-static void _cancel_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
+static void _cancel_clicked(void *data, Evas_Object *obj, void *event_info) //const char *emission, const char *source)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
@@ -125,7 +125,7 @@ _searchicon_clicked(void *data, Evas_Object *obj, const char *emission, const ch
    if (!strcmp(source, "search_icon"))
      evas_object_smart_callback_call(data, "searchsymbol,clicked", NULL);
    else if (!strcmp(source, "base_bg"))
-     _clicked(data, obj, emission, source);
+     _clicked(data, obj, NULL); //emission, source);
 }
 
 /**
diff --git a/src/lib/elm_softkey.c b/src/lib/elm_softkey.c
index e972396..c026592 100644
--- a/src/lib/elm_softkey.c
+++ b/src/lib/elm_softkey.c
@@ -594,7 +594,7 @@ static void
 _softkey_up_cb(void *data, Evas_Object *obj, const char *emission,
                const char *source)
 {
-   Evas_Object *edj;
+   Evas_Object *edj = NULL;
 
    Elm_Softkey_Item *it = (Elm_Softkey_Item *) data;
    elm_softkey_panel_close(it->obj);
@@ -618,7 +618,7 @@ static void
 _softkey_down_cb(void *data, Evas_Object *obj, const char *emission,
                  const char *source)
 {
-   Evas_Object *edj;
+   Evas_Object *edj = NULL;
 
    Elm_Softkey_Item *it = (Elm_Softkey_Item *) data;
    evas_object_smart_callback_call(it->obj, "press", it);
diff --git a/src/lib/elm_stackedicon.c b/src/lib/elm_stackedicon.c
index 9ff207b..8610619 100644
--- a/src/lib/elm_stackedicon.c
+++ b/src/lib/elm_stackedicon.c
@@ -59,7 +59,7 @@ static void _del_all_image(void *data);
 static unsigned int _current_time_get(void);
 static void _icon_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _icon_move_to_zero(Evas_Object *obj);
-static Eina_Bool _icon_move_to_zero_cb(Evas_Object *obj);
+static Eina_Bool _icon_move_to_zero_cb(void *data);
 static void _icon_move_map(void *data, int interval_x, int interval_y);
 static void _icon_map_pos(Evas_Object *obj, int index, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
 static void _calc_item_size(int w, int h, int iw, int ih, int *res_w, int *res_h);
@@ -310,8 +310,9 @@ _icon_move_to_zero(Evas_Object *obj)
 }
 
 static Eina_Bool 
-_icon_move_to_zero_cb(Evas_Object *obj)
-{	
+_icon_move_to_zero_cb(void *data)
+{
+    Evas_Object *obj = (Evas_Object *)data;
 	_icon_move_to_zero(obj);
 	
 	return EXIT_FAILURE;
diff --git a/src/lib/elm_viewflipper.c b/src/lib/elm_viewflipper.c
index f7796a8..a8f26c7 100644
--- a/src/lib/elm_viewflipper.c
+++ b/src/lib/elm_viewflipper.c
@@ -71,7 +71,7 @@ static void _mouse_down(void *data, Evas *e, Evas_Object *o, void *event_info);
 static void _complete_move(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__);
 static void _left_button_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__);
 static void _right_button_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__);
-static int   _flipping_timer_cb(void *data);
+static Eina_Bool  _flipping_timer_cb(void *data);
 static void _set_layout_each_view(Evas_Object * left,Evas_Object * middle,Evas_Object *right);
 static int   _setView();
 static void _setup_button_show_left_right();
@@ -236,7 +236,7 @@ _right_button_click(void *data, Evas_Object *obj __UNUSED__, const char *emissio
 	printf("_right_button_click\n");
 }
 
-static int
+static Eina_Bool
 _flipping_timer_cb(void *data)
 {
 	if(elm_viewflipper_isAutoStart()==FALSE)
diff --git a/src/lib/elm_xml_animator.c b/src/lib/elm_xml_animator.c
index 920b714..cbf7c95 100644
--- a/src/lib/elm_xml_animator.c
+++ b/src/lib/elm_xml_animator.c
@@ -225,7 +225,7 @@ set_evas_map_disable(void *data)
 {
 	Evas_Object *obj = (Evas_Object *)data;
 	evas_object_map_enable_set(obj, EINA_FALSE);
-	evas_render_updates(obj);
+	evas_render_updates(evas_object_evas_get(obj));
 
 	return ECORE_CALLBACK_CANCEL;
 }
diff --git a/src/lib/els_hor_scroller.c b/src/lib/els_hor_scroller.c
index c59b7fb..358645c 100644
--- a/src/lib/els_hor_scroller.c
+++ b/src/lib/els_hor_scroller.c
@@ -308,7 +308,7 @@ _smart_drag_stop(Evas_Object *obj)
    evas_object_smart_callback_call(obj, "drag,stop", NULL);
 }
 
-static int
+static Eina_Bool
 _smart_scrollto_x_animator(void *data)
 {
    Hor_Smart_Data *sd = data;
@@ -1362,7 +1362,6 @@ _smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
 #ifdef SMART_SCROLLER
 
-		int number = NUMBERS_OF_AVERAGE_QUEUE;
 		int i;
 		if(sd->timer) {
 			ecore_timer_del(sd->timer);
@@ -1385,7 +1384,6 @@ _smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 		sd->x_pos = x * -1;
 
 #endif
-		 
 	  }
      }
 }
@@ -1548,7 +1546,7 @@ _smart_onhold_animator(void *data)
    Hor_Smart_Data *sd;
    double t, td;
    double vx, vy;
-   Evas_Coord x, y, ox, oy, dx, dy;
+   Evas_Coord x, y, ox, oy; 
 
    sd = data;
    t = ecore_loop_time_get();
@@ -1627,14 +1625,10 @@ static Eina_Bool special_timer_cb(void *d)
 	return ECORE_CALLBACK_RENEW;
 }
 
-static int consumer_timer_cb(void *d)
+static Eina_Bool consumer_timer_cb(void *d)
 {
 	Hor_Smart_Data *sd = d;
-	Eina_List *l;
-	Evas_Object *sub_obj;
-	struct cached_geometry *geo;
 	int tmp_movement = 0;
-	static int x = 0, y = 0;
 
 // TODO: OPTIMIZE ME
 	tmp_movement = sd->consumer_queue[sd->consumer-1];
@@ -1850,8 +1844,8 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
                     {
                        if (sd->down.onhold_animator)
                          {
-                           // ecore_animator_del(sd->down.onhold_animator);
-	                        ecore_timer_del(sd->down.onhold_animator);
+                            ecore_animator_del(sd->down.onhold_animator);
+	                        //ecore_timer_del(sd->down.onhold_animator);
                             sd->down.onhold_animator = NULL;
                          }
                     }
diff --git a/src/modules/popup_copypasteUI/copypaste.c b/src/modules/popup_copypasteUI/copypaste.c
index 147a9cc..15c8dd2 100644
--- a/src/modules/popup_copypasteUI/copypaste.c
+++ b/src/modules/popup_copypasteUI/copypaste.c
@@ -114,7 +114,7 @@ obj_longpress(Evas_Object *obj)
 		if(top)
 		ext_mod->popup = elm_popup_add(top);
 		elm_object_style_set(ext_mod->popup,"menustyle");
-		elm_popup_set_mode(ext_mod->popup, ELM_POPUP_TYPE_ALERT);
+		elm_popup_mode_set(ext_mod->popup, ELM_POPUP_TYPE_ALERT);
 		elm_popup_title_label_set(ext_mod->popup,"CopyPaste");
 		list = elm_list_add(ext_mod->popup);
 		elm_object_style_set(list,"popup");
-- 
2.7.4