From: Woochanlee Date: Mon, 15 Jun 2020 09:55:45 +0000 (+0900) Subject: efl : Fix build warnings. X-Git-Tag: submit/tizen/20200616.213914~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F74%2F236174%2F4;p=platform%2Fupstream%2Fefl.git efl : Fix build warnings. Change-Id: I0777c22ad7784beee94646cf17420e41b0e798e8 --- diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c index 5198a60..2687470 100644 --- a/src/bin/edje/edje_cc_out.c +++ b/src/bin/edje/edje_cc_out.c @@ -718,8 +718,8 @@ check_program(Edje_Part_Collection *pc, Edje_Program *ep, Eet_File *ef) //TIZEN_ONLY(20200221): comment out unused variables //Edje_Program_Target *et; //Eina_List *l; + //unsigned int i = 0; // - unsigned int i = 0; if ((!ep->targets) && (ep->action == EDJE_ACTION_TYPE_SIGNAL_EMIT)) { diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index fb0ae66..e9422ea 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -3378,6 +3378,8 @@ ecore_evas_tick_end(Ecore_Evas *ee) ee->engine.func->fn_animator_unregister(ee); } +/* TIZEN_ONLY : To use vsync as a custom source of animator */ +/* // Need all possible tick to tick for animator fallback as we don't // know if a window is the source of animator static void @@ -3461,6 +3463,7 @@ _ecore_evas_tick_source_find(void) ecore_animator_source_set(ECORE_ANIMATOR_SOURCE_CUSTOM); } } +*/ static Eina_Bool _ecore_evas_animator_fallback(void *data) @@ -5428,7 +5431,7 @@ ecore_evas_tbm_stride_get(Ecore_Evas *ee) stride_get = eina_module_symbol_get(m, "ecore_evas_tbm_stride_get_internal"); EINA_SAFETY_ON_NULL_RETURN_VAL(stride_get, 0); - return stride_get(ee); + return (int)stride_get(ee); } /* new input model with eo: diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index a73278d..b9518f3 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -924,7 +924,7 @@ _edje_color_class_list_foreach(const Eina_Hash *hash EINA_UNUSED, const void *ke * TIZEN_ONLY_FEATURE: apply Tizen's color_class features. * ***********************************************************************************/ static const char * -_edje_color_class_data_get(Evas_Object *obj, const char *color_class) +_edje_color_class_data_get(const Evas_Object *obj, const char *color_class) { const char *edje_data = NULL; char *temp, *temp_orig, *tok, *save = NULL; diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 6e07e1c..bb0bb2c 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -2051,6 +2051,7 @@ _calculate_tree_number(int self_counter, int parent_counter, Eina_Bool flag) return self_counter; } +/* TIZEN_ONLY(20190821): keep legacy focus logic static void _propagate_bool_property(Elm_Widget_Smart_Data *pd, Eina_Bool flag, void (*property_setting)(Eo *obj, Eina_Bool flag)) { @@ -2062,6 +2063,7 @@ _propagate_bool_property(Elm_Widget_Smart_Data *pd, Eina_Bool flag, void (*prope property_setting(subs, flag); } } +*/ /** * @internal diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c index ccbc25b..e57e07d 100644 --- a/src/lib/elementary/elm_config.c +++ b/src/lib/elementary/elm_config.c @@ -1280,7 +1280,7 @@ _extension_color_overlay_desc_init(Eet_Data_Descriptor **color_overlay_edd, } _EAPI Eina_Bool -_elm_config_extension_color_overlay_set(const Eina_List* list, const char* theme_name) +_elm_config_extension_color_overlay_set(Eina_List* list, const char* theme_name) { if (!theme_name || !list) { @@ -1346,7 +1346,7 @@ _elm_config_extension_color_overlay_get(const char* theme_name) if (!ef) { ERR("failed to open extension color overlay of RW. try to load RO data."); - snprintf(config_path, sizeof(config_path), "%s/config/%s/%s_color_overlays.cfg\0", + snprintf(config_path, sizeof(config_path), "%s/config/%s/%s_color_overlays.cfg", _elm_data_dir, _elm_profile, theme_name); ef = eet_open(config_path, EET_FILE_MODE_READ); @@ -1434,7 +1434,7 @@ _extension_font_overlay_desc_init(Eet_Data_Descriptor **font_overlay_edd, } _EAPI Eina_Bool -_elm_config_extension_font_overlay_set(const Eina_List* list, const char* theme_name) +_elm_config_extension_font_overlay_set(Eina_List* list, const char* theme_name) { if (!theme_name || !list) { @@ -1501,7 +1501,7 @@ _elm_config_extension_font_overlay_get(const char* theme_name) if (!ef) { ERR("failed to open extension font overlay of RW. try to load RO data."); - snprintf(config_path, sizeof(config_path), "%s/config/%s/%s_font_overlays.cfg\0", + snprintf(config_path, sizeof(config_path), "%s/config/%s/%s_font_overlays.cfg", _elm_data_dir, _elm_profile, theme_name); ef = eet_open(config_path, EET_FILE_MODE_READ); diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index bf4067d..a9689d6 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -1808,7 +1808,7 @@ _elm_conformant_efl_file_mmap_get(const Eo *obj, Elm_Conformant_Data *pd EINA_UN } EOLIAN static Eina_Error -_elm_conformant_efl_file_load(Eo *obj, Elm_Conformant_Data *sd) +_elm_conformant_efl_file_load(Eo *obj, Elm_Conformant_Data *sd EINA_UNUSED) { Eina_Error err; diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index d95db20..2f2a51a 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -1014,12 +1014,12 @@ _elm_flipselector_efl_access_component_accessible_at_point_get(Eo *obj, Elm_Flip evas_object_geometry_get(_pd->access_top_button, &wx, &wy, &ww, &wh); Eina_Rect r = EINA_RECT(wx,wy,ww,wh); - if (eina_rectangle_coords_inside(&r, x, y)) + if (eina_rectangle_coords_inside(&r.rect, x, y)) return _pd->access_top_button; evas_object_geometry_get(_pd->access_bottom_button, &wx, &wy, &ww, &wh); r = EINA_RECT(wx, wy, ww, wh); - if (eina_rectangle_coords_inside(&r, x, y)) + if (eina_rectangle_coords_inside(&r.rect, x, y)) return _pd->access_bottom_button; return NULL; diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 56b9cff..1f61872 100755 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -5388,11 +5388,6 @@ _content_min_limit_cb(Evas_Object *obj, Eina_Bool w, Eina_Bool h) elm_layout_sizing_eval(obj); } -static void -_size_cache_free(void *data) -{ - if (data) free(data); -} EOLIAN static void _elm_gengrid_efl_canvas_group_group_add(Eo *obj, Elm_Gengrid_Data *priv) { diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 1f711dd..19f03c5 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -9693,7 +9693,7 @@ _elm_genlist_item_efl_ui_focus_object_focus_parent_get(const Eo *obj EINA_UNUSED //TIZEN_ONLY(20200413) : internal API for center adjust item showing. // This is fake API for building efl tv profile. _EAPI void -__elm_genlist_item_show_center_adjust(Eo *eo_item, Eina_Bool anim) +__elm_genlist_item_show_center_adjust(Eo *eo_item EINA_UNUSED, Eina_Bool anim EINA_UNUSED) { //Nothing provided. } diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index a2ce83d..bef2a89 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -2991,14 +2991,13 @@ static Evas_Coord _elm_scroll_page_x_get(Elm_Scrollable_Smart_Interface_Data *sid, int offset, Eina_Bool limit) { - Evas_Coord x, y, w, h, dx, cw, ch, minx = 0; + Evas_Coord x, y, w, dx, cw, ch, minx = 0; if (!sid->pan_obj) return 0; elm_interface_scrollable_content_pos_get(sid->obj, &x, &y); //TIZEN_ONLY(20200414): Support rotary event w = sid->w; - h = sid->h; // elm_obj_pan_content_size_get(sid->pan_obj, &cw, &ch); elm_obj_pan_pos_min_get(sid->pan_obj, &minx, NULL); @@ -3042,13 +3041,12 @@ static Evas_Coord _elm_scroll_page_y_get(Elm_Scrollable_Smart_Interface_Data *sid, int offset, Eina_Bool limit) { - Evas_Coord x, y, w = 0, h = 0, dy, cw = 0, ch = 0, miny = 0; + Evas_Coord x, y, h = 0, dy, cw = 0, ch = 0, miny = 0; if (!sid->pan_obj) return 0; elm_interface_scrollable_content_pos_get(sid->obj, &x, &y); //TIZEN_ONLY(20200414): Support rotary event - w = sid->w; h = sid->h; // elm_obj_pan_content_size_get(sid->pan_obj, &cw, &ch); @@ -6131,7 +6129,7 @@ EAPI void _elm_interface_scrollable_item_scroll_align_force_set(Eo *obj, Eina_Bool enabled) { ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(obj, sid); - sid->force_align = EINA_TRUE; + sid->force_align = enabled; } // diff --git a/src/lib/elementary/elm_scroller_eo.c b/src/lib/elementary/elm_scroller_eo.c index 2e4701a..01aab1e 100644 --- a/src/lib/elementary/elm_scroller_eo.c +++ b/src/lib/elementary/elm_scroller_eo.c @@ -112,6 +112,7 @@ Eina_Bool _elm_scroller_efl_ui_widget_focus_next(Eo *obj, Elm_Scroller_Data *pd, Eina_Bool _elm_scroller_efl_ui_widget_focus_direction(Eo *obj, Elm_Scroller_Data *pd, const Efl_Canvas_Object *base, double degree, Efl_Canvas_Object **direction, Elm_Widget_Item **direction_item, double *weight); +void _elm_scroller_efl_ui_widget_screen_reader(Eo *obj, Elm_Scroller_Data *pd, Eina_Bool is_screen_reader); static Eina_Bool _elm_scroller_class_initializer(Efl_Class *klass) @@ -152,6 +153,7 @@ _elm_scroller_class_initializer(Efl_Class *klass) EFL_OBJECT_OP_FUNC(efl_ui_widget_focus_direction_manager_is, _elm_scroller_efl_ui_widget_focus_direction_manager_is), EFL_OBJECT_OP_FUNC(efl_ui_widget_focus_next, _elm_scroller_efl_ui_widget_focus_next), EFL_OBJECT_OP_FUNC(efl_ui_widget_focus_direction, _elm_scroller_efl_ui_widget_focus_direction), + EFL_OBJECT_OP_FUNC(efl_ui_widget_screen_reader, _elm_scroller_efl_ui_widget_screen_reader), ELM_SCROLLER_EXTRA_OPS ); opsp = &ops; diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 7c9544f..b22b0a6 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -2000,6 +2000,9 @@ _elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv) elm_gesture_layer_attach(priv->g_layer, priv->g_rect); elm_gesture_layer_cb_set(priv->g_layer, ELM_GESTURE_N_FLICKS, ELM_GESTURE_STATE_END, _text_button_flick_end, obj); elm_gesture_layer_cb_set(priv->g_layer, ELM_GESTURE_N_FLICKS, ELM_GESTURE_STATE_MOVE, _text_button_flick_move, obj); + + evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _on_obj_move, priv); + evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_obj_resize, priv); } // @@ -2515,7 +2518,7 @@ _elm_spinner_efl_ui_range_display_range_value_set(Eo *obj, Elm_Spinner_Data *sd, } EOLIAN static double -_elm_spinner_efl_ui_range_display_range_value_get(const Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) +_elm_spinner_efl_ui_range_display_range_value_get(const Eo *obj, Elm_Spinner_Data *sd) { //TIZEN_ONLY(20200403): For value_get while scroll in progress if (sd->list_spinner) @@ -2529,7 +2532,7 @@ _elm_spinner_efl_ui_range_display_range_value_get(const Eo *obj EINA_UNUSED, Elm if (center_item) { sd->aligned_item = center_item; - _genlist_item_value_apply(obj); + _genlist_item_value_apply((Evas_Object *)obj); } } } diff --git a/src/lib/elementary_tizen/elm_genlist.c b/src/lib/elementary_tizen/elm_genlist.c index 928c310..76190ad 100644 --- a/src/lib/elementary_tizen/elm_genlist.c +++ b/src/lib/elementary_tizen/elm_genlist.c @@ -4212,6 +4212,7 @@ static Eina_Bool _item_focusable_search(Elm_Gen_Item **it, int dir) return EINA_FALSE; } +/*FIXME: Need to be implemented on New Widget Event Interface static Eina_Bool _item_focus_next(Elm_Genlist_Data *sd, Focus_Dir dir) { Elm_Gen_Item *it = NULL; @@ -4351,7 +4352,7 @@ static Eina_Bool _item_focus_next(Elm_Genlist_Data *sd, Focus_Dir dir) return EINA_TRUE; } -/*FIXME: Need to be implemented on New Widget Event Interface + //#ifdef ELM_FOCUSED_UI EOLIAN static Eina_Bool _elm_genlist_efl_ui_widget_widget_event(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) @@ -8323,7 +8324,7 @@ end: if (sd->show_item == it) sd->show_item = NULL; //TIZEN_ONLY(30May2019): Item free optimization on clear - if (!sd->on_clear && (sd->aligned_item == it || elm_genlist_item_prev_get(sd->aligned_item) == it)) + if (!sd->on_clear && (sd->aligned_item == it || elm_genlist_item_prev_get(EO_OBJ(sd->aligned_item)) == EO_OBJ(it))) { //TIZEN_ONLY(23Mar2020): During callback application can trigger item update //operations which can reset align item for doing self align operation again diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index b84fb02..89337f1 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -329,7 +329,7 @@ void _ecore_evas_wl_common_move(Ecore_Evas *ee, int x, int y) { Ecore_Evas_Engine_Wl_Data *wdata; - LOGFN(__FILE__, __LINE__, __FUNCTION__); + LOGFN; if (!ee) return; @@ -2067,7 +2067,7 @@ _ecore_evas_wl_common_pointer_warp(const Ecore_Evas *ee, Evas_Coord x, Evas_Coor Ecore_Evas_Engine_Wl_Data *wdata; Eina_Bool ret; - LOGFN(__FILE__, __LINE__, __FUNCTION__); + LOGFN; if ((!ee) || (!ee->visible)) return EINA_FALSE; wdata = ee->engine.data; @@ -2173,7 +2173,7 @@ _ecore_evas_wl_common_raise(Ecore_Evas *ee) { Ecore_Evas_Engine_Wl_Data *wdata; - LOGFN(__FILE__, __LINE__, __FUNCTION__); + LOGFN; if (!ee) return; wdata = ee->engine.data;