hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=5e8d2e518da89d615a5635539b2bc7cabafcdf10
commit 5e8d2e518da89d615a5635539b2bc7cabafcdf10 Author: Hermet Park <[email protected]> Date: Sat Jul 2 14:09:42 2016 +0900 fixed all compile warning stuff. --- src/bin/base_gui.c | 2 +- src/bin/config_data.c | 2 +- src/bin/file_browser.c | 2 +- src/bin/file_mgr.c | 2 +- src/bin/live_edit.c | 11 ----------- src/bin/main.c | 1 - src/bin/statusbar.c | 7 ++++--- src/include/base_gui.h | 1 + src/lib/edc_editor.c | 1 + src/lib/wireframes_obj.c | 15 --------------- 10 files changed, 10 insertions(+), 34 deletions(-) diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c index 9875ab1..0c631d3 100644 --- a/src/bin/base_gui.c +++ b/src/bin/base_gui.c @@ -389,7 +389,7 @@ Enventor_Object * base_enventor_get(void) { base_data *bd = g_bd; - EINA_SAFETY_ON_NULL_RETURN(bd); + EINA_SAFETY_ON_NULL_RETURN_VAL(bd, NULL); return bd->enventor; } diff --git a/src/bin/config_data.c b/src/bin/config_data.c index 5e6bc91..6d79580 100644 --- a/src/bin/config_data.c +++ b/src/bin/config_data.c @@ -967,7 +967,7 @@ double config_editor_size_get(void) { config_data *cd = g_cd; - EINA_SAFETY_ON_NULL_RETURN(cd); + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, 0); return cd->editor_size; } diff --git a/src/bin/file_browser.c b/src/bin/file_browser.c index 5fa0fb7..a5e76f7 100644 --- a/src/bin/file_browser.c +++ b/src/bin/file_browser.c @@ -114,7 +114,7 @@ gl_clicked_double_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Eina_List *l; EINA_LIST_FOREACH(sub_items, l, eit) { - const char *it_file_path = enventor_item_file_get(eit); + it_file_path = enventor_item_file_get(eit); if (!it_file_path) continue; //Let's check if the file is already opened. diff --git a/src/bin/file_mgr.c b/src/bin/file_mgr.c index a3b9689..5b28c8a 100644 --- a/src/bin/file_mgr.c +++ b/src/bin/file_mgr.c @@ -148,7 +148,7 @@ int file_mgr_edc_modified_get(void) { file_mgr_data *fmd = g_fmd; - EINA_SAFETY_ON_NULL_RETURN(fmd); + EINA_SAFETY_ON_NULL_RETURN_VAL(fmd, 0); return fmd->edc_modified; } diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index 2d10ae1..71e2d57 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -1958,13 +1958,6 @@ rel_to_values_reset(live_data *ld) } static void -fixed_check_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, - void *event_info EINA_UNUSED) -{ - live_data *ld = data; -} - -static void live_edit_layer_set(live_data *ld) { //Keygrabber @@ -2268,8 +2261,6 @@ live_edit_init(Evas_Object *parent) Evas_Object *fixed_w_check = elm_check_add(fixed_box); elm_object_focus_allow_set(fixed_w_check, EINA_FALSE); elm_object_text_set(fixed_w_check, "Fixed width"); - evas_object_smart_callback_add(fixed_w_check, "changed", - fixed_check_changed_cb, ld); evas_object_show(fixed_w_check); elm_box_pack_end(fixed_box, fixed_w_check); @@ -2277,8 +2268,6 @@ live_edit_init(Evas_Object *parent) Evas_Object *fixed_h_check = elm_check_add(fixed_box); elm_object_focus_allow_set(fixed_h_check, EINA_FALSE); elm_object_text_set(fixed_h_check, "Fixed height"); - evas_object_smart_callback_add(fixed_h_check, "changed", - fixed_check_changed_cb, ld); evas_object_show(fixed_h_check); elm_box_pack_end(fixed_box, fixed_h_check); diff --git a/src/bin/main.c b/src/bin/main.c index 45985d4..ceba5a8 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -126,7 +126,6 @@ config_update_cb(void *data EINA_UNUSED) static Eina_Bool main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void *ev) { - app_data *ad = data; Ecore_Event_Mouse_Wheel *event = ev; Evas_Coord x, y, w, h; diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c index a32ca92..75aee5f 100644 --- a/src/bin/statusbar.c +++ b/src/bin/statusbar.c @@ -376,10 +376,11 @@ stats_init(Evas_Object *parent) return layout; } -Eina_Stringshare *stats_group_name_get(void) +Eina_Stringshare * +stats_group_name_get(void) { stats_data *sd = g_sd; - EINA_SAFETY_ON_NULL_RETURN(sd); + EINA_SAFETY_ON_NULL_RETURN_VAL(sd, NULL); return sd->group_name; } @@ -452,7 +453,7 @@ Eina_Bool stats_ctxpopup_dismiss(void) { stats_data *sd = g_sd; - EINA_SAFETY_ON_NULL_RETURN(sd); + EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE); if (sd->ctxpopup) { diff --git a/src/include/base_gui.h b/src/include/base_gui.h index 9876a0c..238c5c7 100644 --- a/src/include/base_gui.h +++ b/src/include/base_gui.h @@ -31,3 +31,4 @@ void base_file_browser_toggle(Eina_Bool toggle); void base_edc_navigator_toggle(Eina_Bool toggle); void base_edc_navigator_group_update(void); void base_edc_navigator_deselect(void); +void base_file_tab_toggle(Eina_Bool toggle); diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c index 4f0e190..0bd0ce9 100644 --- a/src/lib/edc_editor.c +++ b/src/lib/edc_editor.c @@ -1423,6 +1423,7 @@ edit_init(Enventor_Object *enventor, Eina_Bool main) ed->pd = parser_init(); ed->rd = redoundo_init(ed, enventor); ed->sh = syntax_init(ed); + ed->main = main; return ed; } diff --git a/src/lib/wireframes_obj.c b/src/lib/wireframes_obj.c index b894120..cfdecd3 100644 --- a/src/lib/wireframes_obj.c +++ b/src/lib/wireframes_obj.c @@ -27,13 +27,6 @@ const char *OUTLINE_EDIT_LAYOUT_KEY = "edit_layout"; /*****************************************************************************/ /* Internal method implementation */ /*****************************************************************************/ -static void -edje_part_clicked(void *data, Evas *e EINA_UNUSED, - Evas_Object *obj, void *ei EINA_UNUSED) -{ - part_obj *po = (part_obj *)data; - Evas_Object *layout = evas_object_data_get(obj, OUTLINE_EDIT_LAYOUT_KEY); -} static void wireframes_objs_update(wireframes_obj *wireframes) @@ -41,9 +34,7 @@ wireframes_objs_update(wireframes_obj *wireframes) Eina_List *parts = edje_edit_parts_list_get(wireframes->layout); Eina_List *l, *l_next, *l2; char *part_name; - Edje_Part_Type type = EDJE_PART_TYPE_NONE; part_obj *po; - Evas *evas = evas_object_evas_get(wireframes->layout); Eina_Bool removed; //Remove the wireframes objects that parts are removed. @@ -58,7 +49,6 @@ wireframes_objs_update(wireframes_obj *wireframes) if ((strlen(po->name) != strlen(part_name))) continue; if (!strcmp(po->name, part_name)) { - type = edje_edit_part_type_get(wireframes->layout, part_name); removed = EINA_FALSE; break; } @@ -75,8 +65,6 @@ wireframes_objs_update(wireframes_obj *wireframes) //Add new part object or Update changed part. EINA_LIST_FOREACH(parts, l, part_name) { - type = edje_edit_part_type_get(wireframes->layout, part_name); - Eina_List *part_l; Evas_Object *pobj = NULL; int part_x = 0, part_y = 0, part_w = 0, part_h = 0, part_lx = 0, part_ly = 0; @@ -109,9 +97,6 @@ wireframes_objs_update(wireframes_obj *wireframes) evas_object_clip_set(pobj, clipper); evas_object_data_set(pobj, OUTLINE_EDIT_LAYOUT_KEY, wireframes->layout); - - evas_object_event_callback_add(pobj, EVAS_CALLBACK_MOUSE_DOWN, - edje_part_clicked, po); } evas_object_geometry_get(wireframes->layout, &part_lx, &part_ly, NULL, NULL); --
