hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=6d2b4a01b415015e8d14617d8842725b6297bac9
commit 6d2b4a01b415015e8d14617d8842725b6297bac9 Author: Hermet Park <her...@hermet.pe.kr> Date: Sat Mar 5 11:27:24 2016 +0900 remove unused compile warnings. --- src/bin/main.c | 27 +++++++++++++++------------ src/bin/menu.c | 3 +-- src/bin/statusbar.c | 12 ++++-------- src/bin/tools.c | 6 +++--- src/lib/ctxpopup.c | 34 ++-------------------------------- src/lib/edc_parser.c | 1 - src/lib/edj_viewer.c | 1 - 7 files changed, 25 insertions(+), 59 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index a46459f..64f70b3 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -168,9 +168,9 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void *ev) scale = config_view_scale_get(); enventor_object_live_view_scale_set(ad->enventor, scale); - Evas_Coord w, h; - config_view_size_get(&w, &h); - enventor_object_live_view_size_set(base_enventor_get(), w, h); + Evas_Coord ww, hh; + config_view_size_get(&ww, &hh); + enventor_object_live_view_size_set(base_enventor_get(), ww, hh); //Just in live edit mode case. live_edit_update(); @@ -211,7 +211,7 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void *ev) } static Evas_Object * -tools_set(Evas_Object *enventor) +tools_set(void) { Evas_Object *tools = tools_init(base_layout_get()); base_tools_set(tools); @@ -388,7 +388,8 @@ elm_setup() } static void -enventor_cursor_line_changed_cb(void *data EINA_UNUSED, Evas_Object *obj, +enventor_cursor_line_changed_cb(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info) { Enventor_Cursor_Line *cur_line = (Enventor_Cursor_Line *)event_info; @@ -456,7 +457,9 @@ enventor_program_run_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } static void -enventor_ctxpopup_activated_cb(void *data, Evas_Object *obj, void *event_info) +enventor_ctxpopup_activated_cb(void *data EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + void *event_info) { Enventor_Ctxpopup_Type type = (Enventor_Ctxpopup_Type) event_info; @@ -817,7 +820,7 @@ statusbar_set() } static void -live_edit_set(Evas_Object *enventor, Evas_Object *tools) +live_edit_set(Evas_Object *tools) { Evas_Object *trigger = tools_live_edit_get(tools); live_edit_init(trigger); @@ -903,8 +906,8 @@ init(app_data *ad, int argc, char **argv) statusbar_set(); enventor_setup(ad); file_mgr_init(); - Evas_Object *tools = tools_set(ad->enventor); - live_edit_set(ad->enventor, tools); + Evas_Object *tools = tools_set(); + live_edit_set(tools); base_gui_show(); @@ -927,7 +930,7 @@ init(app_data *ad, int argc, char **argv) } static void -term(app_data *ad) +term(void) { menu_term(); live_edit_term(); @@ -947,13 +950,13 @@ int elm_main(int argc, char **argv) if (!init(&ad, argc, argv)) { - term(&ad); + term(); return 0; } elm_run(); - term(&ad); + term(); return 0; } diff --git a/src/bin/menu.c b/src/bin/menu.c index 3894480..ae20669 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -315,10 +315,9 @@ exit_yes_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } static void -exit_save_btn_cb(void *data, Evas_Object *obj EINA_UNUSED, +exit_save_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - menu_data *md = data; enventor_object_save(base_enventor_get(), config_input_path_get()); elm_exit(); } diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c index 564c1f8..6d68fcb 100644 --- a/src/bin/statusbar.c +++ b/src/bin/statusbar.c @@ -27,12 +27,9 @@ stats_data *g_sd = NULL; /*****************************************************************************/ static void -view_scale_slider_changed_cb(void *data, Evas_Object *obj, +view_scale_slider_changed_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { - - stats_data *sd = data; - double scale = elm_slider_value_get(obj); double rounded = ROUNDING(scale, 1); @@ -88,10 +85,9 @@ view_invert_transit_end(void *data, Elm_Transit *transit EINA_UNUSED) } static void -view_invert_btn_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) +view_invert_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { - stats_data *sd = data; - invert_data *id = malloc(sizeof(invert_data)); Evas_Coord w, h; @@ -110,7 +106,7 @@ view_invert_btn_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) } static void -view_resize_slider_changed_cb(void *data, Evas_Object *obj, +view_resize_slider_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Object *layout = data; diff --git a/src/bin/tools.c b/src/bin/tools.c index def3209..06c5d69 100644 --- a/src/bin/tools.c +++ b/src/bin/tools.c @@ -67,7 +67,7 @@ status_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } static void -find_cb(void *data, Evas_Object *obj EINA_UNUSED, +find_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { live_edit_cancel(); @@ -76,7 +76,7 @@ find_cb(void *data, Evas_Object *obj EINA_UNUSED, } static void -goto_cb(void *data, Evas_Object *obj EINA_UNUSED, +goto_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { live_edit_cancel(); @@ -112,7 +112,7 @@ redo_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } static void -undo_cb(void *data, Evas_Object *obj EINA_UNUSED, +undo_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { if (enventor_object_undo(base_enventor_get())) diff --git a/src/lib/ctxpopup.c b/src/lib/ctxpopup.c index eee963e..9d3b160 100644 --- a/src/lib/ctxpopup.c +++ b/src/lib/ctxpopup.c @@ -176,36 +176,6 @@ slider_changed_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) } static void -entry_changed_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) -{ - ctxpopup_data *ctxdata = data; - Evas_Object *slider = evas_object_data_get(obj, "slider"); - double text_val, val, min_val, max_val; - char buf[128]; - - text_val = atof(elm_object_text_get(obj)); - val = elm_slider_value_get(slider); - - //no change. - if (fabs(val - text_val) < 0.000006) return; - - elm_slider_min_max_get(slider, &min_val, &max_val); - - if (text_val < min_val) val = min_val; - else if (text_val > max_val) val = max_val; - else val = text_val; - - if (val != text_val) - { - if (ctxdata->integer) snprintf(buf, sizeof(buf), "%1.0f", val); - else snprintf(buf, sizeof(buf), "%1.2f", val); - elm_object_text_set(obj, buf); - } - else - elm_slider_value_set(slider, val); -} - -static void toggle_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { @@ -378,7 +348,7 @@ slider_layout_set(Evas_Object *ctxpopup, ctxpopup_data *ctxdata) } static void -colorselector_changed_cb(void *data, Evas_Object *obj, +colorselector_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { ctxpopup_data *ctxdata = data; @@ -407,7 +377,7 @@ colorselector_changed_cb(void *data, Evas_Object *obj, } static void -colorselector_inputs_changed_cb(void *data, Evas_Object *obj, +colorselector_inputs_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { ctxpopup_data *ctxdata = data; diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c index 868ccb3..ae042bb 100644 --- a/src/lib/edc_parser.c +++ b/src/lib/edc_parser.c @@ -1959,7 +1959,6 @@ parser_first_group_name_get(parser_data *pd, Evas_Object *entry) const char *semicol = SEMICOL_UTF8; const char *group = "group"; const int quot_len = QUOT_UTF8_LEN; - const int semicol_len = SEMICOL_UTF8_LEN; const int group_len = 5; //strlen("group"); const char *group_name = NULL; diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c index 1969985..0bd8d03 100644 --- a/src/lib/edj_viewer.c +++ b/src/lib/edj_viewer.c @@ -713,7 +713,6 @@ view_size_set(view_data *vd, Evas_Coord w, Evas_Coord h) if (!vd) return; - double scale = edj_mgr_view_scale_get(); int prev_w = vd->view_config_size.w; int prev_h = vd->view_config_size.h; --