summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-08 11:48:31 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-08 13:25:58 +0900
commit9a2d4928f09ced3ea34d3bf643d9d52ce6a5f57c (patch)
tree367624ca751b9c736ba969b2e4c3830dbc2e65ee
parentdb29ee1cd686f4d58f1a13eb8eb0177d5ddd8be8 (diff)
elm: Rename elm_layout to Efl.Ui.Layout
Some names have not been changed, hopefully making a distinction between legacy APIs and internal code (elm_layout_blah) and valid EO usages. This means many internal functions are still elm_layout_ as their sole purpose is to support the legacy API. Ref T5315
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/Makefile_Elementary.am9
-rw-r--r--src/bin/elementary/test_evas_mask.c2
-rw-r--r--src/examples/elementary/layout_example.js4
-rw-r--r--src/examples/elementary/twitter_example_01.js2
-rw-r--r--src/lib/elementary/efl_ui_box.c2
-rw-r--r--src/lib/elementary/efl_ui_button.c12
-rw-r--r--src/lib/elementary/efl_ui_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_button_internal_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_check.c4
-rw-r--r--src/lib/elementary/efl_ui_clock.eo2
-rw-r--r--src/lib/elementary/efl_ui_focus_manager.c2
-rw-r--r--src/lib/elementary/efl_ui_frame.c8
-rw-r--r--src/lib/elementary/efl_ui_frame.eo2
-rw-r--r--src/lib/elementary/efl_ui_grid.c2
-rw-r--r--src/lib/elementary/efl_ui_layout.c (renamed from src/lib/elementary/elm_layout.c)294
-rw-r--r--src/lib/elementary/efl_ui_layout.eo (renamed from src/lib/elementary/elm_layout.eo)4
-rw-r--r--src/lib/elementary/efl_ui_layout_internal_part.eo (renamed from src/lib/elementary/elm_layout_internal_part.eo)2
-rw-r--r--src/lib/elementary/efl_ui_layout_pack.c (renamed from src/lib/elementary/elm_layout_pack.c)52
-rw-r--r--src/lib/elementary/efl_ui_panes.c4
-rw-r--r--src/lib/elementary/efl_ui_panes.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c16
-rw-r--r--src/lib/elementary/efl_ui_progressbar.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar_internal_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_radio.c4
-rw-r--r--src/lib/elementary/efl_ui_slider.c16
-rw-r--r--src/lib/elementary/efl_ui_slider.eo2
-rw-r--r--src/lib/elementary/efl_ui_slider_internal_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_text.c12
-rw-r--r--src/lib/elementary/efl_ui_text.eo2
-rw-r--r--src/lib/elementary/efl_ui_video.eo2
-rw-r--r--src/lib/elementary/elc_ctxpopup.c8
-rw-r--r--src/lib/elementary/elc_fileselector.c4
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c12
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c6
-rw-r--r--src/lib/elementary/elc_naviframe.c12
-rw-r--r--src/lib/elementary/elc_player.c4
-rw-r--r--src/lib/elementary/elc_popup.c12
-rw-r--r--src/lib/elementary/elm_actionslider.c10
-rw-r--r--src/lib/elementary/elm_actionslider.eo2
-rw-r--r--src/lib/elementary/elm_actionslider_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_bg.c4
-rw-r--r--src/lib/elementary/elm_bg.eo2
-rw-r--r--src/lib/elementary/elm_bubble.c13
-rw-r--r--src/lib/elementary/elm_bubble.eo2
-rw-r--r--src/lib/elementary/elm_bubble_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_calendar.eo2
-rw-r--r--src/lib/elementary/elm_clock.eo2
-rw-r--r--src/lib/elementary/elm_code_widget.eo2
-rw-r--r--src/lib/elementary/elm_colorselector.eo2
-rw-r--r--src/lib/elementary/elm_conform.c4
-rw-r--r--src/lib/elementary/elm_conformant.eo2
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo2
-rw-r--r--src/lib/elementary/elm_ctxpopup_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_dayselector.c6
-rw-r--r--src/lib/elementary/elm_dayselector.eo2
-rw-r--r--src/lib/elementary/elm_dayselector_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_entry.c20
-rw-r--r--src/lib/elementary/elm_entry.eo2
-rw-r--r--src/lib/elementary/elm_entry_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_fileselector.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_entry_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_flipselector.eo2
-rw-r--r--src/lib/elementary/elm_gengrid.eo2
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/elm_genlist.eo2
-rw-r--r--src/lib/elementary/elm_hover.c12
-rw-r--r--src/lib/elementary/elm_hover.eo2
-rw-r--r--src/lib/elementary/elm_hover_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_index.eo2
-rw-r--r--src/lib/elementary/elm_inwin.c4
-rw-r--r--src/lib/elementary/elm_inwin.eo2
-rw-r--r--src/lib/elementary/elm_label.c4
-rw-r--r--src/lib/elementary/elm_label.eo2
-rw-r--r--src/lib/elementary/elm_label_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_layout.h2
-rw-r--r--src/lib/elementary/elm_layout_eo.h11
-rw-r--r--src/lib/elementary/elm_layout_legacy.h8
-rw-r--r--src/lib/elementary/elm_list.eo2
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo2
-rw-r--r--src/lib/elementary/elm_multibuttonentry_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_naviframe.eo2
-rw-r--r--src/lib/elementary/elm_naviframe_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_panel.eo2
-rw-r--r--src/lib/elementary/elm_part_helper.h4
-rw-r--r--src/lib/elementary/elm_player.eo2
-rw-r--r--src/lib/elementary/elm_player_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_popup.eo2
-rw-r--r--src/lib/elementary/elm_popup_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_priv.h8
-rw-r--r--src/lib/elementary/elm_scroller.c8
-rw-r--r--src/lib/elementary/elm_scroller.eo2
-rw-r--r--src/lib/elementary/elm_scroller_internal_part.eo2
-rw-r--r--src/lib/elementary/elm_segment_control.eo2
-rw-r--r--src/lib/elementary/elm_separator.eo2
-rw-r--r--src/lib/elementary/elm_slideshow.eo2
-rw-r--r--src/lib/elementary/elm_spinner.eo2
-rw-r--r--src/lib/elementary/elm_thumb.eo2
-rw-r--r--src/lib/elementary/elm_widget.c4
-rw-r--r--src/lib/elementary/elm_widget_layout.h10
-rw-r--r--src/tests/elementary/elm_test_layout.c4
103 files changed, 375 insertions, 388 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2ce033c..3185320 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -135,7 +135,7 @@ src/lib/elementary/elm_index.c
135src/lib/elementary/elm_interface_scrollable.c 135src/lib/elementary/elm_interface_scrollable.c
136src/lib/elementary/elm_inwin.c 136src/lib/elementary/elm_inwin.c
137src/lib/elementary/elm_label.c 137src/lib/elementary/elm_label.c
138src/lib/elementary/elm_layout.c 138src/lib/elementary/efl_ui_layout.c
139src/lib/elementary/elm_list.c 139src/lib/elementary/elm_list.c
140src/lib/elementary/elm_main.c 140src/lib/elementary/elm_main.c
141src/lib/elementary/elm_map.c 141src/lib/elementary/elm_map.c
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 6be2e81..fcdc7b4 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -41,7 +41,7 @@ elm_public_eolian_files = \
41 lib/elementary/elm_interface_fileselector.eo \ 41 lib/elementary/elm_interface_fileselector.eo \
42 lib/elementary/elm_interface_scrollable.eo \ 42 lib/elementary/elm_interface_scrollable.eo \
43 lib/elementary/elm_label.eo \ 43 lib/elementary/elm_label.eo \
44 lib/elementary/elm_layout.eo \ 44 lib/elementary/efl_ui_layout.eo \
45 lib/elementary/elm_list.eo \ 45 lib/elementary/elm_list.eo \
46 lib/elementary/elm_map.eo \ 46 lib/elementary/elm_map.eo \
47 lib/elementary/elm_map_pan.eo \ 47 lib/elementary/elm_map_pan.eo \
@@ -92,6 +92,7 @@ elm_public_eolian_files = \
92 lib/elementary/efl_ui_box_stack.eo \ 92 lib/elementary/efl_ui_box_stack.eo \
93 lib/elementary/efl_ui_grid.eo \ 93 lib/elementary/efl_ui_grid.eo \
94 lib/elementary/efl_ui_grid_static.eo \ 94 lib/elementary/efl_ui_grid_static.eo \
95 lib/elementary/efl_ui_layout_internal_part.eo \
95 lib/elementary/efl_ui_layout_internal_box.eo \ 96 lib/elementary/efl_ui_layout_internal_box.eo \
96 lib/elementary/efl_ui_layout_internal_table.eo \ 97 lib/elementary/efl_ui_layout_internal_table.eo \
97 lib/elementary/efl_ui_button_internal_part.eo \ 98 lib/elementary/efl_ui_button_internal_part.eo \
@@ -101,7 +102,6 @@ elm_public_eolian_files = \
101 lib/elementary/elm_fileselector_entry_internal_part.eo \ 102 lib/elementary/elm_fileselector_entry_internal_part.eo \
102 lib/elementary/elm_flip_internal_part.eo \ 103 lib/elementary/elm_flip_internal_part.eo \
103 lib/elementary/elm_hover_internal_part.eo \ 104 lib/elementary/elm_hover_internal_part.eo \
104 lib/elementary/elm_layout_internal_part.eo \
105 lib/elementary/elm_mapbuf_internal_part.eo \ 105 lib/elementary/elm_mapbuf_internal_part.eo \
106 lib/elementary/elm_naviframe_internal_part.eo \ 106 lib/elementary/elm_naviframe_internal_part.eo \
107 lib/elementary/elm_notify_internal_part.eo \ 107 lib/elementary/elm_notify_internal_part.eo \
@@ -430,7 +430,6 @@ includesub_HEADERS = \
430 lib/elementary/elm_label_legacy.h \ 430 lib/elementary/elm_label_legacy.h \
431 lib/elementary/elm_layout.h \ 431 lib/elementary/elm_layout.h \
432 lib/elementary/elm_layout_common.h \ 432 lib/elementary/elm_layout_common.h \
433 lib/elementary/elm_layout_eo.h \
434 lib/elementary/elm_layout_legacy.h \ 433 lib/elementary/elm_layout_legacy.h \
435 lib/elementary/elm_list.h \ 434 lib/elementary/elm_list.h \
436 lib/elementary/elm_list_eo.h \ 435 lib/elementary/elm_list_eo.h \
@@ -618,8 +617,8 @@ lib_elementary_libelementary_la_SOURCES = \
618 lib/elementary/elm_interface_scrollable.c \ 617 lib/elementary/elm_interface_scrollable.c \
619 lib/elementary/elm_inwin.c \ 618 lib/elementary/elm_inwin.c \
620 lib/elementary/elm_label.c \ 619 lib/elementary/elm_label.c \
621 lib/elementary/elm_layout.c \ 620 lib/elementary/efl_ui_layout.c \
622 lib/elementary/elm_layout_pack.c \ 621 lib/elementary/efl_ui_layout_pack.c \
623 lib/elementary/elm_list.c \ 622 lib/elementary/elm_list.c \
624 lib/elementary/elm_main.c \ 623 lib/elementary/elm_main.c \
625 lib/elementary/elm_map.c \ 624 lib/elementary/elm_map.c \
diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c
index 96524b2..b3a4ffa 100644
--- a/src/bin/elementary/test_evas_mask.c
+++ b/src/bin/elementary/test_evas_mask.c
@@ -123,7 +123,7 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
123 123
124 // FIXME: layout EO API 124 // FIXME: layout EO API
125 snprintf(buf, sizeof(buf), "%s/objects/test_masking.edj", elm_app_data_dir_get()); 125 snprintf(buf, sizeof(buf), "%s/objects/test_masking.edj", elm_app_data_dir_get());
126 ly = efl_add(ELM_LAYOUT_CLASS, win, 126 ly = efl_add(EFL_UI_LAYOUT_CLASS, win,
127 efl_file_set(efl_added, buf, "masking"), 127 efl_file_set(efl_added, buf, "masking"),
128 efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0), 128 efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
129 efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0)); 129 efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0));
diff --git a/src/examples/elementary/layout_example.js b/src/examples/elementary/layout_example.js
index 003cb4d..24c51e5 100644
--- a/src/examples/elementary/layout_example.js
+++ b/src/examples/elementary/layout_example.js
@@ -12,7 +12,7 @@ box.setHintWeight(1.0, 1.0);
12win.setContent(box); 12win.setContent(box);
13box.setVisible(true); 13box.setVisible(true);
14 14
15ly = new Elm.Layout(box); 15ly = new Efl.Ui.Layout(box);
16 16
17if (!ly.setTheme("layout", "application", "titlebar")) 17if (!ly.setTheme("layout", "application", "titlebar"))
18{ 18{
@@ -41,7 +41,7 @@ end_container = ly.part('elm.swallow.end').cast('Efl.Container');
41end_container.setContent(bt); 41end_container.setContent(bt);
42ly.emitSignal('elm,state,end,visible', 'elm'); 42ly.emitSignal('elm,state,end,visible', 'elm');
43 43
44ly = new Elm.Layout(box); 44ly = new Efl.Ui.Layout(box);
45filename = path.join(__dirname, 'layout_example.edj'); 45filename = path.join(__dirname, 'layout_example.edj');
46ly.setFile(filename, 'example/mylayout'); 46ly.setFile(filename, 'example/mylayout');
47ly.setHintWeight(1.0, 1.0); 47ly.setHintWeight(1.0, 1.0);
diff --git a/src/examples/elementary/twitter_example_01.js b/src/examples/elementary/twitter_example_01.js
index 761eab9..db4945c 100644
--- a/src/examples/elementary/twitter_example_01.js
+++ b/src/examples/elementary/twitter_example_01.js
@@ -48,7 +48,7 @@ twit.get('statuses/user_timeline', {screen_name: user_acount, count:10}, functio
48 var screen_name = tweets[i].user.screen_name; 48 var screen_name = tweets[i].user.screen_name;
49 var text = tweets[i].text; 49 var text = tweets[i].text;
50 50
51 var layout = new efl.Elm.Layout(win); 51 var layout = new efl.Efl.Ui.Layout(win);
52 var filename = path.join(__dirname, 'twitter_example_01.edj'); 52 var filename = path.join(__dirname, 'twitter_example_01.edj');
53 layout.setFile(filename, "tweet"); 53 layout.setFile(filename, "tweet");
54 54
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 845061a..f699c61 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -494,7 +494,7 @@ _box_item_iterator_next(Box_Item_Iterator *it, void **data)
494 return EINA_TRUE; 494 return EINA_TRUE;
495} 495}
496 496
497static Elm_Layout * 497static Eo *
498_box_item_iterator_get_container(Box_Item_Iterator *it) 498_box_item_iterator_get_container(Box_Item_Iterator *it)
499{ 499{
500 return it->object; 500 return it->object;
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 2a0ea7b..f19d840 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -437,8 +437,8 @@ EFL_TEXT_PART_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
437 437
438/* Efl.Part begin */ 438/* Efl.Part begin */
439 439
440ELM_PART_OVERRIDE(efl_ui_button, EFL_UI_BUTTON, ELM_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data) 440ELM_PART_OVERRIDE(efl_ui_button, EFL_UI_BUTTON, EFL_UI_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
441ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_button, EFL_UI_BUTTON, ELM_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data) 441ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_button, EFL_UI_BUTTON, EFL_UI_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
442#include "efl_ui_button_internal_part.eo.c" 442#include "efl_ui_button_internal_part.eo.c"
443 443
444/* Efl.Part end */ 444/* Efl.Part end */
@@ -481,12 +481,12 @@ elm_button_autorepeat_get(const Evas_Object *obj)
481 481
482/* Internal EO APIs and hidden overrides */ 482/* Internal EO APIs and hidden overrides */
483 483
484ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() 484ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
485ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() 485ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
486 486
487#define EFL_UI_BUTTON_EXTRA_OPS \ 487#define EFL_UI_BUTTON_EXTRA_OPS \
488 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \ 488 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
489 ELM_LAYOUT_TEXT_ALIASES_OPS(), \ 489 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
490 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_button), \ 490 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_button), \
491 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button) 491 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button)
492 492
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index 83fea41..5694a83 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text, 1class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
2 Elm.Interface.Atspi_Widget_Action) 2 Elm.Interface.Atspi_Widget_Action)
3{ 3{
4 [[Push-button widget 4 [[Push-button widget
diff --git a/src/lib/elementary/efl_ui_button_internal_part.eo b/src/lib/elementary/efl_ui_button_internal_part.eo
index fde79c8..d0f9914 100644
--- a/src/lib/elementary/efl_ui_button_internal_part.eo
+++ b/src/lib/elementary/efl_ui_button_internal_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Button.Internal.Part (Elm.Layout.Internal.Part) 1class Efl.Ui.Button.Internal.Part (Efl.Ui.Layout.Internal.Part)
2{ 2{
3 [[Elementary button internal part class]] 3 [[Elementary button internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index 87ed3d5..193f1b1 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -428,10 +428,10 @@ _efl_ui_check_class_constructor(Efl_Class *klass)
428 428
429/* Internal EO APIs and hidden overrides */ 429/* Internal EO APIs and hidden overrides */
430 430
431ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() 431ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
432 432
433#define EFL_UI_CHECK_EXTRA_OPS \ 433#define EFL_UI_CHECK_EXTRA_OPS \
434 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_check), \ 434 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_check), \
435 ELM_LAYOUT_TEXT_ALIASES_OPS() 435 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
436 436
437#include "efl_ui_check.eo.c" 437#include "efl_ui_check.eo.c"
diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo
index 67bc072..dbc735b 100644
--- a/src/lib/elementary/efl_ui_clock.eo
+++ b/src/lib/elementary/efl_ui_clock.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Clock.Type
16 ampm = 7, [[Indicates AM/PM field .]] 16 ampm = 7, [[Indicates AM/PM field .]]
17} 17}
18 18
19class Efl.Ui.Clock (Elm.Layout) 19class Efl.Ui.Clock (Efl.Ui.Layout)
20{ 20{
21 [[Efl UI clock class]] 21 [[Efl UI clock class]]
22 methods { 22 methods {
diff --git a/src/lib/elementary/efl_ui_focus_manager.c b/src/lib/elementary/efl_ui_focus_manager.c
index c771f3d..9ebb7ba 100644
--- a/src/lib/elementary/efl_ui_focus_manager.c
+++ b/src/lib/elementary/efl_ui_focus_manager.c
@@ -896,7 +896,7 @@ _iterator_next(Border_Elements_Iterator *it, void **data)
896 return EINA_FALSE; 896 return EINA_FALSE;
897} 897}
898 898
899static Elm_Layout * 899static Eo *
900_iterator_get_container(Border_Elements_Iterator *it) 900_iterator_get_container(Border_Elements_Iterator *it)
901{ 901{
902 return it->object; 902 return it->object;
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 937b384..52c73bd 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -269,12 +269,12 @@ _efl_ui_frame_class_constructor(Efl_Class *klass)
269 269
270/* Internal EO APIs and hidden overrides */ 270/* Internal EO APIs and hidden overrides */
271 271
272ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() 272ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
273ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() 273ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
274 274
275#define EFL_UI_FRAME_EXTRA_OPS \ 275#define EFL_UI_FRAME_EXTRA_OPS \
276 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_frame), \ 276 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_frame), \
277 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \ 277 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
278 ELM_LAYOUT_TEXT_ALIASES_OPS() 278 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
279 279
280#include "efl_ui_frame.eo.c" 280#include "efl_ui_frame.eo.c"
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index 3c233bf..7983c81 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Frame (Elm.Layout, Efl.Ui.Clickable, Efl.Text) 1class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text)
2{ 2{
3 [[Frame widget 3 [[Frame widget
4 4
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 24ac1f8..67c47a8 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -552,7 +552,7 @@ _grid_item_iterator_next(Grid_Item_Iterator *it, void **data)
552 return EINA_TRUE; 552 return EINA_TRUE;
553} 553}
554 554
555static Elm_Layout * 555static Eo *
556_grid_item_iterator_get_container(Grid_Item_Iterator *it) 556_grid_item_iterator_get_container(Grid_Item_Iterator *it)
557{ 557{
558 return it->object; 558 return it->object;
diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/efl_ui_layout.c
index 1c4293d..2ec57b5 100644
--- a/src/lib/elementary/elm_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -10,21 +10,21 @@
10#include "elm_priv.h" 10#include "elm_priv.h"
11#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
12 12
13#include "elm_layout_internal_part.eo.h" 13#include "efl_ui_layout_internal_part.eo.h"
14#include "elm_part_helper.h" 14#include "elm_part_helper.h"
15 15
16#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT 16#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT
17#include <Edje_Edit.h> 17#include <Edje_Edit.h>
18 18
19#define MY_CLASS ELM_LAYOUT_CLASS 19#define MY_CLASS EFL_UI_LAYOUT_CLASS
20#define MY_CLASS_PFX elm_layout 20#define MY_CLASS_PFX efl_ui_layout
21 21
22#define MY_CLASS_NAME "Elm_Layout" 22#define MY_CLASS_NAME "Elm_Layout"
23#define MY_CLASS_NAME_LEGACY "elm_layout" 23#define MY_CLASS_NAME_LEGACY "elm_layout"
24 24
25Eo *_elm_layout_pack_proxy_get(Elm_Layout *obj, Edje_Part_Type type, const char *part); 25Eo *_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const char *part);
26static void _efl_model_properties_changed_cb(void *, const Efl_Event *); 26static void _efl_model_properties_changed_cb(void *, const Efl_Event *);
27static Eina_Bool _elm_layout_part_cursor_unset(Elm_Layout_Smart_Data *sd, const char *part_name); 27static Eina_Bool _efl_ui_layout_part_cursor_unset(Elm_Layout_Smart_Data *sd, const char *part_name);
28 28
29static const char SIG_THEME_CHANGED[] = "theme,changed"; 29static const char SIG_THEME_CHANGED[] = "theme,changed";
30const char SIG_LAYOUT_FOCUSED[] = "focused"; 30const char SIG_LAYOUT_FOCUSED[] = "focused";
@@ -54,7 +54,7 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] =
54 {NULL, NULL} 54 {NULL, NULL}
55}; 55};
56 56
57static const char *_elm_layout_swallow_parts[] = { 57static const char *_efl_ui_layout_swallow_parts[] = {
58 "elm.swallow.icon", 58 "elm.swallow.icon",
59 "elm.swallow.end", 59 "elm.swallow.end",
60 "elm.swallow.background", 60 "elm.swallow.background",
@@ -71,7 +71,7 @@ struct _Elm_Layout_Sub_Iterator
71{ 71{
72 Eina_Iterator iterator; 72 Eina_Iterator iterator;
73 Eina_Iterator *real_iterator; 73 Eina_Iterator *real_iterator;
74 Elm_Layout *object; 74 Efl_Ui_Layout *object;
75}; 75};
76 76
77struct _Elm_Layout_Sub_Object_Data 77struct _Elm_Layout_Sub_Object_Data
@@ -172,8 +172,8 @@ _icon_signal_emit(Elm_Layout_Smart_Data *sd,
172 if (sub_d->type != SWALLOW) return; 172 if (sub_d->type != SWALLOW) return;
173 for (i = 0;; i++) 173 for (i = 0;; i++)
174 { 174 {
175 if (!_elm_layout_swallow_parts[i]) return; 175 if (!_efl_ui_layout_swallow_parts[i]) return;
176 if (!strcmp(sub_d->part, _elm_layout_swallow_parts[i])) break; 176 if (!strcmp(sub_d->part, _efl_ui_layout_swallow_parts[i])) break;
177 } 177 }
178 178
179 if (!strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow."))) 179 if (!strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
@@ -286,7 +286,7 @@ _parts_cursors_apply(Elm_Layout_Smart_Data *sd)
286} 286}
287 287
288static void 288static void
289_elm_layout_highlight_in_theme(Evas_Object *obj) 289_efl_ui_layout_highlight_in_theme(Evas_Object *obj)
290{ 290{
291 const char *fh; 291 const char *fh;
292 292
@@ -325,7 +325,7 @@ _visuals_refresh(Evas_Object *obj,
325 (wd->resize_obj, 325 (wd->resize_obj,
326 efl_ui_scale_get(obj) * elm_config_scale_get()); 326 efl_ui_scale_get(obj) * elm_config_scale_get());
327 327
328 _elm_layout_highlight_in_theme(obj); 328 _efl_ui_layout_highlight_in_theme(obj);
329 329
330 ret = elm_obj_widget_disable(obj); 330 ret = elm_obj_widget_disable(obj);
331 331
@@ -335,7 +335,7 @@ _visuals_refresh(Evas_Object *obj,
335} 335}
336 336
337EOLIAN static Eina_Bool 337EOLIAN static Eina_Bool
338_elm_layout_elm_widget_disable(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED) 338_efl_ui_layout_elm_widget_disable(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
339{ 339{
340 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 340 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
341 341
@@ -350,7 +350,7 @@ _elm_layout_elm_widget_disable(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
350} 350}
351 351
352static Elm_Theme_Apply 352static Elm_Theme_Apply
353_elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd) 353_efl_ui_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
354{ 354{
355 Elm_Theme_Apply ret = ELM_THEME_APPLY_FAILED; 355 Elm_Theme_Apply ret = ELM_THEME_APPLY_FAILED;
356 356
@@ -365,7 +365,7 @@ _elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
365 } 365 }
366 366
367 if (ret) 367 if (ret)
368 efl_event_callback_legacy_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL); 368 efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
369 369
370 if (!_visuals_refresh(obj, sd)) 370 if (!_visuals_refresh(obj, sd))
371 ret = ELM_THEME_APPLY_FAILED; 371 ret = ELM_THEME_APPLY_FAILED;
@@ -374,19 +374,19 @@ _elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
374} 374}
375 375
376EOLIAN static Elm_Theme_Apply 376EOLIAN static Elm_Theme_Apply
377_elm_layout_elm_widget_theme_apply(Eo *obj, Elm_Layout_Smart_Data *sd) 377_efl_ui_layout_elm_widget_theme_apply(Eo *obj, Elm_Layout_Smart_Data *sd)
378{ 378{
379 Elm_Theme_Apply theme_apply = ELM_THEME_APPLY_FAILED; 379 Elm_Theme_Apply theme_apply = ELM_THEME_APPLY_FAILED;
380 380
381 theme_apply = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 381 theme_apply = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
382 if (!theme_apply) return ELM_THEME_APPLY_FAILED; 382 if (!theme_apply) return ELM_THEME_APPLY_FAILED;
383 383
384 theme_apply &= _elm_layout_theme_internal(obj, sd); 384 theme_apply &= _efl_ui_layout_theme_internal(obj, sd);
385 return theme_apply; 385 return theme_apply;
386} 386}
387 387
388static void * 388static void *
389_elm_layout_list_data_get(const Eina_List *list) 389_efl_ui_layout_list_data_get(const Eina_List *list)
390{ 390{
391 Elm_Layout_Sub_Object_Data *sub_d = eina_list_data_get(list); 391 Elm_Layout_Sub_Object_Data *sub_d = eina_list_data_get(list);
392 392
@@ -394,7 +394,7 @@ _elm_layout_list_data_get(const Eina_List *list)
394} 394}
395 395
396EOLIAN static Eina_Bool 396EOLIAN static Eina_Bool
397_elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED) 397_efl_ui_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
398{ 398{
399 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 399 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
400 400
@@ -423,7 +423,7 @@ _elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED,
423} 423}
424 424
425EOLIAN static Eina_Bool 425EOLIAN static Eina_Bool
426_elm_layout_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED) 426_efl_ui_layout_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
427{ 427{
428 if (!elm_widget_can_focus_get(obj)) 428 if (!elm_widget_can_focus_get(obj))
429 return EINA_TRUE; 429 return EINA_TRUE;
@@ -467,7 +467,7 @@ _access_focus_list_sort(Eina_List *origin)
467 * child objects, but still inheriting from elm_layout, just set its 467 * child objects, but still inheriting from elm_layout, just set its
468 * focus_next smart function back to NULL */ 468 * focus_next smart function back to NULL */
469EOLIAN static Eina_Bool 469EOLIAN static Eina_Bool
470_elm_layout_elm_widget_focus_next(Eo *obj, Elm_Layout_Smart_Data *sd, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item) 470_efl_ui_layout_elm_widget_focus_next(Eo *obj, Elm_Layout_Smart_Data *sd, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
471{ 471{
472 const Eina_List *items; 472 const Eina_List *items;
473 void *(*list_data_get)(const Eina_List *list); 473 void *(*list_data_get)(const Eina_List *list);
@@ -477,7 +477,7 @@ _elm_layout_elm_widget_focus_next(Eo *obj, Elm_Layout_Smart_Data *sd, Elm_Focus_
477 else 477 else
478 { 478 {
479 items = sd->subs; 479 items = sd->subs;
480 list_data_get = _elm_layout_list_data_get; 480 list_data_get = _efl_ui_layout_list_data_get;
481 481
482 if (!items) return EINA_FALSE; 482 if (!items) return EINA_FALSE;
483 483
@@ -490,7 +490,7 @@ _elm_layout_elm_widget_focus_next(Eo *obj, Elm_Layout_Smart_Data *sd, Elm_Focus_
490} 490}
491 491
492EOLIAN static Eina_Bool 492EOLIAN static Eina_Bool
493_elm_layout_elm_widget_sub_object_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Evas_Object *sobj) 493_efl_ui_layout_elm_widget_sub_object_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Evas_Object *sobj)
494{ 494{
495 Eina_Bool int_ret = EINA_FALSE; 495 Eina_Bool int_ret = EINA_FALSE;
496 496
@@ -507,7 +507,7 @@ _elm_layout_elm_widget_sub_object_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_U
507} 507}
508 508
509EOLIAN static Eina_Bool 509EOLIAN static Eina_Bool
510_elm_layout_elm_widget_sub_object_del(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_Object *sobj) 510_efl_ui_layout_elm_widget_sub_object_del(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_Object *sobj)
511{ 511{
512 Eina_List *l; 512 Eina_List *l;
513 Elm_Layout_Sub_Object_Data *sub_d; 513 Elm_Layout_Sub_Object_Data *sub_d;
@@ -544,7 +544,7 @@ _elm_layout_elm_widget_sub_object_del(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_O
544} 544}
545 545
546EOLIAN static Eina_Bool 546EOLIAN static Eina_Bool
547_elm_layout_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED) 547_efl_ui_layout_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
548{ 548{
549 if (!elm_widget_can_focus_get(obj)) 549 if (!elm_widget_can_focus_get(obj))
550 return EINA_TRUE; 550 return EINA_TRUE;
@@ -553,7 +553,7 @@ _elm_layout_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Layou
553} 553}
554 554
555EOLIAN static Eina_Bool 555EOLIAN static Eina_Bool
556_elm_layout_elm_widget_focus_direction(Eo *obj, Elm_Layout_Smart_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight) 556_efl_ui_layout_elm_widget_focus_direction(Eo *obj, Elm_Layout_Smart_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight)
557{ 557{
558 const Eina_List *items; 558 const Eina_List *items;
559 void *(*list_data_get)(const Eina_List *list); 559 void *(*list_data_get)(const Eina_List *list);
@@ -566,7 +566,7 @@ _elm_layout_elm_widget_focus_direction(Eo *obj, Elm_Layout_Smart_Data *sd, const
566 else 566 else
567 { 567 {
568 items = sd->subs; 568 items = sd->subs;
569 list_data_get = _elm_layout_list_data_get; 569 list_data_get = _efl_ui_layout_list_data_get;
570 570
571 if (!items) return EINA_FALSE; 571 if (!items) return EINA_FALSE;
572 } 572 }
@@ -647,7 +647,7 @@ _sub_box_remove(Evas_Object *obj,
647 Elm_Layout_Sub_Object_Data *sub_d) 647 Elm_Layout_Sub_Object_Data *sub_d)
648{ 648{
649 Evas_Object *child = sub_d->obj; /* sub_d will die in 649 Evas_Object *child = sub_d->obj; /* sub_d will die in
650 * _elm_layout_smart_sub_object_del */ 650 * _efl_ui_layout_smart_sub_object_del */
651 651
652 if (sub_d->type == BOX_INSERT_BEFORE) 652 if (sub_d->type == BOX_INSERT_BEFORE)
653 evas_object_event_callback_del_full 653 evas_object_event_callback_del_full
@@ -692,7 +692,7 @@ _sub_table_remove(Evas_Object *obj,
692 Evas_Object *child; 692 Evas_Object *child;
693 ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd, NULL); 693 ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd, NULL);
694 694
695 child = sub_d->obj; /* sub_d will die in _elm_layout_smart_sub_object_del */ 695 child = sub_d->obj; /* sub_d will die in _efl_ui_layout_smart_sub_object_del */
696 696
697 edje_object_part_table_unpack 697 edje_object_part_table_unpack
698 (wd->resize_obj, sub_d->part, child); 698 (wd->resize_obj, sub_d->part, child);
@@ -718,7 +718,7 @@ _on_size_evaluate_signal(void *data,
718} 718}
719 719
720EOLIAN static void 720EOLIAN static void
721_elm_layout_efl_canvas_group_group_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED) 721_efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
722{ 722{
723 Evas_Object *edje; 723 Evas_Object *edje;
724 724
@@ -739,7 +739,7 @@ _elm_layout_efl_canvas_group_group_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_
739} 739}
740 740
741EOLIAN static void 741EOLIAN static void
742_elm_layout_efl_canvas_group_group_del(Eo *obj, Elm_Layout_Smart_Data *sd) 742_efl_ui_layout_efl_canvas_group_group_del(Eo *obj, Elm_Layout_Smart_Data *sd)
743{ 743{
744 Elm_Layout_Sub_Object_Data *sub_d; 744 Elm_Layout_Sub_Object_Data *sub_d;
745 Elm_Layout_Sub_Object_Cursor *pc; 745 Elm_Layout_Sub_Object_Cursor *pc;
@@ -804,7 +804,7 @@ _elm_layout_efl_canvas_group_group_del(Eo *obj, Elm_Layout_Smart_Data *sd)
804/* rewrite or extend this one on your derived class as to suit your 804/* rewrite or extend this one on your derived class as to suit your
805 * needs */ 805 * needs */
806EOLIAN static void 806EOLIAN static void
807_elm_layout_efl_canvas_group_group_calculate(Eo *obj, Elm_Layout_Smart_Data *sd) 807_efl_ui_layout_efl_canvas_group_group_calculate(Eo *obj, Elm_Layout_Smart_Data *sd)
808{ 808{
809 if (sd->needs_size_calc) 809 if (sd->needs_size_calc)
810 { 810 {
@@ -833,7 +833,7 @@ _parts_cursors_find(Elm_Layout_Smart_Data *sd,
833 * widget inheriting from elm_layout */ 833 * widget inheriting from elm_layout */
834 834
835EOLIAN static Eina_Bool 835EOLIAN static Eina_Bool
836_elm_layout_efl_file_file_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *file, const char *group) 836_efl_ui_layout_efl_file_file_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *file, const char *group)
837{ 837{
838 Eina_Bool int_ret = EINA_FALSE; 838 Eina_Bool int_ret = EINA_FALSE;
839 839
@@ -857,7 +857,7 @@ _elm_layout_efl_file_file_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *fi
857} 857}
858 858
859EOLIAN static void 859EOLIAN static void
860_elm_layout_efl_file_file_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const char **file, const char **group) 860_efl_ui_layout_efl_file_file_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const char **file, const char **group)
861{ 861{
862 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 862 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
863 edje_object_file_get(wd->resize_obj, file, group); 863 edje_object_file_get(wd->resize_obj, file, group);
@@ -865,7 +865,7 @@ _elm_layout_efl_file_file_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, co
865 865
866 866
867EOLIAN static Eina_Bool 867EOLIAN static Eina_Bool
868_elm_layout_efl_file_mmap_set(Eo *obj, Elm_Layout_Smart_Data *sd, const Eina_File *file, const char *group) 868_efl_ui_layout_efl_file_mmap_set(Eo *obj, Elm_Layout_Smart_Data *sd, const Eina_File *file, const char *group)
869{ 869{
870 Eina_Bool int_ret = EINA_FALSE; 870 Eina_Bool int_ret = EINA_FALSE;
871 871
@@ -889,14 +889,14 @@ _elm_layout_efl_file_mmap_set(Eo *obj, Elm_Layout_Smart_Data *sd, const Eina_Fil
889} 889}
890 890
891EOLIAN static void 891EOLIAN static void
892_elm_layout_efl_file_mmap_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const Eina_File **file, const char **group) 892_efl_ui_layout_efl_file_mmap_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const Eina_File **file, const char **group)
893{ 893{
894 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 894 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
895 efl_file_mmap_get(wd->resize_obj, file, group); 895 efl_file_mmap_get(wd->resize_obj, file, group);
896} 896}
897 897
898EOLIAN static Eina_Bool 898EOLIAN static Eina_Bool
899_elm_layout_theme_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *klass, const char *group, const char *style) 899_efl_ui_layout_theme_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *klass, const char *group, const char *style)
900{ 900{
901 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 901 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
902 902
@@ -905,14 +905,14 @@ _elm_layout_theme_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *klass, con
905 eina_stringshare_replace(&(sd->group), group); 905 eina_stringshare_replace(&(sd->group), group);
906 eina_stringshare_replace(&(wd->style), style); 906 eina_stringshare_replace(&(wd->style), style);
907 907
908 if (_elm_layout_theme_internal(obj, sd)) 908 if (_efl_ui_layout_theme_internal(obj, sd))
909 return EINA_TRUE; 909 return EINA_TRUE;
910 else 910 else
911 return EINA_FALSE; 911 return EINA_FALSE;
912} 912}
913 913
914EOLIAN static void 914EOLIAN static void
915_elm_layout_efl_canvas_layout_signal_signal_emit(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source) 915_efl_ui_layout_efl_canvas_layout_signal_signal_emit(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source)
916{ 916{
917 // Don't do anything else than call forward here 917 // Don't do anything else than call forward here
918 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 918 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@@ -920,7 +920,7 @@ _elm_layout_efl_canvas_layout_signal_signal_emit(Eo *obj, Elm_Layout_Smart_Data
920} 920}
921 921
922EOLIAN static Eina_Bool 922EOLIAN static Eina_Bool
923_elm_layout_efl_canvas_layout_signal_signal_callback_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data) 923_efl_ui_layout_efl_canvas_layout_signal_signal_callback_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
924{ 924{
925 // Don't do anything else than call forward here 925 // Don't do anything else than call forward here
926 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 926 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -928,7 +928,7 @@ _elm_layout_efl_canvas_layout_signal_signal_callback_add(Eo *obj, Elm_Layout_Sma
928} 928}
929 929
930EOLIAN static Eina_Bool 930EOLIAN static Eina_Bool
931_elm_layout_efl_canvas_layout_signal_signal_callback_del(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data) 931_efl_ui_layout_efl_canvas_layout_signal_signal_callback_del(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
932{ 932{
933 // Don't do anything else than call forward here 933 // Don't do anything else than call forward here
934 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 934 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -955,7 +955,7 @@ elm_layout_content_set(Evas_Object *obj,
955} 955}
956 956
957static Eina_Bool 957static Eina_Bool
958_elm_layout_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *content) 958_efl_ui_layout_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *content)
959{ 959{
960 Elm_Layout_Sub_Object_Data *sub_d; 960 Elm_Layout_Sub_Object_Data *sub_d;
961 const Eina_List *l; 961 const Eina_List *l;
@@ -1036,7 +1036,7 @@ elm_layout_content_get(const Evas_Object *obj,
1036} 1036}
1037 1037
1038static Evas_Object* 1038static Evas_Object*
1039_elm_layout_content_get(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part) 1039_efl_ui_layout_content_get(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
1040{ 1040{
1041 const Eina_List *l; 1041 const Eina_List *l;
1042 Elm_Layout_Sub_Object_Data *sub_d; 1042 Elm_Layout_Sub_Object_Data *sub_d;
@@ -1066,7 +1066,7 @@ elm_layout_content_unset(Evas_Object *obj,
1066} 1066}
1067 1067
1068static Evas_Object* 1068static Evas_Object*
1069_elm_layout_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part) 1069_efl_ui_layout_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
1070{ 1070{
1071 Elm_Layout_Sub_Object_Data *sub_d; 1071 Elm_Layout_Sub_Object_Data *sub_d;
1072 const Eina_List *l; 1072 const Eina_List *l;
@@ -1085,7 +1085,7 @@ _elm_layout_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
1085 if (!sub_d->obj) return NULL; 1085 if (!sub_d->obj) return NULL;
1086 1086
1087 content = sub_d->obj; /* sub_d will die in 1087 content = sub_d->obj; /* sub_d will die in
1088 * _elm_layout_smart_sub_object_del */ 1088 * _efl_ui_layout_smart_sub_object_del */
1089 1089
1090 if (!_elm_widget_sub_object_redirect_to_top(obj, content)) 1090 if (!_elm_widget_sub_object_redirect_to_top(obj, content))
1091 { 1091 {
@@ -1104,25 +1104,25 @@ _elm_layout_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part)
1104} 1104}
1105 1105
1106EOLIAN static Eina_Bool 1106EOLIAN static Eina_Bool
1107_elm_layout_efl_container_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_Object *content) 1107_efl_ui_layout_efl_container_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_Object *content)
1108{ 1108{
1109 return _elm_layout_content_set(obj, sd, NULL, content); 1109 return _efl_ui_layout_content_set(obj, sd, NULL, content);
1110} 1110}
1111 1111
1112EOLIAN static Evas_Object* 1112EOLIAN static Evas_Object*
1113_elm_layout_efl_container_content_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *sd) 1113_efl_ui_layout_efl_container_content_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *sd)
1114{ 1114{
1115 return _elm_layout_content_get(obj, sd, NULL); 1115 return _efl_ui_layout_content_get(obj, sd, NULL);
1116} 1116}
1117 1117
1118EOLIAN static Evas_Object* 1118EOLIAN static Evas_Object*
1119_elm_layout_efl_container_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd) 1119_efl_ui_layout_efl_container_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd)
1120{ 1120{
1121 return _elm_layout_content_unset(obj, sd, NULL); 1121 return _efl_ui_layout_content_unset(obj, sd, NULL);
1122} 1122}
1123 1123
1124EOLIAN static Eina_Bool 1124EOLIAN static Eina_Bool
1125_elm_layout_efl_container_content_remove(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, 1125_efl_ui_layout_efl_container_content_remove(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED,
1126 Efl_Gfx *content) 1126 Efl_Gfx *content)
1127{ 1127{
1128 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 1128 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -1169,7 +1169,7 @@ _sub_iterator_next(Elm_Layout_Sub_Iterator *it, void **data)
1169 return EINA_TRUE; 1169 return EINA_TRUE;
1170} 1170}
1171 1171
1172static Elm_Layout * 1172static Efl_Ui_Layout *
1173_sub_iterator_get_container(Elm_Layout_Sub_Iterator *it) 1173_sub_iterator_get_container(Elm_Layout_Sub_Iterator *it)
1174{ 1174{
1175 return it->object; 1175 return it->object;
@@ -1203,19 +1203,19 @@ _sub_iterator_create(Eo *eo_obj, Elm_Layout_Smart_Data *sd)
1203} 1203}
1204 1204
1205EOLIAN static Eina_Iterator * 1205EOLIAN static Eina_Iterator *
1206_elm_layout_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Elm_Layout_Smart_Data *sd) 1206_efl_ui_layout_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Elm_Layout_Smart_Data *sd)
1207{ 1207{
1208 return _sub_iterator_create(eo_obj, sd); 1208 return _sub_iterator_create(eo_obj, sd);
1209} 1209}
1210 1210
1211EOLIAN static int 1211EOLIAN static int
1212_elm_layout_efl_container_content_count(Eo *eo_obj EINA_UNUSED, Elm_Layout_Smart_Data *sd) 1212_efl_ui_layout_efl_container_content_count(Eo *eo_obj EINA_UNUSED, Elm_Layout_Smart_Data *sd)
1213{ 1213{
1214 return eina_list_count(sd->subs); 1214 return eina_list_count(sd->subs);
1215} 1215}
1216 1216
1217EOLIAN static Eina_Bool 1217EOLIAN static Eina_Bool
1218_elm_layout_text_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, const char *text) 1218_efl_ui_layout_text_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, const char *text)
1219{ 1219{
1220 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 1220 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
1221 1221
@@ -1286,7 +1286,7 @@ _elm_layout_text_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, const
1286} 1286}
1287 1287
1288EOLIAN static const char* 1288EOLIAN static const char*
1289_elm_layout_text_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const char *part) 1289_efl_ui_layout_text_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const char *part)
1290{ 1290{
1291 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 1291 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
1292 1292
@@ -1306,7 +1306,7 @@ _layout_box_subobj_init(Elm_Layout_Smart_Data *sd, Elm_Layout_Sub_Object_Data *s
1306} 1306}
1307 1307
1308Eina_Bool 1308Eina_Bool
1309_elm_layout_box_append(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child) 1309_efl_ui_layout_box_append(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child)
1310{ 1310{
1311 Elm_Layout_Sub_Object_Data *sub_d; 1311 Elm_Layout_Sub_Object_Data *sub_d;
1312 1312
@@ -1343,7 +1343,7 @@ _elm_layout_box_append(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eva
1343} 1343}
1344 1344
1345Eina_Bool 1345Eina_Bool
1346_elm_layout_box_prepend(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child) 1346_efl_ui_layout_box_prepend(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child)
1347{ 1347{
1348 Elm_Layout_Sub_Object_Data *sub_d; 1348 Elm_Layout_Sub_Object_Data *sub_d;
1349 1349
@@ -1380,7 +1380,7 @@ _elm_layout_box_prepend(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Ev
1380} 1380}
1381 1381
1382Eina_Bool 1382Eina_Bool
1383_elm_layout_box_insert_before(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference) 1383_efl_ui_layout_box_insert_before(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference)
1384{ 1384{
1385 Elm_Layout_Sub_Object_Data *sub_d; 1385 Elm_Layout_Sub_Object_Data *sub_d;
1386 1386
@@ -1422,7 +1422,7 @@ _elm_layout_box_insert_before(Eo *obj, Elm_Layout_Smart_Data *sd, const char *pa
1422} 1422}
1423 1423
1424Eina_Bool 1424Eina_Bool
1425_elm_layout_box_insert_at(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned int pos) 1425_efl_ui_layout_box_insert_at(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned int pos)
1426{ 1426{
1427 Elm_Layout_Sub_Object_Data *sub_d; 1427 Elm_Layout_Sub_Object_Data *sub_d;
1428 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 1428 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -1460,7 +1460,7 @@ _elm_layout_box_insert_at(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part,
1460} 1460}
1461 1461
1462Evas_Object * 1462Evas_Object *
1463_elm_layout_box_remove(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child) 1463_efl_ui_layout_box_remove(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child)
1464{ 1464{
1465 1465
1466 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); 1466 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
@@ -1481,7 +1481,7 @@ _elm_layout_box_remove(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eva
1481} 1481}
1482 1482
1483Eina_Bool 1483Eina_Bool
1484_elm_layout_box_remove_all(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear) 1484_efl_ui_layout_box_remove_all(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear)
1485{ 1485{
1486 EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE); 1486 EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE);
1487 1487
@@ -1511,7 +1511,7 @@ _elm_layout_box_remove_all(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part,
1511} 1511}
1512 1512
1513Eina_Bool 1513Eina_Bool
1514_elm_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) 1514_efl_ui_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
1515{ 1515{
1516 Elm_Layout_Sub_Object_Data *sub_d; 1516 Elm_Layout_Sub_Object_Data *sub_d;
1517 1517
@@ -1558,7 +1558,7 @@ _elm_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eva
1558} 1558}
1559 1559
1560Evas_Object * 1560Evas_Object *
1561_elm_layout_table_unpack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child) 1561_efl_ui_layout_table_unpack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child)
1562{ 1562{
1563 1563
1564 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); 1564 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
@@ -1580,7 +1580,7 @@ _elm_layout_table_unpack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, E
1580} 1580}
1581 1581
1582Eina_Bool 1582Eina_Bool
1583_elm_layout_table_clear(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear) 1583_efl_ui_layout_table_clear(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear)
1584{ 1584{
1585 EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE); 1585 EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE);
1586 1586
@@ -1618,7 +1618,7 @@ elm_layout_edje_get(const Eo *obj)
1618} 1618}
1619 1619
1620EOLIAN static const char * 1620EOLIAN static const char *
1621_elm_layout_efl_canvas_layout_group_group_data_get(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *key) 1621_efl_ui_layout_efl_canvas_layout_group_group_data_get(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, const char *key)
1622{ 1622{
1623 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 1623 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
1624 1624
@@ -1626,7 +1626,7 @@ _elm_layout_efl_canvas_layout_group_group_data_get(Eo *obj, Elm_Layout_Smart_Dat
1626} 1626}
1627 1627
1628EOLIAN static void 1628EOLIAN static void
1629_elm_layout_efl_canvas_layout_group_group_size_min_get(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, int *w, int *h) 1629_efl_ui_layout_efl_canvas_layout_group_group_size_min_get(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, int *w, int *h)
1630{ 1630{
1631 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1631 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1632 1632
@@ -1634,7 +1634,7 @@ _elm_layout_efl_canvas_layout_group_group_size_min_get(Eo *obj, Elm_Layout_Smart
1634} 1634}
1635 1635
1636EOLIAN static void 1636EOLIAN static void
1637_elm_layout_efl_canvas_layout_group_group_size_max_get(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, int *w, int *h) 1637_efl_ui_layout_efl_canvas_layout_group_group_size_max_get(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, int *w, int *h)
1638{ 1638{
1639 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1639 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1640 1640
@@ -1644,7 +1644,7 @@ _elm_layout_efl_canvas_layout_group_group_size_max_get(Eo *obj, Elm_Layout_Smart
1644/* layout's sizing evaluation is deferred. evaluation requests are 1644/* layout's sizing evaluation is deferred. evaluation requests are
1645 * queued up and only flag the object as 'changed'. when it comes to 1645 * queued up and only flag the object as 'changed'. when it comes to
1646 * Evas's rendering phase, it will be addressed, finally (see 1646 * Evas's rendering phase, it will be addressed, finally (see
1647 * _elm_layout_smart_calculate()). */ 1647 * _efl_ui_layout_smart_calculate()). */
1648static void 1648static void
1649_elm_layout_sizing_eval(Eo *obj, Elm_Layout_Smart_Data *sd) 1649_elm_layout_sizing_eval(Eo *obj, Elm_Layout_Smart_Data *sd)
1650{ 1650{
@@ -1668,7 +1668,7 @@ elm_layout_sizing_restricted_eval(Eo *obj, Eina_Bool w, Eina_Bool h)
1668} 1668}
1669 1669
1670EOLIAN static int 1670EOLIAN static int
1671_elm_layout_efl_canvas_layout_calc_calc_freeze(Eo *obj, Elm_Layout_Smart_Data *sd) 1671_efl_ui_layout_efl_canvas_layout_calc_calc_freeze(Eo *obj, Elm_Layout_Smart_Data *sd)
1672{ 1672{
1673 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0); 1673 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
1674 1674
@@ -1680,7 +1680,7 @@ _elm_layout_efl_canvas_layout_calc_calc_freeze(Eo *obj, Elm_Layout_Smart_Data *s
1680} 1680}
1681 1681
1682EOLIAN static int 1682EOLIAN static int
1683_elm_layout_efl_canvas_layout_calc_calc_thaw(Eo *obj, Elm_Layout_Smart_Data *sd) 1683_efl_ui_layout_efl_canvas_layout_calc_calc_thaw(Eo *obj, Elm_Layout_Smart_Data *sd)
1684{ 1684{
1685 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0); 1685 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
1686 1686
@@ -1694,7 +1694,7 @@ _elm_layout_efl_canvas_layout_calc_calc_thaw(Eo *obj, Elm_Layout_Smart_Data *sd)
1694} 1694}
1695 1695
1696static Eina_Bool 1696static Eina_Bool
1697_elm_layout_part_cursor_set(Elm_Layout_Smart_Data *sd, const char *part_name, const char *cursor) 1697_efl_ui_layout_part_cursor_set(Elm_Layout_Smart_Data *sd, const char *part_name, const char *cursor)
1698{ 1698{
1699 Evas_Object *part_obj; 1699 Evas_Object *part_obj;
1700 Elm_Layout_Sub_Object_Cursor *pc; 1700 Elm_Layout_Sub_Object_Cursor *pc;
@@ -1703,7 +1703,7 @@ _elm_layout_part_cursor_set(Elm_Layout_Smart_Data *sd, const char *part_name, co
1703 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 1703 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
1704 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); 1704 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
1705 1705
1706 if (!cursor) return _elm_layout_part_cursor_unset(sd, part_name); 1706 if (!cursor) return _efl_ui_layout_part_cursor_unset(sd, part_name);
1707 1707
1708 part_obj = (Evas_Object *)edje_object_part_object_get 1708 part_obj = (Evas_Object *)edje_object_part_object_get
1709 (wd->resize_obj, part_name); 1709 (wd->resize_obj, part_name);
@@ -1750,7 +1750,7 @@ _elm_layout_part_cursor_set(Elm_Layout_Smart_Data *sd, const char *part_name, co
1750} 1750}
1751 1751
1752static const char * 1752static const char *
1753_elm_layout_part_cursor_get(Elm_Layout_Smart_Data *sd, const char *part_name) 1753_efl_ui_layout_part_cursor_get(Elm_Layout_Smart_Data *sd, const char *part_name)
1754{ 1754{
1755 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL); 1755 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL);
1756 1756
@@ -1762,7 +1762,7 @@ _elm_layout_part_cursor_get(Elm_Layout_Smart_Data *sd, const char *part_name)
1762} 1762}
1763 1763
1764static Eina_Bool 1764static Eina_Bool
1765_elm_layout_part_cursor_unset(Elm_Layout_Smart_Data *sd, const char *part_name) 1765_efl_ui_layout_part_cursor_unset(Elm_Layout_Smart_Data *sd, const char *part_name)
1766{ 1766{
1767 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); 1767 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
1768 1768
@@ -1784,7 +1784,7 @@ _elm_layout_part_cursor_unset(Elm_Layout_Smart_Data *sd, const char *part_name)
1784} 1784}
1785 1785
1786static Eina_Bool 1786static Eina_Bool
1787_elm_layout_part_cursor_style_set(Elm_Layout_Smart_Data *sd, const char *part_name, const char *style) 1787_efl_ui_layout_part_cursor_style_set(Elm_Layout_Smart_Data *sd, const char *part_name, const char *style)
1788{ 1788{
1789 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); 1789 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
1790 1790
@@ -1799,7 +1799,7 @@ _elm_layout_part_cursor_style_set(Elm_Layout_Smart_Data *sd, const char *part_na
1799} 1799}
1800 1800
1801static const char* 1801static const char*
1802_elm_layout_part_cursor_style_get(Elm_Layout_Smart_Data *sd, const char *part_name) 1802_efl_ui_layout_part_cursor_style_get(Elm_Layout_Smart_Data *sd, const char *part_name)
1803{ 1803{
1804 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL); 1804 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL);
1805 1805
@@ -1811,7 +1811,7 @@ _elm_layout_part_cursor_style_get(Elm_Layout_Smart_Data *sd, const char *part_na
1811} 1811}
1812 1812
1813static Eina_Bool 1813static Eina_Bool
1814_elm_layout_part_cursor_engine_only_set(Elm_Layout_Smart_Data *sd, const char *part_name, Eina_Bool engine_only) 1814_efl_ui_layout_part_cursor_engine_only_set(Elm_Layout_Smart_Data *sd, const char *part_name, Eina_Bool engine_only)
1815{ 1815{
1816 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); 1816 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
1817 1817
@@ -1826,7 +1826,7 @@ _elm_layout_part_cursor_engine_only_set(Elm_Layout_Smart_Data *sd, const char *p
1826} 1826}
1827 1827
1828static Eina_Bool 1828static Eina_Bool
1829_elm_layout_part_cursor_engine_only_get(Elm_Layout_Smart_Data *sd, const char *part_name) 1829_efl_ui_layout_part_cursor_engine_only_get(Elm_Layout_Smart_Data *sd, const char *part_name)
1830{ 1830{
1831 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); 1831 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
1832 1832
@@ -1855,7 +1855,7 @@ elm_layout_edje_object_can_access_get(const Eo *obj)
1855} 1855}
1856 1856
1857EOLIAN static void 1857EOLIAN static void
1858_elm_layout_efl_object_dbg_info_get(Eo *eo_obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root) 1858_efl_ui_layout_efl_object_dbg_info_get(Eo *eo_obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
1859{ 1859{
1860 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root); 1860 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
1861 ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd); 1861 ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd);
@@ -1954,7 +1954,7 @@ _prop_future_then_cb(void* data, Efl_Event const*event)
1954} 1954}
1955 1955
1956static void 1956static void
1957_elm_layout_view_model_update(Elm_Layout_Smart_Data *pd) 1957_efl_ui_layout_view_model_update(Elm_Layout_Smart_Data *pd)
1958{ 1958{
1959 Elm_Layout_Sub_Property_Future *sub_pp; 1959 Elm_Layout_Sub_Property_Future *sub_pp;
1960 Efl_Future **future_arr, **f, *future_all; 1960 Efl_Future **future_arr, **f, *future_all;
@@ -2042,7 +2042,7 @@ _efl_model_properties_changed_cb(void *data, const Efl_Event *event)
2042} 2042}
2043 2043
2044EOLIAN static void 2044EOLIAN static void
2045_elm_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd, Efl_Model *model) 2045_efl_ui_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd, Efl_Model *model)
2046{ 2046{
2047 if (pd->model) 2047 if (pd->model)
2048 { 2048 {
@@ -2061,7 +2061,7 @@ _elm_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd
2061 return; 2061 return;
2062 2062
2063 if (pd->prop_connect) 2063 if (pd->prop_connect)
2064 _elm_layout_view_model_update(pd); 2064 _efl_ui_layout_view_model_update(pd);
2065 2065
2066 if (pd->factories) 2066 if (pd->factories)
2067 { 2067 {
@@ -2093,13 +2093,13 @@ _elm_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd
2093} 2093}
2094 2094
2095EOLIAN static Efl_Model * 2095EOLIAN static Efl_Model *
2096_elm_layout_efl_ui_view_model_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd) 2096_efl_ui_layout_efl_ui_view_model_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd)
2097{ 2097{
2098 return pd->model; 2098 return pd->model;
2099} 2099}
2100 2100
2101EOLIAN static void 2101EOLIAN static void
2102_elm_layout_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd, const char *name, const char *property) 2102_efl_ui_layout_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd, const char *name, const char *property)
2103{ 2103{
2104 EINA_SAFETY_ON_NULL_RETURN(name); 2104 EINA_SAFETY_ON_NULL_RETURN(name);
2105 Eina_Stringshare *ss_name, *ss_prop; 2105 Eina_Stringshare *ss_name, *ss_prop;
@@ -2141,7 +2141,7 @@ _elm_layout_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Elm_Layout_Smart_D
2141 2141
2142 2142
2143EOLIAN static void 2143EOLIAN static void
2144_elm_layout_efl_ui_model_factory_connect_connect(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd, 2144_efl_ui_layout_efl_ui_model_factory_connect_connect(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *pd,
2145 const char *name, Efl_Ui_Factory *factory) 2145 const char *name, Efl_Ui_Factory *factory)
2146{ 2146{
2147 EINA_SAFETY_ON_NULL_RETURN(name); 2147 EINA_SAFETY_ON_NULL_RETURN(name);
@@ -2180,7 +2180,7 @@ elm_layout_add(Evas_Object *parent)
2180} 2180}
2181 2181
2182EOLIAN static Eo * 2182EOLIAN static Eo *
2183_elm_layout_efl_object_constructor(Eo *obj, Elm_Layout_Smart_Data *sd) 2183_efl_ui_layout_efl_object_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
2184{ 2184{
2185 sd->obj = obj; 2185 sd->obj = obj;
2186 obj = efl_constructor(efl_super(obj, MY_CLASS)); 2186 obj = efl_constructor(efl_super(obj, MY_CLASS));
@@ -2191,20 +2191,20 @@ _elm_layout_efl_object_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
2191 return obj; 2191 return obj;
2192} 2192}
2193 2193
2194EOLIAN static void _elm_layout_class_constructor(Efl_Class *klass) 2194EOLIAN static void _efl_ui_layout_class_constructor(Efl_Class *klass)
2195{ 2195{
2196 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 2196 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
2197} 2197}
2198 2198
2199EOLIAN static void 2199EOLIAN static void
2200_elm_layout_efl_canvas_layout_signal_message_send(Eo *obj, Elm_Layout_Smart_Data *pd EINA_UNUSED, int id, const Eina_Value msg) 2200_efl_ui_layout_efl_canvas_layout_signal_message_send(Eo *obj, Elm_Layout_Smart_Data *pd EINA_UNUSED, int id, const Eina_Value msg)
2201{ 2201{
2202 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 2202 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
2203 efl_canvas_layout_signal_message_send(wd->resize_obj, id, msg); 2203 efl_canvas_layout_signal_message_send(wd->resize_obj, id, msg);
2204} 2204}
2205 2205
2206EOLIAN static void 2206EOLIAN static void
2207_elm_layout_efl_canvas_layout_signal_signal_process(Eo *obj, Elm_Layout_Smart_Data *pd EINA_UNUSED, Eina_Bool recurse) 2207_efl_ui_layout_efl_canvas_layout_signal_signal_process(Eo *obj, Elm_Layout_Smart_Data *pd EINA_UNUSED, Eina_Bool recurse)
2208{ 2208{
2209 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 2209 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
2210 efl_canvas_layout_signal_process(wd->resize_obj, recurse); 2210 efl_canvas_layout_signal_process(wd->resize_obj, recurse);
@@ -2238,31 +2238,31 @@ elm_layout_mmap_get(Eo *obj, const Eina_File **file, const char **group)
2238} 2238}
2239 2239
2240EAPI Eina_Bool 2240EAPI Eina_Bool
2241elm_layout_box_append(Elm_Layout *obj, const char *part, Evas_Object *child) 2241elm_layout_box_append(Eo *obj, const char *part, Evas_Object *child)
2242{ 2242{
2243 return efl_pack(efl_part(obj, part), child); 2243 return efl_pack(efl_part(obj, part), child);
2244} 2244}
2245 2245
2246EAPI Eina_Bool 2246EAPI Eina_Bool
2247elm_layout_box_prepend(Elm_Layout *obj, const char *part, Evas_Object *child) 2247elm_layout_box_prepend(Eo *obj, const char *part, Evas_Object *child)
2248{ 2248{
2249 return efl_pack_begin(efl_part(obj, part), child); 2249 return efl_pack_begin(efl_part(obj, part), child);
2250} 2250}
2251 2251
2252EAPI Eina_Bool 2252EAPI Eina_Bool
2253elm_layout_box_insert_before(Elm_Layout *obj, const char *part, Evas_Object *child, const Evas_Object *reference) 2253elm_layout_box_insert_before(Eo *obj, const char *part, Evas_Object *child, const Evas_Object *reference)
2254{ 2254{
2255 return efl_pack_before(efl_part(obj, part), child, reference); 2255 return efl_pack_before(efl_part(obj, part), child, reference);
2256} 2256}
2257 2257
2258EAPI Eina_Bool 2258EAPI Eina_Bool
2259elm_layout_box_insert_at(Elm_Layout *obj, const char *part, Evas_Object *child, unsigned int pos) 2259elm_layout_box_insert_at(Eo *obj, const char *part, Evas_Object *child, unsigned int pos)
2260{ 2260{
2261 return efl_pack_at(efl_part(obj, part), child, pos); 2261 return efl_pack_at(efl_part(obj, part), child, pos);
2262} 2262}
2263 2263
2264EAPI Evas_Object * 2264EAPI Evas_Object *
2265elm_layout_box_remove(Elm_Layout *obj, const char *part, Evas_Object *child) 2265elm_layout_box_remove(Eo *obj, const char *part, Evas_Object *child)
2266{ 2266{
2267 if (!efl_pack_unpack(efl_part(obj, part), child)) 2267 if (!efl_pack_unpack(efl_part(obj, part), child))
2268 return NULL; 2268 return NULL;
@@ -2270,7 +2270,7 @@ elm_layout_box_remove(Elm_Layout *obj, const char *part, Evas_Object *child)
2270} 2270}
2271 2271
2272EAPI Eina_Bool 2272EAPI Eina_Bool
2273elm_layout_box_remove_all(Elm_Layout *obj, const char *part, Eina_Bool clear) 2273elm_layout_box_remove_all(Eo *obj, const char *part, Eina_Bool clear)
2274{ 2274{
2275 if (clear) 2275 if (clear)
2276 return efl_pack_clear(efl_part(obj, part)); 2276 return efl_pack_clear(efl_part(obj, part));
@@ -2279,13 +2279,13 @@ elm_layout_box_remove_all(Elm_Layout *obj, const char *part, Eina_Bool clear)
2279} 2279}
2280 2280
2281EAPI Eina_Bool 2281EAPI Eina_Bool
2282elm_layout_table_pack(Elm_Layout *obj, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) 2282elm_layout_table_pack(Eo *obj, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
2283{ 2283{
2284 return efl_pack_grid(efl_part(obj, part), child, col, row, colspan, rowspan); 2284 return efl_pack_grid(efl_part(obj, part), child, col, row, colspan, rowspan);
2285} 2285}
2286 2286
2287EAPI Evas_Object * 2287EAPI Evas_Object *
2288elm_layout_table_unpack(Elm_Layout *obj, const char *part, Evas_Object *child) 2288elm_layout_table_unpack(Eo *obj, const char *part, Evas_Object *child)
2289{ 2289{
2290 if (!efl_pack_unpack(efl_part(obj, part), child)) 2290 if (!efl_pack_unpack(efl_part(obj, part), child))
2291 return NULL; 2291 return NULL;
@@ -2293,7 +2293,7 @@ elm_layout_table_unpack(Elm_Layout *obj, const char *part, Evas_Object *child)
2293} 2293}
2294 2294
2295EAPI Eina_Bool 2295EAPI Eina_Bool
2296elm_layout_table_clear(Elm_Layout *obj, const char *part, Eina_Bool clear) 2296elm_layout_table_clear(Eo *obj, const char *part, Eina_Bool clear)
2297{ 2297{
2298 if (clear) 2298 if (clear)
2299 return efl_pack_clear(efl_part(obj, part)); 2299 return efl_pack_clear(efl_part(obj, part));
@@ -2302,7 +2302,7 @@ elm_layout_table_clear(Elm_Layout *obj, const char *part, Eina_Bool clear)
2302} 2302}
2303 2303
2304EAPI Eina_Bool 2304EAPI Eina_Bool
2305elm_layout_text_set(Elm_Layout *obj, const char *part, const char *text) 2305elm_layout_text_set(Eo *obj, const char *part, const char *text)
2306{ 2306{
2307 if (!part) 2307 if (!part)
2308 { 2308 {
@@ -2314,7 +2314,7 @@ elm_layout_text_set(Elm_Layout *obj, const char *part, const char *text)
2314} 2314}
2315 2315
2316EAPI const char * 2316EAPI const char *
2317elm_layout_text_get(const Elm_Layout *obj, const char *part) 2317elm_layout_text_get(const Eo *obj, const char *part)
2318{ 2318{
2319 if (!part) 2319 if (!part)
2320 { 2320 {
@@ -2325,43 +2325,43 @@ elm_layout_text_get(const Elm_Layout *obj, const char *part)
2325} 2325}
2326 2326
2327EAPI Eina_Bool 2327EAPI Eina_Bool
2328elm_layout_part_cursor_engine_only_set(Elm_Layout *obj, const char *part, Eina_Bool engine_only) 2328elm_layout_part_cursor_engine_only_set(Eo *obj, const char *part, Eina_Bool engine_only)
2329{ 2329{
2330 return efl_ui_cursor_theme_search_enabled_set(efl_part(obj, part), !engine_only); 2330 return efl_ui_cursor_theme_search_enabled_set(efl_part(obj, part), !engine_only);
2331} 2331}
2332 2332
2333EAPI Eina_Bool 2333EAPI Eina_Bool
2334elm_layout_part_cursor_engine_only_get(const Elm_Layout *obj, const char *part) 2334elm_layout_part_cursor_engine_only_get(const Eo *obj, const char *part)
2335{ 2335{
2336 return !efl_ui_cursor_theme_search_enabled_get(efl_part(obj, part)); 2336 return !efl_ui_cursor_theme_search_enabled_get(efl_part(obj, part));
2337} 2337}
2338 2338
2339EAPI Eina_Bool 2339EAPI Eina_Bool
2340elm_layout_part_cursor_set(Elm_Layout *obj, const char *part, const char *cursor) 2340elm_layout_part_cursor_set(Eo *obj, const char *part, const char *cursor)
2341{ 2341{
2342 return efl_ui_cursor_set(efl_part(obj, part), cursor); 2342 return efl_ui_cursor_set(efl_part(obj, part), cursor);
2343} 2343}
2344 2344
2345EAPI const char * 2345EAPI const char *
2346elm_layout_part_cursor_get(const Elm_Layout *obj, const char *part) 2346elm_layout_part_cursor_get(const Eo *obj, const char *part)
2347{ 2347{
2348 return efl_ui_cursor_get(efl_part(obj, part)); 2348 return efl_ui_cursor_get(efl_part(obj, part));
2349} 2349}
2350 2350
2351EAPI Eina_Bool 2351EAPI Eina_Bool
2352elm_layout_part_cursor_style_set(Elm_Layout *obj, const char *part, const char *style) 2352elm_layout_part_cursor_style_set(Eo *obj, const char *part, const char *style)
2353{ 2353{
2354 return efl_ui_cursor_style_set(efl_part(obj, part), style); 2354 return efl_ui_cursor_style_set(efl_part(obj, part), style);
2355} 2355}
2356 2356
2357EAPI const char * 2357EAPI const char *
2358elm_layout_part_cursor_style_get(const Elm_Layout *obj, const char *part) 2358elm_layout_part_cursor_style_get(const Eo *obj, const char *part)
2359{ 2359{
2360 return efl_ui_cursor_style_get(efl_part(obj, part)); 2360 return efl_ui_cursor_style_get(efl_part(obj, part));
2361} 2361}
2362 2362
2363EAPI Eina_Bool 2363EAPI Eina_Bool
2364elm_layout_part_cursor_unset(Elm_Layout *obj, const char *part) 2364elm_layout_part_cursor_unset(Eo *obj, const char *part)
2365{ 2365{
2366 return efl_ui_cursor_set(efl_part(obj, part), NULL); 2366 return efl_ui_cursor_set(efl_part(obj, part), NULL);
2367} 2367}
@@ -2400,7 +2400,7 @@ _elm_layout_signal_callback_add_legacy(Eo *obj, Eo *edje, Eina_List **p_edje_sig
2400} 2400}
2401 2401
2402EAPI void 2402EAPI void
2403elm_layout_signal_callback_add(Elm_Layout *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data) 2403elm_layout_signal_callback_add(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
2404{ 2404{
2405 Elm_Layout_Smart_Data *sd; 2405 Elm_Layout_Smart_Data *sd;
2406 2406
@@ -2454,7 +2454,7 @@ _elm_layout_signal_callback_del_legacy(Eo *obj EINA_UNUSED, Eo *edje, Eina_List
2454} 2454}
2455 2455
2456EAPI void * 2456EAPI void *
2457elm_layout_signal_callback_del(Elm_Layout *obj, const char *emission, const char *source, Edje_Signal_Cb func) 2457elm_layout_signal_callback_del(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func)
2458{ 2458{
2459 Elm_Layout_Smart_Data *sd; 2459 Elm_Layout_Smart_Data *sd;
2460 2460
@@ -2472,7 +2472,7 @@ elm_layout_signal_callback_del(Elm_Layout *obj, const char *emission, const char
2472} 2472}
2473 2473
2474EAPI void 2474EAPI void
2475elm_layout_signal_emit(Elm_Layout *obj, const char *emission, const char *source) 2475elm_layout_signal_emit(Eo *obj, const char *emission, const char *source)
2476{ 2476{
2477 efl_canvas_layout_signal_emit(obj, emission, source); 2477 efl_canvas_layout_signal_emit(obj, emission, source);
2478} 2478}
@@ -2489,7 +2489,7 @@ elm_layout_data_get(const Evas_Object *obj, const char *key)
2489/* Efl.Part implementation */ 2489/* Efl.Part implementation */
2490 2490
2491static EOLIAN Efl_Object * 2491static EOLIAN Efl_Object *
2492_elm_layout_efl_part_part(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, 2492_efl_ui_layout_efl_part_part(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED,
2493 const char *part) 2493 const char *part)
2494{ 2494{
2495 Edje_Part_Type type; 2495 Edje_Part_Type type;
@@ -2503,15 +2503,15 @@ _elm_layout_efl_part_part(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED,
2503 // has side effects (it calls recalc, which may be really bad). 2503 // has side effects (it calls recalc, which may be really bad).
2504 type = edje_edit_part_type_get(wd->resize_obj, part); 2504 type = edje_edit_part_type_get(wd->resize_obj, part);
2505 if ((type == EDJE_PART_TYPE_BOX) || (type == EDJE_PART_TYPE_TABLE)) 2505 if ((type == EDJE_PART_TYPE_BOX) || (type == EDJE_PART_TYPE_TABLE))
2506 return _elm_layout_pack_proxy_get((Eo *) obj, type, part); 2506 return _efl_ui_layout_pack_proxy_get((Eo *) obj, type, part);
2507 2507
2508 // Generic parts (text, anything, ...) 2508 // Generic parts (text, anything, ...)
2509 proxy = efl_add(ELM_LAYOUT_INTERNAL_PART_CLASS, (Eo *) obj); 2509 proxy = efl_add(EFL_UI_LAYOUT_INTERNAL_PART_CLASS, (Eo *) obj);
2510 pd = efl_data_scope_get(proxy, ELM_LAYOUT_INTERNAL_PART_CLASS); 2510 pd = efl_data_scope_get(proxy, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
2511 if (pd) 2511 if (pd)
2512 { 2512 {
2513 pd->obj = (Eo *) obj; 2513 pd->obj = (Eo *) obj;
2514 pd->sd = efl_data_xref(pd->obj, ELM_LAYOUT_CLASS, proxy); 2514 pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, proxy);
2515 pd->part = strdup(part); 2515 pd->part = strdup(part);
2516 pd->temp = 1; 2516 pd->temp = 1;
2517 } 2517 }
@@ -2520,7 +2520,7 @@ _elm_layout_efl_part_part(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED,
2520} 2520}
2521 2521
2522static const char * 2522static const char *
2523_elm_layout_default_content_part_get(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED) 2523_efl_ui_layout_default_content_part_get(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED)
2524{ 2524{
2525 const char *part = NULL; 2525 const char *part = NULL;
2526 if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_FALSE)) 2526 if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_FALSE))
@@ -2529,7 +2529,7 @@ _elm_layout_default_content_part_get(const Eo *obj, Elm_Layout_Smart_Data *sd EI
2529} 2529}
2530 2530
2531static const char * 2531static const char *
2532_elm_layout_default_text_part_get(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED) 2532_efl_ui_layout_default_text_part_get(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED)
2533{ 2533{
2534 const char *part = NULL; 2534 const char *part = NULL;
2535 if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE)) 2535 if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
@@ -2538,48 +2538,48 @@ _elm_layout_default_text_part_get(const Eo *obj, Elm_Layout_Smart_Data *sd EINA_
2538} 2538}
2539 2539
2540EOLIAN static Eina_Bool 2540EOLIAN static Eina_Bool
2541_elm_layout_internal_part_efl_ui_cursor_cursor_set(Eo *obj, Elm_Part_Data *pd, const char *cursor) 2541_efl_ui_layout_internal_part_efl_ui_cursor_cursor_set(Eo *obj, Elm_Part_Data *pd, const char *cursor)
2542{ 2542{
2543 ELM_PART_RETURN_VAL(_elm_layout_part_cursor_set(pd->sd, pd->part, cursor)); 2543 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_set(pd->sd, pd->part, cursor));
2544} 2544}
2545 2545
2546EOLIAN static const char * 2546EOLIAN static const char *
2547_elm_layout_internal_part_efl_ui_cursor_cursor_get(Eo *obj, Elm_Part_Data *pd) 2547_efl_ui_layout_internal_part_efl_ui_cursor_cursor_get(Eo *obj, Elm_Part_Data *pd)
2548{ 2548{
2549 ELM_PART_RETURN_VAL(_elm_layout_part_cursor_get(pd->sd, pd->part)); 2549 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_get(pd->sd, pd->part));
2550} 2550}
2551 2551
2552EOLIAN static Eina_Bool 2552EOLIAN static Eina_Bool
2553_elm_layout_internal_part_efl_ui_cursor_cursor_style_set(Eo *obj, Elm_Part_Data *pd, const char *style) 2553_efl_ui_layout_internal_part_efl_ui_cursor_cursor_style_set(Eo *obj, Elm_Part_Data *pd, const char *style)
2554{ 2554{
2555 ELM_PART_RETURN_VAL(_elm_layout_part_cursor_style_set(pd->sd, pd->part, style)); 2555 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_style_set(pd->sd, pd->part, style));
2556} 2556}
2557 2557
2558EOLIAN static const char * 2558EOLIAN static const char *
2559_elm_layout_internal_part_efl_ui_cursor_cursor_style_get(Eo *obj, Elm_Part_Data *pd) 2559_efl_ui_layout_internal_part_efl_ui_cursor_cursor_style_get(Eo *obj, Elm_Part_Data *pd)
2560{ 2560{
2561 ELM_PART_RETURN_VAL(_elm_layout_part_cursor_style_get(pd->sd, pd->part)); 2561 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_style_get(pd->sd, pd->part));
2562} 2562}
2563 2563
2564EOLIAN static Eina_Bool 2564EOLIAN static Eina_Bool
2565_elm_layout_internal_part_efl_ui_cursor_cursor_theme_search_enabled_set(Eo *obj, Elm_Part_Data *pd, Eina_Bool allow) 2565_efl_ui_layout_internal_part_efl_ui_cursor_cursor_theme_search_enabled_set(Eo *obj, Elm_Part_Data *pd, Eina_Bool allow)
2566{ 2566{
2567 ELM_PART_RETURN_VAL(_elm_layout_part_cursor_engine_only_set(pd->sd, pd->part, !allow)); 2567 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_engine_only_set(pd->sd, pd->part, !allow));
2568} 2568}
2569 2569
2570EOLIAN static Eina_Bool 2570EOLIAN static Eina_Bool
2571_elm_layout_internal_part_efl_ui_cursor_cursor_theme_search_enabled_get(Eo *obj, Elm_Part_Data *pd) 2571_efl_ui_layout_internal_part_efl_ui_cursor_cursor_theme_search_enabled_get(Eo *obj, Elm_Part_Data *pd)
2572{ 2572{
2573 ELM_PART_RETURN_VAL(!_elm_layout_part_cursor_engine_only_get(pd->sd, pd->part)); 2573 ELM_PART_RETURN_VAL(!_efl_ui_layout_part_cursor_engine_only_get(pd->sd, pd->part));
2574} 2574}
2575 2575
2576ELM_PART_IMPLEMENT_DESTRUCTOR(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data) 2576ELM_PART_IMPLEMENT_DESTRUCTOR(efl_ui_layout, EFL_UI_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
2577ELM_PART_IMPLEMENT_CONTENT_SET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data) 2577ELM_PART_IMPLEMENT_CONTENT_SET(efl_ui_layout, EFL_UI_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
2578ELM_PART_IMPLEMENT_CONTENT_GET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data) 2578ELM_PART_IMPLEMENT_CONTENT_GET(efl_ui_layout, EFL_UI_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
2579ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data) 2579ELM_PART_IMPLEMENT_CONTENT_UNSET(efl_ui_layout, EFL_UI_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
2580ELM_PART_IMPLEMENT_TEXT_SET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data) 2580ELM_PART_IMPLEMENT_TEXT_SET(efl_ui_layout, EFL_UI_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
2581ELM_PART_IMPLEMENT_TEXT_GET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data) 2581ELM_PART_IMPLEMENT_TEXT_GET(efl_ui_layout, EFL_UI_LAYOUT, Elm_Layout_Smart_Data, Elm_Part_Data)
2582#include "elm_layout_internal_part.eo.c" 2582#include "efl_ui_layout_internal_part.eo.c"
2583 2583
2584/* Efl.Part end */ 2584/* Efl.Part end */
2585 2585
@@ -2590,16 +2590,16 @@ EAPI EFL_VOID_FUNC_BODY(elm_layout_sizing_eval)
2590EFL_FUNC_BODY_CONST(elm_layout_text_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL) 2590EFL_FUNC_BODY_CONST(elm_layout_text_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL)
2591EFL_FUNC_BODY_CONST(elm_layout_content_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL) 2591EFL_FUNC_BODY_CONST(elm_layout_content_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL)
2592 2592
2593ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() 2593ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
2594ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() 2594ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
2595 2595
2596#define ELM_LAYOUT_EXTRA_OPS \ 2596#define EFL_UI_LAYOUT_EXTRA_OPS \
2597 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_layout), \ 2597 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_layout), \
2598 ELM_PART_CONTENT_DEFAULT_OPS(elm_layout), \ 2598 ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_layout), \
2599 ELM_PART_TEXT_DEFAULT_OPS(elm_layout), \ 2599 ELM_PART_TEXT_DEFAULT_OPS(efl_ui_layout), \
2600 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \ 2600 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
2601 ELM_LAYOUT_TEXT_ALIASES_OPS(), \ 2601 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
2602 EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _elm_layout_sizing_eval), \ 2602 EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _elm_layout_sizing_eval), \
2603 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_layout_efl_object_dbg_info_get) 2603 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_layout_efl_object_dbg_info_get)
2604 2604
2605#include "elm_layout.eo.c" 2605#include "efl_ui_layout.eo.c"
diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/efl_ui_layout.eo
index 8cbc798..3bed847 100644
--- a/src/lib/elementary/elm_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,14 +1,12 @@
1import edje_types; 1import edje_types;
2 2
3class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File, 3class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
4 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect, 4 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect,
5 Efl.Canvas.Layout_Calc, Efl.Canvas.Layout_Signal, 5 Efl.Canvas.Layout_Calc, Efl.Canvas.Layout_Signal,
6 Efl.Canvas.Layout_Group) 6 Efl.Canvas.Layout_Group)
7{ 7{
8 [[Elementary layout class]] 8 [[Elementary layout class]]
9 legacy_prefix: elm_layout; 9 legacy_prefix: elm_layout;
10 eo_prefix: elm_obj_layout;
11 event_prefix: elm_layout;
12 data: Elm_Layout_Smart_Data; 10 data: Elm_Layout_Smart_Data;
13 methods { 11 methods {
14 @property theme { 12 @property theme {
diff --git a/src/lib/elementary/elm_layout_internal_part.eo b/src/lib/elementary/efl_ui_layout_internal_part.eo
index 11334cf..1d7ab39 100644
--- a/src/lib/elementary/elm_layout_internal_part.eo
+++ b/src/lib/elementary/efl_ui_layout_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Layout.Internal.Part (Efl.Object, Efl.Container, Efl.Text, 1class Efl.Ui.Layout.Internal.Part (Efl.Object, Efl.Container, Efl.Text,
2 Efl.Ui.Cursor) 2 Efl.Ui.Cursor)
3{ 3{
4 [[Elementary layout internal part class]] 4 [[Elementary layout internal part class]]
diff --git a/src/lib/elementary/elm_layout_pack.c b/src/lib/elementary/efl_ui_layout_pack.c
index ecbbefe..a6cbd55 100644
--- a/src/lib/elementary/elm_layout_pack.c
+++ b/src/lib/elementary/efl_ui_layout_pack.c
@@ -18,15 +18,15 @@
18#include "../evas/canvas/evas_table.eo.h" 18#include "../evas/canvas/evas_table.eo.h"
19 19
20/* layout internals for box & table */ 20/* layout internals for box & table */
21Eina_Bool _elm_layout_box_append(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child); 21Eina_Bool _efl_ui_layout_box_append(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child);
22Eina_Bool _elm_layout_box_prepend(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child); 22Eina_Bool _efl_ui_layout_box_prepend(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child);
23Eina_Bool _elm_layout_box_insert_before(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference); 23Eina_Bool _efl_ui_layout_box_insert_before(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference);
24Eina_Bool _elm_layout_box_insert_at(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned int pos); 24Eina_Bool _efl_ui_layout_box_insert_at(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned int pos);
25Evas_Object *_elm_layout_box_remove(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child); 25Evas_Object *_efl_ui_layout_box_remove(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child);
26Eina_Bool _elm_layout_box_remove_all(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear); 26Eina_Bool _efl_ui_layout_box_remove_all(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear);
27Eina_Bool _elm_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan); 27Eina_Bool _efl_ui_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
28Evas_Object *_elm_layout_table_unpack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child); 28Evas_Object *_efl_ui_layout_table_unpack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Evas_Object *child);
29Eina_Bool _elm_layout_table_clear(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear); 29Eina_Bool _efl_ui_layout_table_clear(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eina_Bool clear);
30 30
31#define BOX_CLASS EFL_UI_LAYOUT_INTERNAL_BOX_CLASS 31#define BOX_CLASS EFL_UI_LAYOUT_INTERNAL_BOX_CLASS
32#define TABLE_CLASS EFL_UI_LAYOUT_INTERNAL_TABLE_CLASS 32#define TABLE_CLASS EFL_UI_LAYOUT_INTERNAL_TABLE_CLASS
@@ -37,7 +37,7 @@ typedef struct _Part_Item_Iterator Part_Item_Iterator;
37 37
38struct _Layout_Part_Data 38struct _Layout_Part_Data
39{ 39{
40 Elm_Layout *obj; // no ref 40 Efl_Ui_Layout *obj; // no ref
41 Elm_Layout_Smart_Data *sd; // data xref 41 Elm_Layout_Smart_Data *sd; // data xref
42 Eina_Stringshare *part; 42 Eina_Stringshare *part;
43 unsigned char temp; 43 unsigned char temp;
@@ -52,7 +52,7 @@ struct _Part_Item_Iterator
52}; 52};
53 53
54Eo * 54Eo *
55_elm_layout_pack_proxy_get(Elm_Layout *obj, Edje_Part_Type type, const char *part) 55_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const char *part)
56{ 56{
57 if (type == EDJE_PART_TYPE_BOX) 57 if (type == EDJE_PART_TYPE_BOX)
58 return efl_add(BOX_CLASS, obj, 58 return efl_add(BOX_CLASS, obj,
@@ -77,7 +77,7 @@ EOLIAN static void
77_efl_ui_layout_internal_box_real_part_set(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Eo *layout, const char *part) 77_efl_ui_layout_internal_box_real_part_set(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Eo *layout, const char *part)
78{ 78{
79 pd->obj = layout; 79 pd->obj = layout;
80 pd->sd = efl_data_xref(pd->obj, ELM_LAYOUT_CLASS, obj); 80 pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, obj);
81 eina_stringshare_replace(&pd->part, part); 81 eina_stringshare_replace(&pd->part, part);
82 pd->temp = 1; 82 pd->temp = 1;
83} 83}
@@ -151,19 +151,19 @@ _efl_ui_layout_internal_box_efl_container_content_count(Eo *obj EINA_UNUSED, Efl
151EOLIAN static Eina_Bool 151EOLIAN static Eina_Bool
152_efl_ui_layout_internal_box_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) 152_efl_ui_layout_internal_box_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd)
153{ 153{
154 ELM_PART_RETURN_VAL(_elm_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_TRUE)); 154 ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_TRUE));
155} 155}
156 156
157EOLIAN static Eina_Bool 157EOLIAN static Eina_Bool
158_efl_ui_layout_internal_box_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) 158_efl_ui_layout_internal_box_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd)
159{ 159{
160 ELM_PART_RETURN_VAL(_elm_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_FALSE)); 160 ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_FALSE));
161} 161}
162 162
163EOLIAN static Eina_Bool 163EOLIAN static Eina_Bool
164_efl_ui_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) 164_efl_ui_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
165{ 165{
166 ELM_PART_RETURN_VAL(_elm_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL); 166 ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL);
167} 167}
168 168
169EOLIAN static Eina_Bool 169EOLIAN static Eina_Bool
@@ -176,25 +176,25 @@ _efl_ui_layout_internal_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_
176EOLIAN static Eina_Bool 176EOLIAN static Eina_Bool
177_efl_ui_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) 177_efl_ui_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
178{ 178{
179 ELM_PART_RETURN_VAL(_elm_layout_box_append(pd->obj, pd->sd, pd->part, subobj)); 179 ELM_PART_RETURN_VAL(_efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj));
180} 180}
181 181
182EOLIAN static Eina_Bool 182EOLIAN static Eina_Bool
183_efl_ui_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) 183_efl_ui_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
184{ 184{
185 ELM_PART_RETURN_VAL(_elm_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj)); 185 ELM_PART_RETURN_VAL(_efl_ui_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj));
186} 186}
187 187
188EOLIAN static Eina_Bool 188EOLIAN static Eina_Bool
189_efl_ui_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) 189_efl_ui_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
190{ 190{
191 ELM_PART_RETURN_VAL(_elm_layout_box_append(pd->obj, pd->sd, pd->part, subobj)); 191 ELM_PART_RETURN_VAL(_efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj));
192} 192}
193 193
194EOLIAN static Eina_Bool 194EOLIAN static Eina_Bool
195_efl_ui_layout_internal_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing) 195_efl_ui_layout_internal_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing)
196{ 196{
197 ELM_PART_RETURN_VAL(_elm_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing)); 197 ELM_PART_RETURN_VAL(_efl_ui_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing));
198} 198}
199 199
200EOLIAN static Eina_Bool 200EOLIAN static Eina_Bool
@@ -208,7 +208,7 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_
208 208
209 other = efl_pack_content_get(pack, index + 1); 209 other = efl_pack_content_get(pack, index + 1);
210 if (other) 210 if (other)
211 ELM_PART_RETURN_VAL(_elm_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, other)); 211 ELM_PART_RETURN_VAL(_efl_ui_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, other));
212 212
213 ELM_PART_CALL(efl_pack_end(obj, subobj)); 213 ELM_PART_CALL(efl_pack_end(obj, subobj));
214 ELM_PART_RETURN_VAL(EINA_TRUE); 214 ELM_PART_RETURN_VAL(EINA_TRUE);
@@ -217,7 +217,7 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_
217EOLIAN static Eina_Bool 217EOLIAN static Eina_Bool
218_efl_ui_layout_internal_box_efl_pack_linear_pack_at(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, int index) 218_efl_ui_layout_internal_box_efl_pack_linear_pack_at(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, int index)
219{ 219{
220 ELM_PART_RETURN_VAL(_elm_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index)); 220 ELM_PART_RETURN_VAL(_efl_ui_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index));
221} 221}
222 222
223EOLIAN static Efl_Gfx * 223EOLIAN static Efl_Gfx *
@@ -270,7 +270,7 @@ EOLIAN static void
270_efl_ui_layout_internal_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Eo *layout, const char *part) 270_efl_ui_layout_internal_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Eo *layout, const char *part)
271{ 271{
272 pd->obj = layout; 272 pd->obj = layout;
273 pd->sd = efl_data_xref(pd->obj, ELM_LAYOUT_CLASS, obj); 273 pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, obj);
274 eina_stringshare_replace(&pd->part, part); 274 eina_stringshare_replace(&pd->part, part);
275 pd->temp = 1; 275 pd->temp = 1;
276} 276}
@@ -305,20 +305,20 @@ _efl_ui_layout_internal_table_efl_container_content_count(Eo *obj EINA_UNUSED, E
305EOLIAN static Eina_Bool 305EOLIAN static Eina_Bool
306_efl_ui_layout_internal_table_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) 306_efl_ui_layout_internal_table_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd)
307{ 307{
308 ELM_PART_RETURN_VAL(_elm_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_TRUE)); 308 ELM_PART_RETURN_VAL(_efl_ui_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_TRUE));
309} 309}
310 310
311EOLIAN static Eina_Bool 311EOLIAN static Eina_Bool
312_efl_ui_layout_internal_table_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) 312_efl_ui_layout_internal_table_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd)
313{ 313{
314 ELM_PART_RETURN_VAL(_elm_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_FALSE)); 314 ELM_PART_RETURN_VAL(_efl_ui_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_FALSE));
315} 315}
316 316
317EOLIAN static Eina_Bool 317EOLIAN static Eina_Bool
318_efl_ui_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj) 318_efl_ui_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj)
319{ 319{
320 if (!subobj) ELM_PART_RETURN_VAL(EINA_FALSE); 320 if (!subobj) ELM_PART_RETURN_VAL(EINA_FALSE);
321 ELM_PART_RETURN_VAL(_elm_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj); 321 ELM_PART_RETURN_VAL(_efl_ui_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj);
322} 322}
323 323
324EOLIAN static Eina_Bool 324EOLIAN static Eina_Bool
@@ -331,7 +331,7 @@ _efl_ui_layout_internal_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layou
331EOLIAN static Eina_Bool 331EOLIAN static Eina_Bool
332_efl_ui_layout_internal_table_efl_pack_grid_pack_grid(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan) 332_efl_ui_layout_internal_table_efl_pack_grid_pack_grid(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan)
333{ 333{
334 ELM_PART_RETURN_VAL(_elm_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan)); 334 ELM_PART_RETURN_VAL(_efl_ui_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan));
335} 335}
336 336
337EOLIAN static Efl_Gfx * 337EOLIAN static Efl_Gfx *
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 3b9a97a..9251e1b 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -555,11 +555,11 @@ _efl_ui_panes_class_constructor(Efl_Class *klass)
555 555
556/* Internal EO APIs and hidden overrides */ 556/* Internal EO APIs and hidden overrides */
557 557
558ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(); 558ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX);
559 559
560#define EFL_UI_PANES_EXTRA_OPS \ 560#define EFL_UI_PANES_EXTRA_OPS \
561 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_panes), \ 561 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_panes), \
562 ELM_LAYOUT_CONTENT_ALIASES_OPS() 562 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX)
563 563
564 564
565#include "efl_ui_panes.eo.c" 565#include "efl_ui_panes.eo.c"
diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo
index f9baf93..fa92db0 100644
--- a/src/lib/elementary/efl_ui_panes.eo
+++ b/src/lib/elementary/efl_ui_panes.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Panes (Elm.Layout, Efl.Orientation, 1class Efl.Ui.Panes (Efl.Ui.Layout, Efl.Orientation,
2 Efl.Ui.Clickable) 2 Efl.Ui.Clickable)
3{ 3{
4 [[Elementary panes class]] 4 [[Elementary panes class]]
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 56a332f..0b42a08 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -646,12 +646,12 @@ _efl_ui_progressbar_class_constructor(Efl_Class *klass)
646} 646}
647 647
648/* Efl.Part begin */ 648/* Efl.Part begin */
649ELM_PART_OVERRIDE(efl_ui_progressbar, EFL_UI_PROGRESSBAR, ELM_LAYOUT, Efl_Ui_Progressbar_Data, Elm_Part_Data) 649ELM_PART_OVERRIDE(efl_ui_progressbar, EFL_UI_PROGRESSBAR, EFL_UI_LAYOUT, Efl_Ui_Progressbar_Data, Elm_Part_Data)
650 650
651static EOLIAN Eina_Bool 651static EOLIAN Eina_Bool
652_efl_ui_progressbar_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content) 652_efl_ui_progressbar_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content)
653{ 653{
654 Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS); 654 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
655 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); 655 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS);
656 ELM_PART_RETURN_VAL(_efl_ui_progressbar_content_set(pd->obj, sd, pd->part, content)); 656 ELM_PART_RETURN_VAL(_efl_ui_progressbar_content_set(pd->obj, sd, pd->part, content));
657} 657}
@@ -659,7 +659,7 @@ _efl_ui_progressbar_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Da
659EOLIAN static void 659EOLIAN static void
660_efl_ui_progressbar_internal_part_efl_ui_range_range_value_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double val) 660_efl_ui_progressbar_internal_part_efl_ui_range_range_value_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double val)
661{ 661{
662 Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS); 662 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
663 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); 663 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS);
664 664
665 _progressbar_part_value_set(pd->obj, sd, pd->part, val); 665 _progressbar_part_value_set(pd->obj, sd, pd->part, val);
@@ -668,7 +668,7 @@ _efl_ui_progressbar_internal_part_efl_ui_range_range_value_set(Eo *obj, Elm_Part
668EOLIAN static double 668EOLIAN static double
669_efl_ui_progressbar_internal_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED) 669_efl_ui_progressbar_internal_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED)
670{ 670{
671 Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS); 671 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
672 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); 672 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS);
673 673
674 return _progressbar_part_value_get(sd, pd->part); 674 return _progressbar_part_value_get(sd, pd->part);
@@ -680,12 +680,12 @@ _efl_ui_progressbar_internal_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part
680 680
681/* Internal EO APIs and hidden overrides */ 681/* Internal EO APIs and hidden overrides */
682 682
683ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() 683ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
684ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() 684ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
685 685
686#define EFL_UI_PROGRESSBAR_EXTRA_OPS \ 686#define EFL_UI_PROGRESSBAR_EXTRA_OPS \
687 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \ 687 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
688 ELM_LAYOUT_TEXT_ALIASES_OPS(), \ 688 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
689 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_progressbar), \ 689 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_progressbar), \
690 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar) 690 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar)
691 691
diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo
index 4b3c019..624449a 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Progressbar (Elm.Layout, Efl.Ui.Range, 1class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range,
2 Efl.Orientation) 2 Efl.Orientation)
3{ 3{
4 [[Elementary progressbar class]] 4 [[Elementary progressbar class]]
diff --git a/src/lib/elementary/efl_ui_progressbar_internal_part.eo b/src/lib/elementary/efl_ui_progressbar_internal_part.eo
index 98ff926..18dbc7f 100644
--- a/src/lib/elementary/efl_ui_progressbar_internal_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_internal_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Progressbar.Internal.Part (Elm.Layout.Internal.Part, Efl.Ui.Range) 1class Efl.Ui.Progressbar.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Ui.Range)
2{ 2{
3 [[Elementary progressbar internal part class]] 3 [[Elementary progressbar internal part class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index 166bd4c..464059d 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -401,10 +401,10 @@ _efl_ui_radio_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Radio
401 401
402/* Internal EO APIs and hidden overrides */ 402/* Internal EO APIs and hidden overrides */
403 403
404ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() 404ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
405 405
406#define EFL_UI_RADIO_EXTRA_OPS \ 406#define EFL_UI_RADIO_EXTRA_OPS \
407 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_radio), \ 407 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_radio), \
408 ELM_LAYOUT_TEXT_ALIASES_OPS() 408 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
409 409
410#include "efl_ui_radio.eo.c" 410#include "efl_ui_radio.eo.c"
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index b8445e1..7a12e78 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -1564,7 +1564,7 @@ _efl_ui_slider_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UN
1564// A11Y Accessibility - END 1564// A11Y Accessibility - END
1565 1565
1566/* Efl.Part begin */ 1566/* Efl.Part begin */
1567ELM_PART_OVERRIDE(efl_ui_slider, EFL_UI_SLIDER, ELM_LAYOUT, Efl_Ui_Slider_Data, Elm_Part_Data) 1567ELM_PART_OVERRIDE(efl_ui_slider, EFL_UI_SLIDER, EFL_UI_LAYOUT, Efl_Ui_Slider_Data, Elm_Part_Data)
1568 1568
1569static Eina_Bool 1569static Eina_Bool
1570_efl_ui_slider_content_set(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content) 1570_efl_ui_slider_content_set(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
@@ -1580,7 +1580,7 @@ _efl_ui_slider_content_set(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUSED, const c
1580static EOLIAN Eina_Bool 1580static EOLIAN Eina_Bool
1581_efl_ui_slider_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content) 1581_efl_ui_slider_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content)
1582{ 1582{
1583 Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS); 1583 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
1584 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); 1584 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
1585 ELM_PART_RETURN_VAL(_efl_ui_slider_content_set(pd->obj, sd, pd->part, content)); 1585 ELM_PART_RETURN_VAL(_efl_ui_slider_content_set(pd->obj, sd, pd->part, content));
1586} 1586}
@@ -1621,7 +1621,7 @@ _span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, int w, int h)
1621EOLIAN void 1621EOLIAN void
1622_efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int w, int h) 1622_efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int w, int h)
1623{ 1623{
1624 Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS); 1624 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
1625 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); 1625 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
1626 1626
1627 _span_size_set(pd->obj, sd, w, h); 1627 _span_size_set(pd->obj, sd, w, h);
@@ -1630,7 +1630,7 @@ _efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_set(Eo *obj, Elm_Part_Da
1630EOLIAN void 1630EOLIAN void
1631_efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int *w, int *h) 1631_efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int *w, int *h)
1632{ 1632{
1633 Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS); 1633 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS);
1634 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); 1634 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
1635 1635
1636 if (_is_horizontal(sd->orientation)) 1636 if (_is_horizontal(sd->orientation))
@@ -1782,12 +1782,12 @@ elm_slider_min_max_get(const Evas_Object *obj, double *min, double *max)
1782 1782
1783/* Internal EO APIs and hidden overrides */ 1783/* Internal EO APIs and hidden overrides */
1784 1784
1785ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() 1785ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
1786ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() 1786ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
1787 1787
1788#define EFL_UI_SLIDER_EXTRA_OPS \ 1788#define EFL_UI_SLIDER_EXTRA_OPS \
1789 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \ 1789 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
1790 ELM_LAYOUT_TEXT_ALIASES_OPS(), \ 1790 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
1791 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_slider), \ 1791 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_slider), \
1792 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_slider) 1792 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_slider)
1793 1793
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 83c86c3..e5634f6 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -1,7 +1,7 @@
1type slider_func_type: __undefined_type; [[Elementary slider function type]] 1type slider_func_type: __undefined_type; [[Elementary slider function type]]
2type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]] 2type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]]
3 3
4class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Range, 4class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range,
5 Efl.Orientation, 5 Efl.Orientation,
6 Elm.Interface.Atspi.Value, 6 Elm.Interface.Atspi.Value,
7 Elm.Interface.Atspi_Widget_Action) 7 Elm.Interface.Atspi_Widget_Action)
diff --git a/src/lib/elementary/efl_ui_slider_internal_part.eo b/src/lib/elementary/efl_ui_slider_internal_part.eo
index 9b1a403..8ea97e4 100644
--- a/src/lib/elementary/efl_ui_slider_internal_part.eo
+++ b/src/lib/elementary/efl_ui_slider_internal_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Slider.Internal.Part (Elm.Layout.Internal.Part, Efl.Gfx.Size.Hint) 1class Efl.Ui.Slider.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Gfx.Size.Hint)
2{ 2{
3 [[Elementary slider internal part class]] 3 [[Elementary slider internal part class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 05a97b7..ff066ed 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -1029,7 +1029,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
1029 evas_event_thaw(evas_object_evas_get(obj)); 1029 evas_event_thaw(evas_object_evas_get(obj));
1030 evas_event_thaw_eval(evas_object_evas_get(obj)); 1030 evas_event_thaw_eval(evas_object_evas_get(obj));
1031 1031
1032 efl_event_callback_legacy_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL); 1032 efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
1033 1033
1034 evas_object_unref(obj); 1034 evas_object_unref(obj);
1035 1035
@@ -5327,9 +5327,9 @@ _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED,
5327#if 0 5327#if 0
5328/* Efl.Part begin */ 5328/* Efl.Part begin */
5329 5329
5330ELM_PART_OVERRIDE(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data) 5330ELM_PART_OVERRIDE(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data)
5331ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data) 5331ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data)
5332ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data) 5332ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data)
5333#include "elm_entry_internal_part.eo.c" 5333#include "elm_entry_internal_part.eo.c"
5334 5334
5335/* Efl.Part end */ 5335/* Efl.Part end */
@@ -5337,12 +5337,12 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_
5337 5337
5338/* Internal EO APIs and hidden overrides */ 5338/* Internal EO APIs and hidden overrides */
5339 5339
5340ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() 5340ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
5341 5341
5342#define EFL_UI_TEXT_EXTRA_OPS \ 5342#define EFL_UI_TEXT_EXTRA_OPS \
5343 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_text), \ 5343 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_text), \
5344 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_text), \ 5344 ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_text), \
5345 ELM_LAYOUT_CONTENT_ALIASES_OPS() 5345 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX)
5346 5346
5347#include "efl_ui_text.eo.c" 5347#include "efl_ui_text.eo.c"
5348 5348
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 086af59..fded573 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -50,7 +50,7 @@ struct Efl.Ui.Text.Anchor_Hover_Info
50 ]] 50 ]]
51} 51}
52 52
53class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, 53class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
54 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File, 54 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File,
55 Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Ui.Text.Interactive) 55 Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Ui.Text.Interactive)
56{ 56{
diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo
index 4102da4..138a5c7 100644
--- a/src/lib/elementary/efl_ui_video.eo
+++ b/src/lib/elementary/efl_ui_video.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Video (Elm.Layout, Efl.File, 1class Efl.Ui.Video (Efl.Ui.Layout, Efl.File,
2 Efl.Player, Elm.Interface.Atspi_Widget_Action) 2 Efl.Player, Elm.Interface.Atspi_Widget_Action)
3{ 3{
4 [[Efl UI video class]] 4 [[Efl UI video class]]
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 4d10170..8eb858a 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -1573,10 +1573,10 @@ _elm_ctxpopup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Ctxpopup
1573 1573
1574/* Efl.Part begin */ 1574/* Efl.Part begin */
1575 1575
1576ELM_PART_OVERRIDE(elm_ctxpopup, ELM_CTXPOPUP, ELM_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data) 1576ELM_PART_OVERRIDE(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
1577ELM_PART_OVERRIDE_CONTENT_SET(elm_ctxpopup, ELM_CTXPOPUP, ELM_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data) 1577ELM_PART_OVERRIDE_CONTENT_SET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
1578ELM_PART_OVERRIDE_CONTENT_GET(elm_ctxpopup, ELM_CTXPOPUP, ELM_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data) 1578ELM_PART_OVERRIDE_CONTENT_GET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
1579ELM_PART_OVERRIDE_CONTENT_UNSET(elm_ctxpopup, ELM_CTXPOPUP, ELM_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data) 1579ELM_PART_OVERRIDE_CONTENT_UNSET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
1580ELM_PART_CONTENT_DEFAULT_SET(elm_ctxpopup, "default") 1580ELM_PART_CONTENT_DEFAULT_SET(elm_ctxpopup, "default")
1581#include "elm_ctxpopup_internal_part.eo.c" 1581#include "elm_ctxpopup_internal_part.eo.c"
1582 1582
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index a599b4b..25293ad 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -3234,8 +3234,8 @@ _elm_fileselector_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA
3234 3234
3235/* Efl.Part begin */ 3235/* Efl.Part begin */
3236 3236
3237ELM_PART_OVERRIDE(elm_fileselector, ELM_FILESELECTOR, ELM_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data) 3237ELM_PART_OVERRIDE(elm_fileselector, ELM_FILESELECTOR, EFL_UI_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data)
3238ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector, ELM_FILESELECTOR, ELM_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data) 3238ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector, ELM_FILESELECTOR, EFL_UI_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data)
3239#include "elm_fileselector_internal_part.eo.c" 3239#include "elm_fileselector_internal_part.eo.c"
3240 3240
3241/* Efl.Part end */ 3241/* Efl.Part end */
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index e25feba..12b024e 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -675,12 +675,12 @@ _elm_fileselector_entry_class_constructor(Efl_Class *klass)
675 675
676/* Efl.Part begin */ 676/* Efl.Part begin */
677 677
678ELM_PART_OVERRIDE(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) 678ELM_PART_OVERRIDE(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
679ELM_PART_OVERRIDE_CONTENT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) 679ELM_PART_OVERRIDE_CONTENT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
680ELM_PART_OVERRIDE_CONTENT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) 680ELM_PART_OVERRIDE_CONTENT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
681ELM_PART_OVERRIDE_CONTENT_UNSET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) 681ELM_PART_OVERRIDE_CONTENT_UNSET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
682ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) 682ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
683ELM_PART_OVERRIDE_TEXT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) 683ELM_PART_OVERRIDE_TEXT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
684ELM_PART_CONTENT_DEFAULT_SET(elm_fileselector_entry, "button icon") 684ELM_PART_CONTENT_DEFAULT_SET(elm_fileselector_entry, "button icon")
685#include "elm_fileselector_entry_internal_part.eo.c" 685#include "elm_fileselector_entry_internal_part.eo.c"
686 686
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 22b5937..0547901 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -2134,9 +2134,9 @@ _elm_multibuttonentry_item_elm_interface_atspi_widget_action_elm_actions_get(Eo
2134 2134
2135/* Efl.Part begin */ 2135/* Efl.Part begin */
2136 2136
2137ELM_PART_OVERRIDE(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, ELM_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data) 2137ELM_PART_OVERRIDE(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data)
2138ELM_PART_OVERRIDE_TEXT_SET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, ELM_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data) 2138ELM_PART_OVERRIDE_TEXT_SET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data)
2139ELM_PART_OVERRIDE_TEXT_GET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, ELM_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data) 2139ELM_PART_OVERRIDE_TEXT_GET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data)
2140#include "elm_multibuttonentry_internal_part.eo.c" 2140#include "elm_multibuttonentry_internal_part.eo.c"
2141 2141
2142/* Efl.Part end */ 2142/* Efl.Part end */
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 89042e0..3cc642a 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -2069,12 +2069,12 @@ _elm_naviframe_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UN
2069 2069
2070/* Efl.Part begin */ 2070/* Efl.Part begin */
2071 2071
2072ELM_PART_OVERRIDE(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data) 2072ELM_PART_OVERRIDE(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
2073ELM_PART_OVERRIDE_CONTENT_SET(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data) 2073ELM_PART_OVERRIDE_CONTENT_SET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
2074ELM_PART_OVERRIDE_CONTENT_GET(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data) 2074ELM_PART_OVERRIDE_CONTENT_GET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
2075ELM_PART_OVERRIDE_CONTENT_UNSET(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data) 2075ELM_PART_OVERRIDE_CONTENT_UNSET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
2076ELM_PART_OVERRIDE_TEXT_SET(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data) 2076ELM_PART_OVERRIDE_TEXT_SET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
2077ELM_PART_OVERRIDE_TEXT_GET(elm_naviframe, ELM_NAVIFRAME, ELM_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data) 2077ELM_PART_OVERRIDE_TEXT_GET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
2078#include "elm_naviframe_internal_part.eo.c" 2078#include "elm_naviframe_internal_part.eo.c"
2079 2079
2080/* Efl.Part end */ 2080/* Efl.Part end */
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 63f57f0..1e96b58 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -707,8 +707,8 @@ _elm_player_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
707 707
708/* Efl.Part implementation */ 708/* Efl.Part implementation */
709 709
710ELM_PART_OVERRIDE(elm_player, ELM_PLAYER, ELM_LAYOUT, Elm_Player_Data, Elm_Part_Data) 710ELM_PART_OVERRIDE(elm_player, ELM_PLAYER, EFL_UI_LAYOUT, Elm_Player_Data, Elm_Part_Data)
711ELM_PART_OVERRIDE_CONTENT_SET(elm_player, ELM_PLAYER, ELM_LAYOUT, Elm_Player_Data, Elm_Part_Data) 711ELM_PART_OVERRIDE_CONTENT_SET(elm_player, ELM_PLAYER, EFL_UI_LAYOUT, Elm_Player_Data, Elm_Part_Data)
712ELM_PART_CONTENT_DEFAULT_SET(elm_player, "video") 712ELM_PART_CONTENT_DEFAULT_SET(elm_player, "video")
713#include "elm_player_internal_part.eo.c" 713#include "elm_player_internal_part.eo.c"
714 714
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 7f10f45..b404567 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1929,12 +1929,12 @@ _elm_popup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Popup_Data
1929 1929
1930/* Efl.Part begin */ 1930/* Efl.Part begin */
1931 1931
1932ELM_PART_OVERRIDE(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data, Elm_Part_Data) 1932ELM_PART_OVERRIDE(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
1933ELM_PART_OVERRIDE_CONTENT_SET(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data, Elm_Part_Data) 1933ELM_PART_OVERRIDE_CONTENT_SET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
1934ELM_PART_OVERRIDE_CONTENT_GET(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data, Elm_Part_Data) 1934ELM_PART_OVERRIDE_CONTENT_GET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
1935ELM_PART_OVERRIDE_CONTENT_UNSET(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data, Elm_Part_Data) 1935ELM_PART_OVERRIDE_CONTENT_UNSET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
1936ELM_PART_OVERRIDE_TEXT_SET(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data, Elm_Part_Data) 1936ELM_PART_OVERRIDE_TEXT_SET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
1937ELM_PART_OVERRIDE_TEXT_GET(elm_popup, ELM_POPUP, ELM_LAYOUT, Elm_Popup_Data, Elm_Part_Data) 1937ELM_PART_OVERRIDE_TEXT_GET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
1938ELM_PART_CONTENT_DEFAULT_SET(elm_popup, "default") 1938ELM_PART_CONTENT_DEFAULT_SET(elm_popup, "default")
1939#include "elm_popup_internal_part.eo.c" 1939#include "elm_popup_internal_part.eo.c"
1940 1940
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index a7cc0f3..213f338 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -659,19 +659,19 @@ _elm_actionslider_class_constructor(Efl_Class *klass)
659} 659}
660 660
661/* Efl.Part begin */ 661/* Efl.Part begin */
662ELM_PART_OVERRIDE(elm_actionslider, ELM_ACTIONSLIDER, ELM_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data) 662ELM_PART_OVERRIDE(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data)
663ELM_PART_OVERRIDE_TEXT_SET(elm_actionslider, ELM_ACTIONSLIDER, ELM_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data) 663ELM_PART_OVERRIDE_TEXT_SET(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data)
664ELM_PART_OVERRIDE_TEXT_GET(elm_actionslider, ELM_ACTIONSLIDER, ELM_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data) 664ELM_PART_OVERRIDE_TEXT_GET(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data)
665 665
666#include "elm_actionslider_internal_part.eo.c" 666#include "elm_actionslider_internal_part.eo.c"
667/* Efl.Part end */ 667/* Efl.Part end */
668 668
669/* Internal EO APIs and hidden overrides */ 669/* Internal EO APIs and hidden overrides */
670 670
671ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() 671ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
672 672
673#define ELM_ACTIONSLIDER_EXTRA_OPS \ 673#define ELM_ACTIONSLIDER_EXTRA_OPS \
674 ELM_LAYOUT_TEXT_ALIASES_OPS(), \ 674 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
675 ELM_LAYOUT_SIZING_EVAL_OPS(elm_actionslider), \ 675 ELM_LAYOUT_SIZING_EVAL_OPS(elm_actionslider), \
676 EFL_CANVAS_GROUP_ADD_OPS(elm_actionslider) 676 EFL_CANVAS_GROUP_ADD_OPS(elm_actionslider)
677 677
diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo
index d91d576..1843d5a 100644
--- a/src/lib/elementary/elm_actionslider.eo
+++ b/src/lib/elementary/elm_actionslider.eo
@@ -10,7 +10,7 @@ enum Elm.Actionslider.Pos
10 all = (1 << 3) - 1 [[All positions for left/center/right.]] 10 all = (1 << 3) - 1 [[All positions for left/center/right.]]
11} 11}
12 12
13class Elm.Actionslider (Elm.Layout, Efl.Ui.Selectable) 13class Elm.Actionslider (Efl.Ui.Layout, Efl.Ui.Selectable)
14{ 14{
15 [[An actionslider is a switcher for 2 or 3 labels 15 [[An actionslider is a switcher for 2 or 3 labels
16 16
diff --git a/src/lib/elementary/elm_actionslider_internal_part.eo b/src/lib/elementary/elm_actionslider_internal_part.eo
index cd5b42f..09bb0c6 100644
--- a/src/lib/elementary/elm_actionslider_internal_part.eo
+++ b/src/lib/elementary/elm_actionslider_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm_Actionslider.Internal.Part (Elm.Layout.Internal.Part, Efl.Text) 1class Elm_Actionslider.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
2{ 2{
3 [[Elementary Actionslider internal part class]] 3 [[Elementary Actionslider internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_bg.c b/src/lib/elementary/elm_bg.c
index 073dc1e..e0e2c48 100644
--- a/src/lib/elementary/elm_bg.c
+++ b/src/lib/elementary/elm_bg.c
@@ -282,10 +282,10 @@ elm_bg_file_get(const Eo *obj, const char **file, const char **group)
282 282
283/* Internal EO APIs and hidden overrides */ 283/* Internal EO APIs and hidden overrides */
284 284
285ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() 285ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
286 286
287#define ELM_BG_EXTRA_OPS \ 287#define ELM_BG_EXTRA_OPS \
288 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \ 288 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
289 ELM_LAYOUT_SIZING_EVAL_OPS(elm_bg), \ 289 ELM_LAYOUT_SIZING_EVAL_OPS(elm_bg), \
290 EFL_CANVAS_GROUP_ADD_OPS(elm_bg) 290 EFL_CANVAS_GROUP_ADD_OPS(elm_bg)
291 291
diff --git a/src/lib/elementary/elm_bg.eo b/src/lib/elementary/elm_bg.eo
index 2431d16..0714299 100644
--- a/src/lib/elementary/elm_bg.eo
+++ b/src/lib/elementary/elm_bg.eo
@@ -13,7 +13,7 @@ enum Elm.Bg.Option
13 last [[Sentinel value to indicate last enum field during iteration. Also used to indicate errors]] 13 last [[Sentinel value to indicate last enum field during iteration. Also used to indicate errors]]
14} 14}
15 15
16class Elm.Bg (Elm.Layout, Efl.File) 16class Elm.Bg (Efl.Ui.Layout, Efl.File)
17{ 17{
18 [[The bg (background) widget is used for setting (solid) background decorations 18 [[The bg (background) widget is used for setting (solid) background decorations
19 19
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index a7dc0a6..afac407 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -242,6 +242,7 @@ _elm_bubble_efl_object_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED)
242EOLIAN static void 242EOLIAN static void
243_elm_bubble_pos_set(Eo *obj, Elm_Bubble_Data *sd, Elm_Bubble_Pos pos) 243_elm_bubble_pos_set(Eo *obj, Elm_Bubble_Data *sd, Elm_Bubble_Pos pos)
244{ 244{
245 /* FIXME: Why is this dealing with layout data directly? */
245 ELM_LAYOUT_DATA_GET(obj, ld); 246 ELM_LAYOUT_DATA_GET(obj, ld);
246 247
247 if (pos < ELM_BUBBLE_POS_TOP_LEFT || pos > ELM_BUBBLE_POS_BOTTOM_RIGHT) 248 if (pos < ELM_BUBBLE_POS_TOP_LEFT || pos > ELM_BUBBLE_POS_BOTTOM_RIGHT)
@@ -280,20 +281,20 @@ _elm_bubble_class_constructor(Efl_Class *klass)
280} 281}
281 282
282/* Efl.Part begin */ 283/* Efl.Part begin */
283ELM_PART_OVERRIDE(elm_bubble, ELM_BUBBLE, ELM_LAYOUT, Elm_Bubble_Data, Elm_Part_Data) 284ELM_PART_OVERRIDE(elm_bubble, ELM_BUBBLE, EFL_UI_LAYOUT, Elm_Bubble_Data, Elm_Part_Data)
284ELM_PART_OVERRIDE_TEXT_SET(elm_bubble, ELM_BUBBLE, ELM_LAYOUT, Elm_Bubble_Data, Elm_Part_Data) 285ELM_PART_OVERRIDE_TEXT_SET(elm_bubble, ELM_BUBBLE, EFL_UI_LAYOUT, Elm_Bubble_Data, Elm_Part_Data)
285 286
286#include "elm_bubble_internal_part.eo.c" 287#include "elm_bubble_internal_part.eo.c"
287/* Efl.Part end */ 288/* Efl.Part end */
288 289
289/* Internal EO APIs and hidden overrides */ 290/* Internal EO APIs and hidden overrides */
290 291
291ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() 292ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
292ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() 293ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
293 294
294#define ELM_BUBBLE_EXTRA_OPS \ 295#define ELM_BUBBLE_EXTRA_OPS \
295 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \ 296 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
296 ELM_LAYOUT_TEXT_ALIASES_OPS(), \ 297 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
297 ELM_LAYOUT_SIZING_EVAL_OPS(elm_bubble), \ 298 ELM_LAYOUT_SIZING_EVAL_OPS(elm_bubble), \
298 EFL_CANVAS_GROUP_ADD_OPS(elm_bubble) 299 EFL_CANVAS_GROUP_ADD_OPS(elm_bubble)
299 300
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index cd3fc90..5bf8644 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -12,7 +12,7 @@ enum Elm.Bubble.Pos
12 bottom_right [[The arrow of the bubble points to the bottom right corner.]] 12 bottom_right [[The arrow of the bubble points to the bottom right corner.]]
13} 13}
14 14
15class Elm.Bubble (Elm.Layout, Efl.Ui.Clickable) 15class Elm.Bubble (Efl.Ui.Layout, Efl.Ui.Clickable)
16{ 16{
17 [[Speech bubble widget used in messaging applications]] 17 [[Speech bubble widget used in messaging applications]]
18 18
diff --git a/src/lib/elementary/elm_bubble_internal_part.eo b/src/lib/elementary/elm_bubble_internal_part.eo
index 60654cf..7deaa91 100644
--- a/src/lib/elementary/elm_bubble_internal_part.eo
+++ b/src/lib/elementary/elm_bubble_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm_Bubble.Internal.Part (Elm.Layout.Internal.Part, Efl.Text) 1class Elm_Bubble.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
2{ 2{
3 [[Elementary Bubble internal part class]] 3 [[Elementary Bubble internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo
index 4e30747..542ee3f 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -72,7 +72,7 @@ struct Elm.Calendar.Mark; [[Item handle for a calendar mark.
72 with @Elm.Calendar.mark_del. 72 with @Elm.Calendar.mark_del.
73 ]] 73 ]]
74 74
75class Elm.Calendar (Elm.Layout, Elm.Interface.Atspi_Widget_Action) 75class Elm.Calendar (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action)
76{ 76{
77 [[Calendar widget 77 [[Calendar widget
78 78
diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo
index c2f5007..ad44516 100644
--- a/src/lib/elementary/elm_clock.eo
+++ b/src/lib/elementary/elm_clock.eo
@@ -18,7 +18,7 @@ enum Elm.Clock.Edit_Mode
18 all = (1 << 6) - 1 [[All digits should be editable.]] 18 all = (1 << 6) - 1 [[All digits should be editable.]]
19} 19}
20 20
21class Elm.Clock (Elm.Layout) 21class Elm.Clock (Efl.Ui.Layout)
22{ 22{
23 [[Digital clock widget 23 [[Digital clock widget
24 24
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index c61277b..3386321 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -5,7 +5,7 @@ import elm_general;
5struct @extern Elm_Code; [[Elementary code main data structure]] /* The main interface currently defined in code */ 5struct @extern Elm_Code; [[Elementary code main data structure]] /* The main interface currently defined in code */
6struct @extern Elm_Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */ 6struct @extern Elm_Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */
7 7
8class Elm.Code_Widget (Elm.Layout, Elm.Interface.Atspi.Text) 8class Elm.Code_Widget (Efl.Ui.Layout, Elm.Interface.Atspi.Text)
9{ 9{
10 [[Elementary code widget]] 10 [[Elementary code widget]]
11 eo_prefix: elm_obj_code_widget; 11 eo_prefix: elm_obj_code_widget;
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index dd5ef04..9bc1349 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -12,7 +12,7 @@ enum Elm.Colorselector.Mode
12 all [[All possible color selector is displayed.]] 12 all [[All possible color selector is displayed.]]
13} 13}
14 14
15class Elm.Colorselector (Elm.Layout, Elm.Interface.Atspi_Widget_Action, 15class Elm.Colorselector (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action,
16 Efl.Ui.Clickable) 16 Efl.Ui.Clickable)
17{ 17{
18 [[Elementary colorselector class]] 18 [[Elementary colorselector class]]
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index d2f55c3..6cd6b77 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -1026,10 +1026,10 @@ _elm_conformant_class_constructor(Efl_Class *klass)
1026 1026
1027/* Internal EO APIs and hidden overrides */ 1027/* Internal EO APIs and hidden overrides */
1028 1028
1029ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() 1029ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
1030 1030
1031#define ELM_CONFORMANT_EXTRA_OPS \ 1031#define ELM_CONFORMANT_EXTRA_OPS \
1032 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \ 1032 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
1033 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_conformant) 1033 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_conformant)
1034 1034
1035#include "elm_conformant.eo.c" 1035#include "elm_conformant.eo.c"
diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo
index fecbb63..f289493 100644
--- a/src/lib/elementary/elm_conformant.eo
+++ b/src/lib/elementary/elm_conformant.eo
@@ -1,4 +1,4 @@
1class Elm.Conformant (Elm.Layout) 1class Elm.Conformant (Efl.Ui.Layout)
2{ 2{
3 [[Elementary conformant class]] 3 [[Elementary conformant class]]
4 legacy_prefix: elm_conformant; 4 legacy_prefix: elm_conformant;
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index dae494b..39448e2 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -8,7 +8,7 @@ enum Elm.Ctxpopup.Direction
8 unknown [[Ctxpopup does not determine it's direction yet.]] 8 unknown [[Ctxpopup does not determine it's direction yet.]]
9} 9}
10 10
11class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, 11class Elm.Ctxpopup (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action,
12 Efl.Orientation, Efl.Ui.Menu) 12 Efl.Orientation, Efl.Ui.Menu)
13{ 13{
14 [[Elementary context popup class]] 14 [[Elementary context popup class]]
diff --git a/src/lib/elementary/elm_ctxpopup_internal_part.eo b/src/lib/elementary/elm_ctxpopup_internal_part.eo
index badd8fc..a1b49a7 100644
--- a/src/lib/elementary/elm_ctxpopup_internal_part.eo
+++ b/src/lib/elementary/elm_ctxpopup_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Ctxpopup.Internal.Part (Elm.Layout.Internal.Part) 1class Elm.Ctxpopup.Internal.Part (Efl.Ui.Layout.Internal.Part)
2{ 2{
3 [[Elementary contex popup internal part class]] 3 [[Elementary contex popup internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index 0f64016..bd98932 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -609,9 +609,9 @@ _elm_dayselector_class_constructor(Efl_Class *klass)
609 609
610/* Efl.Part begin */ 610/* Efl.Part begin */
611 611
612ELM_PART_OVERRIDE(elm_dayselector, ELM_DAYSELECTOR, ELM_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data) 612ELM_PART_OVERRIDE(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data)
613ELM_PART_OVERRIDE_CONTENT_SET(elm_dayselector, ELM_DAYSELECTOR, ELM_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data) 613ELM_PART_OVERRIDE_CONTENT_SET(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data)
614ELM_PART_OVERRIDE_CONTENT_UNSET(elm_dayselector, ELM_DAYSELECTOR, ELM_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data) 614ELM_PART_OVERRIDE_CONTENT_UNSET(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data)
615#include "elm_dayselector_internal_part.eo.c" 615#include "elm_dayselector_internal_part.eo.c"
616 616
617/* Efl.Part end */ 617/* Efl.Part end */
diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo
index c89cdce..432ebe6 100644
--- a/src/lib/elementary/elm_dayselector.eo
+++ b/src/lib/elementary/elm_dayselector.eo
@@ -17,7 +17,7 @@ enum Elm.Dayselector.Day
17 max [[Sentinel value to indicate last enum field during iteration]] 17 max [[Sentinel value to indicate last enum field during iteration]]
18} 18}
19 19
20class Elm.Dayselector (Elm.Layout) 20class Elm.Dayselector (Efl.Ui.Layout)
21{ 21{
22 [[Elementary dayselector class]] 22 [[Elementary dayselector class]]
23 legacy_prefix: elm_dayselector; 23 legacy_prefix: elm_dayselector;
diff --git a/src/lib/elementary/elm_dayselector_internal_part.eo b/src/lib/elementary/elm_dayselector_internal_part.eo
index 08f86ee..1b2677f 100644
--- a/src/lib/elementary/elm_dayselector_internal_part.eo
+++ b/src/lib/elementary/elm_dayselector_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Dayselector.Internal.Part (Elm.Layout.Internal.Part) 1class Elm.Dayselector.Internal.Part (Efl.Ui.Layout.Internal.Part)
2{ 2{
3 [[Elementary dayselector internal part class]] 3 [[Elementary dayselector internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index eef46a5..562c25b 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -999,7 +999,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
999 evas_event_thaw(evas_object_evas_get(obj)); 999 evas_event_thaw(evas_object_evas_get(obj));
1000 evas_event_thaw_eval(evas_object_evas_get(obj)); 1000 evas_event_thaw_eval(evas_object_evas_get(obj));
1001 1001
1002 efl_event_callback_legacy_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL); 1002 efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
1003 1003
1004 evas_object_unref(obj); 1004 evas_object_unref(obj);
1005 1005
@@ -6060,11 +6060,11 @@ _elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Entry_Data *sd)
6060 6060
6061/* Efl.Part begin */ 6061/* Efl.Part begin */
6062 6062
6063ELM_PART_OVERRIDE(elm_entry, ELM_ENTRY, ELM_LAYOUT, Elm_Entry_Data, Elm_Part_Data) 6063ELM_PART_OVERRIDE(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
6064ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, ELM_ENTRY, ELM_LAYOUT, Elm_Entry_Data, Elm_Part_Data) 6064ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
6065ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, ELM_ENTRY, ELM_LAYOUT, Elm_Entry_Data, Elm_Part_Data) 6065ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
6066ELM_PART_OVERRIDE_TEXT_SET(elm_entry, ELM_ENTRY, ELM_LAYOUT, Elm_Entry_Data, Elm_Part_Data) 6066ELM_PART_OVERRIDE_TEXT_SET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
6067ELM_PART_OVERRIDE_TEXT_GET(elm_entry, ELM_ENTRY, ELM_LAYOUT, Elm_Entry_Data, Elm_Part_Data) 6067ELM_PART_OVERRIDE_TEXT_GET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
6068ELM_PART_CONTENT_DEFAULT_SET(elm_entry, "icon") 6068ELM_PART_CONTENT_DEFAULT_SET(elm_entry, "icon")
6069#include "elm_entry_internal_part.eo.c" 6069#include "elm_entry_internal_part.eo.c"
6070 6070
@@ -6072,14 +6072,14 @@ ELM_PART_CONTENT_DEFAULT_SET(elm_entry, "icon")
6072 6072
6073/* Internal EO APIs and hidden overrides */ 6073/* Internal EO APIs and hidden overrides */
6074 6074
6075ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() 6075ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
6076ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() 6076ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
6077 6077
6078#define ELM_ENTRY_EXTRA_OPS \ 6078#define ELM_ENTRY_EXTRA_OPS \
6079 ELM_PART_CONTENT_DEFAULT_OPS(elm_entry), \ 6079 ELM_PART_CONTENT_DEFAULT_OPS(elm_entry), \
6080 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_entry), \ 6080 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_entry), \
6081 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \ 6081 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
6082 ELM_LAYOUT_TEXT_ALIASES_OPS(), \ 6082 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
6083 ELM_LAYOUT_SIZING_EVAL_OPS(elm_entry) 6083 ELM_LAYOUT_SIZING_EVAL_OPS(elm_entry)
6084 6084
6085#include "elm_entry.eo.c" 6085#include "elm_entry.eo.c"
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 74450e1..7fecf8f 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -115,7 +115,7 @@ enum Elm.Cnp_Mode
115 plaintext, [[ copy & paste text without markup tag ]] 115 plaintext, [[ copy & paste text without markup tag ]]
116} 116}
117 117
118class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, 118class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
119 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File, 119 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File,
120 Efl.Ui.Selectable, Efl.Ui.Scrollable) 120 Efl.Ui.Selectable, Efl.Ui.Scrollable)
121{ 121{
diff --git a/src/lib/elementary/elm_entry_internal_part.eo b/src/lib/elementary/elm_entry_internal_part.eo
index c58037f..14fe0fb 100644
--- a/src/lib/elementary/elm_entry_internal_part.eo
+++ b/src/lib/elementary/elm_entry_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Entry.Internal.Part (Elm.Layout.Internal.Part, Efl.Text) 1class Elm.Entry.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
2{ 2{
3 [[Elementary entry internal part class]] 3 [[Elementary entry internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index 7817c4c..3ac04a4 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -1,4 +1,4 @@
1class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector, 1class Elm.Fileselector (Efl.Ui.Layout, Elm.Interface.Fileselector,
2 Elm.Interface.Atspi_Widget_Action, 2 Elm.Interface.Atspi_Widget_Action,
3 Efl.Ui.Clickable, Efl.Ui.Selectable) 3 Efl.Ui.Clickable, Efl.Ui.Selectable)
4{ 4{
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index d3cb592..23a316a 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -1,4 +1,4 @@
1class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector, 1class Elm.Fileselector_Entry (Efl.Ui.Layout, Elm.Interface.Fileselector,
2 Efl.Ui.Clickable, Efl.Ui.Selectable) 2 Efl.Ui.Clickable, Efl.Ui.Selectable)
3{ 3{
4 [[Elementary fileselector entry class]] 4 [[Elementary fileselector entry class]]
diff --git a/src/lib/elementary/elm_fileselector_entry_internal_part.eo b/src/lib/elementary/elm_fileselector_entry_internal_part.eo
index b5cb388..3adbf14 100644
--- a/src/lib/elementary/elm_fileselector_entry_internal_part.eo
+++ b/src/lib/elementary/elm_fileselector_entry_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Fileselector.Entry.Internal.Part (Elm.Layout.Internal.Part, Efl.Text) 1class Elm.Fileselector.Entry.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
2{ 2{
3 [[Elementary fileselector entry internal part class]] 3 [[Elementary fileselector entry internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_fileselector_internal_part.eo b/src/lib/elementary/elm_fileselector_internal_part.eo
index 2403b5f..91a27b0 100644
--- a/src/lib/elementary/elm_fileselector_internal_part.eo
+++ b/src/lib/elementary/elm_fileselector_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Fileselector.Internal.Part (Elm.Layout.Internal.Part, Efl.Text) 1class Elm.Fileselector.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
2{ 2{
3 [[Elementary fileselector entry internal part class]] 3 [[Elementary fileselector entry internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index f478bc5..cf368ed 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -1,4 +1,4 @@
1class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin, 1class Elm.Flipselector (Efl.Ui.Layout, Efl.Ui.Spin,
2 Elm.Interface.Atspi_Widget_Action, 2 Elm.Interface.Atspi_Widget_Action,
3 Efl.Ui.Selectable) 3 Efl.Ui.Selectable)
4{ 4{
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index 16697a9..96506b4 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -10,7 +10,7 @@ enum Elm.Gengrid.Reorder_Type
10 swap [[Swap reorder type]] 10 swap [[Swap reorder type]]
11} 11}
12 12
13class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable, 13class Elm.Gengrid (Efl.Ui.Layout, Elm.Interface_Scrollable,
14 Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action, 14 Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action,
15 Elm.Interface.Atspi.Selection) 15 Elm.Interface.Atspi.Selection)
16{ 16{
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index bd0dab9..f9fc39c 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -439,7 +439,7 @@ _item_content_realize(Elm_Gen_Item *it,
439 ELM_WIDGET_DATA_GET_OR_RETURN(content, wd); 439 ELM_WIDGET_DATA_GET_OR_RETURN(content, wd);
440 440
441 // FIXME : Layout need sizing eval before group calculate 441 // FIXME : Layout need sizing eval before group calculate
442 if (efl_class_get(content) == ELM_LAYOUT_CLASS) 442 if (efl_class_get(content) == EFL_UI_LAYOUT_CLASS)
443 elm_layout_sizing_eval(content); 443 elm_layout_sizing_eval(content);
444 444
445 _widget_calculate_recursive(content); 445 _widget_calculate_recursive(content);
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index 56abb93..44bb787 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -2,7 +2,7 @@ import elm_general;
2import elm_list; 2import elm_list;
3import elm_genlist_item; 3import elm_genlist_item;
4 4
5class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, 5class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
6 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection, 6 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
7 Efl.Ui.Selectable) 7 Efl.Ui.Selectable)
8{ 8{
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index b464fe5..d4581cd 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -892,18 +892,18 @@ _elm_hover_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED
892 892
893/* Efl.Part begin */ 893/* Efl.Part begin */
894 894
895ELM_PART_OVERRIDE(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data, Elm_Part_Data) 895ELM_PART_OVERRIDE(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
896ELM_PART_OVERRIDE_CONTENT_SET(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data, Elm_Part_Data) 896ELM_PART_OVERRIDE_CONTENT_SET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
897ELM_PART_OVERRIDE_CONTENT_GET(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data, Elm_Part_Data) 897ELM_PART_OVERRIDE_CONTENT_GET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
898ELM_PART_OVERRIDE_CONTENT_UNSET(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data, Elm_Part_Data) 898ELM_PART_OVERRIDE_CONTENT_UNSET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
899#include "elm_hover_internal_part.eo.c" 899#include "elm_hover_internal_part.eo.c"
900 900
901/* Efl.Part end */ 901/* Efl.Part end */
902 902
903/* Internal EO APIs and hidden overrides */ 903/* Internal EO APIs and hidden overrides */
904 904
905// ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() is overridden with an if() 905// ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) is overridden with an if()
906// ELM_LAYOUT_CONTENT_ALIASES_OPS() somehow doesn't compile!? 906// ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX) somehow doesn't compile!?
907 907
908#define ELM_HOVER_EXTRA_OPS \ 908#define ELM_HOVER_EXTRA_OPS \
909 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hover), \ 909 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hover), \
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index f28beb9..b919a53 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -7,7 +7,7 @@ enum Elm.Hover.Axis
7 both [[ELM_HOVER_AXIS_BOTH -- both.]] 7 both [[ELM_HOVER_AXIS_BOTH -- both.]]
8} 8}
9 9
10class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action, Efl.Ui.Focus.Manager) 10class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action, Efl.Ui.Focus.Manager)
11{ 11{
12 [[Elementary hover class]] 12 [[Elementary hover class]]
13 legacy_prefix: elm_hover; 13 legacy_prefix: elm_hover;
diff --git a/src/lib/elementary/elm_hover_internal_part.eo b/src/lib/elementary/elm_hover_internal_part.eo
index a201fd3..cd56689 100644
--- a/src/lib/elementary/elm_hover_internal_part.eo
+++ b/src/lib/elementary/elm_hover_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Hover.Internal.Part (Elm.Layout.Internal.Part) 1class Elm.Hover.Internal.Part (Efl.Ui.Layout.Internal.Part)
2{ 2{
3 [[elementary hover internal part class]] 3 [[elementary hover internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 98e5d75..0053d19 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -1,4 +1,4 @@
1class Elm.Index (Elm.Layout, Efl.Orientation, 1class Elm.Index (Efl.Ui.Layout, Efl.Orientation,
2 Efl.Ui.Clickable, Efl.Ui.Selectable) 2 Efl.Ui.Clickable, Efl.Ui.Selectable)
3{ 3{
4 [[elementary index class]] 4 [[elementary index class]]
diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index 188155a..26f019c 100644
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -218,11 +218,11 @@ _elm_inwin_class_constructor(Efl_Class *klass)
218 218
219/* Internal EO APIs and hidden overrides */ 219/* Internal EO APIs and hidden overrides */
220 220
221ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() 221ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
222 222
223#define ELM_INWIN_EXTRA_OPS \ 223#define ELM_INWIN_EXTRA_OPS \
224 EFL_CANVAS_GROUP_ADD_OPS(elm_inwin), \ 224 EFL_CANVAS_GROUP_ADD_OPS(elm_inwin), \
225 ELM_LAYOUT_SIZING_EVAL_OPS(elm_inwin), \ 225 ELM_LAYOUT_SIZING_EVAL_OPS(elm_inwin), \
226 ELM_LAYOUT_CONTENT_ALIASES_OPS() 226 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX)
227 227
228#include "elm_inwin.eo.c" 228#include "elm_inwin.eo.c"
diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo
index 37e1bb5..db76498 100644
--- a/src/lib/elementary/elm_inwin.eo
+++ b/src/lib/elementary/elm_inwin.eo
@@ -1,4 +1,4 @@
1class Elm.Inwin (Elm.Layout, Efl.Ui.Focus.Manager) 1class Elm.Inwin (Efl.Ui.Layout, Efl.Ui.Focus.Manager)
2{ 2{
3 [[Elementary inwin class]] 3 [[Elementary inwin class]]
4 legacy_prefix: elm_inwin; 4 legacy_prefix: elm_inwin;
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index ed0ac85..d3c8fba 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -634,8 +634,8 @@ _elm_label_class_constructor(Efl_Class *klass)
634} 634}
635 635
636/* Efl.Part begin */ 636/* Efl.Part begin */
637ELM_PART_OVERRIDE(elm_label, ELM_LABEL, ELM_LAYOUT, Elm_Label_Data, Elm_Part_Data) 637ELM_PART_OVERRIDE(elm_label, ELM_LABEL, EFL_UI_LAYOUT, Elm_Label_Data, Elm_Part_Data)
638ELM_PART_OVERRIDE_TEXT_SET(elm_label, ELM_LABEL, ELM_LAYOUT, Elm_Label_Data, Elm_Part_Data) 638ELM_PART_OVERRIDE_TEXT_SET(elm_label, ELM_LABEL, EFL_UI_LAYOUT, Elm_Label_Data, Elm_Part_Data)
639 639
640#include "elm_label_internal_part.eo.c" 640#include "elm_label_internal_part.eo.c"
641/* Efl.Part end */ 641/* Efl.Part end */
diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo
index a79995e..eac4f09 100644
--- a/src/lib/elementary/elm_label.eo
+++ b/src/lib/elementary/elm_label.eo
@@ -8,7 +8,7 @@ enum Elm.Label.Slide_Mode
8 always [[Slide always.]] 8 always [[Slide always.]]
9} 9}
10 10
11class Elm.Label (Elm.Layout) 11class Elm.Label (Efl.Ui.Layout)
12{ 12{
13 [[Elementary label class]] 13 [[Elementary label class]]
14 legacy_prefix: elm_label; 14 legacy_prefix: elm_label;
diff --git a/src/lib/elementary/elm_label_internal_part.eo b/src/lib/elementary/elm_label_internal_part.eo
index 881c7fd..ff37310 100644
--- a/src/lib/elementary/elm_label_internal_part.eo
+++ b/src/lib/elementary/elm_label_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm_Label.Internal.Part (Elm.Layout.Internal.Part, Efl.Text) 1class Elm_Label.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
2{ 2{
3 [[Elementary button internal part class]] 3 [[Elementary button internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_layout.h b/src/lib/elementary/elm_layout.h
index 3c34391..a867b5b 100644
--- a/src/lib/elementary/elm_layout.h
+++ b/src/lib/elementary/elm_layout.h
@@ -168,7 +168,7 @@
168 168
169#include <elm_layout_common.h> 169#include <elm_layout_common.h>
170#ifdef EFL_EO_API_SUPPORT 170#ifdef EFL_EO_API_SUPPORT
171#include <elm_layout_eo.h> 171#include <efl_ui_layout.eo.h>
172#endif 172#endif
173#ifndef EFL_NOLEGACY_API_SUPPORT 173#ifndef EFL_NOLEGACY_API_SUPPORT
174#include <elm_layout_legacy.h> 174#include <elm_layout_legacy.h>
diff --git a/src/lib/elementary/elm_layout_eo.h b/src/lib/elementary/elm_layout_eo.h
deleted file mode 100644
index 993fefc..0000000
--- a/src/lib/elementary/elm_layout_eo.h
+++ /dev/null
@@ -1,11 +0,0 @@
1/**
2 * @ingroup Elm_Layout
3 *
4 * @{
5 */
6
7#include "elm_layout.eo.h"
8
9/**
10 * @}
11 */
diff --git a/src/lib/elementary/elm_layout_legacy.h b/src/lib/elementary/elm_layout_legacy.h
index 361926c..e59699f 100644
--- a/src/lib/elementary/elm_layout_legacy.h
+++ b/src/lib/elementary/elm_layout_legacy.h
@@ -18,9 +18,9 @@ struct _Elm_Layout_Part_Alias_Description
18 const char *alias; /**< Alternate name for a given (real) part. Calls 18 const char *alias; /**< Alternate name for a given (real) part. Calls
19 * receiving this string as a part name will be translated 19 * receiving this string as a part name will be translated
20 * to the string at 20 * to the string at
21 * Elm.Layout_Part_Proxies_Description::real_part */ 21 * Efl.Ui.Layout_Part_Proxies_Description::real_part */
22 const char *real_part; /**< Target part name for the alias set on 22 const char *real_part; /**< Target part name for the alias set on
23 * Elm.Layout_Part_Proxies_Description::real_part. An 23 * Efl.Ui.Layout_Part_Proxies_Description::real_part. An
24 * example of usage would be "default" on that field, 24 * example of usage would be "default" on that field,
25 * with "elm.content.swallow" on this one */ 25 * with "elm.content.swallow" on this one */
26}; 26};
@@ -92,7 +92,7 @@ EAPI void elm_layout_sizing_eval(Evas_Object *obj);
92 * 92 *
93 * @ingroup Elm_Layout 93 * @ingroup Elm_Layout
94 */ 94 */
95EAPI void elm_layout_sizing_restricted_eval(Elm_Layout *obj, Eina_Bool width, Eina_Bool height); 95EAPI void elm_layout_sizing_restricted_eval(Evas_Object *obj, Eina_Bool width, Eina_Bool height);
96 96
97/** 97/**
98 * @brief Add a callback for a (Edje) signal emitted by a layout widget's 98 * @brief Add a callback for a (Edje) signal emitted by a layout widget's
@@ -693,4 +693,4 @@ EAPI const char *elm_layout_part_cursor_style_get(const Evas_Object *obj, const
693 */ 693 */
694EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name); 694EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name);
695 695
696#include "elm_layout.eo.legacy.h" 696#include "efl_ui_layout.eo.legacy.h"
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index bb80170..646cbdd 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -36,7 +36,7 @@ enum Elm.List.Mode
36 last [[Indicates error if returned by elm_list_mode_get().]] 36 last [[Indicates error if returned by elm_list_mode_get().]]
37} 37}
38 38
39class Elm.List (Elm.Layout, Elm.Interface_Scrollable, 39class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
40 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection, 40 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
41 Efl.Ui.Clickable, Efl.Ui.Selectable) 41 Efl.Ui.Clickable, Efl.Ui.Selectable)
42{ 42{
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index 4b994ad..40d4e72 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -1,7 +1,7 @@
1type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type; [[Elementary multibuttonentry item filter callback type]] 1type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type; [[Elementary multibuttonentry item filter callback type]]
2type Elm_Multibuttonentry_Format_Cb: __undefined_type; [[Elementary multibuttonentry format callback type]] 2type Elm_Multibuttonentry_Format_Cb: __undefined_type; [[Elementary multibuttonentry format callback type]]
3 3
4class Elm.Multibuttonentry (Elm.Layout) 4class Elm.Multibuttonentry (Efl.Ui.Layout)
5{ 5{
6 [[Elementary multibuttonentry class]] 6 [[Elementary multibuttonentry class]]
7 legacy_prefix: elm_multibuttonentry; 7 legacy_prefix: elm_multibuttonentry;
diff --git a/src/lib/elementary/elm_multibuttonentry_internal_part.eo b/src/lib/elementary/elm_multibuttonentry_internal_part.eo
index 1471fbb..44f1abe 100644
--- a/src/lib/elementary/elm_multibuttonentry_internal_part.eo
+++ b/src/lib/elementary/elm_multibuttonentry_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Multibuttonentry.Internal.Part (Elm.Layout.Internal.Part, Efl.Text) 1class Elm.Multibuttonentry.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
2{ 2{
3 [[Elementary multibuttonentry internal part class]] 3 [[Elementary multibuttonentry internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index a837565..811be7d 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -1,4 +1,4 @@
1class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action) 1class Elm.Naviframe (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action)
2{ 2{
3 [[Elementary naviframe class]] 3 [[Elementary naviframe class]]
4 legacy_prefix: elm_naviframe; 4 legacy_prefix: elm_naviframe;
diff --git a/src/lib/elementary/elm_naviframe_internal_part.eo b/src/lib/elementary/elm_naviframe_internal_part.eo
index a3821cb..5e95140 100644
--- a/src/lib/elementary/elm_naviframe_internal_part.eo
+++ b/src/lib/elementary/elm_naviframe_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Naviframe.Internal.Part (Elm.Layout.Internal.Part) 1class Elm.Naviframe.Internal.Part (Efl.Ui.Layout.Internal.Part)
2{ 2{
3 [[Elementary naviframe internal part class]] 3 [[Elementary naviframe internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo
index 202c6ca..0041d3f 100644
--- a/src/lib/elementary/elm_panel.eo
+++ b/src/lib/elementary/elm_panel.eo
@@ -8,7 +8,7 @@ enum Elm.Panel.Orient
8 right [[Panel (dis)appears from the right]] 8 right [[Panel (dis)appears from the right]]
9} 9}
10 10
11class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable, 11class Elm.Panel (Efl.Ui.Layout, Elm.Interface_Scrollable,
12 Elm.Interface.Atspi_Widget_Action) 12 Elm.Interface.Atspi_Widget_Action)
13{ 13{
14 [[Elementary panel class]] 14 [[Elementary panel class]]
diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h
index b95a318..040ab98 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -1,7 +1,7 @@
1#ifndef _ELM_PART_HELPER_H 1#ifndef _ELM_PART_HELPER_H
2#define _ELM_PART_HELPER_H 2#define _ELM_PART_HELPER_H
3 3
4#include "elm_layout_internal_part.eo.h" 4#include "efl_ui_layout_internal_part.eo.h"
5 5
6//#define ELM_PART_HOOK do { ERR("%p:%s [%d]", pd->obj, pd->part, (int) pd->temp); } while(0) 6//#define ELM_PART_HOOK do { ERR("%p:%s [%d]", pd->obj, pd->part, (int) pd->temp); } while(0)
7#define ELM_PART_HOOK do {} while(0) 7#define ELM_PART_HOOK do {} while(0)
@@ -104,7 +104,7 @@ _ ## type ## _internal_part_efl_text_text_get(Eo *obj, partdata *pd) \
104#define ELM_PART_TEXT_DEFAULT_OPS(type) \ 104#define ELM_PART_TEXT_DEFAULT_OPS(type) \
105 EFL_OBJECT_OP_FUNC(elm_widget_default_text_part_get, _ ## type ## _default_text_part_get) 105 EFL_OBJECT_OP_FUNC(elm_widget_default_text_part_get, _ ## type ## _default_text_part_get)
106 106
107// For widgets that inherit from something with parts (eg. from Elm.Layout) 107// For widgets that inherit from something with parts (eg. from Efl.Ui.Layout)
108#define ELM_PART_OVERRIDE(type, TYPE, SUPER, typedata, partdata) \ 108#define ELM_PART_OVERRIDE(type, TYPE, SUPER, typedata, partdata) \
109static EOLIAN Efl_Object * \ 109static EOLIAN Efl_Object * \
110_ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const char *part) \ 110_ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const char *part) \
diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo
index a1544b2..1c4e807 100644
--- a/src/lib/elementary/elm_player.eo
+++ b/src/lib/elementary/elm_player.eo
@@ -1,4 +1,4 @@
1class Elm.Player (Elm.Layout, Elm.Interface.Atspi_Widget_Action) 1class Elm.Player (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action)
2{ 2{
3 [[Elementary player class]] 3 [[Elementary player class]]
4 legacy_prefix: elm_player; 4 legacy_prefix: elm_player;
diff --git a/src/lib/elementary/elm_player_internal_part.eo b/src/lib/elementary/elm_player_internal_part.eo
index 201dfbe..655bf9c 100644
--- a/src/lib/elementary/elm_player_internal_part.eo
+++ b/src/lib/elementary/elm_player_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Player.Internal.Part (Elm.Layout.Internal.Part) 1class Elm.Player.Internal.Part (Efl.Ui.Layout.Internal.Part)
2{ 2{
3 [[Elementary player internal part class]] 3 [[Elementary player internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index 168a9a4..2700cd8 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -23,7 +23,7 @@ enum Elm.Popup.Orient
23} 23}
24 24
25 25
26class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action) 26class Elm.Popup (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action)
27{ 27{
28 [[Elementary popup class]] 28 [[Elementary popup class]]
29 legacy_prefix: elm_popup; 29 legacy_prefix: elm_popup;
diff --git a/src/lib/elementary/elm_popup_internal_part.eo b/src/lib/elementary/elm_popup_internal_part.eo
index 76a26ba..29ca9e8 100644
--- a/src/lib/elementary/elm_popup_internal_part.eo
+++ b/src/lib/elementary/elm_popup_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Popup.Internal.Part (Elm.Layout.Internal.Part, Efl.Text) 1class Elm.Popup.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text)
2{ 2{
3 [[Elementary popup internal part class]] 3 [[Elementary popup internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 3da811a..80f410e 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -632,11 +632,11 @@ const Elm_Layout_Part_Alias_Description *elm_layout_text_aliases_get(const Eo *o
632#define _ELM_LAYOUT_ALIASES_OPS(_pfx, _typ) \ 632#define _ELM_LAYOUT_ALIASES_OPS(_pfx, _typ) \
633 EFL_OBJECT_OP_FUNC(elm_layout_##_typ##_aliases_get, _##_pfx##_##_typ##_aliases_get) 633 EFL_OBJECT_OP_FUNC(elm_layout_##_typ##_aliases_get, _##_pfx##_##_typ##_aliases_get)
634 634
635#define ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() _ELM_LAYOUT_ALIASES_IMPLEMENT(MY_CLASS_PFX, content) 635#define ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(_pfx) _ELM_LAYOUT_ALIASES_IMPLEMENT(_pfx, content)
636#define ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() _ELM_LAYOUT_ALIASES_IMPLEMENT(MY_CLASS_PFX, text) 636#define ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(_pfx) _ELM_LAYOUT_ALIASES_IMPLEMENT(_pfx, text)
637 637
638#define ELM_LAYOUT_CONTENT_ALIASES_OPS() _ELM_LAYOUT_ALIASES_OPS(MY_CLASS_PFX, content) 638#define ELM_LAYOUT_CONTENT_ALIASES_OPS(_pfx) _ELM_LAYOUT_ALIASES_OPS(_pfx, content)
639#define ELM_LAYOUT_TEXT_ALIASES_OPS() _ELM_LAYOUT_ALIASES_OPS(MY_CLASS_PFX, text) 639#define ELM_LAYOUT_TEXT_ALIASES_OPS(_pfx) _ELM_LAYOUT_ALIASES_OPS(_pfx, text)
640 640
641#define ELM_LAYOUT_SIZING_EVAL_OPS(_pfx) \ 641#define ELM_LAYOUT_SIZING_EVAL_OPS(_pfx) \
642 EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _##_pfx##_elm_layout_sizing_eval) 642 EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _##_pfx##_elm_layout_sizing_eval)
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 5c35902..0612bbe 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -1476,10 +1476,10 @@ _elm_scroller_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNU
1476 1476
1477/* Efl.Part begin */ 1477/* Efl.Part begin */
1478 1478
1479ELM_PART_OVERRIDE(elm_scroller, ELM_SCROLLER, ELM_LAYOUT, Elm_Scroller_Data, Elm_Part_Data) 1479ELM_PART_OVERRIDE(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
1480ELM_PART_OVERRIDE_CONTENT_SET(elm_scroller, ELM_SCROLLER, ELM_LAYOUT, Elm_Scroller_Data, Elm_Part_Data) 1480ELM_PART_OVERRIDE_CONTENT_SET(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
1481ELM_PART_OVERRIDE_CONTENT_GET(elm_scroller, ELM_SCROLLER, ELM_LAYOUT, Elm_Scroller_Data, Elm_Part_Data) 1481ELM_PART_OVERRIDE_CONTENT_GET(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
1482ELM_PART_OVERRIDE_CONTENT_UNSET(elm_scroller, ELM_SCROLLER, ELM_LAYOUT, Elm_Scroller_Data, Elm_Part_Data) 1482ELM_PART_OVERRIDE_CONTENT_UNSET(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
1483// FIXME: should be "content" but "default" was legacy API 1483// FIXME: should be "content" but "default" was legacy API
1484ELM_PART_CONTENT_DEFAULT_SET(elm_scroller, "default") 1484ELM_PART_CONTENT_DEFAULT_SET(elm_scroller, "default")
1485#include "elm_scroller_internal_part.eo.c" 1485#include "elm_scroller_internal_part.eo.c"
diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index 92a8fab..ad39dc6 100644
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -1,4 +1,4 @@
1class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable, 1class Elm.Scroller (Efl.Ui.Layout, Elm.Interface_Scrollable,
2 Elm.Interface.Atspi_Widget_Action, 2 Elm.Interface.Atspi_Widget_Action,
3 Efl.Ui.Scrollable, Efl.Container) 3 Efl.Ui.Scrollable, Efl.Container)
4{ 4{
diff --git a/src/lib/elementary/elm_scroller_internal_part.eo b/src/lib/elementary/elm_scroller_internal_part.eo
index c3bb463..0410363 100644
--- a/src/lib/elementary/elm_scroller_internal_part.eo
+++ b/src/lib/elementary/elm_scroller_internal_part.eo
@@ -1,4 +1,4 @@
1class Elm.Scroller.Internal.Part (Elm.Layout.Internal.Part) 1class Elm.Scroller.Internal.Part (Efl.Ui.Layout.Internal.Part)
2{ 2{
3 [[Elementary scroller internal part class]] 3 [[Elementary scroller internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo
index a7c7b2d..5a019ea 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -1,4 +1,4 @@
1class Elm.Segment_Control (Elm.Layout) 1class Elm.Segment_Control (Efl.Ui.Layout)
2{ 2{
3 [[Elementary segment control class]] 3 [[Elementary segment control class]]
4 legacy_prefix: elm_segment_control; 4 legacy_prefix: elm_segment_control;
diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo
index 38b6bd5..ba4e585 100644
--- a/src/lib/elementary/elm_separator.eo
+++ b/src/lib/elementary/elm_separator.eo
@@ -1,4 +1,4 @@
1class Elm.Separator (Elm.Layout, Efl.Orientation) 1class Elm.Separator (Efl.Ui.Layout, Efl.Orientation)
2{ 2{
3 [[Elementary separator class]] 3 [[Elementary separator class]]
4 legacy_prefix: elm_separator; 4 legacy_prefix: elm_separator;
diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index cb445a7..21174f4 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -1,6 +1,6 @@
1type Elm_Slideshow_Item_Class: __undefined_type; [[Elementary slideshow item class type]] 1type Elm_Slideshow_Item_Class: __undefined_type; [[Elementary slideshow item class type]]
2 2
3class Elm.Slideshow (Elm.Layout, Elm.Interface.Atspi_Widget_Action) 3class Elm.Slideshow (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action)
4{ 4{
5 [[Elementary slideshow class]] 5 [[Elementary slideshow class]]
6 eo_prefix: elm_obj_slideshow; 6 eo_prefix: elm_obj_slideshow;
diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo
index 0b1e1bd..95614a3 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -1,4 +1,4 @@
1class Elm.Spinner (Elm.Layout, Efl.Ui.Spin, 1class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Spin,
2 Elm.Interface.Atspi.Value, Elm.Interface.Atspi_Widget_Action) 2 Elm.Interface.Atspi.Value, Elm.Interface.Atspi_Widget_Action)
3{ 3{
4 [[Elementary spinner class]] 4 [[Elementary spinner class]]
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
index e66a079..a6f9820 100644
--- a/src/lib/elementary/elm_thumb.eo
+++ b/src/lib/elementary/elm_thumb.eo
@@ -1,4 +1,4 @@
1class Elm.Thumb (Elm.Layout, Efl.File, Efl.Ui.Clickable, 1class Elm.Thumb (Efl.Ui.Layout, Efl.File, Efl.Ui.Clickable,
2 Efl.Ui.Draggable) 2 Efl.Ui.Draggable)
3{ 3{
4 [[Elementary thumbnail class]] 4 [[Elementary thumbnail class]]
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 0c84c57..d895b59 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -158,7 +158,7 @@ _elm_widget_item_highlight_in_theme(Evas_Object *obj, Elm_Object_Item *eo_it)
158 { 158 {
159 Elm_Widget_Item_Data *it = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); 159 Elm_Widget_Item_Data *it = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
160 160
161 if (efl_isa(it->view, ELM_LAYOUT_CLASS)) 161 if (efl_isa(it->view, EFL_UI_LAYOUT_CLASS))
162 str = edje_object_data_get(elm_layout_edje_get(it->view), "focus_highlight"); 162 str = edje_object_data_get(elm_layout_edje_get(it->view), "focus_highlight");
163 else 163 else
164 str = edje_object_data_get(it->view, "focus_highlight"); 164 str = edje_object_data_get(it->view, "focus_highlight");
@@ -4535,7 +4535,7 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj,
4535 if (!(target_hl_part = edje_object_data_get(edje_obj, "focus_part"))) 4535 if (!(target_hl_part = edje_object_data_get(edje_obj, "focus_part")))
4536 return; 4536 return;
4537 } 4537 }
4538 else if (obj && efl_isa(obj, ELM_LAYOUT_CLASS)) 4538 else if (obj && efl_isa(obj, EFL_UI_LAYOUT_CLASS))
4539 { 4539 {
4540 edje_obj = elm_layout_edje_get(obj); 4540 edje_obj = elm_layout_edje_get(obj);
4541 if (!(target_hl_part = elm_layout_data_get(obj, "focus_part"))) 4541 if (!(target_hl_part = elm_layout_data_get(obj, "focus_part")))
diff --git a/src/lib/elementary/elm_widget_layout.h b/src/lib/elementary/elm_widget_layout.h
index 684a119..bafd004 100644
--- a/src/lib/elementary/elm_widget_layout.h
+++ b/src/lib/elementary/elm_widget_layout.h
@@ -64,9 +64,9 @@ typedef struct _Elm_Layout_Smart_Data
64 Eina_Bool restricted_calc_w : 1; /**< This is a flag to support edje restricted_calc in w axis. */ 64 Eina_Bool restricted_calc_w : 1; /**< This is a flag to support edje restricted_calc in w axis. */
65 Eina_Bool restricted_calc_h : 1; /**< This is a flag to support edje restricted_calc in y axis. */ 65 Eina_Bool restricted_calc_h : 1; /**< This is a flag to support edje restricted_calc in y axis. */
66 Eina_Bool can_access : 1; /**< This is true when all text(including textblock) parts can be accessible by accessibility. */ 66 Eina_Bool can_access : 1; /**< This is true when all text(including textblock) parts can be accessible by accessibility. */
67 Eina_Bool destructed_is : 1; /**< This flag indicates if Elm_Layout destructor was called. This is needed to avoid unnecessary calculation of subobject deletion during layout object's deletion. */ 67 Eina_Bool destructed_is : 1; /**< This flag indicates if Efl.Ui.Layout destructor was called. This is needed to avoid unnecessary calculation of subobject deletion during layout object's deletion. */
68 Eina_Bool file_set : 1; /**< This flag indicates if Elm_Layout source is set from a file*/ 68 Eina_Bool file_set : 1; /**< This flag indicates if Efl.Ui.Layout source is set from a file*/
69 Eina_Bool view_updated : 1; /**< This flag indicates to Elm_Layout don't update model in text_set */ 69 Eina_Bool view_updated : 1; /**< This flag indicates to Efl.Ui.Layout don't update model in text_set */
70} Elm_Layout_Smart_Data; 70} Elm_Layout_Smart_Data;
71 71
72/** 72/**
@@ -74,10 +74,10 @@ typedef struct _Elm_Layout_Smart_Data
74 */ 74 */
75 75
76#define ELM_LAYOUT_DATA_GET(o, sd) \ 76#define ELM_LAYOUT_DATA_GET(o, sd) \
77 Elm_Layout_Smart_Data * sd = efl_data_scope_get(o, ELM_LAYOUT_CLASS) 77 Elm_Layout_Smart_Data * sd = efl_data_scope_get(o, EFL_UI_LAYOUT_CLASS)
78 78
79#define ELM_LAYOUT_CHECK(obj) \ 79#define ELM_LAYOUT_CHECK(obj) \
80 if (EINA_UNLIKELY(!efl_isa(obj, ELM_LAYOUT_CLASS))) \ 80 if (EINA_UNLIKELY(!efl_isa(obj, EFL_UI_LAYOUT_CLASS))) \
81 return 81 return
82 82
83#endif 83#endif
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index 87004b5..52e5dbe 100644
--- a/src/tests/elementary/elm_test_layout.c
+++ b/src/tests/elementary/elm_test_layout.c
@@ -32,7 +32,7 @@ START_TEST(elm_layout_swallows)
32 elm_init(1, NULL); 32 elm_init(1, NULL);
33 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); 33 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
34 34
35 ly = efl_add(ELM_LAYOUT_CLASS, win); 35 ly = efl_add(EFL_UI_LAYOUT_CLASS, win);
36 snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR); 36 snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR);
37 elm_layout_file_set(ly, buf, "layout"); 37 elm_layout_file_set(ly, buf, "layout");
38 evas_object_show(ly); 38 evas_object_show(ly);
@@ -69,7 +69,7 @@ START_TEST(elm_layout_model_connect)
69 elm_init(1, NULL); 69 elm_init(1, NULL);
70 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); 70 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
71 71
72 ly = efl_add(ELM_LAYOUT_CLASS, win); 72 ly = efl_add(EFL_UI_LAYOUT_CLASS, win);
73 snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR); 73 snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR);
74 elm_layout_file_set(ly, buf, "layout"); 74 elm_layout_file_set(ly, buf, "layout");
75 evas_object_show(ly); 75 evas_object_show(ly);