From 72bc64c6a3fa3f9396bb0659882bb5f163dd99ef Mon Sep 17 00:00:00 2001 From: Yeongjong Lee Date: Fri, 21 Feb 2020 14:00:06 +0900 Subject: [PATCH] elementary: remove unused variable in tizen only code Fixes '-Wunused-variable' compiler warnings. @tizen_fix Change-Id: I462ca6212f97f00e628e839b19e1b05f4f1dd7ca --- src/lib/elementary/efl_ui_widget.c | 3 --- src/lib/elementary/elm_config.c | 2 +- src/lib/elementary/elm_genlist.c | 9 ------- src/lib/elementary/elm_index.c | 19 +-------------- src/lib/elementary/elm_interface_scrollable.c | 6 ++--- src/lib/elementary_tizen/elm_genlist.c | 35 +++++++++++---------------- 6 files changed, 18 insertions(+), 56 deletions(-) diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index fd8009c..5af4aef 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -5904,9 +5904,6 @@ _efl_ui_widget_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, { Eina_List *l, *accs = NULL; Evas_Object *widget; - // TIZEN_ONLY(20160824): Do not append a child, if its accessible parent is different with widget parent - Eo *parent; - // Eo *proxy = NULL; EINA_LIST_FOREACH(pd->subobjs, l, widget) diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c index 46a2233..bcf9df2 100644 --- a/src/lib/elementary/elm_config.c +++ b/src/lib/elementary/elm_config.c @@ -1795,8 +1795,8 @@ _elm_config_color_overlay_apply(void) EINA_INLIST_FOREACH(th->themes, base_etf) { if (strcmp(base_etf->item, _elm_config->theme)) continue; - Eina_File* f = base_etf->handle; //TODO + //Eina_File* f = base_etf->handle; //Getting Edje_File from Eina_File //Modifying color_hash of Edje_File } diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index db6d345..fda66dc 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -5650,7 +5650,6 @@ _item_unrealize(Elm_Gen_Item *it) { Evas_Object *c; Eina_List *cache = NULL; - ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); EINA_LIST_FREE(it->item->flip_contents, c) evas_object_del(c); @@ -5659,14 +5658,6 @@ _item_unrealize(Elm_Gen_Item *it) if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) _elm_access_widget_item_unregister(it->base); - //TIZEN_ONLY(20150709) Do not register children of MANAGES_DESCENDATS objects - if (_elm_atspi_enabled()) - { - efl_access_removed(EO_OBJ(it)); - efl_access_children_changed_del_signal_emit(sd->obj, EO_OBJ(it)); - } - // - // unswallow VIEW(it) first then manipulate VIEW(it) _decorate_item_unrealize(it, EINA_FALSE); if (it->item->wsd->decorate_all_mode) _decorate_all_item_unrealize(it); diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index 3aeca7a..585ca62 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -58,7 +58,6 @@ _elm_index_item_order_signal_emit(Eina_List *items, Eo *eo_it, Eina_Bool it_on_deletion) { - Eina_List *it_list = NULL; int count = 0; Elm_Object_Item *prev_eo_it = NULL; Elm_Index_Item_Data *prev_it = NULL; @@ -1367,24 +1366,8 @@ _elm_index_efl_ui_widget_on_access_update(Eo *obj, Elm_Index_Data *_pd EINA_UNUS //TIZEN_ONLY(20160822): When atspi mode is dynamically switched on/off, //register/unregister access objects accordingly. EOLIAN static void -_elm_index_efl_ui_widget_screen_reader(Eo *obj, Elm_Index_Data *_pd, Eina_Bool is_screen_reader) +_elm_index_efl_ui_widget_screen_reader(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED, Eina_Bool is_screen_reader) { - Eina_List *elist = NULL; - Elm_Object_Item *eo_it; - - EINA_LIST_FOREACH(_pd->items, elist, eo_it) - { - if (is_screen_reader) - { - efl_access_added(eo_it); - efl_access_children_changed_added_signal_emit(obj, eo_it); - } - else - { - efl_access_removed(eo_it); - efl_access_children_changed_del_signal_emit(obj, eo_it); - } - } //TIZEN_ONLY(20161213): apply screen_reader_changed callback evas_object_smart_callback_call(obj, SIG_ATSPI_SCREEN_READER_CHANGED, &is_screen_reader); // diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index 699203a..66ae579 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -3359,13 +3359,11 @@ _elm_scroll_mouse_up_event_cb(void *data, if (sid->is_page_flick) { - double last_time = ev->timestamp/1000.0; - double dt = 0.0, dx = 0.0, dy = 0.0; + double dt = 0.0, dx = 0.0; if (sid->move.count > 2) { dx = sid->move.history[sid->move.count - 1].x - sid->move.history[0].x; - dy = sid->move.history[sid->move.count - 1].y - sid->move.history[0].y; time_gap = dt = sid->move.history[sid->move.count - 1].timestamp - sid->move.history[0].timestamp; left_direction = dx < 0 ? EINA_FALSE : EINA_TRUE; DBG("dx:%f (%d, %d)", dx, sid->move.history[sid->move.count - 1].x, sid->move.history[0].x); @@ -3488,7 +3486,7 @@ _elm_scroll_mouse_up_event_cb(void *data, if (sid->is_page_flick || ((_elm_config->thumbscroll_momentum_friction > 0.0) && (vel > _elm_config->thumbscroll_momentum_threshold))) { - Evas_Coord vw, vh, aw, ah, max_d; + Evas_Coord max_d; int minx, miny, mx, my, px, py; double tt = 0.0, dtt = 0.0; diff --git a/src/lib/elementary_tizen/elm_genlist.c b/src/lib/elementary_tizen/elm_genlist.c index 23afa4e..7aec768 100644 --- a/src/lib/elementary_tizen/elm_genlist.c +++ b/src/lib/elementary_tizen/elm_genlist.c @@ -1257,13 +1257,6 @@ _item_unrealize(Elm_Gen_Item *it, { efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_UNREALIZED, EO_OBJ(it)); elm_object_item_access_order_unset(EO_OBJ(it)); - //TIZEN_ONLY(20150709) Do not register children of MANAGES_DESCENDATS objects - if (_elm_atspi_enabled()) - { - efl_access_removed(EO_OBJ(it)); - efl_access_children_changed_del_signal_emit(sd->obj, EO_OBJ(it)); - } - // } Eina_List *l; @@ -2768,7 +2761,7 @@ _item_block_realize(Item_Block *itb, Eina_Bool force) Elm_Gen_Item *top_drawn_item = NULL; const Eina_List *l, *ll; Evas_Object *content; - Eina_Bool unrealize = EINA_TRUE, add_fx_play = EINA_FALSE; + Eina_Bool unrealize = EINA_TRUE; Evas_Coord ox = 0, oy = 0, ow = 0, oh = 0, cvx = 0, cvy = 0, cvw = 0, cvh = 0; ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wsd); @@ -2786,6 +2779,7 @@ _item_block_realize(Item_Block *itb, Eina_Bool force) cvh = cvh * 3; } #ifdef GENLIST_FX_SUPPORT + Eina_Bool add_fx_play = EINA_FALSE; // TIZEN_ONLY(20190110) add VI's direction is to be upwar if (sd->del_fx.anim) { @@ -3876,9 +3870,9 @@ static Evas_Object if ((dir != 1) && (dir != -1)) return NULL; Evas_Object *next = NULL; +/* FIXME : Need to Implement focus logic based on focus manager. Elm_Object_Item *next_item = NULL; -/* FIXME : Need to Implement focus logic based on focus manager. while (l) { next = eina_list_data_get(l); @@ -5392,7 +5386,7 @@ _elm_genlist_efl_ui_widget_focus_next(Eo *obj, Elm_Genlist_Data *sd, Efl_Ui_Focu EINA_LIST_FOREACH(itb->items, l, it) { Eina_List *ll; - Evas_Object *c, *ret; + Evas_Object *c; Eina_List *orders; if (!(it->realized)) continue; @@ -10501,19 +10495,20 @@ elm_genlist_fx_mode_set(Evas_Object *obj, Eina_Bool mode) { ELM_GENLIST_CHECK(obj); ELM_GENLIST_DATA_GET(obj, sd); - Eina_Bool prev = sd->fx_mode; - sd->fx_mode = !!mode; + mode = !!mode; + + if (sd->fx_mode == mode) + return; + + sd->fx_mode = mode; #ifdef GENLIST_FX_SUPPORT - if (prev != mode) + Elm_Gen_Item *it; + EINA_INLIST_FOREACH(sd->items, it) { - Elm_Gen_Item *it; - EINA_INLIST_FOREACH(sd->items, it) - { - if (mode) efl_del_intercept_set(EO_OBJ(it), _item_del_intercept_cb); - else efl_del_intercept_set(EO_OBJ(it), NULL); - } + if (mode) efl_del_intercept_set(EO_OBJ(it), _item_del_intercept_cb); + else efl_del_intercept_set(EO_OBJ(it), NULL); } #endif @@ -10928,8 +10923,6 @@ _elm_genlist_elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Genlist_Data EOLIAN static Eina_Bool _elm_genlist_item_efl_access_component_highlight_grab(Eo *eo_it, Elm_Gen_Item *it) { - ELM_GENLIST_DATA_GET(WIDGET(it), sd); - efl_access_component_highlight_grab(efl_super(EO_OBJ(it), ELM_GENLIST_ITEM_CLASS)); //TIZEN_ONLY(20170412) Make atspi,(un)highlighted work on widget item -- 2.7.4