cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c2e8b492b18bdecc2300ad051ba1406e40ad068f
commit c2e8b492b18bdecc2300ad051ba1406e40ad068f
Author: Cedric Bail <ced...@osg.samsung.com>
Date: Tue May 8 17:37:30 2018 -0700
evas: enforce legacy parent to be the canvas.
---
src/lib/edje/edje_edit.c | 2 +-
src/lib/edje/edje_smart.c | 2 +-
src/lib/emotion/emotion_smart.c | 2 +-
src/lib/evas/canvas/efl_canvas_event_grabber.c | 2 +-
src/lib/evas/canvas/efl_canvas_vg_object.c | 2 +-
src/lib/evas/canvas/evas_image_legacy.c | 4 ++--
src/lib/evas/canvas/evas_object_box.c | 2 +-
src/lib/evas/canvas/evas_object_grid.c | 2 +-
src/lib/evas/canvas/evas_object_line.c | 2 +-
src/lib/evas/canvas/evas_object_polygon.c | 2 +-
src/lib/evas/canvas/evas_object_rectangle.c | 2 +-
src/lib/evas/canvas/evas_object_smart.c | 2 +-
src/lib/evas/canvas/evas_object_table.c | 2 +-
src/lib/evas/canvas/evas_object_text.c | 2 +-
src/lib/evas/canvas/evas_object_textgrid.c | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index ef0dd243aa..2527598c69 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -289,7 +289,7 @@ _edje_edit_efl_file_mmap_set(Eo *obj, Edje_Edit *eed, const
Eina_File *mmap, con
EAPI Evas_Object *
edje_edit_object_add(Evas *evas)
{
- return efl_add(MY_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(MY_CLASS, evas_find(evas),
efl_canvas_object_legacy_ctor(efl_added));
}
EOLIAN static Eo *
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 5d413649c6..c8bd123a8c 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -21,7 +21,7 @@ EAPI Evas_Object *
edje_object_add(Evas *evas)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(evas, NULL);
- return efl_add(MY_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(MY_CLASS, evas_find(evas),
efl_canvas_object_legacy_ctor(efl_added));
}
EOLIAN static Eo *
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index d52e27eaca..d68b84bce4 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -230,7 +230,7 @@ _clipper_position_size_update(Evas_Object *obj, int x, int
y, int w, int h, int
EAPI Evas_Object *
emotion_object_add(Evas *evas)
{
- return efl_add(MY_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(MY_CLASS, evas_find(evas),
efl_canvas_object_legacy_ctor(efl_added));
}
EOLIAN static Eo *
diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber.c
b/src/lib/evas/canvas/efl_canvas_event_grabber.c
index 536e1ee916..deb1c28bcc 100644
--- a/src/lib/evas/canvas/efl_canvas_event_grabber.c
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.c
@@ -404,7 +404,7 @@ EAPI Evas_Object *
evas_object_event_grabber_add(Evas *eo_e)
{
EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(eo_e, EVAS_CANVAS_CLASS), NULL);
- return efl_add(MY_CLASS, eo_e, efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(MY_CLASS, evas_find(eo_e),
efl_canvas_object_legacy_ctor(efl_added));
}
#include "efl_canvas_event_grabber.eo.c"
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c
b/src/lib/evas/canvas/efl_canvas_vg_object.c
index 935e0021db..6d4ceaff0e 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -128,7 +128,7 @@ evas_object_vg_add(Evas *e)
return NULL;
MAGIC_CHECK_END();
// TODO: Ask backend to return the main Ector_Surface
- return efl_add(MY_CLASS, e, efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(MY_CLASS, evas_find(e),
efl_canvas_object_legacy_ctor(efl_added));
}
EOLIAN static Efl_VG *
diff --git a/src/lib/evas/canvas/evas_image_legacy.c
b/src/lib/evas/canvas/evas_image_legacy.c
index e38c1a2d77..344408e38a 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -26,7 +26,7 @@ EAPI Evas_Object *
evas_object_image_add(Evas *eo_e)
{
EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(eo_e, EVAS_CANVAS_CLASS), NULL);
- return efl_add(EVAS_IMAGE_CLASS, eo_e,
+ return efl_add(EVAS_IMAGE_CLASS, evas_find(eo_e),
efl_gfx_fill_auto_set(efl_added, EINA_FALSE),
efl_canvas_object_legacy_ctor(efl_added));
}
@@ -35,7 +35,7 @@ EAPI Evas_Object *
evas_object_image_filled_add(Evas *eo_e)
{
EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(eo_e, EVAS_CANVAS_CLASS), NULL);
- return efl_add(EVAS_IMAGE_CLASS, eo_e,
+ return efl_add(EVAS_IMAGE_CLASS, evas_find(eo_e),
efl_canvas_object_legacy_ctor(efl_added));
}
diff --git a/src/lib/evas/canvas/evas_object_box.c
b/src/lib/evas/canvas/evas_object_box.c
index e5b9b5aef6..3adbf22f6e 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -478,7 +478,7 @@ evas_object_box_add(Evas *evas)
MAGIC_CHECK(evas, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- return efl_add(MY_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(MY_CLASS, evas_find(evas),
efl_canvas_object_legacy_ctor(efl_added));
}
EOLIAN static Eo *
diff --git a/src/lib/evas/canvas/evas_object_grid.c
b/src/lib/evas/canvas/evas_object_grid.c
index a8fdba858c..b954bf2dce 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -276,7 +276,7 @@ evas_object_grid_add(Evas *evas)
MAGIC_CHECK(evas, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- return efl_add(MY_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(MY_CLASS, evas_find(evas),
efl_canvas_object_legacy_ctor(efl_added));
}
EOLIAN static Eo *
diff --git a/src/lib/evas/canvas/evas_object_line.c
b/src/lib/evas/canvas/evas_object_line.c
index 02aeea8d5d..e26ea6677b 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -97,7 +97,7 @@ evas_object_line_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- return efl_add(EVAS_LINE_CLASS, e,
efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(EVAS_LINE_CLASS, evas_find(e),
efl_canvas_object_legacy_ctor(efl_added));
}
EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_object_polygon.c
b/src/lib/evas/canvas/evas_object_polygon.c
index c0f11a6885..90c05dda42 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -87,7 +87,7 @@ evas_object_polygon_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- return efl_add(MY_CLASS, e, efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(MY_CLASS, evas_find(e),
efl_canvas_object_legacy_ctor(efl_added));
}
EOLIAN static Eo *
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c
b/src/lib/evas/canvas/evas_object_rectangle.c
index d9e0d28b64..c5d8253aee 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -95,7 +95,7 @@ evas_object_rectangle_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- return efl_add(EFL_CANVAS_RECTANGLE_CLASS, e,
efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas_find(e),
efl_canvas_object_legacy_ctor(efl_added));
}
EOLIAN static Eo *
diff --git a/src/lib/evas/canvas/evas_object_smart.c
b/src/lib/evas/canvas/evas_object_smart.c
index b5265331b4..8b1a5669f2 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -676,7 +676,7 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s)
MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- eo_obj = efl_add(EFL_CANVAS_GROUP_CLASS, eo_e,
efl_canvas_object_legacy_ctor(efl_added));
+ eo_obj = efl_add(EFL_CANVAS_GROUP_CLASS, evas_find(eo_e),
efl_canvas_object_legacy_ctor(efl_added));
evas_object_smart_attach(eo_obj, s);
return eo_obj;
}
diff --git a/src/lib/evas/canvas/evas_object_table.c
b/src/lib/evas/canvas/evas_object_table.c
index 74ee07b45e..fde93eca58 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -982,7 +982,7 @@ evas_object_table_add(Evas *evas)
MAGIC_CHECK(evas, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- return efl_add(MY_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(MY_CLASS, evas_find(evas),
efl_canvas_object_legacy_ctor(efl_added));
}
EOLIAN static Eo *
diff --git a/src/lib/evas/canvas/evas_object_text.c
b/src/lib/evas/canvas/evas_object_text.c
index b487a64cf9..82be722deb 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -379,7 +379,7 @@ evas_object_text_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- return efl_add(EVAS_TEXT_CLASS, e,
efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(EVAS_TEXT_CLASS, evas_find(e),
efl_canvas_object_legacy_ctor(efl_added));
}
EOLIAN static Eo *
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c
b/src/lib/evas/canvas/evas_object_textgrid.c
index 0eea223132..d817d94e46 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -902,7 +902,7 @@ evas_object_textgrid_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- return efl_add(EVAS_TEXTGRID_CLASS, e,
efl_canvas_object_legacy_ctor(efl_added));
+ return efl_add(EVAS_TEXTGRID_CLASS, evas_find(e),
efl_canvas_object_legacy_ctor(efl_added));
}
EOLIAN static Eo *
--
