From 850a5a723575ab2271a4dc1ab3a74757ee908f8a Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Wed, 4 May 2011 11:30:32 +0900 Subject: [PATCH] [Genlist] Removed warnings. --- src/bin/test_genlist.c | 48 ++++++++++++++++++++++++------------------------ src/lib/elm_genlist.c | 22 +++++++++++----------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c index 2e7564a..389d209 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -21,14 +21,14 @@ typedef struct _Testitem static Elm_Genlist_Item_Class itc1; -char *gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +char *gl_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { char buf[256]; snprintf(buf, sizeof(buf), "Item # %i", (int)(long)data); return strdup(buf); } -Evas_Object *gl_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part) +Evas_Object *gl_icon_get(const void *data __UNUSED__, Evas_Object *obj, const char *part) { char buf[PATH_MAX]; Evas_Object *ic = elm_icon_add(obj); @@ -40,11 +40,11 @@ Evas_Object *gl_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *pa evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); return ic; } -Eina_Bool gl_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +Eina_Bool gl_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { return EINA_FALSE; } -void gl_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__) +void gl_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__) { } @@ -264,9 +264,9 @@ my_gl_insert_after(void *data, Evas_Object *obj __UNUSED__, void *event_info __U } static void -my_gl_del(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +my_gl_del(const void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Object *gl = data; + Evas_Object *gl = (Evas_Object *)data; Elm_Genlist_Item *gli = elm_genlist_selected_item_get(gl); if (!gli) { @@ -462,7 +462,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in bt = elm_button_add(win); elm_button_label_set(bt, "-"); - evas_object_smart_callback_add(bt, "clicked", my_gl_del, gl); + evas_object_smart_callback_add(bt, "clicked", (Evas_Smart_Cb)my_gl_del, gl); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); @@ -512,14 +512,14 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in /*************/ static Elm_Genlist_Item_Class itc2; -char *gl2_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +char *gl2_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { const Testitem *tit = data; char buf[256]; snprintf(buf, sizeof(buf), "Item mode %i", tit->mode); return strdup(buf); } -Evas_Object *gl2_icon_get(void *data, Evas_Object *obj, const char *part) +Evas_Object *gl2_icon_get(const void *data, Evas_Object *obj, const char *part) { const Testitem *tit = data; char buf[PATH_MAX]; @@ -551,11 +551,11 @@ Evas_Object *gl2_icon_get(void *data, Evas_Object *obj, const char *part) evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); return ic; } -Eina_Bool gl2_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +Eina_Bool gl2_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { return EINA_FALSE; } -void gl2_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__) +void gl2_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__) { } @@ -662,14 +662,14 @@ my_gl_item_check_changed(void *data, Evas_Object *obj, void *event_info __UNUSED } static Elm_Genlist_Item_Class itc3; -char *gl3_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +char *gl3_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { const Testitem *tit = data; char buf[256]; snprintf(buf, sizeof(buf), "Item mode %i", tit->mode); return strdup(buf); } -Evas_Object *gl3_icon_get(void *data, Evas_Object *obj, const char *part) +Evas_Object *gl3_icon_get(const void *data, Evas_Object *obj, const char *part) { const Testitem *tit = data; if (!strcmp(part, "elm.swallow.icon")) @@ -695,11 +695,11 @@ Evas_Object *gl3_icon_get(void *data, Evas_Object *obj, const char *part) } return NULL; } -Eina_Bool gl3_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +Eina_Bool gl3_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { return EINA_FALSE; } -void gl3_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__) +void gl3_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__) { } @@ -799,7 +799,7 @@ my_gl_item_check_changed2(void *data, Evas_Object *obj, void *event_info __UNUSE } static Elm_Genlist_Item_Class itc5; -char *gl5_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part) +char *gl5_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part) { const Testitem *tit = data; char buf[256]; @@ -813,7 +813,7 @@ char *gl5_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part) } return strdup(buf); } -Evas_Object *gl5_icon_get(void *data, Evas_Object *obj, const char *part) +Evas_Object *gl5_icon_get(const void *data, Evas_Object *obj, const char *part) { const Testitem *tit = data; char buf[PATH_MAX]; @@ -849,11 +849,11 @@ Evas_Object *gl5_icon_get(void *data, Evas_Object *obj, const char *part) } return NULL; } -Eina_Bool gl5_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +Eina_Bool gl5_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { return EINA_FALSE; } -void gl5_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__) +void gl5_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__) { } @@ -1073,13 +1073,13 @@ gl4_con_req(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_genlist_item_expanded_set(it, 0); } -char *gl4_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +char *gl4_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { char buf[256]; snprintf(buf, sizeof(buf), "Item mode %i", (int)(long)data); return strdup(buf); } -Evas_Object *gl4_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part) +Evas_Object *gl4_icon_get(const void *data __UNUSED__, Evas_Object *obj, const char *part) { char buf[PATH_MAX]; if (!strcmp(part, "elm.swallow.icon")) @@ -1100,11 +1100,11 @@ Evas_Object *gl4_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *p } return NULL; } -Eina_Bool gl4_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +Eina_Bool gl4_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { return EINA_FALSE; } -void gl4_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__) +void gl4_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__) { } @@ -1320,7 +1320,7 @@ test_genlist7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in /*************/ static Elm_Genlist_Item_Class itc_group; -char *gl8_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +char *gl8_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { char buf[256]; snprintf(buf, sizeof(buf), "Group Index # %i (Item # %i)", (int)((long)data / 10), (int)(long)data); diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 18b9b31..4c9f394 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -5685,13 +5685,13 @@ elm_genlist_reorder_mode_get(const Evas_Object *obj) } EAPI void -elm_genlist_item_move_after(Elm_Genlist_Item *it, Elm_Genlist_Item *after) +elm_genlist_item_move_after(Elm_Genlist_Item *it __UNUSED__, Elm_Genlist_Item *after __UNUSED__) { return; } EAPI void -elm_genlist_item_move_before(Elm_Genlist_Item *it, Elm_Genlist_Item *before) +elm_genlist_item_move_before(Elm_Genlist_Item *it __UNUSED__, Elm_Genlist_Item *before __UNUSED__) { return; } @@ -6015,7 +6015,7 @@ _elm_genlist_pinch_zoom_execute(Evas_Object *obj, Eina_Bool emode) * @ingroup Genlist */ EAPI void -elm_genlist_pinch_zoom_mode_set(Evas_Object *obj, Eina_Bool emode) +elm_genlist_pinch_zoom_mode_set(Evas_Object *obj __UNUSED__, Eina_Bool emode __UNUSED__) { printf("!!! NOW FIXING \n"); } @@ -6030,14 +6030,14 @@ elm_genlist_pinch_zoom_mode_set(Evas_Object *obj, Eina_Bool emode) * @ingroup Genlist */ EAPI Eina_Bool -elm_genlist_pinch_zoom_mode_get(const Evas_Object *obj) +elm_genlist_pinch_zoom_mode_get(const Evas_Object *obj __UNUSED__) { printf("!!! NOW FIXING \n"); return EINA_FALSE; } EAPI void -elm_genlist_pinch_zoom_set(Evas_Object *obj, Eina_Bool emode) +elm_genlist_pinch_zoom_set(Evas_Object *obj __UNUSED__, Eina_Bool emode __UNUSED__) { printf("!!! NOW FIXING \n"); } @@ -6244,7 +6244,7 @@ elm_genlist_edit_mode_set(Evas_Object *obj, Eina_Bool edit_mode) * @ingroup Genlist */ EAPI void -elm_genlist_edit_selected_items_del(Evas_Object *obj) +elm_genlist_edit_selected_items_del(Evas_Object *obj __UNUSED__) { fprintf(stderr, "=================> Caution!!! <========================\n"); fprintf(stderr, "==> elm_genlist_edit_selected_items_del() is deprecated. <=======\n"); @@ -6252,7 +6252,7 @@ elm_genlist_edit_selected_items_del(Evas_Object *obj) } EAPI void -elm_genlist_selected_items_del(Evas_Object *obj) +elm_genlist_selected_items_del(Evas_Object *obj __UNUSED__) { fprintf(stderr, "=================> Caution!!! <========================\n"); fprintf(stderr, "==> elm_genlist_selected_items_del() is deprecated. <=======\n"); @@ -6275,7 +6275,7 @@ elm_genlist_selected_items_del(Evas_Object *obj) * @ingroup Genlist */ EAPI Eina_List * -elm_genlist_edit_selected_items_get(const Evas_Object *obj) +elm_genlist_edit_selected_items_get(const Evas_Object *obj __UNUSED__) { fprintf(stderr, "========================> Caution!!! <==========================\n"); fprintf(stderr, "==> elm_genlist_edit_selected_items_get() is deprecated. <=======\n"); @@ -6285,8 +6285,8 @@ elm_genlist_edit_selected_items_get(const Evas_Object *obj) // TODO : add comment EAPI void -elm_genlist_edit_item_selected_set(Elm_Genlist_Item *it, - Eina_Bool selected) +elm_genlist_edit_item_selected_set(Elm_Genlist_Item *it __UNUSED__, + Eina_Bool selected __UNUSED__) { fprintf(stderr, "========================> Caution!!! <==========================\n"); fprintf(stderr, "==> elm_genlist_edit_item_selected_set() is deprecated. <=======\n"); @@ -6295,7 +6295,7 @@ elm_genlist_edit_item_selected_set(Elm_Genlist_Item *it, // TODO : add comment EAPI Eina_Bool -elm_genlist_edit_item_selected_get(const Elm_Genlist_Item *it) +elm_genlist_edit_item_selected_get(const Elm_Genlist_Item *it __UNUSED__) { fprintf(stderr, "========================> Caution!!! <==========================\n"); fprintf(stderr, "==> elm_genlist_edit_item_selected_get() is deprecated. <=======\n"); -- 2.7.4