From: Jihoon Kim Date: Mon, 9 Aug 2010 23:52:56 +0000 (+0900) Subject: remove unused variables X-Git-Tag: beat-winset-test_0.1.1-40~72^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f446a94933df1d1f148571bcb746c9558a09055;p=framework%2Fuifw%2Felementary.git remove unused variables --- diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index 89c236e..3f3e65d 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -611,24 +611,24 @@ extern "C" { }; EAPI Evas_Object *elm_gengrid_add(Evas_Object *parent); - EAPI void elm_gengrid_item_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h); - EAPI void elm_gengrid_item_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); + EAPI void elm_gengrid_item_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h); + EAPI void elm_gengrid_item_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); EAPI void elm_gengrid_align_set(Evas_Object *obj, double align_x, double align_y); EAPI void elm_gengrid_align_get(const Evas_Object *obj, double *align_x, double *align_y); - EAPI void elm_gengrid_item_del(Elm_Gengrid_Item *item); - EAPI void elm_gengrid_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select); + EAPI void elm_gengrid_item_del(Elm_Gengrid_Item *item); + EAPI void elm_gengrid_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select); EAPI Eina_Bool elm_gengrid_always_select_mode_get(const Evas_Object *obj); - EAPI void elm_gengrid_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select); + EAPI void elm_gengrid_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select); EAPI Eina_Bool elm_gengrid_no_select_mode_get(const Evas_Object *obj); - EAPI void elm_gengrid_multi_select_set(Evas_Object *obj, Eina_Bool multi); + EAPI void elm_gengrid_multi_select_set(Evas_Object *obj, Eina_Bool multi); EAPI Eina_Bool elm_gengrid_multi_select_get(const Evas_Object *obj); - EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce); - EAPI void elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce); - EAPI void elm_gengrid_horizontal_set(Evas_Object *obj, Eina_Bool setting); - EAPI void elm_gengrid_clear(Evas_Object *obj); - EAPI void *elm_gengrid_item_data_get(Elm_Gengrid_Item *item); - EAPI void elm_gengrid_item_pos_get(const Elm_Gengrid_Item *item, unsigned int *x, unsigned int *y); - EAPI void elm_gengrid_item_selected_set(Elm_Gengrid_Item *item, Eina_Bool selected); + EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce); + EAPI void elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce); + EAPI void elm_gengrid_horizontal_set(Evas_Object *obj, Eina_Bool setting); + EAPI void elm_gengrid_clear(Evas_Object *obj); + EAPI void *elm_gengrid_item_data_get(Elm_Gengrid_Item *item); + EAPI void elm_gengrid_item_pos_get(const Elm_Gengrid_Item *item, unsigned int *x, unsigned int *y); + EAPI void elm_gengrid_item_selected_set(Elm_Gengrid_Item *item, Eina_Bool selected); EAPI Eina_Bool elm_gengrid_item_selected_get(const Elm_Gengrid_Item *item); EAPI const Evas_Object *elm_gengrid_item_object_get(Elm_Gengrid_Item *item); EAPI const Eina_List *elm_gengrid_selected_items_get(const Evas_Object *obj); @@ -689,11 +689,11 @@ extern "C" { } Elm_Notify_Orient; EAPI Evas_Object *elm_notify_add(Evas_Object *parent); EAPI void elm_notify_content_set(Evas_Object *obj, Evas_Object *content); - EAPI void elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent); - EAPI void elm_notify_orient_set(Evas_Object *obj, Elm_Notify_Orient orient); + EAPI void elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent); + EAPI void elm_notify_orient_set(Evas_Object *obj, Elm_Notify_Orient orient); EAPI void elm_notify_timeout_set(Evas_Object *obj, int timeout); - EAPI void elm_notify_timer_init(Evas_Object *obj); - EAPI void elm_notify_repeat_events_set(Evas_Object *obj, Eina_Bool repeat); + EAPI void elm_notify_timer_init(Evas_Object *obj); + EAPI void elm_notify_repeat_events_set(Evas_Object *obj, Eina_Bool repeat); /* smart callbacks called: */ @@ -746,12 +746,12 @@ extern "C" { typedef enum _Elm_Input_Panel_Layout { - ELM_INPUT_PANEL_LAYOUT_NORMAL, - ELM_INPUT_PANEL_LAYOUT_NUMBER, - ELM_INPUT_PANEL_LAYOUT_EMAIL, - ELM_INPUT_PANEL_LAYOUT_URL, - ELM_INPUT_PANEL_LAYOUT_PHONENUMBER, - ELM_INPUT_PANEL_LAYOUT_IP, + ELM_INPUT_PANEL_LAYOUT_NORMAL, + ELM_INPUT_PANEL_LAYOUT_NUMBER, + ELM_INPUT_PANEL_LAYOUT_EMAIL, + ELM_INPUT_PANEL_LAYOUT_URL, + ELM_INPUT_PANEL_LAYOUT_PHONENUMBER, + ELM_INPUT_PANEL_LAYOUT_IP, } Elm_Input_Panel_Layout; EAPI Evas_Object *elm_entry_add(Evas_Object *parent); @@ -1056,7 +1056,7 @@ extern "C" { EAPI void elm_list_horizontal_mode_set(Evas_Object *obj, Elm_List_Mode mode); EAPI Elm_List_Mode elm_list_horizontal_mode_get(const Evas_Object *obj); EAPI void elm_list_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select); - EAPI Eina_Bool elm_list_always_select_mode_get(const Evas_Object *obj); + EAPI Eina_Bool elm_list_always_select_mode_get(const Evas_Object *obj); EAPI const Eina_List *elm_list_items_get(const Evas_Object *obj); EAPI Elm_List_Item *elm_list_selected_item_get(const Evas_Object *obj); EAPI const Eina_List *elm_list_selected_items_get(const Evas_Object *obj); @@ -1295,24 +1295,24 @@ extern "C" { } func; }; - EAPI Evas_Object * elm_slideshow_add(Evas_Object *parent); + EAPI Evas_Object *elm_slideshow_add(Evas_Object *parent); EAPI Elm_Slideshow_Item* elm_slideshow_item_add(Evas_Object *obj, const Elm_Slideshow_Item_Class *itc, const void *data); - EAPI void elm_slideshow_show(Elm_Slideshow_Item *item); - EAPI void elm_slideshow_next(Evas_Object *obj); - EAPI void elm_slideshow_previous(Evas_Object *obj); + EAPI void elm_slideshow_show(Elm_Slideshow_Item *item); + EAPI void elm_slideshow_next(Evas_Object *obj); + EAPI void elm_slideshow_previous(Evas_Object *obj); EAPI const Eina_List *elm_slideshow_transitions_get(const Evas_Object *obj); - EAPI void elm_slideshow_transition_set(Evas_Object *obj, const char *); - EAPI const char *elm_slideshow_transition_get(const Evas_Object *obj); - EAPI void elm_slideshow_timeout_set(Evas_Object *obj ,int timeout); - EAPI int elm_slideshow_timeout_get(const Evas_Object *obj); - EAPI void elm_slideshow_loop_set(Evas_Object *obj, Eina_Bool loop); - EAPI Eina_Bool elm_slideshow_loop_get(const Evas_Object *obj); - EAPI void elm_slideshow_clear(Evas_Object *obj); + EAPI void elm_slideshow_transition_set(Evas_Object *obj, const char *); + EAPI const char *elm_slideshow_transition_get(const Evas_Object *obj); + EAPI void elm_slideshow_timeout_set(Evas_Object *obj ,int timeout); + EAPI int elm_slideshow_timeout_get(const Evas_Object *obj); + EAPI void elm_slideshow_loop_set(Evas_Object *obj, Eina_Bool loop); + EAPI Eina_Bool elm_slideshow_loop_get(const Evas_Object *obj); + EAPI void elm_slideshow_clear(Evas_Object *obj); EAPI const Eina_List *elm_slideshow_items_get(const Evas_Object *obj); - EAPI void elm_slideshow_item_del(Elm_Slideshow_Item *item); - EAPI void * elm_slideshow_item_data_get(Elm_Slideshow_Item *item); + EAPI void elm_slideshow_item_del(Elm_Slideshow_Item *item); + EAPI void * elm_slideshow_item_data_get(Elm_Slideshow_Item *item); EAPI Elm_Slideshow_Item* elm_slideshow_item_current_get(const Evas_Object *obj); - EAPI Evas_Object* elm_slideshow_item_object_get(Elm_Slideshow_Item* item); + EAPI Evas_Object* elm_slideshow_item_object_get(Elm_Slideshow_Item* item); EAPI Evas_Object *elm_fileselector_add(Evas_Object *parent); @@ -1851,17 +1851,17 @@ extern "C" { EAPI void elm_popup_response(Evas_Object *obj, int response_id); EAPI void elm_popup_orient_set(Evas_Object *obj, Elm_Popup_Orient orient); EAPI void elm_popup_rotation_set(Evas_Object *obj, int rot_angle); - EAPI int elm_popup_run(Evas_Object *obj); + EAPI int elm_popup_run(Evas_Object *obj); /* Contextual Popup */ typedef struct _Ctxpopup_Item Elm_Ctxpopup_Item; typedef enum _Ctxpopup_Arrow_Direction - { - ELM_CTXPOPUP_ARROW_DOWN, - ELM_CTXPOPUP_ARROW_RIGHT, - ELM_CTXPOPUP_ARROW_LEFT, - ELM_CTXPOPUP_ARROW_UP, - } Elm_Ctxpopup_Arrow; + { + ELM_CTXPOPUP_ARROW_DOWN, + ELM_CTXPOPUP_ARROW_RIGHT, + ELM_CTXPOPUP_ARROW_LEFT, + ELM_CTXPOPUP_ARROW_UP, + } Elm_Ctxpopup_Arrow; EAPI Evas_Object *elm_ctxpopup_add(Evas_Object *parent); @@ -1959,8 +1959,8 @@ extern "C" { EAPI Eina_Bool elm_animator_auto_reverse_get(Elm_Animator *animator); EAPI Eina_Bool elm_animator_operating_get(Elm_Animator *animator); EAPI unsigned int elm_animator_repeat_get(Elm_Animator *animator); - EAPI void elm_animator_pause(Elm_Animator *animator); - EAPI void elm_animator_resume(Elm_Animator *animator); + EAPI void elm_animator_pause(Elm_Animator *animator); + EAPI void elm_animator_resume(Elm_Animator *animator); /* tansit */ @@ -1979,8 +1979,8 @@ extern "C" { EAPI Eina_Bool elm_transit_fx_insert(Elm_Transit *transit, Elm_Effect *effect); EAPI void elm_transit_fx_clear(Elm_Transit *transit); EAPI Eina_Bool elm_transit_event_block_disabled_get(Elm_Transit *transit); - EAPI void elm_transit_pause(Elm_Transit *transit); - EAPI void elm_transit_resume(Elm_Transit *transit); + EAPI void elm_transit_pause(Elm_Transit *transit); + EAPI void elm_transit_resume(Elm_Transit *transit); /* Translation FX */ EAPI Elm_Effect *elm_fx_translation_add(Evas_Object *obj, Evas_Coord from_x, Evas_Coord from_y, Evas_Coord to_x, Evas_Coord to_y); @@ -2496,7 +2496,6 @@ extern "C" { EAPI void elm_webview_uri_set(Evas_Object *obj, const char *uri); */ - #ifdef __cplusplus } #endif diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index 830c3ed..9c943ef 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -15,12 +15,14 @@ typedef struct _Widget_Data Widget_Data; -enum{ - DEFAULT = 0, - HIGHLIGHTED, - FOCUSED, - DISABLED, +enum +{ + DEFAULT = 0, + HIGHLIGHTED, + FOCUSED, + DISABLED, }; + struct _Widget_Data { Evas_Object *btn, *icon; @@ -79,19 +81,20 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj) if (!wd) return; if (elm_widget_focus_get(obj)) { - if(wd->statelabel[FOCUSED]) - { - _set_label(obj, wd->statelabel[FOCUSED]); - } + if(wd->statelabel[FOCUSED]) + { + _set_label(obj, wd->statelabel[FOCUSED]); + } edje_object_signal_emit(wd->btn, "elm,action,focus", "elm"); evas_object_focus_set(wd->btn, 1); } else { - if(wd->statelabel[DEFAULT]) - _set_label(obj, wd->statelabel[DEFAULT]); - else - _set_label(obj, wd->label); + if(wd->statelabel[DEFAULT]) + _set_label(obj, wd->statelabel[DEFAULT]); + else + _set_label(obj, wd->label); + edje_object_signal_emit(wd->btn, "elm,action,unfocus", "elm"); evas_object_focus_set(wd->btn, 0); } @@ -103,16 +106,20 @@ _theme_hook(Evas_Object *obj) Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; _elm_theme_object_set(obj, wd->btn, "button", "base", elm_widget_style_get(obj)); + if (wd->icon) edje_object_part_swallow(wd->btn, "elm.swallow.content", wd->icon); + if (wd->label) edje_object_signal_emit(wd->btn, "elm,state,text,visible", "elm"); else edje_object_signal_emit(wd->btn, "elm,state,text,hidden", "elm"); + if (wd->icon) edje_object_signal_emit(wd->btn, "elm,state,icon,visible", "elm"); else edje_object_signal_emit(wd->btn, "elm,state,icon,hidden", "elm"); + edje_object_part_text_set(wd->btn, "elm.text", wd->label); edje_object_message_signal_process(wd->btn); edje_object_scale_set(wd->btn, elm_widget_scale_get(obj) * _elm_config->scale); @@ -125,21 +132,21 @@ _disable_hook(Evas_Object *obj) Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; if (elm_widget_disabled_get(obj)) - { - if(wd->statelabel[DISABLED] ) + { + if(wd->statelabel[DISABLED] ) { - _set_label(obj, wd->statelabel[DISABLED]); + _set_label(obj, wd->statelabel[DISABLED]); } - edje_object_signal_emit(wd->btn, "elm,state,disabled", "elm"); - } + edje_object_signal_emit(wd->btn, "elm,state,disabled", "elm"); + } else - { - if(wd->statelabel[DEFAULT]) - _set_label(obj, wd->statelabel[DEFAULT]); - else - _set_label(obj, wd->label); - edje_object_signal_emit(wd->btn, "elm,state,enabled", "elm"); - } + { + if(wd->statelabel[DEFAULT]) + _set_label(obj, wd->statelabel[DEFAULT]); + else + _set_label(obj, wd->label); + edje_object_signal_emit(wd->btn, "elm,state,enabled", "elm"); + } } static void @@ -240,9 +247,9 @@ _signal_pressed(void *data, Evas_Object *obj __UNUSED__, const char *emission __ if (!wd) return; if(wd->statelabel[HIGHLIGHTED]) - { - _set_label(data, wd->statelabel[HIGHLIGHTED]); - } + { + _set_label(data, wd->statelabel[HIGHLIGHTED]); + } if (wd->autorepeat && !wd->repeating) { if (wd->ar_threshold <= 0.0) @@ -255,13 +262,13 @@ _signal_pressed(void *data, Evas_Object *obj __UNUSED__, const char *emission __ static void _signal_default_text_set(void *data, Evas_Object *obj, const char *emission, const char *source) { - Widget_Data *wd = elm_widget_data_get(data); - if (!wd) return; + Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; if(wd->statelabel[DEFAULT]) _set_label(data, wd->statelabel[DEFAULT]); - else - _set_label(data, wd->label); - return; + else + _set_label(data, wd->label); + return; } static void @@ -269,10 +276,10 @@ _signal_unpressed(void *data, Evas_Object *obj __UNUSED__, const char *emission { Widget_Data *wd = elm_widget_data_get(data); if (!wd) return; - if(wd->statelabel[DEFAULT]) - _set_label(data, wd->statelabel[DEFAULT]); - else - _set_label(data, wd->label); + if(wd->statelabel[DEFAULT]) + _set_label(data, wd->statelabel[DEFAULT]); + else + _set_label(data, wd->label); if (wd->timer) { @@ -382,35 +389,34 @@ EAPI void elm_button_label_set_for_state(Evas_Object *obj, const char *label, UIControlState state) { Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord mw, mh; if (!wd) return; if(label == NULL) return; if(state == UIControlStateDefault) - { - wd->statetype[DEFAULT] = UIControlStateDefault; - eina_stringshare_replace(&wd->statelabel[DEFAULT], label); - return; - } + { + wd->statetype[DEFAULT] = UIControlStateDefault; + eina_stringshare_replace(&wd->statelabel[DEFAULT], label); + return; + } if(state == UIControlStateHighlighted) - { - wd->statetype[HIGHLIGHTED] = UIControlStateHighlighted; - eina_stringshare_replace(&wd->statelabel[HIGHLIGHTED], label); - return; - } + { + wd->statetype[HIGHLIGHTED] = UIControlStateHighlighted; + eina_stringshare_replace(&wd->statelabel[HIGHLIGHTED], label); + return; + } if(state == UIControlStateFocused) - { - wd->statetype[FOCUSED] = UIControlStateFocused; - eina_stringshare_replace(&wd->statelabel[FOCUSED], label); - return; - } + { + wd->statetype[FOCUSED] = UIControlStateFocused; + eina_stringshare_replace(&wd->statelabel[FOCUSED], label); + return; + } if(state == UIControlStateDisabled) - { - wd->statetype[DISABLED] = UIControlStateDisabled; - eina_stringshare_replace(&wd->statelabel[DISABLED], label); - return; - } + { + wd->statetype[DISABLED] = UIControlStateDisabled; + eina_stringshare_replace(&wd->statelabel[DISABLED], label); + return; + } } /** @@ -453,7 +459,7 @@ elm_button_label_get_for_state(const Evas_Object *obj, UIControlState state) else if(state == UIControlStateDisabled) return wd->statelabel[DISABLED]; else - return NULL; + return NULL; } /** diff --git a/src/lib/elm_colorpalette.c b/src/lib/elm_colorpalette.c index 014ca21..2dc1552 100644 --- a/src/lib/elm_colorpalette.c +++ b/src/lib/elm_colorpalette.c @@ -373,7 +373,6 @@ EAPI Evas_Object *elm_colorpalette_add(Evas_Object *parent) Evas_Object *obj = NULL; Widget_Data *wd = NULL; Evas *e; - Elm_Colorpalette_Color *color; wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); diff --git a/src/lib/elm_editfield.c b/src/lib/elm_editfield.c index c1b6817..35aa44b 100644 --- a/src/lib/elm_editfield.c +++ b/src/lib/elm_editfield.c @@ -207,7 +207,7 @@ static void _resize_cb(void *data, Evas *evas, Evas_Object *obj, void *event) { Widget_Data *wd = elm_widget_data_get(data); - Evas_Coord w, h; + Evas_Coord h; if (!wd || !wd->base) return; evas_object_geometry_get(obj, NULL, NULL, NULL, &h); }