From c3e40612c1ab0779bef26640ede24157ca045626 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Sat, 25 Feb 2012 00:35:32 +0000 Subject: [PATCH] elementary_test: change deprecated APIs SVN revision: 68429 --- legacy/elementary/src/bin/test_diskselector.c | 16 ++++++++-------- .../src/bin/test_fileselector_button.c | 2 +- .../elementary/src/bin/test_fileselector_entry.c | 2 +- legacy/elementary/src/bin/test_list.c | 12 ++++++------ legacy/elementary/src/bin/test_photocam.c | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/legacy/elementary/src/bin/test_diskselector.c b/legacy/elementary/src/bin/test_diskselector.c index e265f00bd2..5097ae68fe 100644 --- a/legacy/elementary/src/bin/test_diskselector.c +++ b/legacy/elementary/src/bin/test_diskselector.c @@ -63,23 +63,23 @@ set_api_state(api_data *api) break; case ITEM_LABEL_SET: /* 3 */ - elm_diskselector_item_label_set(elm_diskselector_selected_item_get(eina_list_nth(disks, 0)), "Label from API"); + elm_object_item_text_set(elm_diskselector_selected_item_get(eina_list_nth(disks, 0)), "Label from API"); break; case TOOLTIP_TEXT_SET: /* 4 */ - elm_diskselector_item_tooltip_text_set(elm_diskselector_selected_item_get(eina_list_nth(disks, 0)), "Tooltip from API"); + elm_object_item_tooltip_text_set(elm_diskselector_selected_item_get(eina_list_nth(disks, 0)), "Tooltip from API"); break; case ITEM_TOOLTIP_UNSET: /* 5 */ - elm_diskselector_item_tooltip_unset(elm_diskselector_selected_item_get(eina_list_nth(disks, 0))); + elm_object_item_tooltip_unset(elm_diskselector_selected_item_get(eina_list_nth(disks, 0))); break; case ITEM_CURSOR_SET: /* 6 */ - elm_diskselector_item_cursor_set(elm_diskselector_selected_item_get(eina_list_nth(disks, 0)), ELM_CURSOR_HAND2); + elm_object_item_cursor_set(elm_diskselector_selected_item_get(eina_list_nth(disks, 0)), ELM_CURSOR_HAND2); break; case ITEM_CURSOR_UNSET: /* 7 */ - elm_diskselector_item_cursor_unset(elm_diskselector_selected_item_get(eina_list_nth(disks, 0))); + elm_object_item_cursor_unset(elm_diskselector_selected_item_get(eina_list_nth(disks, 0))); break; case ITEM_ICON_SET: /* 8 */ @@ -88,7 +88,7 @@ set_api_state(api_data *api) Evas_Object *ic = elm_icon_add(elm_object_parent_widget_get(eina_list_nth(disks, 0))); snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); - elm_diskselector_item_icon_set(elm_diskselector_selected_item_get(eina_list_nth(disks, 0)), ic); + elm_object_item_part_content_set(elm_diskselector_selected_item_get(eina_list_nth(disks, 0)), NULL, ic); evas_object_show(ic); } break; @@ -108,13 +108,13 @@ set_api_state(api_data *api) case ITEM_DEL_NOT_SELECTED: /* 11 */ { /* Remove selected item of third disk */ - elm_diskselector_item_del(elm_diskselector_item_prev_get(elm_diskselector_selected_item_get(eina_list_nth(disks, 2)))); + elm_object_item_del(elm_diskselector_item_prev_get(elm_diskselector_selected_item_get(eina_list_nth(disks, 2)))); } break; case ITEM_DEL: /* 12 */ { /* Remove selected item of first disk */ - elm_diskselector_item_del(elm_diskselector_selected_item_get(eina_list_nth(disks, 1))); + elm_object_item_del(elm_diskselector_selected_item_get(eina_list_nth(disks, 1))); } break; diff --git a/legacy/elementary/src/bin/test_fileselector_button.c b/legacy/elementary/src/bin/test_fileselector_button.c index f72a3cbcc7..ed565bd52c 100644 --- a/legacy/elementary/src/bin/test_fileselector_button.c +++ b/legacy/elementary/src/bin/test_fileselector_button.c @@ -34,7 +34,7 @@ set_api_state(api_data *api) switch(api->state) { /* Put all api-changes under switch */ case ICON_UNSET: - elm_fileselector_button_icon_unset(fs_bt); + elm_object_part_content_unset(fs_bt, NULL); break; case WINDOW_TITLE_SET: diff --git a/legacy/elementary/src/bin/test_fileselector_entry.c b/legacy/elementary/src/bin/test_fileselector_entry.c index e20fb3443f..f86b2d1bca 100644 --- a/legacy/elementary/src/bin/test_fileselector_entry.c +++ b/legacy/elementary/src/bin/test_fileselector_entry.c @@ -34,7 +34,7 @@ set_api_state(api_data *api) switch(api->state) { /* Put all api-changes under switch */ case ICON_UNSET: - elm_fileselector_entry_button_icon_unset(fs_bt); + elm_object_part_content_unset(fs_bt, NULL); break; case WINDOW_TITLE_SET: diff --git a/legacy/elementary/src/bin/test_list.c b/legacy/elementary/src/bin/test_list.c index bf5775d73d..f3e25691dd 100644 --- a/legacy/elementary/src/bin/test_list.c +++ b/legacy/elementary/src/bin/test_list.c @@ -121,7 +121,7 @@ Scroll to end const Eina_List *items = elm_list_items_get(li); if(eina_list_count(items)) { - elm_list_item_del(eina_list_data_get(eina_list_last(items))); + elm_object_item_del(eina_list_data_get(eina_list_last(items))); } } break; @@ -140,7 +140,7 @@ Scroll to end const Eina_List *items = elm_list_items_get(li); if(eina_list_count(items)) { - elm_list_item_tooltip_text_set(eina_list_data_get(eina_list_last(items)), "Tooltip set from API"); + elm_object_item_tooltip_text_set(eina_list_data_get(eina_list_last(items)), "Tooltip set from API"); } elm_list_scroller_policy_set(li, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_AUTO); } @@ -151,7 +151,7 @@ Scroll to end const Eina_List *items = elm_list_items_get(li); if(eina_list_count(items)) { - elm_list_item_tooltip_unset(eina_list_data_get(eina_list_last(items))); + elm_object_item_tooltip_unset(eina_list_data_get(eina_list_last(items))); } } break; @@ -161,7 +161,7 @@ Scroll to end const Eina_List *items = elm_list_items_get(li); if(eina_list_count(items)) { - elm_list_item_cursor_set(eina_list_data_get(eina_list_last(items)), ELM_CURSOR_HAND2); + elm_object_item_cursor_set(eina_list_data_get(eina_list_last(items)), ELM_CURSOR_HAND2); } } break; @@ -171,7 +171,7 @@ Scroll to end const Eina_List *items = elm_list_items_get(li); if(eina_list_count(items)) { - elm_list_item_cursor_style_set(eina_list_data_get(eina_list_last(items)), "transparent"); + elm_object_item_cursor_style_set(eina_list_data_get(eina_list_last(items)), "transparent"); } } break; @@ -181,7 +181,7 @@ Scroll to end const Eina_List *items = elm_list_items_get(li); if(eina_list_count(items)) { - elm_list_item_disabled_set(eina_list_data_get(eina_list_last(items)), EINA_TRUE); + elm_object_item_disabled_set(eina_list_data_get(eina_list_last(items)), EINA_TRUE); } } break; diff --git a/legacy/elementary/src/bin/test_photocam.c b/legacy/elementary/src/bin/test_photocam.c index 3dae136565..626ed06b64 100644 --- a/legacy/elementary/src/bin/test_photocam.c +++ b/legacy/elementary/src/bin/test_photocam.c @@ -100,7 +100,7 @@ static void my_ph_scroll(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { int x, y, w, h; - elm_photocam_region_get(obj, &x, &y, &w, &h); + elm_photocam_image_region_get(obj, &x, &y, &w, &h); printf("scroll %i %i %ix%i\n", x, y, w, h); }