From 052d8185c42eeb3e5f17b2e262739465fe7d8311 Mon Sep 17 00:00:00 2001 From: sumanth Date: Fri, 24 Jun 2011 19:05:05 +0530 Subject: [PATCH] [elm_datefield.c][elm_dayselector.c][elm_actionslider.c] build time warnings are removed. Gerrit review comments are corrected. Change-Id: Idb8ea2e52021cf550a1e98c747e2ad5ce854cbcd --- src/lib/elm_actionslider.c | 29 ++++++++++------------------- src/lib/elm_datefield.c | 35 +++++++++++++++++------------------ src/lib/elm_dayselector.c | 6 +++--- 3 files changed, 30 insertions(+), 40 deletions(-) diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c index 3fc007f..09dbd92 100644 --- a/src/lib/elm_actionslider.c +++ b/src/lib/elm_actionslider.c @@ -67,9 +67,9 @@ static void _sub_del(void *data, Evas_Object *obj, void *event_info); /* * callback functions */ -static void _icon_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _icon_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _icon_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _icon_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__); +static void _icon_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__); +static void _icon_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__); /* * internal functions @@ -209,25 +209,17 @@ _theme_hook(Evas_Object *obj) static void _disable_hook(Evas_Object *obj) { -// Widget_Data *wd = elm_widget_data_get(obj); -/* - TODO + Widget_Data *wd = elm_widget_data_get(obj); + if (elm_widget_disabled_get(obj)) - edje_object_signal_emit(wd->btn, "elm,state,disabled", "elm"); + edje_object_signal_emit(wd->icon, "elm,state,disabled", "elm"); else - edje_object_signal_emit(wd->btn, "elm,state,enabled", "elm"); -*/ -} + edje_object_signal_emit(wd->icon, "elm,state,enabled", "elm"); -static void -_sub_del(void *data, Evas_Object *obj, void *event_info) -{ -// Widget_Data *wd = elm_widget_data_get(obj); -// Evas_Object *sub = event_info; } static void -_icon_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +_icon_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Widget_Data *wd = elm_widget_data_get((Evas_Object *)data); if (!wd) return; @@ -235,7 +227,7 @@ _icon_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) } static void -_icon_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +_icon_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Evas_Object *as = (Evas_Object *)data; Widget_Data *wd = elm_widget_data_get(as); @@ -269,7 +261,7 @@ edje_object_signal_emit(wd->as, "elm,hide,text,center", "elm"); } static void -_icon_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +_icon_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { Evas_Object *as = (Evas_Object *)data; Widget_Data *wd = elm_widget_data_get((Evas_Object *)data); @@ -466,7 +458,6 @@ elm_actionslider_add(Evas_Object *parent) edje_object_part_swallow(wd->as, "elm.swallow.space", wd->icon_fake); // event callbacks - evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); evas_object_event_callback_add(wd->icon, EVAS_CALLBACK_MOUSE_DOWN, _icon_down_cb, obj); evas_object_event_callback_add(wd->icon, EVAS_CALLBACK_MOUSE_MOVE, _icon_move_cb, obj); evas_object_event_callback_add(wd->icon, EVAS_CALLBACK_MOUSE_UP, _icon_up_cb, obj); diff --git a/src/lib/elm_datefield.c b/src/lib/elm_datefield.c index a165f3d..4711b00 100644 --- a/src/lib/elm_datefield.c +++ b/src/lib/elm_datefield.c @@ -54,7 +54,7 @@ struct _Widget_Data Evas_Object *time[TIME_MAX]; Ecore_Event_Handler *handler; Ecore_Idler *idler; - int layout; + unsigned int layout; int year, month, day, hour, min; int y_max, m_max, d_max; @@ -74,15 +74,14 @@ static const char *widtype = NULL; static void _del_hook(Evas_Object *obj); static void _theme_hook(Evas_Object *obj); static void _sizing_eval(Evas_Object *obj); -static void _on_focus_hook(void *data, Evas_Object *obj); +static void _on_focus_hook(void *data __UNUSED__, Evas_Object *obj); -static void _signal_rect_mouse_down(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _signal_ampm_clicked(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _entry_focused_cb(void *data, Evas_Object *obj, void *event_info); -static void _entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info); -static void _entry_key_up_cb(void *data, Evas *e , Evas_Object *obj , void *event_info); -static Eina_Bool _imf_event_commit_cb(void *data, int type, void *event); -static void _input_panel_event_callback(void *data, Ecore_IMF_Context *ctx, int value); +static void _signal_rect_mouse_down(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source); +static void _entry_focused_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__); +static void _entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__); +static void _entry_key_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj , void *event_info); +static Eina_Bool _imf_event_commit_cb(void *data, int type __UNUSED__, void *event); +static void _input_panel_event_callback(void *data, Ecore_IMF_Context *ctx __UNUSED__, int value); static void _date_entry_add(Evas_Object *obj); static void _time_entry_add(Evas_Object *obj); @@ -107,7 +106,7 @@ _del_hook(Evas_Object *obj) } static void -_on_focus_hook(void *data, Evas_Object *obj) +_on_focus_hook(void *data __UNUSED__, Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd || !wd->base) return ; @@ -215,7 +214,7 @@ _sizing_eval(Evas_Object *obj) } static void -_ampm_clicked_cb(void *data, Evas_Object *obj, void *event_info) +_ampm_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Widget_Data *wd = elm_widget_data_get(data); char *str; @@ -247,7 +246,7 @@ _ampm_clicked_cb(void *data, Evas_Object *obj, void *event_info) } static void -_signal_rect_mouse_down(void *data, Evas_Object *obj, const char *emission, const char *source) +_signal_rect_mouse_down(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source) { Widget_Data *wd = elm_widget_data_get(data); if (!wd) return; @@ -299,7 +298,7 @@ _focus_idler_cb(void *obj) } static void -_entry_focused_cb(void *data, Evas_Object *obj, void *event_info) +_entry_focused_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) { Widget_Data *wd = elm_widget_data_get(data); if (!wd || !wd->base) return; @@ -323,7 +322,7 @@ _entry_focused_cb(void *data, Evas_Object *obj, void *event_info) } static void -_entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info) +_entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) { Widget_Data *wd = elm_widget_data_get(data); char str[YEAR_MAX_LENGTH+1] = {0,}; @@ -689,7 +688,7 @@ _check_input_done(Evas_Object *obj, Evas_Object *focus_obj, int strlen) } static void -_entry_key_up_cb(void *data, Evas *e , Evas_Object *obj , void *event_info) +_entry_key_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj , void *event_info) { Evas_Event_Key_Up *ev = (Evas_Event_Key_Up *) event_info; @@ -698,7 +697,7 @@ _entry_key_up_cb(void *data, Evas *e , Evas_Object *obj , void *event_info) } static Eina_Bool -_imf_event_commit_cb(void *data, int type, void *event) +_imf_event_commit_cb(void *data , int type __UNUSED__, void *event) { Widget_Data *wd = elm_widget_data_get(data); Ecore_IMF_Event_Commit *ev = (Ecore_IMF_Event_Commit *) event; @@ -739,7 +738,7 @@ _imf_event_commit_cb(void *data, int type, void *event) } static void -_input_panel_event_callback(void *data, Ecore_IMF_Context *ctx, int value) +_input_panel_event_callback(void *data, Ecore_IMF_Context *ctx __UNUSED__, int value) { Widget_Data *wd = elm_widget_data_get(data); @@ -947,7 +946,7 @@ elm_datefield_layout_set(Evas_Object *obj, Elm_Datefield_Layout layout) Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - if (layout < ELM_DATEFIELD_LAYOUT_TIME ||layout > ELM_DATEFIELD_LAYOUT_DATEANDTIME) return; + if (layout > ELM_DATEFIELD_LAYOUT_DATEANDTIME) return; if (wd->layout != layout) { diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c index 2284b9d..0eb6a09 100644 --- a/src/lib/elm_dayselector.c +++ b/src/lib/elm_dayselector.c @@ -28,7 +28,7 @@ static void _del_hook(Evas_Object *obj); static void _theme_hook(Evas_Object *obj); //static void _sizing_eval(Evas_Object* obj); //static void _dayselector_resize(void *data, Evas *e, Evas_Object *obj, void *event_info); -//static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _changed_size_hints(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__); static void _del_hook(Evas_Object *obj) @@ -45,7 +45,7 @@ _dayselector_resize(void *data, Evas *e, Evas_Object *obj, void *event_info) } */ static void -_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info) +_changed_size_hints(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { Evas_Coord w, h; Widget_Data *wd = elm_widget_data_get(obj); @@ -56,7 +56,7 @@ _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info) } static void -_check_clicked(void *data, Evas_Object *obj, void *event_info) +_check_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__) { static Elm_DaySelector_Day day; Widget_Data* wd = (Widget_Data*) elm_widget_data_get(data); -- 2.7.4