From cee4098e1f9033f98f2202b3861dbdb702333030 Mon Sep 17 00:00:00 2001 From: Bruno Dilly Date: Mon, 24 Oct 2011 23:43:34 +0000 Subject: [PATCH] Elementary: remove vars set but not used Remove almost all of them. Remaining: - device on _event_history_clear, elm_gesture_layer - config has a hand of these cases. - ctxpopup var inside macro - segment control edje external (it's unfinished) SVN revision: 64365 --- legacy/elementary/src/bin/test_flip_page.c | 2 - legacy/elementary/src/bin/test_genlist.c | 16 ++++---- legacy/elementary/src/bin/test_menu.c | 4 +- .../elementary/src/bin/test_segment_control.c | 40 +++++++++---------- legacy/elementary/src/lib/elm_gengrid.c | 4 +- legacy/elementary/src/lib/els_cursor.c | 3 +- 6 files changed, 32 insertions(+), 37 deletions(-) diff --git a/legacy/elementary/src/bin/test_flip_page.c b/legacy/elementary/src/bin/test_flip_page.c index 2307a763ef..5537ea1150 100644 --- a/legacy/elementary/src/bin/test_flip_page.c +++ b/legacy/elementary/src/bin/test_flip_page.c @@ -318,7 +318,6 @@ _state_update(State *st) double b, minv = 0.0, minva, mgrad; int gx, gy, gszw, gszh, gw, gh, col, row, nw, nh; double rho, A, theta, perc, percm, n, rhol, Al, thetal; - Vertex2 *tvi; Vertex3 *tvo, *tvol; st->backflip = 0; @@ -474,7 +473,6 @@ _state_update(State *st) num = (st->slices_w + 1) * (st->slices_h + 1); - tvi = alloca(sizeof(Vertex2) * num); tvo = alloca(sizeof(Vertex3) * num); tvol = alloca(sizeof(Vertex3) * (st->slices_w + 1)); diff --git a/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c index dd8e5bb327..23f2d166e3 100644 --- a/legacy/elementary/src/bin/test_genlist.c +++ b/legacy/elementary/src/bin/test_genlist.c @@ -1348,7 +1348,7 @@ test_genlist8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in { Evas_Object *win, *bg, *gl, *bt[8], *bx, *bx2, *bx3; Elm_Genlist_Item *gli = NULL, *git = NULL; - int i, bt_count, bt_num; + int i, bt_num; win = elm_win_add(NULL, "genlist-group", ELM_WIN_BASIC); elm_win_title_set(win, "Genlist Group"); @@ -1460,7 +1460,6 @@ test_genlist8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_box_pack_end(bx, bx3); evas_object_show(bx3); - bt_count = 0; for (i = 0; i < 500; i++) { if (!(i % 10)) @@ -1889,7 +1888,6 @@ test_genlist12(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i { Evas_Object *win, *bg, *bx, *gl; int i; - Elm_Genlist_Item *gli; win = elm_win_add(NULL, "genlist-textblock", ELM_WIN_BASIC); elm_win_title_set(win, "Genlist Textblock"); @@ -1920,12 +1918,12 @@ test_genlist12(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i for (i = 0; i < 1000; i++) { - gli = elm_genlist_item_append(gl, &itc1, - (void *)(long)i/* item data */, - NULL/* parent */, - ELM_GENLIST_ITEM_NONE, - gl_sel/* func */, - (void *)(long)(i * 10)/* func data */); + elm_genlist_item_append(gl, &itc1, + (void *)(long)i/* item data */, + NULL/* parent */, + ELM_GENLIST_ITEM_NONE, + gl_sel/* func */, + (void *)(long)(i * 10)/* func data */); } evas_object_resize(win, 400, 500); diff --git a/legacy/elementary/src/bin/test_menu.c b/legacy/elementary/src/bin/test_menu.c index b880994cb8..540b425848 100644 --- a/legacy/elementary/src/bin/test_menu.c +++ b/legacy/elementary/src/bin/test_menu.c @@ -72,7 +72,7 @@ _populate_2(Elm_Menu_Item *item) static void _populate_1(Evas_Object *win, Elm_Menu_Item *item) { - Elm_Menu_Item *item2, *item3; + Elm_Menu_Item *item2; Evas_Object *radio; radio = elm_radio_add(win); @@ -80,7 +80,7 @@ _populate_1(Evas_Object *win, Elm_Menu_Item *item) elm_radio_value_set(radio, 0); elm_object_text_set(radio, "radio in menu"); item2 = elm_menu_item_add(menu, item, "object-rotate-left", "menu 1", NULL, NULL); - item3 = elm_menu_item_add_object(menu, item, radio, NULL, NULL); + elm_menu_item_add_object(menu, item, radio, NULL, NULL); _populate_2(item2); } diff --git a/legacy/elementary/src/bin/test_segment_control.c b/legacy/elementary/src/bin/test_segment_control.c index 63ad4e34c8..60d3a49dc4 100644 --- a/legacy/elementary/src/bin/test_segment_control.c +++ b/legacy/elementary/src/bin/test_segment_control.c @@ -8,7 +8,7 @@ void test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Evas_Object *win, *bg, *ic, *ic1, *ic2, *ic3, *ic4, *ic5; - Elm_Segment_Item *it1, *it2, *it3, *it4, *it5; + Elm_Segment_Item *it; Evas_Object * in_layout; Evas_Object *segment1, *segment2, *segment3, *segment4; @@ -46,19 +46,19 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e evas_object_size_hint_aspect_set(ic1, EVAS_ASPECT_CONTROL_BOTH, 1, 1); segment1 = elm_segment_control_add(win); - it1 = elm_segment_control_item_add(segment1, NULL, "Only Text"); - it2 = elm_segment_control_item_add(segment1, ic, NULL); - elm_segment_control_item_selected_set(it2, EINA_TRUE); - it3 = elm_segment_control_item_add(segment1, ic1, "Text_Icon_test"); - it4 = elm_segment_control_item_add(segment1, NULL, "Seg4"); - it5 = elm_segment_control_item_add(segment1, NULL, "Seg5"); + elm_segment_control_item_add(segment1, NULL, "Only Text"); + it = elm_segment_control_item_add(segment1, ic, NULL); + elm_segment_control_item_selected_set(it, EINA_TRUE); + elm_segment_control_item_add(segment1, ic1, "Text_Icon_test"); + elm_segment_control_item_add(segment1, NULL, "Seg4"); + elm_segment_control_item_add(segment1, NULL, "Seg5"); segment2 = elm_segment_control_add(win); - it1 = elm_segment_control_item_add(segment2, NULL, "SegmentItem"); - it2 = elm_segment_control_item_add(segment2, NULL, "SegmentItem"); - elm_segment_control_item_selected_set(it2, EINA_TRUE); - it3 = elm_segment_control_item_add(segment2, NULL, "SegmentControlItem"); - it4 = elm_segment_control_item_add(segment2, NULL, "SegmentItem"); + elm_segment_control_item_add(segment2, NULL, "SegmentItem"); + it = elm_segment_control_item_add(segment2, NULL, "SegmentItem"); + elm_segment_control_item_selected_set(it, EINA_TRUE); + elm_segment_control_item_add(segment2, NULL, "SegmentControlItem"); + elm_segment_control_item_add(segment2, NULL, "SegmentItem"); ic2 = elm_icon_add(in_layout); snprintf(buf3, sizeof(buf3), "%s/images/logo.png", elm_app_data_dir_get()); @@ -76,10 +76,10 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e evas_object_size_hint_aspect_set(ic4, EVAS_ASPECT_CONTROL_BOTH, 1, 1); segment3 = elm_segment_control_add(win); - it1 = elm_segment_control_item_add(segment3, ic2, NULL); - it2 = elm_segment_control_item_add(segment3, ic3, NULL); - elm_segment_control_item_selected_set(it2, EINA_TRUE); - it3 = elm_segment_control_item_add(segment3, ic4, NULL); + elm_segment_control_item_add(segment3, ic2, NULL); + it = elm_segment_control_item_add(segment3, ic3, NULL); + elm_segment_control_item_selected_set(it, EINA_TRUE); + elm_segment_control_item_add(segment3, ic4, NULL); ic5 = elm_icon_add(in_layout); snprintf(buf6, sizeof(buf6), "%s/images/logo.png", elm_app_data_dir_get()); @@ -87,10 +87,10 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e evas_object_size_hint_aspect_set(ic5, EVAS_ASPECT_CONTROL_BOTH, 1, 1); segment4 = elm_segment_control_add(win); - it1 = elm_segment_control_item_add(segment4, NULL, "Disabled"); - it2 = elm_segment_control_item_add(segment4, ic5, "Disabled"); - elm_segment_control_item_selected_set(it2, EINA_TRUE); - it3 = elm_segment_control_item_add(segment4, NULL, "Disabled"); + elm_segment_control_item_add(segment4, NULL, "Disabled"); + it = elm_segment_control_item_add(segment4, ic5, "Disabled"); + elm_segment_control_item_selected_set(it, EINA_TRUE); + elm_segment_control_item_add(segment4, NULL, "Disabled"); elm_object_disabled_set(segment4, EINA_TRUE); elm_layout_content_set(in_layout, "segment1", segment1); diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index 8ac7c1d4d1..50d11f7849 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -948,10 +948,10 @@ _item_realize(Elm_Gen_Item *it) EINA_LIST_FOREACH(it->labels, l, key) { char *s = it->itc->func.label_get - ((void *)it->base.data, WIDGET(it), l->data); + ((void *)it->base.data, WIDGET(it), key); if (s) { - edje_object_part_text_set(VIEW(it), l->data, s); + edje_object_part_text_set(VIEW(it), key, s); free(s); } } diff --git a/legacy/elementary/src/lib/els_cursor.c b/legacy/elementary/src/lib/els_cursor.c index 9fd0a4ce7f..6c0c8810b2 100644 --- a/legacy/elementary/src/lib/els_cursor.c +++ b/legacy/elementary/src/lib/els_cursor.c @@ -300,9 +300,8 @@ _elm_cursor_cur_set(Elm_Cursor *cur) if (cur->use_engine) { #ifdef HAVE_ELEMENTARY_X - struct _Cursor_Id cur_search, *cur_id; + struct _Cursor_Id *cur_id; - cur_search.name = cur->cursor_name; cur_id = bsearch(&(cur->cursor_name), _cursors, _cursors_count, sizeof(struct _Cursor_Id), _elm_cursor_strcmp);