summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-12-06 12:15:39 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-12-06 13:12:29 +0900
commit54ae9cc18b6c0fdb9a10f03ad2681587ca062c6c (patch)
tree0691dec1bd167d6e4f62a974543ae452ee16f9c2
parentb3715d30bb50015d5fc423fee1adeab2ff8dbb8e (diff)
edje: rename Edje.Object to Efl.Canvas.Layout
-rw-r--r--src/Makefile_Edje.am2
-rw-r--r--src/lib/edje/Edje_Eo.h2
-rw-r--r--src/lib/edje/Edje_Legacy.h2
-rw-r--r--src/lib/edje/edje_edit.c10
-rw-r--r--src/lib/edje/edje_edit.eo2
-rw-r--r--src/lib/edje/edje_legacy.c38
-rw-r--r--src/lib/edje/edje_load.c6
-rw-r--r--src/lib/edje/edje_message_queue.c4
-rw-r--r--src/lib/edje/edje_part.c2
-rw-r--r--src/lib/edje/edje_private.h2
-rw-r--r--src/lib/edje/edje_program.c14
-rw-r--r--src/lib/edje/edje_smart.c48
-rw-r--r--src/lib/edje/edje_util.c106
-rw-r--r--src/lib/edje/efl_canvas_layout.eo (renamed from src/lib/edje/edje_object.eo)11
-rw-r--r--src/lib/elementary/efl_ui_image.c4
-rw-r--r--src/lib/elementary/efl_ui_layout.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/efl_ui_win.c2
-rw-r--r--src/lib/elementary/elm_colorselector.c2
-rw-r--r--src/lib/elementary/elm_widget.c6
-rw-r--r--src/tests/edje/edje_test_edje.c22
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c4
22 files changed, 147 insertions, 148 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 1f7ffe980f..0831e01dba 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -5,7 +5,7 @@ edje_eolian_files = \
5 lib/edje/efl_layout_calc.eo \ 5 lib/edje/efl_layout_calc.eo \
6 lib/edje/efl_layout_signal.eo \ 6 lib/edje/efl_layout_signal.eo \
7 lib/edje/efl_layout_group.eo \ 7 lib/edje/efl_layout_group.eo \
8 lib/edje/edje_object.eo \ 8 lib/edje/efl_canvas_layout.eo \
9 lib/edje/efl_canvas_layout_part.eo \ 9 lib/edje/efl_canvas_layout_part.eo \
10 lib/edje/efl_canvas_layout_part_box.eo \ 10 lib/edje/efl_canvas_layout_part_box.eo \
11 lib/edje/efl_canvas_layout_part_external.eo \ 11 lib/edje/efl_canvas_layout_part_external.eo \
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index 663d6c5244..859d4d0183 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -3,7 +3,7 @@
3#include "efl_layout_calc.eo.h" 3#include "efl_layout_calc.eo.h"
4#include "efl_layout_signal.eo.h" 4#include "efl_layout_signal.eo.h"
5#include "efl_layout_group.eo.h" 5#include "efl_layout_group.eo.h"
6#include "edje_object.eo.h" 6#include "efl_canvas_layout.eo.h"
7#include "edje_edit.eo.h" 7#include "edje_edit.eo.h"
8 8
9#include "efl_canvas_layout_part.eo.h" 9#include "efl_canvas_layout_part.eo.h"
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index 730b6ff64b..b7350114d4 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -3109,6 +3109,6 @@ typedef Efl_Canvas_Layout_Part_Type Edje_Part_Type;
3109/** 3109/**
3110 * @} 3110 * @}
3111 */ 3111 */
3112#include "edje_object.eo.legacy.h" 3112#include "efl_canvas_layout.eo.legacy.h"
3113#include "edje_edit.eo.legacy.h" 3113#include "edje_edit.eo.legacy.h"
3114#include "efl_layout_group.eo.legacy.h" 3114#include "efl_layout_group.eo.legacy.h"
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 4aebf29726..0d39dc0274 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -39,9 +39,9 @@ EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_DOES_NOT_EXIST = 0;
39/* Get ed(Edje*) from obj(Evas_Object*) */ 39/* Get ed(Edje*) from obj(Evas_Object*) */
40#define GET_ED_OR_RETURN(RET) \ 40#define GET_ED_OR_RETURN(RET) \
41 Edje *ed; \ 41 Edje *ed; \
42 if (!efl_isa(obj, EDJE_OBJECT_CLASS)) \ 42 if (!efl_isa(obj, EFL_CANVAS_LAYOUT_CLASS)) \
43 return RET; \ 43 return RET; \
44 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 44 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
45 45
46/* Get rp(Edje_Real_Part*) from obj(Evas_Object*) and part(char*) */ 46/* Get rp(Edje_Real_Part*) from obj(Evas_Object*) and part(char*) */
47#define GET_RP_OR_RETURN(RET) \ 47#define GET_RP_OR_RETURN(RET) \
@@ -298,7 +298,7 @@ edje_edit_object_add(Evas *evas)
298EOLIAN static Eo * 298EOLIAN static Eo *
299_edje_edit_efl_object_constructor(Eo *obj, Edje_Edit *eed) 299_edje_edit_efl_object_constructor(Eo *obj, Edje_Edit *eed)
300{ 300{
301 eed->base = efl_data_ref(obj, EDJE_OBJECT_CLASS); 301 eed->base = efl_data_ref(obj, EFL_CANVAS_LAYOUT_CLASS);
302 302
303 return efl_constructor(efl_super(obj, MY_CLASS)); 303 return efl_constructor(efl_super(obj, MY_CLASS));
304} 304}
@@ -1145,7 +1145,7 @@ _delete_play_actions(Evas_Object *obj, const char *name, int action_type, Eet_Fi
1145 continue; 1145 continue;
1146 1146
1147 eeo = edje_edit_object_add(ed->base.evas); 1147 eeo = edje_edit_object_add(ed->base.evas);
1148 if (!efl_isa(eeo, EDJE_OBJECT_CLASS)) 1148 if (!efl_isa(eeo, EFL_CANVAS_LAYOUT_CLASS))
1149 return EINA_FALSE; 1149 return EINA_FALSE;
1150 1150
1151 if (!edje_object_file_set(eeo, ed->file->path, pce->entry)) 1151 if (!edje_object_file_set(eeo, ed->file->path, pce->entry))
@@ -1161,7 +1161,7 @@ _delete_play_actions(Evas_Object *obj, const char *name, int action_type, Eet_Fi
1161 continue; 1161 continue;
1162 } 1162 }
1163 1163
1164 eed = efl_data_scope_get(eeo, EDJE_OBJECT_CLASS); 1164 eed = efl_data_scope_get(eeo, EFL_CANVAS_LAYOUT_CLASS);
1165 for (i = 0; i < eed->collection->patterns.table_programs_size; i++) 1165 for (i = 0; i < eed->collection->patterns.table_programs_size; i++)
1166 { 1166 {
1167 Edje_Program *program; 1167 Edje_Program *program;
diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo
index 297120e492..1f225ae3de 100644
--- a/src/lib/edje/edje_edit.eo
+++ b/src/lib/edje/edje_edit.eo
@@ -1,4 +1,4 @@
1class Edje.Edit (Edje.Object) 1class Edje.Edit (Efl.Canvas.Layout)
2{ 2{
3 [[Edje editing class to access edje object internals. 3 [[Edje editing class to access edje object internals.
4 4
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index 2ead3b40be..6638270d57 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -369,7 +369,7 @@ edje_object_part_text_cursor_content_get(const Edje_Object *obj, const char *par
369 Edje_Real_Part *rp; 369 Edje_Real_Part *rp;
370 Edje *ed; 370 Edje *ed;
371 371
372 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 372 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
373 if ((!ed) || (!part)) return NULL; 373 if ((!ed) || (!part)) return NULL;
374 rp = _edje_real_part_recursive_get(&ed, part); 374 rp = _edje_real_part_recursive_get(&ed, part);
375 if (!rp) return NULL; 375 if (!rp) return NULL;
@@ -398,7 +398,7 @@ edje_object_part_text_hide_visible_password(Eo *obj, const char *part)
398 Eina_Bool int_ret = EINA_FALSE; 398 Eina_Bool int_ret = EINA_FALSE;
399 Edje *ed; 399 Edje *ed;
400 400
401 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 401 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
402 402
403 if ((!ed) || (!part)) return EINA_FALSE; 403 if ((!ed) || (!part)) return EINA_FALSE;
404 rp = _edje_real_part_recursive_get(&ed, part); 404 rp = _edje_real_part_recursive_get(&ed, part);
@@ -490,7 +490,7 @@ edje_object_part_text_style_user_push(Eo *obj EINA_UNUSED, const char *part, con
490 Evas_Textblock_Style *ts; 490 Evas_Textblock_Style *ts;
491 Edje *ed; 491 Edje *ed;
492 492
493 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 493 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
494 494
495 if ((!ed) || (!part) || (!style)) return; 495 if ((!ed) || (!part) || (!style)) return;
496 rp = _edje_real_part_recursive_get(&ed, part); 496 rp = _edje_real_part_recursive_get(&ed, part);
@@ -514,7 +514,7 @@ edje_object_part_text_style_user_pop(Eo *obj EINA_UNUSED, const char *part)
514 Edje_Real_Part *rp; 514 Edje_Real_Part *rp;
515 Edje *ed; 515 Edje *ed;
516 516
517 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 517 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
518 518
519 if ((!ed) || (!part)) return; 519 if ((!ed) || (!part)) return;
520 rp = _edje_real_part_recursive_get(&ed, part); 520 rp = _edje_real_part_recursive_get(&ed, part);
@@ -536,7 +536,7 @@ edje_object_part_text_style_user_peek(const Eo *obj EINA_UNUSED, const char *par
536 const Evas_Textblock_Style *ts; 536 const Evas_Textblock_Style *ts;
537 Edje *ed; 537 Edje *ed;
538 538
539 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 539 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
540 540
541 if ((!ed) || (!part)) return NULL; 541 if ((!ed) || (!part)) return NULL;
542 rp = _edje_real_part_recursive_get(&ed, part); 542 rp = _edje_real_part_recursive_get(&ed, part);
@@ -556,7 +556,7 @@ edje_object_part_text_item_list_get(const Eo *obj EINA_UNUSED, const char *part)
556 Edje_Real_Part *rp; 556 Edje_Real_Part *rp;
557 Edje *ed; 557 Edje *ed;
558 558
559 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 559 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
560 560
561 if ((!ed) || (!part)) return NULL; 561 if ((!ed) || (!part)) return NULL;
562 rp = _edje_real_part_recursive_get(&ed, part); 562 rp = _edje_real_part_recursive_get(&ed, part);
@@ -573,7 +573,7 @@ edje_object_part_text_item_geometry_get(const Eo *obj EINA_UNUSED, const char *p
573 Edje_Real_Part *rp; 573 Edje_Real_Part *rp;
574 Edje *ed; 574 Edje *ed;
575 575
576 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 576 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
577 577
578 if ((!ed) || (!part)) return EINA_FALSE; 578 if ((!ed) || (!part)) return EINA_FALSE;
579 rp = _edje_real_part_recursive_get(&ed, part); 579 rp = _edje_real_part_recursive_get(&ed, part);
@@ -592,7 +592,7 @@ edje_object_text_insert_filter_callback_add(Eo *obj EINA_UNUSED, const char *par
592 Edje_Text_Insert_Filter_Callback *cb; 592 Edje_Text_Insert_Filter_Callback *cb;
593 Edje *ed; 593 Edje *ed;
594 594
595 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 595 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
596 596
597 if ((!ed) || (!part)) return; 597 if ((!ed) || (!part)) return;
598 cb = calloc(1, sizeof(Edje_Text_Insert_Filter_Callback)); 598 cb = calloc(1, sizeof(Edje_Text_Insert_Filter_Callback));
@@ -610,7 +610,7 @@ edje_object_text_insert_filter_callback_del(Eo *obj EINA_UNUSED, const char *par
610 Eina_List *l; 610 Eina_List *l;
611 Edje *ed; 611 Edje *ed;
612 612
613 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 613 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
614 614
615 if ((!ed) || (!part)) return NULL; 615 if ((!ed) || (!part)) return NULL;
616 EINA_LIST_FOREACH(ed->text_insert_filter_callbacks, l, cb) 616 EINA_LIST_FOREACH(ed->text_insert_filter_callbacks, l, cb)
@@ -636,7 +636,7 @@ edje_object_text_insert_filter_callback_del_full(Eo *obj EINA_UNUSED, const char
636 Eina_List *l; 636 Eina_List *l;
637 Edje *ed; 637 Edje *ed;
638 638
639 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 639 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
640 640
641 if ((!ed) || (!part)) return NULL; 641 if ((!ed) || (!part)) return NULL;
642 EINA_LIST_FOREACH(ed->text_insert_filter_callbacks, l, cb) 642 EINA_LIST_FOREACH(ed->text_insert_filter_callbacks, l, cb)
@@ -662,7 +662,7 @@ edje_object_text_markup_filter_callback_add(Eo *obj EINA_UNUSED, const char *par
662 Edje_Markup_Filter_Callback *cb; 662 Edje_Markup_Filter_Callback *cb;
663 Edje *ed; 663 Edje *ed;
664 664
665 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 665 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
666 666
667 if ((!ed) || (!part)) return; 667 if ((!ed) || (!part)) return;
668 cb = calloc(1, sizeof(Edje_Markup_Filter_Callback)); 668 cb = calloc(1, sizeof(Edje_Markup_Filter_Callback));
@@ -680,7 +680,7 @@ edje_object_text_markup_filter_callback_del(Eo *obj EINA_UNUSED, const char *par
680 Eina_List *l; 680 Eina_List *l;
681 Edje *ed; 681 Edje *ed;
682 682
683 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 683 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
684 684
685 if ((!ed) || (!part)) return NULL; 685 if ((!ed) || (!part)) return NULL;
686 EINA_LIST_FOREACH(ed->markup_filter_callbacks, l, cb) 686 EINA_LIST_FOREACH(ed->markup_filter_callbacks, l, cb)
@@ -706,7 +706,7 @@ edje_object_text_markup_filter_callback_del_full(Eo *obj EINA_UNUSED, const char
706 Eina_List *l; 706 Eina_List *l;
707 Edje *ed; 707 Edje *ed;
708 708
709 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 709 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
710 710
711 if ((!ed) || (!part)) return NULL; 711 if ((!ed) || (!part)) return NULL;
712 EINA_LIST_FOREACH(ed->markup_filter_callbacks, l, cb) 712 EINA_LIST_FOREACH(ed->markup_filter_callbacks, l, cb)
@@ -732,7 +732,7 @@ edje_object_part_text_user_insert(const Eo *obj, const char *part, const char *t
732 Edje_Real_Part *rp; 732 Edje_Real_Part *rp;
733 Edje *ed; 733 Edje *ed;
734 734
735 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 735 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
736 736
737 if ((!ed) || (!part)) return; 737 if ((!ed) || (!part)) return;
738 rp = _edje_real_part_recursive_get(&ed, part); 738 rp = _edje_real_part_recursive_get(&ed, part);
@@ -785,7 +785,7 @@ edje_object_part_text_append(Eo *obj, const char *part, const char *text)
785 785
786 Edje *ed; 786 Edje *ed;
787 787
788 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 788 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
789 if ((!ed) || (!part)) return; 789 if ((!ed) || (!part)) return;
790 rp = _edje_real_part_recursive_get(&ed, part); 790 rp = _edje_real_part_recursive_get(&ed, part);
791 if (!rp) return; 791 if (!rp) return;
@@ -809,7 +809,7 @@ edje_object_part_text_escaped_set(Eo *obj, const char *part, const char *text)
809 Eina_Bool int_ret; 809 Eina_Bool int_ret;
810 Edje *ed; 810 Edje *ed;
811 811
812 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 812 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
813 813
814 if ((!ed) || (!part)) return EINA_FALSE; 814 if ((!ed) || (!part)) return EINA_FALSE;
815 rp = _edje_real_part_recursive_get(&ed, part); 815 rp = _edje_real_part_recursive_get(&ed, part);
@@ -995,7 +995,7 @@ edje_object_part_text_unescaped_set(Eo *obj, const char *part, const char *text_
995 Eina_Bool int_ret = EINA_FALSE; 995 Eina_Bool int_ret = EINA_FALSE;
996 Edje *ed; 996 Edje *ed;
997 997
998 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 998 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
999 999
1000 if ((!ed) || (!part)) return EINA_FALSE; 1000 if ((!ed) || (!part)) return EINA_FALSE;
1001 rp = _edje_real_part_recursive_get(&ed, part); 1001 rp = _edje_real_part_recursive_get(&ed, part);
@@ -1022,7 +1022,7 @@ edje_object_part_text_unescaped_get(const Eo *obj EINA_UNUSED, const char *part)
1022 Edje_Real_Part *rp; 1022 Edje_Real_Part *rp;
1023 Edje *ed; 1023 Edje *ed;
1024 1024
1025 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 1025 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
1026 1026
1027 if ((!ed) || (!part)) return NULL; 1027 if ((!ed) || (!part)) return NULL;
1028 1028
@@ -1076,7 +1076,7 @@ edje_object_part_text_insert(Eo *obj, const char *part, const char *text)
1076 Edje_Real_Part *rp; 1076 Edje_Real_Part *rp;
1077 Edje *ed; 1077 Edje *ed;
1078 1078
1079 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 1079 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
1080 1080
1081 if ((!ed) || (!part)) return; 1081 if ((!ed) || (!part)) return;
1082 rp = _edje_real_part_recursive_get(&ed, part); 1082 rp = _edje_real_part_recursive_get(&ed, part);
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 59b1e18ce2..080cca567d 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -160,16 +160,16 @@ static int _sort_defined_boxes(const void *a, const void *b);
160/************************** API Routines **************************/ 160/************************** API Routines **************************/
161 161
162EOLIAN void 162EOLIAN void
163_edje_object_efl_file_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char **file, const char **group) 163_efl_canvas_layout_efl_file_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char **file, const char **group)
164{ 164{
165 if (file) *file = ed->path; 165 if (file) *file = ed->path;
166 if (group) *group = ed->group; 166 if (group) *group = ed->group;
167} 167}
168 168
169EOLIAN Efl_Image_Load_Error 169EOLIAN Efl_Image_Load_Error
170_edje_object_efl_file_load_error_get(Eo *obj, Edje *ed) 170_efl_canvas_layout_efl_file_load_error_get(Eo *obj, Edje *ed)
171{ 171{
172 Efl_Image_Load_Error p = efl_file_load_error_get(efl_super(obj, EDJE_OBJECT_CLASS)); 172 Efl_Image_Load_Error p = efl_file_load_error_get(efl_super(obj, EFL_CANVAS_LAYOUT_CLASS));
173 173
174 if (p != EFL_IMAGE_LOAD_ERROR_NONE) return p; 174 if (p != EFL_IMAGE_LOAD_ERROR_NONE) return p;
175 switch (ed->load_error) 175 switch (ed->load_error)
diff --git a/src/lib/edje/edje_message_queue.c b/src/lib/edje/edje_message_queue.c
index d971582e4d..4d8cbc754d 100644
--- a/src/lib/edje/edje_message_queue.c
+++ b/src/lib/edje/edje_message_queue.c
@@ -32,7 +32,7 @@ _edje_object_message_propagate_send(Evas_Object *obj, Edje_Message_Type type, in
32} 32}
33 33
34EOLIAN void 34EOLIAN void
35_edje_object_efl_layout_signal_message_send(Eo *obj, Edje *pd EINA_UNUSED, int id, const Eina_Value val) 35_efl_canvas_layout_efl_layout_signal_message_send(Eo *obj, Edje *pd EINA_UNUSED, int id, const Eina_Value val)
36{ 36{
37 const Eina_Value_Type *valtype; 37 const Eina_Value_Type *valtype;
38 Edje_Message_Type msgtype; 38 Edje_Message_Type msgtype;
@@ -228,7 +228,7 @@ end:
228} 228}
229 229
230EOLIAN void 230EOLIAN void
231_edje_object_efl_layout_signal_signal_process(Eo *obj, Edje *ed, Eina_Bool recurse) 231_efl_canvas_layout_efl_layout_signal_signal_process(Eo *obj, Edje *ed, Eina_Bool recurse)
232{ 232{
233 Eina_List *l; 233 Eina_List *l;
234 Evas_Object *o; 234 Evas_Object *o;
diff --git a/src/lib/edje/edje_part.c b/src/lib/edje/edje_part.c
index 741dcbef75..98e9f20e82 100644
--- a/src/lib/edje/edje_part.c
+++ b/src/lib/edje/edje_part.c
@@ -42,7 +42,7 @@ _part_reuse_error(Efl_Canvas_Layout_Part_Data *pd)
42 42
43 // TODO: Enable full debug only for eo_debug? 43 // TODO: Enable full debug only for eo_debug?
44 // Don't trust pd->ed as it may be invalid now. 44 // Don't trust pd->ed as it may be invalid now.
45 ed = efl_data_scope_safe_get(pd->obj, EDJE_OBJECT_CLASS); 45 ed = efl_data_scope_safe_get(pd->obj, EFL_CANVAS_LAYOUT_CLASS);
46 if (!ed) 46 if (!ed)
47 { 47 {
48 ERR("A previous misuse of efl_part has been detected. Handles returned " 48 ERR("A previous misuse of efl_part has been detected. Handles returned "
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index eae37b8244..217aa48c22 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -40,7 +40,7 @@
40#endif 40#endif
41 41
42// auto_unref 42// auto_unref
43#define EDJE_OBJECT_BETA 43#define EFL_CANVAS_LAYOUT_BETA
44#define EFL_CANVAS_OBJECT_PROTECTED 44#define EFL_CANVAS_OBJECT_PROTECTED
45#define EFL_LAYOUT_CALC_PROTECTED 45#define EFL_LAYOUT_CALC_PROTECTED
46 46
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 7412fa2674..dd6e73c260 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -178,13 +178,13 @@ _edje_emit_send(Edje *ed, Eina_Bool broadcast, const char *sig, const char *src,
178*============================================================================*/ 178*============================================================================*/
179 179
180EOLIAN Eina_Stringshare* 180EOLIAN Eina_Stringshare*
181_edje_object_seat_name_get(Eo *obj EINA_UNUSED, Edje *ed, Efl_Input_Device *device) 181_efl_canvas_layout_seat_name_get(Eo *obj EINA_UNUSED, Edje *ed, Efl_Input_Device *device)
182{ 182{
183 return _edje_seat_name_get(ed, device); 183 return _edje_seat_name_get(ed, device);
184} 184}
185 185
186EOLIAN Efl_Input_Device * 186EOLIAN Efl_Input_Device *
187_edje_object_seat_get(Eo *obj EINA_UNUSED, Edje *ed, Eina_Stringshare *name) 187_efl_canvas_layout_seat_get(Eo *obj EINA_UNUSED, Edje *ed, Eina_Stringshare *name)
188{ 188{
189 return _edje_seat_get(ed, name); 189 return _edje_seat_get(ed, name);
190} 190}
@@ -248,13 +248,13 @@ edje_object_propagate_callback_add(Evas_Object *obj, Efl_Signal_Cb func, void *d
248} 248}
249 249
250EOLIAN Eina_Bool 250EOLIAN Eina_Bool
251_edje_object_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data) 251_efl_canvas_layout_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
252{ 252{
253 return _edje_object_signal_callback_add(ed, emission, source, func, data); 253 return _edje_object_signal_callback_add(ed, emission, source, func, data);
254} 254}
255 255
256EOLIAN Eina_Bool 256EOLIAN Eina_Bool
257_edje_object_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data) 257_efl_canvas_layout_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
258{ 258{
259 Edje_Signal_Callback_Group *gp; 259 Edje_Signal_Callback_Group *gp;
260 Eina_Bool ok; 260 Eina_Bool ok;
@@ -277,7 +277,7 @@ _edje_object_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed
277} 277}
278 278
279EOLIAN void 279EOLIAN void
280_edje_object_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source) 280_efl_canvas_layout_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source)
281{ 281{
282 if (ed->delete_me) return; 282 if (ed->delete_me) return;
283 if ((!emission) || (!source)) return; 283 if ((!emission) || (!source)) return;
@@ -286,7 +286,7 @@ _edje_object_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const
286 286
287/* FIXDOC: Verify/Expand */ 287/* FIXDOC: Verify/Expand */
288EOLIAN void 288EOLIAN void
289_edje_object_animation_set(Eo *obj, Edje *ed, Eina_Bool on) 289_efl_canvas_layout_animation_set(Eo *obj, Edje *ed, Eina_Bool on)
290{ 290{
291 Eina_List *l; 291 Eina_List *l;
292 unsigned short i; 292 unsigned short i;
@@ -356,7 +356,7 @@ break_prog:
356} 356}
357 357
358EOLIAN Eina_Bool 358EOLIAN Eina_Bool
359_edje_object_animation_get(Eo *obj EINA_UNUSED, Edje *ed) 359_efl_canvas_layout_animation_get(Eo *obj EINA_UNUSED, Edje *ed)
360{ 360{
361 if (!ed) return EINA_FALSE; 361 if (!ed) return EINA_FALSE;
362 if (ed->delete_me) return EINA_FALSE; 362 if (ed->delete_me) return EINA_FALSE;
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 6c2406d13a..ae038fb10e 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -7,7 +7,7 @@
7# undef MY_CLASS 7# undef MY_CLASS
8#endif 8#endif
9 9
10#define MY_CLASS EDJE_OBJECT_CLASS 10#define MY_CLASS EFL_CANVAS_LAYOUT_CLASS
11 11
12#define MY_CLASS_NAME "Edje" 12#define MY_CLASS_NAME "Edje"
13#define MY_CLASS_NAME_LEGACY "edje" 13#define MY_CLASS_NAME_LEGACY "edje"
@@ -24,7 +24,7 @@ edje_object_add(Evas *evas)
24} 24}
25 25
26EOLIAN static Eo * 26EOLIAN static Eo *
27_edje_object_efl_object_constructor(Eo *obj, Edje *ed) 27_efl_canvas_layout_efl_object_constructor(Eo *obj, Edje *ed)
28{ 28{
29 Eo *parent; 29 Eo *parent;
30 Evas *e; 30 Evas *e;
@@ -48,7 +48,7 @@ _edje_object_efl_object_constructor(Eo *obj, Edje *ed)
48} 48}
49 49
50EOLIAN static void 50EOLIAN static void
51_edje_object_efl_object_debug_name_override(Eo *obj, Edje *ed, Eina_Strbuf *sb) 51_efl_canvas_layout_efl_object_debug_name_override(Eo *obj, Edje *ed, Eina_Strbuf *sb)
52{ 52{
53 efl_debug_name_override(efl_super(obj, MY_CLASS), sb); 53 efl_debug_name_override(efl_super(obj, MY_CLASS), sb);
54 eina_strbuf_append_printf(sb, ":file='%s':group='%s'", 54 eina_strbuf_append_printf(sb, ":file='%s':group='%s'",
@@ -57,7 +57,7 @@ _edje_object_efl_object_debug_name_override(Eo *obj, Edje *ed, Eina_Strbuf *sb)
57} 57}
58 58
59EOLIAN static void 59EOLIAN static void
60_edje_object_efl_object_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Efl_Dbg_Info *root) EINA_ARG_NONNULL(3) 60_efl_canvas_layout_efl_object_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Efl_Dbg_Info *root) EINA_ARG_NONNULL(3)
61{ 61{
62 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root); 62 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
63 Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); 63 Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
@@ -106,7 +106,7 @@ _edje_size_class_free(void *data)
106 106
107/* Private Routines */ 107/* Private Routines */
108EOLIAN static void 108EOLIAN static void
109_edje_object_efl_canvas_group_group_add(Eo *obj, Edje *ed) 109_efl_canvas_layout_efl_canvas_group_group_add(Eo *obj, Edje *ed)
110{ 110{
111 Evas *tev = evas_object_evas_get(obj); 111 Evas *tev = evas_object_evas_get(obj);
112 112
@@ -130,7 +130,7 @@ _edje_object_efl_canvas_group_group_add(Eo *obj, Edje *ed)
130} 130}
131 131
132EOLIAN static void 132EOLIAN static void
133_edje_object_efl_canvas_group_group_del(Eo *obj, Edje *ed) 133_efl_canvas_layout_efl_canvas_group_group_del(Eo *obj, Edje *ed)
134{ 134{
135 _edje_block_violate(ed); 135 _edje_block_violate(ed);
136 ed->delete_me = 1; 136 ed->delete_me = 1;
@@ -155,7 +155,7 @@ _edje_object_efl_canvas_group_group_del(Eo *obj, Edje *ed)
155} 155}
156 156
157EOLIAN static void 157EOLIAN static void
158_edje_object_efl_gfx_position_set(Eo *obj, Edje *ed, Eina_Position2D pos) 158_efl_canvas_layout_efl_gfx_position_set(Eo *obj, Edje *ed, Eina_Position2D pos)
159{ 159{
160 unsigned short i; 160 unsigned short i;
161 161
@@ -250,7 +250,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s
250} 250}
251 251
252EOLIAN static void 252EOLIAN static void
253_edje_object_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz) 253_efl_canvas_layout_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz)
254{ 254{
255 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 255 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
256 return; 256 return;
@@ -334,7 +334,7 @@ _edje_object_hide(Eo *obj, Edje *ed)
334} 334}
335 335
336EOLIAN static void 336EOLIAN static void
337_edje_object_efl_gfx_visible_set(Eo *obj, Edje *ed, Eina_Bool vis) 337_efl_canvas_layout_efl_gfx_visible_set(Eo *obj, Edje *ed, Eina_Bool vis)
338{ 338{
339 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) 339 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
340 return; 340 return;
@@ -344,7 +344,7 @@ _edje_object_efl_gfx_visible_set(Eo *obj, Edje *ed, Eina_Bool vis)
344} 344}
345 345
346EOLIAN static void 346EOLIAN static void
347_edje_object_efl_canvas_object_no_render_set(Eo *obj, Edje *ed, Eina_Bool enable) 347_efl_canvas_layout_efl_canvas_object_no_render_set(Eo *obj, Edje *ed, Eina_Bool enable)
348{ 348{
349 Eina_List *l; 349 Eina_List *l;
350 Edje *edg; 350 Edje *edg;
@@ -358,13 +358,13 @@ _edje_object_efl_canvas_object_no_render_set(Eo *obj, Edje *ed, Eina_Bool enable
358} 358}
359 359
360EOLIAN static void 360EOLIAN static void
361_edje_object_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Edje *ed) 361_efl_canvas_layout_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Edje *ed)
362{ 362{
363 _edje_recalc_do(ed); 363 _edje_recalc_do(ed);
364} 364}
365 365
366EOLIAN static Eina_Bool 366EOLIAN static Eina_Bool
367_edje_object_efl_file_mmap_set(Eo *obj, Edje *pd EINA_UNUSED, 367_efl_canvas_layout_efl_file_mmap_set(Eo *obj, Edje *pd EINA_UNUSED,
368 const Eina_File *f, const char *key) 368 const Eina_File *f, const char *key)
369{ 369{
370 Eina_Bool ret; 370 Eina_Bool ret;
@@ -384,7 +384,7 @@ _edje_object_efl_file_mmap_set(Eo *obj, Edje *pd EINA_UNUSED,
384} 384}
385 385
386EOLIAN static void 386EOLIAN static void
387_edje_object_efl_file_mmap_get(Eo *obj EINA_UNUSED, Edje *pd, 387_efl_canvas_layout_efl_file_mmap_get(Eo *obj EINA_UNUSED, Edje *pd,
388 const Eina_File **f, const char **key) 388 const Eina_File **f, const char **key)
389{ 389{
390 if (f) *f = pd->file ? pd->file->f : NULL; 390 if (f) *f = pd->file ? pd->file->f : NULL;
@@ -410,7 +410,7 @@ edje_object_file_get(const Edje_Object *obj, const char **file, const char **gro
410} 410}
411 411
412EOLIAN static void 412EOLIAN static void
413_edje_object_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir) 413_efl_canvas_layout_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir)
414{ 414{
415 efl_canvas_object_paragraph_direction_set(efl_super(obj, MY_CLASS), dir); 415 efl_canvas_object_paragraph_direction_set(efl_super(obj, MY_CLASS), dir);
416 416
@@ -421,7 +421,7 @@ _edje_object_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_B
421} 421}
422 422
423EOLIAN static void 423EOLIAN static void
424_edje_object_efl_observer_update(Eo *obj EINA_UNUSED, Edje *ed, Efl_Object *obs, const char *key, void *data) 424_efl_canvas_layout_efl_observer_update(Eo *obj EINA_UNUSED, Edje *ed, Efl_Object *obs, const char *key, void *data)
425{ 425{
426 if (!obs) return; 426 if (!obs) return;
427 427
@@ -471,13 +471,13 @@ _edje_object_efl_observer_update(Eo *obj EINA_UNUSED, Edje *ed, Efl_Object *obs,
471} 471}
472 472
473EOLIAN Eina_Bool 473EOLIAN Eina_Bool
474_edje_object_efl_player_playable_get(Eo *obj EINA_UNUSED, Edje *pd EINA_UNUSED) 474_efl_canvas_layout_efl_player_playable_get(Eo *obj EINA_UNUSED, Edje *pd EINA_UNUSED)
475{ 475{
476 return EINA_TRUE; 476 return EINA_TRUE;
477} 477}
478 478
479EOLIAN void 479EOLIAN void
480_edje_object_efl_player_play_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool play) 480_efl_canvas_layout_efl_player_play_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool play)
481{ 481{
482 double t; 482 double t;
483 Eina_List *l; 483 Eina_List *l;
@@ -514,7 +514,7 @@ _edje_object_efl_player_play_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool play)
514} 514}
515 515
516EOLIAN Eina_Bool 516EOLIAN Eina_Bool
517_edje_object_efl_player_play_get(Eo *obj EINA_UNUSED, Edje *ed) 517_efl_canvas_layout_efl_player_play_get(Eo *obj EINA_UNUSED, Edje *ed)
518{ 518{
519 if (!ed) return EINA_FALSE; 519 if (!ed) return EINA_FALSE;
520 if (ed->delete_me) return EINA_FALSE; 520 if (ed->delete_me) return EINA_FALSE;
@@ -524,25 +524,25 @@ _edje_object_efl_player_play_get(Eo *obj EINA_UNUSED, Edje *ed)
524} 524}
525 525
526EOLIAN void 526EOLIAN void
527_edje_object_efl_player_play_speed_set(Eo *obj EINA_UNUSED, Edje *pd , double speed) 527_efl_canvas_layout_efl_player_play_speed_set(Eo *obj EINA_UNUSED, Edje *pd , double speed)
528{ 528{
529 if (speed <= 0.0) speed = 1.0; 529 if (speed <= 0.0) speed = 1.0;
530 pd->duration_scale = 1.0/speed; 530 pd->duration_scale = 1.0/speed;
531} 531}
532 532
533EOLIAN double 533EOLIAN double
534_edje_object_efl_player_play_speed_get(Eo *obj EINA_UNUSED, Edje *pd) 534_efl_canvas_layout_efl_player_play_speed_get(Eo *obj EINA_UNUSED, Edje *pd)
535{ 535{
536 return 1.0/pd->duration_scale; 536 return 1.0/pd->duration_scale;
537} 537}
538 538
539/* Internal EO APIs and hidden overrides */ 539/* Internal EO APIs and hidden overrides */
540 540
541#define EDJE_OBJECT_EXTRA_OPS \ 541#define EFL_CANVAS_LAYOUT_EXTRA_OPS \
542 EFL_CANVAS_GROUP_ADD_DEL_OPS(edje_object), \ 542 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_canvas_layout), \
543 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _edje_object_efl_object_dbg_info_get) 543 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_layout_efl_object_dbg_info_get)
544 544
545#include "edje_object.eo.c" 545#include "efl_canvas_layout.eo.c"
546#include "edje_global.eo.c" 546#include "edje_global.eo.c"
547#include "efl_layout_calc.eo.c" 547#include "efl_layout_calc.eo.c"
548#include "efl_layout_signal.eo.c" 548#include "efl_layout_signal.eo.c"
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 3ff4c31b80..258a7499b0 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -238,7 +238,7 @@ _edje_language_signal_emit(Edje *ed, Evas_Object *obj, char *signal)
238} 238}
239 239
240EOLIAN void 240EOLIAN void
241_edje_object_efl_ui_base_language_set(Eo *obj, Edje *ed, const char *locale) 241_efl_canvas_layout_efl_ui_base_language_set(Eo *obj, Edje *ed, const char *locale)
242{ 242{
243 const char *lookup; 243 const char *lookup;
244 char *signal; 244 char *signal;
@@ -260,7 +260,7 @@ _edje_object_efl_ui_base_language_set(Eo *obj, Edje *ed, const char *locale)
260} 260}
261 261
262EOLIAN const char * 262EOLIAN const char *
263_edje_object_efl_ui_base_language_get(Eo *obj EINA_UNUSED, Edje *ed) 263_efl_canvas_layout_efl_ui_base_language_get(Eo *obj EINA_UNUSED, Edje *ed)
264{ 264{
265 if (!ed->language) 265 if (!ed->language)
266 return _edje_language; 266 return _edje_language;
@@ -364,7 +364,7 @@ edje_password_show_last_timeout_set(double password_show_last_timeout)
364} 364}
365 365
366EOLIAN void 366EOLIAN void
367_edje_object_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale) 367_efl_canvas_layout_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale)
368{ 368{
369 Edje *ged; 369 Edje *ged;
370 Evas_Object *o; 370 Evas_Object *o;
@@ -390,7 +390,7 @@ _edje_object_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale)
390} 390}
391 391
392EOLIAN double 392EOLIAN double
393_edje_object_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Edje *ed) 393_efl_canvas_layout_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Edje *ed)
394{ 394{
395 return TO_DOUBLE(ed->scale); 395 return TO_DOUBLE(ed->scale);
396} 396}
@@ -406,7 +406,7 @@ edje_object_base_scale_get(const Evas_Object *obj)
406} 406}
407 407
408EOLIAN Eina_Bool 408EOLIAN Eina_Bool
409_edje_object_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Edje *ed) 409_efl_canvas_layout_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Edje *ed)
410{ 410{
411 return ed->is_rtl; 411 return ed->is_rtl;
412} 412}
@@ -422,7 +422,7 @@ _edje_object_orientation_inform(Evas_Object *obj)
422} 422}
423 423
424EOLIAN void 424EOLIAN void
425_edje_object_efl_ui_base_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl) 425_efl_canvas_layout_efl_ui_base_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl)
426{ 426{
427 unsigned short i; 427 unsigned short i;
428 428
@@ -450,7 +450,7 @@ _edje_object_efl_ui_base_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl)
450} 450}
451 451
452EOLIAN const char * 452EOLIAN const char *
453_edje_object_efl_layout_group_group_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key) 453_efl_canvas_layout_efl_layout_group_group_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key)
454{ 454{
455 if (!key) return NULL; 455 if (!key) return NULL;
456 if (!ed->collection) return NULL; 456 if (!ed->collection) return NULL;
@@ -460,7 +460,7 @@ _edje_object_efl_layout_group_group_data_get(Eo *obj EINA_UNUSED, Edje *ed, cons
460} 460}
461 461
462EOLIAN int 462EOLIAN int
463_edje_object_efl_layout_calc_calc_freeze(Eo *obj EINA_UNUSED, Edje *ed) 463_efl_canvas_layout_efl_layout_calc_calc_freeze(Eo *obj EINA_UNUSED, Edje *ed)
464{ 464{
465 unsigned short i; 465 unsigned short i;
466 466
@@ -478,7 +478,7 @@ _edje_object_efl_layout_calc_calc_freeze(Eo *obj EINA_UNUSED, Edje *ed)
478} 478}
479 479
480EOLIAN int 480EOLIAN int
481_edje_object_efl_layout_calc_calc_thaw(Eo *obj EINA_UNUSED, Edje *ed) 481_efl_canvas_layout_efl_layout_calc_calc_thaw(Eo *obj EINA_UNUSED, Edje *ed)
482{ 482{
483 unsigned short i; 483 unsigned short i;
484 484
@@ -754,7 +754,7 @@ _edje_color_class_active_iterator_next(Eina_Iterator *it, void **data)
754 754
755 if (!eina_iterator_next(tuple->data, (void **)&o)) return EINA_FALSE; 755 if (!eina_iterator_next(tuple->data, (void **)&o)) return EINA_FALSE;
756 756
757 ed = efl_data_scope_get(o, EDJE_OBJECT_CLASS); 757 ed = efl_data_scope_get(o, EFL_CANVAS_LAYOUT_CLASS);
758 if (!ed) return EINA_FALSE; 758 if (!ed) return EINA_FALSE;
759 759
760 /* 760 /*
@@ -839,7 +839,7 @@ edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, in
839} 839}
840 840
841EOLIAN Eina_Bool 841EOLIAN Eina_Bool
842_edje_object_efl_gfx_color_class_color_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class, Efl_Gfx_Color_Class_Layer layer, int r, int g, int b, int a) 842_efl_canvas_layout_efl_gfx_color_class_color_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class, Efl_Gfx_Color_Class_Layer layer, int r, int g, int b, int a)
843{ 843{
844 Eina_Bool int_ret; 844 Eina_Bool int_ret;
845 Eina_Bool need_update; 845 Eina_Bool need_update;
@@ -887,7 +887,7 @@ edje_object_color_class_get(const Evas_Object *obj, const char *color_class, int
887} 887}
888 888
889EOLIAN Eina_Bool 889EOLIAN Eina_Bool
890_edje_object_efl_gfx_color_class_color_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class, Efl_Gfx_Color_Class_Layer layer, int *r, int *g, int *b, int *a) 890_efl_canvas_layout_efl_gfx_color_class_color_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class, Efl_Gfx_Color_Class_Layer layer, int *r, int *g, int *b, int *a)
891{ 891{
892 Edje_Color_Class *cc; 892 Edje_Color_Class *cc;
893 893
@@ -906,7 +906,7 @@ edje_objcet_color_class_description_get(const Evas_Object *obj, const char *colo
906} 906}
907 907
908EOLIAN const char * 908EOLIAN const char *
909_edje_object_efl_gfx_color_class_color_class_description_get(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class) 909_efl_canvas_layout_efl_gfx_color_class_color_class_description_get(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class)
910{ 910{
911 Edje_Color_Class *cc = _edje_color_class_find(ed, color_class); 911 Edje_Color_Class *cc = _edje_color_class_find(ed, color_class);
912 return cc ? cc->desc : NULL; 912 return cc ? cc->desc : NULL;
@@ -919,7 +919,7 @@ edje_object_color_class_del(Evas_Object *obj, const char *color_class)
919} 919}
920 920
921EOLIAN void 921EOLIAN void
922_edje_object_efl_gfx_color_class_color_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class) 922_efl_canvas_layout_efl_gfx_color_class_color_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class)
923{ 923{
924 Edje_Color_Class *cc = NULL; 924 Edje_Color_Class *cc = NULL;
925 unsigned short i; 925 unsigned short i;
@@ -958,7 +958,7 @@ edje_object_color_class_clear(const Evas_Object *obj)
958} 958}
959 959
960EOLIAN void 960EOLIAN void
961_edje_object_efl_gfx_color_class_color_class_clear(Eo *obj EINA_UNUSED, Edje *ed) 961_efl_canvas_layout_efl_gfx_color_class_color_class_clear(Eo *obj EINA_UNUSED, Edje *ed)
962{ 962{
963 Edje_List_Foreach_Data fdata; 963 Edje_List_Foreach_Data fdata;
964 Edje_Color_Class *cc = NULL; 964 Edje_Color_Class *cc = NULL;
@@ -1212,7 +1212,7 @@ _edje_text_class_active_iterator_next(Eina_Iterator *it, void **data)
1212 1212
1213 if (!eina_iterator_next(tuple->data, (void **)&o)) return EINA_FALSE; 1213 if (!eina_iterator_next(tuple->data, (void **)&o)) return EINA_FALSE;
1214 1214
1215 ed = efl_data_scope_get(o, EDJE_OBJECT_CLASS); 1215 ed = efl_data_scope_get(o, EFL_CANVAS_LAYOUT_CLASS);
1216 if (!ed) return EINA_FALSE; 1216 if (!ed) return EINA_FALSE;
1217 1217
1218 /* 1218 /*
@@ -1282,7 +1282,7 @@ edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char
1282} 1282}
1283 1283
1284EOLIAN Eina_Bool 1284EOLIAN Eina_Bool
1285_edje_object_efl_gfx_text_class_text_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class, const char *font, Efl_Font_Size size) 1285_efl_canvas_layout_efl_gfx_text_class_text_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class, const char *font, Efl_Font_Size size)
1286{ 1286{
1287 Edje_Text_Class *tc = NULL; 1287 Edje_Text_Class *tc = NULL;
1288 unsigned short i; 1288 unsigned short i;
@@ -1352,7 +1352,7 @@ edje_object_text_class_get(const Evas_Object *obj, const char *text_class, const
1352} 1352}
1353 1353
1354EOLIAN Eina_Bool 1354EOLIAN Eina_Bool
1355_edje_object_efl_gfx_text_class_text_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class, const char **font, Efl_Font_Size *size) 1355_efl_canvas_layout_efl_gfx_text_class_text_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class, const char **font, Efl_Font_Size *size)
1356{ 1356{
1357 Edje_Text_Class *tc = _edje_text_class_find(ed, text_class); 1357 Edje_Text_Class *tc = _edje_text_class_find(ed, text_class);
1358 1358
@@ -1378,7 +1378,7 @@ edje_object_text_class_del(Evas_Object *obj, const char *text_class)
1378} 1378}
1379 1379
1380EOLIAN void 1380EOLIAN void
1381_edje_object_efl_gfx_text_class_text_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class) 1381_efl_canvas_layout_efl_gfx_text_class_text_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class)
1382{ 1382{
1383 Edje_Text_Class *tc = NULL; 1383 Edje_Text_Class *tc = NULL;
1384 unsigned short i; 1384 unsigned short i;
@@ -1622,7 +1622,7 @@ _edje_size_class_active_iterator_next(Eina_Iterator *it, void **data)
1622 1622
1623 if (!eina_iterator_next(tuple->data, (void **)&o)) return EINA_FALSE; 1623 if (!eina_iterator_next(tuple->data, (void **)&o)) return EINA_FALSE;
1624 1624
1625 ed = efl_data_scope_get(o, EDJE_OBJECT_CLASS); 1625 ed = efl_data_scope_get(o, EFL_CANVAS_LAYOUT_CLASS);
1626 if (!ed) return EINA_FALSE; 1626 if (!ed) return EINA_FALSE;
1627 1627
1628 /* 1628 /*
@@ -1692,7 +1692,7 @@ edje_object_size_class_set(Evas_Object *obj, const char *size_class, Evas_Coord
1692} 1692}
1693 1693
1694EOLIAN Eina_Bool 1694EOLIAN Eina_Bool
1695_edje_object_efl_gfx_size_class_size_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *size_class, Evas_Coord minw, Evas_Coord minh, Evas_Coord maxw, Evas_Coord maxh) 1695_efl_canvas_layout_efl_gfx_size_class_size_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *size_class, Evas_Coord minw, Evas_Coord minh, Evas_Coord maxw, Evas_Coord maxh)
1696{ 1696{
1697 Edje_Size_Class *sc = NULL; 1697 Edje_Size_Class *sc = NULL;
1698 unsigned short i; 1698 unsigned short i;
@@ -1760,7 +1760,7 @@ edje_object_size_class_get(const Evas_Object *obj, const char *size_class, Evas_
1760} 1760}
1761 1761
1762EOLIAN Eina_Bool 1762EOLIAN Eina_Bool
1763_edje_object_efl_gfx_size_class_size_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *size_class, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord *maxw, Evas_Coord *maxh) 1763_efl_canvas_layout_efl_gfx_size_class_size_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *size_class, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord *maxw, Evas_Coord *maxh)
1764{ 1764{
1765 Edje_Size_Class *sc = _edje_size_class_find(ed, size_class); 1765 Edje_Size_Class *sc = _edje_size_class_find(ed, size_class);
1766 1766
@@ -1790,7 +1790,7 @@ edje_object_size_class_del(Evas_Object *obj, const char *size_class)
1790} 1790}
1791 1791
1792EOLIAN void 1792EOLIAN void
1793_edje_object_efl_gfx_size_class_size_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char *size_class) 1793_efl_canvas_layout_efl_gfx_size_class_size_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char *size_class)
1794{ 1794{
1795 Edje_Size_Class *sc = NULL; 1795 Edje_Size_Class *sc = NULL;
1796 unsigned short i; 1796 unsigned short i;
@@ -1907,7 +1907,7 @@ edje_object_part_object_get(const Eo *obj, const char *part)
1907} 1907}
1908 1908
1909EOLIAN void 1909EOLIAN void
1910_edje_object_item_provider_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Item_Provider_Cb func, void *data) 1910_efl_canvas_layout_item_provider_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Item_Provider_Cb func, void *data)
1911{ 1911{
1912 ed->item_provider.func = func; 1912 ed->item_provider.func = func;
1913 ed->item_provider.data = data; 1913 ed->item_provider.data = data;
@@ -2151,7 +2151,7 @@ edje_object_part_text_select_all(const Eo *obj, const char *part)
2151} 2151}
2152 2152
2153EOLIAN void 2153EOLIAN void
2154_edje_object_part_text_cursor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 2154_efl_canvas_layout_part_text_cursor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
2155{ 2155{
2156 Edje_Real_Part *rp; 2156 Edje_Real_Part *rp;
2157 2157
@@ -2231,7 +2231,7 @@ edje_object_part_text_select_extend(const Eo *obj, const char *part)
2231} 2231}
2232 2232
2233EOLIAN Eina_Bool 2233EOLIAN Eina_Bool
2234_edje_object_part_text_cursor_next(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) 2234_efl_canvas_layout_part_text_cursor_next(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
2235{ 2235{
2236 Edje_Real_Part *rp; 2236 Edje_Real_Part *rp;
2237 2237
@@ -2247,7 +2247,7 @@ _edje_object_part_text_cursor_next(Eo *obj EINA_UNUSED, Edje *ed, const char *pa
2247} 2247}
2248 2248
2249EOLIAN Eina_Bool 2249EOLIAN Eina_Bool
2250_edje_object_part_text_cursor_prev(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) 2250_efl_canvas_layout_part_text_cursor_prev(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
2251{ 2251{
2252 Edje_Real_Part *rp; 2252 Edje_Real_Part *rp;
2253 2253
@@ -2263,7 +2263,7 @@ _edje_object_part_text_cursor_prev(Eo *obj EINA_UNUSED, Edje *ed, const char *pa
2263} 2263}
2264 2264
2265EOLIAN Eina_Bool 2265EOLIAN Eina_Bool
2266_edje_object_part_text_cursor_up(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) 2266_efl_canvas_layout_part_text_cursor_up(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
2267{ 2267{
2268 Edje_Real_Part *rp; 2268 Edje_Real_Part *rp;
2269 2269
@@ -2279,7 +2279,7 @@ _edje_object_part_text_cursor_up(Eo *obj EINA_UNUSED, Edje *ed, const char *part
2279} 2279}
2280 2280
2281EOLIAN Eina_Bool 2281EOLIAN Eina_Bool
2282_edje_object_part_text_cursor_down(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) 2282_efl_canvas_layout_part_text_cursor_down(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
2283{ 2283{
2284 Edje_Real_Part *rp; 2284 Edje_Real_Part *rp;
2285 2285
@@ -2295,7 +2295,7 @@ _edje_object_part_text_cursor_down(Eo *obj EINA_UNUSED, Edje *ed, const char *pa
2295} 2295}
2296 2296
2297EOLIAN void 2297EOLIAN void
2298_edje_object_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) 2298_efl_canvas_layout_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
2299{ 2299{
2300 Edje_Real_Part *rp; 2300 Edje_Real_Part *rp;
2301 2301
@@ -2309,7 +2309,7 @@ _edje_object_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const cha
2309} 2309}
2310 2310
2311EOLIAN void 2311EOLIAN void
2312_edje_object_part_text_cursor_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) 2312_efl_canvas_layout_part_text_cursor_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
2313{ 2313{
2314 Edje_Real_Part *rp; 2314 Edje_Real_Part *rp;
2315 2315
@@ -2323,7 +2323,7 @@ _edje_object_part_text_cursor_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char
2323} 2323}
2324 2324
2325EOLIAN void 2325EOLIAN void
2326_edje_object_part_text_cursor_copy(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor src, Edje_Cursor dst) 2326_efl_canvas_layout_part_text_cursor_copy(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor src, Edje_Cursor dst)
2327{ 2327{
2328 Edje_Real_Part *rp; 2328 Edje_Real_Part *rp;
2329 2329
@@ -2337,7 +2337,7 @@ _edje_object_part_text_cursor_copy(Eo *obj EINA_UNUSED, Edje *ed, const char *pa
2337} 2337}
2338 2338
2339EOLIAN void 2339EOLIAN void
2340_edje_object_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) 2340_efl_canvas_layout_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
2341{ 2341{
2342 Edje_Real_Part *rp; 2342 Edje_Real_Part *rp;
2343 2343
@@ -2351,7 +2351,7 @@ _edje_object_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, Edje *ed, cons
2351} 2351}
2352 2352
2353EOLIAN void 2353EOLIAN void
2354_edje_object_part_text_cursor_line_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) 2354_efl_canvas_layout_part_text_cursor_line_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
2355{ 2355{
2356 Edje_Real_Part *rp; 2356 Edje_Real_Part *rp;
2357 2357
@@ -2365,7 +2365,7 @@ _edje_object_part_text_cursor_line_end_set(Eo *obj EINA_UNUSED, Edje *ed, const
2365} 2365}
2366 2366
2367EOLIAN Eina_Bool 2367EOLIAN Eina_Bool
2368_edje_object_part_text_cursor_coord_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur, Evas_Coord x, Evas_Coord y) 2368_efl_canvas_layout_part_text_cursor_coord_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur, Evas_Coord x, Evas_Coord y)
2369{ 2369{
2370 Edje_Real_Part *rp; 2370 Edje_Real_Part *rp;
2371 2371
@@ -2381,7 +2381,7 @@ _edje_object_part_text_cursor_coord_set(Eo *obj EINA_UNUSED, Edje *ed, const cha
2381} 2381}
2382 2382
2383EOLIAN void 2383EOLIAN void
2384_edje_object_part_text_cursor_pos_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur, int pos) 2384_efl_canvas_layout_part_text_cursor_pos_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur, int pos)
2385{ 2385{
2386 Edje_Real_Part *rp; 2386 Edje_Real_Part *rp;
2387 2387
@@ -2395,7 +2395,7 @@ _edje_object_part_text_cursor_pos_set(Eo *obj EINA_UNUSED, Edje *ed, const char
2395} 2395}
2396 2396
2397EOLIAN int 2397EOLIAN int
2398_edje_object_part_text_cursor_pos_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) 2398_efl_canvas_layout_part_text_cursor_pos_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur)
2399{ 2399{
2400 int ret; 2400 int ret;
2401 Edje_Real_Part *rp; 2401 Edje_Real_Part *rp;
@@ -3230,7 +3230,7 @@ _swallow_real_part_get(Evas_Object *obj_swallow)
3230} 3230}
3231 3231
3232EOLIAN Eina_Bool 3232EOLIAN Eina_Bool
3233_edje_object_efl_container_content_remove(Eo *obj EINA_UNUSED, Edje *ed, Evas_Object *obj_swallow) 3233_efl_canvas_layout_efl_container_content_remove(Eo *obj EINA_UNUSED, Edje *ed, Evas_Object *obj_swallow)
3234{ 3234{
3235 Edje_Real_Part *rp; 3235 Edje_Real_Part *rp;
3236 Edje_User_Defined *eud; 3236 Edje_User_Defined *eud;
@@ -3290,7 +3290,7 @@ _edje_efl_content_content_get(Edje *ed, const char *part)
3290} 3290}
3291 3291
3292EOLIAN Eo * 3292EOLIAN Eo *
3293_edje_object_efl_part_part(Eo *obj, Edje *ed, const char *part) 3293_efl_canvas_layout_efl_part_part(Eo *obj, Edje *ed, const char *part)
3294{ 3294{
3295 Edje_Real_Part *rp; 3295 Edje_Real_Part *rp;
3296 3296
@@ -3316,7 +3316,7 @@ _edje_object_efl_part_part(Eo *obj, Edje *ed, const char *part)
3316} 3316}
3317 3317
3318EOLIAN Eina_Size2D 3318EOLIAN Eina_Size2D
3319_edje_object_efl_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Edje *ed) 3319_efl_canvas_layout_efl_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Edje *ed)
3320{ 3320{
3321 if ((!ed) || (!ed->collection)) 3321 if ((!ed) || (!ed->collection))
3322 return EINA_SIZE2D(0, 0); 3322 return EINA_SIZE2D(0, 0);
@@ -3325,7 +3325,7 @@ _edje_object_efl_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Edje *ed)
3325} 3325}
3326 3326
3327EOLIAN Eina_Size2D 3327EOLIAN Eina_Size2D
3328_edje_object_efl_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED) 3328_efl_canvas_layout_efl_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED)
3329{ 3329{
3330 Eina_Size2D sz; 3330 Eina_Size2D sz;
3331 3331
@@ -3344,7 +3344,7 @@ _edje_object_efl_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Edje *ed E
3344} 3344}
3345 3345
3346EOLIAN void 3346EOLIAN void
3347_edje_object_efl_layout_calc_calc_force(Eo *obj EINA_UNUSED, Edje *ed) 3347_efl_canvas_layout_efl_layout_calc_calc_force(Eo *obj EINA_UNUSED, Edje *ed)
3348{ 3348{
3349 int pf, pf2; 3349 int pf, pf2;
3350 3350
@@ -3367,7 +3367,7 @@ _edje_object_efl_layout_calc_calc_force(Eo *obj EINA_UNUSED, Edje *ed)
3367} 3367}
3368 3368
3369EOLIAN Eina_Rectangle 3369EOLIAN Eina_Rectangle
3370_edje_object_efl_layout_calc_calc_parts_extends(Eo *obj EINA_UNUSED, Edje *ed) 3370_efl_canvas_layout_efl_layout_calc_calc_parts_extends(Eo *obj EINA_UNUSED, Edje *ed)
3371{ 3371{
3372 Evas_Coord xx1 = INT_MAX, yy1 = INT_MAX; 3372 Evas_Coord xx1 = INT_MAX, yy1 = INT_MAX;
3373 Evas_Coord xx2 = 0, yy2 = 0, w = 0, h = 0; 3373 Evas_Coord xx2 = 0, yy2 = 0, w = 0, h = 0;
@@ -3407,7 +3407,7 @@ _edje_object_efl_layout_calc_calc_parts_extends(Eo *obj EINA_UNUSED, Edje *ed)
3407} 3407}
3408 3408
3409EOLIAN Eina_Size2D 3409EOLIAN Eina_Size2D
3410_edje_object_efl_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Edje *ed, Eina_Size2D restricted) 3410_efl_canvas_layout_efl_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Edje *ed, Eina_Size2D restricted)
3411{ 3411{
3412 const int CALC_COUNT_LIMIT = 255; 3412 const int CALC_COUNT_LIMIT = 255;
3413 3413
@@ -4395,7 +4395,7 @@ _part_iterator_free(Part_Iterator *it)
4395} 4395}
4396 4396
4397EOLIAN Eina_Iterator * 4397EOLIAN Eina_Iterator *
4398_edje_object_access_part_iterate(Eo *obj EINA_UNUSED, Edje *ed) 4398_efl_canvas_layout_access_part_iterate(Eo *obj EINA_UNUSED, Edje *ed)
4399{ 4399{
4400 Part_Iterator *it; 4400 Part_Iterator *it;
4401 4401
@@ -4422,7 +4422,7 @@ edje_object_access_part_list_get(const Edje_Object *obj)
4422 Eina_Iterator *it; 4422 Eina_Iterator *it;
4423 const char *str; 4423 const char *str;
4424 4424
4425 it = edje_obj_access_part_iterate((Eo *) obj); 4425 it = efl_canvas_layout_access_part_iterate((Eo *) obj);
4426 EINA_ITERATOR_FOREACH(it, str) 4426 EINA_ITERATOR_FOREACH(it, str)
4427 access_parts = eina_list_append(access_parts, str); 4427 access_parts = eina_list_append(access_parts, str);
4428 eina_iterator_free(it); 4428 eina_iterator_free(it);
@@ -4792,7 +4792,7 @@ _edje_perspective_obj_del(void *data, EINA_UNUSED Evas *e, EINA_UNUSED Evas_Obje
4792 { 4792 {
4793 Edje *ed; 4793 Edje *ed;
4794 4794
4795 ed = efl_data_scope_get(o, EDJE_OBJECT_CLASS); 4795 ed = efl_data_scope_get(o, EFL_CANVAS_LAYOUT_CLASS);
4796 if (!ed) continue; 4796 if (!ed) continue;
4797 ed->persp = NULL; 4797 ed->persp = NULL;
4798 ed->dirty = EINA_TRUE; 4798 ed->dirty = EINA_TRUE;
@@ -4845,7 +4845,7 @@ edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Co
4845 { 4845 {
4846 Edje *ed; 4846 Edje *ed;
4847 4847
4848 ed = efl_data_scope_get(o, EDJE_OBJECT_CLASS); 4848 ed = efl_data_scope_get(o, EFL_CANVAS_LAYOUT_CLASS);
4849 if (!ed) continue; 4849 if (!ed) continue;
4850 if (!ed->persp) 4850 if (!ed->persp)
4851 { 4851 {
@@ -5040,7 +5040,7 @@ edje_object_preload(Eo *obj, Eina_Bool cancel)
5040} 5040}
5041 5041
5042EOLIAN void 5042EOLIAN void
5043_edje_object_efl_layout_calc_calc_auto_update_hints_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool update) 5043_efl_canvas_layout_efl_layout_calc_calc_auto_update_hints_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool update)
5044{ 5044{
5045 if (!ed) return; 5045 if (!ed) return;
5046 if (ed->update_hints == !!update) return; 5046 if (ed->update_hints == !!update) return;
@@ -5054,7 +5054,7 @@ _edje_object_efl_layout_calc_calc_auto_update_hints_set(Eo *obj EINA_UNUSED, Edj
5054} 5054}
5055 5055
5056EOLIAN Eina_Bool 5056EOLIAN Eina_Bool
5057_edje_object_efl_layout_calc_calc_auto_update_hints_get(Eo *obj EINA_UNUSED, Edje *ed) 5057_efl_canvas_layout_efl_layout_calc_calc_auto_update_hints_get(Eo *obj EINA_UNUSED, Edje *ed)
5058{ 5058{
5059 return ed->update_hints; 5059 return ed->update_hints;
5060} 5060}
@@ -5597,9 +5597,9 @@ _edje_fetch(const Evas_Object *obj)
5597{ 5597{
5598 Edje *ed; 5598 Edje *ed;
5599 5599
5600 if (!obj || !efl_isa(obj, EDJE_OBJECT_CLASS)) 5600 if (!obj || !efl_isa(obj, EFL_CANVAS_LAYOUT_CLASS))
5601 return NULL; 5601 return NULL;
5602 ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); 5602 ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
5603 if ((ed) && (ed->delete_me)) return NULL; 5603 if ((ed) && (ed->delete_me)) return NULL;
5604 return ed; 5604 return ed;
5605} 5605}
@@ -5693,7 +5693,7 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
5693 rp->typedata.swallow->swallow_params.min.h = 0; 5693 rp->typedata.swallow->swallow_params.min.h = 0;
5694 rp->typedata.swallow->swallow_params.max.w = -1; 5694 rp->typedata.swallow->swallow_params.max.w = -1;
5695 rp->typedata.swallow->swallow_params.max.h = -1; 5695 rp->typedata.swallow->swallow_params.max.h = -1;
5696 if (efl_isa(rp->typedata.swallow->swallowed_object, EDJE_OBJECT_CLASS)) 5696 if (efl_isa(rp->typedata.swallow->swallowed_object, EFL_CANVAS_LAYOUT_CLASS))
5697 { 5697 {
5698 Evas_Coord w = 0, h = 0; 5698 Evas_Coord w = 0, h = 0;
5699 5699
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/efl_canvas_layout.eo
index 5af4a417b5..b6cb5b7543 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/efl_canvas_layout.eo
@@ -2,15 +2,14 @@ import edje_types;
2 2
3// FIXME: This EO doc needs a direct link to the "edcref" doc 3// FIXME: This EO doc needs a direct link to the "edcref" doc
4 4
5class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part, 5class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
6 Efl.Observer, Efl.Ui.Base, Efl.Layout.Calc, 6 Efl.Observer, Efl.Ui.Base, Efl.Layout.Calc,
7 Efl.Layout.Signal, Efl.Layout.Group, 7 Efl.Layout.Signal, Efl.Layout.Group,
8 Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class, 8 Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class,
9 Efl.Gfx.Size_Class) 9 Efl.Gfx.Size_Class)
10{ 10{
11 [[Edje object class]] 11 [[Edje object class]]
12 legacy_prefix: edje_object; 12 legacy_prefix: edje_object;
13 eo_prefix: edje_obj;
14 event_prefix: edje_object; 13 event_prefix: edje_object;
15 data: Edje; 14 data: Edje;
16 methods { 15 methods {
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index ef34892c4e..dd184a5286 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -155,7 +155,7 @@ _image_sizing_eval(Efl_Ui_Image_Data *sd, Evas_Object *img)
155{ 155{
156 Evas_Coord x = 0, y = 0, w = 1, h = 1; 156 Evas_Coord x = 0, y = 0, w = 1, h = 1;
157 157
158 if (efl_isa(img, EDJE_OBJECT_CLASS)) 158 if (efl_isa(img, EFL_CANVAS_LAYOUT_CLASS))
159 { 159 {
160 x = sd->img_x; 160 x = sd->img_x;
161 y = sd->img_y; 161 y = sd->img_y;
@@ -1257,7 +1257,7 @@ _efl_ui_image_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data
1257{ 1257{
1258 int tw, th; 1258 int tw, th;
1259 1259
1260 if (efl_isa(sd->img, EDJE_OBJECT_CLASS)) 1260 if (efl_isa(sd->img, EFL_CANVAS_LAYOUT_CLASS))
1261 edje_object_size_min_get(sd->img, &tw, &th); 1261 edje_object_size_min_get(sd->img, &tw, &th);
1262 else 1262 else
1263 evas_object_image_size_get(sd->img, &tw, &th); 1263 evas_object_image_size_get(sd->img, &tw, &th);
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 2ed5db22cc..a0365f8749 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -407,7 +407,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_
407 407
408 efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), item); 408 efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), item);
409 409
410 if (efl_isa(wd->resize_obj, EDJE_OBJECT_CLASS)) 410 if (efl_isa(wd->resize_obj, EFL_CANVAS_LAYOUT_CLASS))
411 edje_object_message_signal_process(wd->resize_obj); 411 edje_object_message_signal_process(wd->resize_obj);
412 412
413 return EINA_TRUE; 413 return EINA_TRUE;
@@ -1791,7 +1791,7 @@ _efl_ui_layout_efl_object_dbg_info_get(Eo *eo_obj, Efl_Ui_Layout_Data *_pd EINA_
1791 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root); 1791 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
1792 ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd); 1792 ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd);
1793 1793
1794 if (wd->resize_obj && efl_isa(wd->resize_obj, EDJE_OBJECT_CLASS)) 1794 if (wd->resize_obj && efl_isa(wd->resize_obj, EFL_CANVAS_LAYOUT_CLASS))
1795 { 1795 {
1796 Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); 1796 Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
1797 const char *file, *edje_group; 1797 const char *file, *edje_group;
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 341b5a4bdb..758681272a 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -4642,7 +4642,7 @@ static inline Eo *
4642_decoration_create(Efl_Ui_Text_Data *sd, const char *file, 4642_decoration_create(Efl_Ui_Text_Data *sd, const char *file,
4643 const char *source, Eina_Bool above) 4643 const char *source, Eina_Bool above)
4644{ 4644{
4645 Eo *ret = efl_add(EDJE_OBJECT_CLASS, sd->entry_edje); 4645 Eo *ret = efl_add(EFL_CANVAS_LAYOUT_CLASS, sd->entry_edje);
4646 Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); 4646 Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
4647 edje_object_file_set(ret, file, source); 4647 edje_object_file_set(ret, file, source);
4648 evas_object_smart_member_add(ret, sd->entry_edje); 4648 evas_object_smart_member_add(ret, sd->entry_edje);
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 3ebbdb116c..5472d8197f 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -8330,7 +8330,7 @@ elm_win_resize_object_add(Eo *obj, Evas_Object *subobj)
8330 // Little hack for E 8330 // Little hack for E
8331 if (evas_obj_box_count(sd->legacy.box) > 0) 8331 if (evas_obj_box_count(sd->legacy.box) > 0)
8332 sd->single_edje_content = 0; 8332 sd->single_edje_content = 0;
8333 else if (efl_isa(subobj, EDJE_OBJECT_CLASS)) 8333 else if (efl_isa(subobj, EFL_CANVAS_LAYOUT_CLASS))
8334 sd->single_edje_content = 1; 8334 sd->single_edje_content = 1;
8335 8335
8336 ret = elm_widget_sub_object_add(obj, subobj); 8336 ret = elm_widget_sub_object_add(obj, subobj);
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 625e63665c..2c2856be95 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1419,7 +1419,7 @@ _sub_obj_size_hints_set(Evas_Object *sobj,
1419 Evas_Coord minw = -1, minh = -1; 1419 Evas_Coord minw = -1, minh = -1;
1420 1420
1421 elm_coords_finger_size_adjust(timesw, &minw, timesh, &minh); 1421 elm_coords_finger_size_adjust(timesw, &minw, timesh, &minh);
1422 if (sobj && efl_isa(sobj, EDJE_OBJECT_CLASS)) 1422 if (sobj && efl_isa(sobj, EFL_CANVAS_LAYOUT_CLASS))
1423 edje_object_size_min_restricted_calc(sobj, &minw, &minh, minw, minh); 1423 edje_object_size_min_restricted_calc(sobj, &minw, &minh, minw, minh);
1424 evas_object_size_hint_min_set(sobj, minw, minh); 1424 evas_object_size_hint_min_set(sobj, minw, minh);
1425 evas_object_size_hint_max_set(sobj, -1, -1); 1425 evas_object_size_hint_max_set(sobj, -1, -1);
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 43414ce521..5f9a4eb18b 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -3322,7 +3322,7 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj,
3322 const char *target_hl_part = NULL; 3322 const char *target_hl_part = NULL;
3323 const Evas_Object *edje_obj = NULL; 3323 const Evas_Object *edje_obj = NULL;
3324 3324
3325 if (obj && efl_isa(obj, EDJE_OBJECT_CLASS)) 3325 if (obj && efl_isa(obj, EFL_CANVAS_LAYOUT_CLASS))
3326 { 3326 {
3327 edje_obj = obj; 3327 edje_obj = obj;
3328 if (!(target_hl_part = edje_object_data_get(edje_obj, "focus_part"))) 3328 if (!(target_hl_part = edje_object_data_get(edje_obj, "focus_part")))
@@ -3650,7 +3650,7 @@ _elm_widget_item_signal_callback_list_get(Elm_Widget_Item_Data *item, Eina_List
3650 elm_object_signal_callback_del(item->view, 3650 elm_object_signal_callback_del(item->view,
3651 wisd->emission, wisd->source, 3651 wisd->emission, wisd->source,
3652 _elm_widget_item_signal_cb); 3652 _elm_widget_item_signal_cb);
3653 else if (efl_isa(item->view, EDJE_OBJECT_CLASS)) 3653 else if (efl_isa(item->view, EFL_CANVAS_LAYOUT_CLASS))
3654 edje_object_signal_callback_del_full(item->view, 3654 edje_object_signal_callback_del_full(item->view,
3655 wisd->emission, wisd->source, 3655 wisd->emission, wisd->source,
3656 _elm_widget_item_signal_cb, wisd); 3656 _elm_widget_item_signal_cb, wisd);
@@ -4717,7 +4717,7 @@ _elm_widget_item_signal_callback_add(Eo *eo_item,
4717 4717
4718 if (_elm_widget_is(item->view)) 4718 if (_elm_widget_is(item->view))
4719 elm_object_signal_callback_add(item->view, emission, source, _elm_widget_item_signal_cb, wisd); 4719 elm_object_signal_callback_add(item->view, emission, source, _elm_widget_item_signal_cb, wisd);
4720 else if (efl_isa(item->view, EDJE_OBJECT_CLASS)) 4720 else if (efl_isa(item->view, EFL_CANVAS_LAYOUT_CLASS))
4721 edje_object_signal_callback_add(item->view, emission, source, _elm_widget_item_signal_cb, wisd); 4721 edje_object_signal_callback_add(item->view, emission, source, _elm_widget_item_signal_cb, wisd);
4722 else 4722 else
4723 { 4723 {
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index a8dbbf32e4..6d545086a7 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -6,7 +6,7 @@
6#include <stdio.h> 6#include <stdio.h>
7 7
8#define EFL_GFX_FILTER_BETA 8#define EFL_GFX_FILTER_BETA
9#define EDJE_OBJECT_BETA 9#define EFL_CANVAS_LAYOUT_BETA
10 10
11#include <Eina.h> 11#include <Eina.h>
12#include <Edje.h> 12#include <Edje.h>
@@ -362,13 +362,13 @@ START_TEST(edje_test_swallows)
362 Evas *evas = EDJE_TEST_INIT_EVAS(); 362 Evas *evas = EDJE_TEST_INIT_EVAS();
363 Evas_Object *ly, *o1, *o2; 363 Evas_Object *ly, *o1, *o2;
364 364
365 ly = efl_add(EDJE_OBJECT_CLASS, evas); 365 ly = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas);
366 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group")); 366 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group"));
367 367
368 fail_unless(edje_object_part_exists(ly, "swallow")); 368 fail_unless(edje_object_part_exists(ly, "swallow"));
369 369
370 370
371 o1 = efl_add(EDJE_OBJECT_CLASS, ly); 371 o1 = efl_add(EFL_CANVAS_LAYOUT_CLASS, ly);
372 fail_if(!edje_object_part_swallow(ly, "swallow", o1)); 372 fail_if(!edje_object_part_swallow(ly, "swallow", o1));
373 ck_assert_ptr_eq(efl_parent_get(o1), ly); 373 ck_assert_ptr_eq(efl_parent_get(o1), ly);
374 374
@@ -378,7 +378,7 @@ START_TEST(edje_test_swallows)
378 fail_if(!edje_object_part_swallow(ly, "swallow", o1)); 378 fail_if(!edje_object_part_swallow(ly, "swallow", o1));
379 ck_assert_ptr_eq(efl_parent_get(o1), ly); 379 ck_assert_ptr_eq(efl_parent_get(o1), ly);
380 380
381 o2 = efl_add(EDJE_OBJECT_CLASS, ly); 381 o2 = efl_add(EFL_CANVAS_LAYOUT_CLASS, ly);
382 fail_if(!edje_object_part_swallow(ly, "swallow", o2)); 382 fail_if(!edje_object_part_swallow(ly, "swallow", o2));
383 ck_assert_ptr_eq(efl_parent_get(o2), ly); 383 ck_assert_ptr_eq(efl_parent_get(o2), ly);
384 /* o1 is deleted at this point. */ 384 /* o1 is deleted at this point. */
@@ -393,13 +393,13 @@ START_TEST(edje_test_swallows_eoapi)
393 Evas *evas = EDJE_TEST_INIT_EVAS(); 393 Evas *evas = EDJE_TEST_INIT_EVAS();
394 Evas_Object *ly, *o1, *o2; 394 Evas_Object *ly, *o1, *o2;
395 395
396 ly = efl_add(EDJE_OBJECT_CLASS, evas); 396 ly = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas);
397 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group")); 397 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group"));
398 398
399 fail_unless(edje_object_part_exists(ly, "swallow")); 399 fail_unless(edje_object_part_exists(ly, "swallow"));
400 400
401 401
402 o1 = efl_add(EDJE_OBJECT_CLASS, ly); 402 o1 = efl_add(EFL_CANVAS_LAYOUT_CLASS, ly);
403 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1)); 403 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1));
404 ck_assert_ptr_eq(efl_parent_get(o1), ly); 404 ck_assert_ptr_eq(efl_parent_get(o1), ly);
405 405
@@ -409,7 +409,7 @@ START_TEST(edje_test_swallows_eoapi)
409 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1)); 409 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1));
410 ck_assert_ptr_eq(efl_parent_get(o1), ly); 410 ck_assert_ptr_eq(efl_parent_get(o1), ly);
411 411
412 o2 = efl_add(EDJE_OBJECT_CLASS, ly); 412 o2 = efl_add(EFL_CANVAS_LAYOUT_CLASS, ly);
413 fail_if(!efl_content_set(efl_part(ly, "swallow"), o2)); 413 fail_if(!efl_content_set(efl_part(ly, "swallow"), o2));
414 ck_assert_ptr_eq(efl_parent_get(o2), ly); 414 ck_assert_ptr_eq(efl_parent_get(o2), ly);
415 /* o1 is deleted at this point. */ 415 /* o1 is deleted at this point. */
@@ -433,7 +433,7 @@ START_TEST(edje_test_access)
433 fail_unless(edje_object_file_set(obj, test_layout_get("test_layout.edj"), "test_group")); 433 fail_unless(edje_object_file_set(obj, test_layout_get("test_layout.edj"), "test_group"));
434 434
435 /* eo api */ 435 /* eo api */
436 it = edje_obj_access_part_iterate(obj); 436 it = efl_canvas_layout_access_part_iterate(obj);
437 fail_if(!it); 437 fail_if(!it);
438 438
439 EINA_ITERATOR_FOREACH(it, name) 439 EINA_ITERATOR_FOREACH(it, name)
@@ -825,7 +825,7 @@ START_TEST(edje_test_message_send_eo)
825 825
826 evas = EDJE_TEST_INIT_EVAS(); 826 evas = EDJE_TEST_INIT_EVAS();
827 827
828 obj = efl_add(EDJE_OBJECT_CLASS, evas, 828 obj = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas,
829 efl_file_set(efl_added, test_layout_get("test_messages.edj"), "test_group")); 829 efl_file_set(efl_added, test_layout_get("test_messages.edj"), "test_group"));
830 830
831 // FIXME: EO API HERE 831 // FIXME: EO API HERE
@@ -882,7 +882,7 @@ START_TEST(edje_test_signals)
882 882
883 evas = EDJE_TEST_INIT_EVAS(); 883 evas = EDJE_TEST_INIT_EVAS();
884 884
885 obj = efl_add(EDJE_OBJECT_CLASS, evas, 885 obj = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas,
886 efl_file_set(efl_added, test_layout_get("test_signals.edj"), "level1"), 886 efl_file_set(efl_added, test_layout_get("test_signals.edj"), "level1"),
887 efl_gfx_size_set(efl_added, EINA_SIZE2D(320, 240)), 887 efl_gfx_size_set(efl_added, EINA_SIZE2D(320, 240)),
888 efl_gfx_visible_set(efl_added, 1)); 888 efl_gfx_visible_set(efl_added, 1));
@@ -925,7 +925,7 @@ START_TEST(edje_test_signal_callback_del_full)
925 925
926 evas = EDJE_TEST_INIT_EVAS(); 926 evas = EDJE_TEST_INIT_EVAS();
927 927
928 obj = efl_add(EDJE_OBJECT_CLASS, evas, 928 obj = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas,
929 efl_file_set(efl_added, 929 efl_file_set(efl_added,
930 test_layout_get("test_signal_callback_del_full.edj"), "test"), 930 test_layout_get("test_signal_callback_del_full.edj"), "test"),
931 efl_gfx_size_set(efl_added, EINA_SIZE2D(320, 240)), 931 efl_gfx_size_set(efl_added, EINA_SIZE2D(320, 240)),
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index d3e4218408..b5848517cc 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -111,7 +111,7 @@ main_delete_request(Ecore_Evas *ee EINA_UNUSED)
111static void 111static void
112bg_setup(void) 112bg_setup(void)
113{ 113{
114 o_bg = efl_add(EDJE_OBJECT_CLASS, evas); 114 o_bg = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas);
115 efl_file_set(o_bg, theme_file, "background"); 115 efl_file_set(o_bg, theme_file, "background");
116 efl_gfx_position_set(o_bg, EINA_POSITION2D(0, 0)); 116 efl_gfx_position_set(o_bg, EINA_POSITION2D(0, 0));
117 efl_gfx_size_set(o_bg, EINA_SIZE2D(startw, starth)); 117 efl_gfx_size_set(o_bg, EINA_SIZE2D(startw, starth));
@@ -621,7 +621,7 @@ init_video_object(const char *module_filename, const char *filename)
621 fd = calloc(1, sizeof(Frame_Data)); 621 fd = calloc(1, sizeof(Frame_Data));
622 if (!fd) exit(1); 622 if (!fd) exit(1);
623 623
624 oe = efl_add(EDJE_OBJECT_CLASS, evas); 624 oe = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas);
625 efl_event_callback_add(oe, EFL_EVENT_DEL, _oe_free_cb, fd); 625 efl_event_callback_add(oe, EFL_EVENT_DEL, _oe_free_cb, fd);
626 efl_key_data_set(oe, "frame_data", fd); 626 efl_key_data_set(oe, "frame_data", fd);
627 efl_file_set(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller"); 627 efl_file_set(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller");