From 9d0b525f327c4403138e0474dbb0d57559d82d54 Mon Sep 17 00:00:00 2001 From: Jiyoun Park Date: Sat, 23 Dec 2017 19:21:54 +0900 Subject: [PATCH] edje: rename Edje.Object to Efl.Canvas.Layout --- src/lib/elementary/elm_gengrid.c | 4 +--- src/lib/elementary/elm_genlist.c | 4 +--- src/lib/elementary/elm_list.c | 4 +--- src/lib/elementary/elm_toolbar.c | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index f35040b..1dc2458 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -6012,14 +6012,12 @@ _elm_gengrid_elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Gengrid_Data if (parent == obj) break; } -/*TIZEN_ONLY(20171222): fix build error temporarly - else if (efl_isa(highlighted_obj, EDJE_OBJECT_CLASS)) + else if (efl_isa(highlighted_obj, EFL_CANVAS_LAYOUT_CLASS)) { while ((parent = evas_object_smart_parent_get(parent))) if (parent == obj) break; } -*/ // TIZEN_ONLY(20160805): set _accessibility_currently_highlighted_obj to NULL in object delete callback else { diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index b8983f0..de6421f 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -9026,14 +9026,12 @@ _elm_genlist_elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Genlist_Data if (parent == obj) break; } -/*TIZEN_ONLY(20171222): fix build error temporarly - else if (efl_isa(highlighted_obj, EDJE_OBJECT_CLASS)) + else if (efl_isa(highlighted_obj, EFL_CANVAS_LAYOUT_CLASS)) { while ((parent = evas_object_smart_parent_get(parent))) if (parent == obj) break; } -*/ // TIZEN_ONLY(20160805): set _accessibility_currently_highlighted_obj to NULL in object delete callback else { diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index d215b56..d4dcfd0 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -3372,14 +3372,12 @@ _elm_list_elm_interface_scrollable_content_pos_set(Eo *obj EINA_UNUSED, Elm_List if (parent == obj) break; } -/*TIZEN_ONLY(20171222): fix build error temporarly - else if (efl_isa(highlighted_obj, EDJE_OBJECT_CLASS)) + else if (efl_isa(highlighted_obj, EFL_CANVAS_LAYOUT_CLASS)) { while ((parent = evas_object_smart_parent_get(parent))) if (parent == obj) break; } -*/ // TIZEN_ONLY(20160805): set _accessibility_currently_highlighted_obj to NULL in object delete callback else { diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index f9f41ae..74685c2 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -4131,14 +4131,12 @@ _elm_toolbar_elm_interface_scrollable_content_pos_set(Eo *obj EINA_UNUSED, Elm_T if (parent == obj) break; } -/*TIZEN_ONLY(20171222): fix build error temporarly - else if (efl_isa(highlighted_obj, EDJE_OBJECT_CLASS)) + else if (efl_isa(highlighted_obj, EFL_CANVAS_LAYOUT_CLASS)) { while ((parent = evas_object_smart_parent_get(parent))) if (parent == obj) break; } -*/ else { WRN("Improper highlighted object: %p", highlighted_obj); -- 2.7.4