summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-01-17 13:46:03 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-01-17 13:58:08 +0100
commit9fefc3530883dd2334210b0204b293ae90a77020 (patch)
treef6274ff5c796208f3a3abdf2120c06eacca130d4 /src/lib/evas
parent586bc5207e63bd8f622f466749781e397fc5e921 (diff)
Revert "evas: make efl_canvas_group abstract"
This reverts commit ae65c64b8d52c3b3d032eb29474b750b7e5781cb. It appears that abstract -> abstract enforcement is not needed anymore, the other patches are fine. However, this one proposes a new object which is not needed to exist. Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D7676
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/Evas_Eo.h1
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_group_object.eo7
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c3
-rw-r--r--src/lib/evas/canvas/meson.build1
5 files changed, 2 insertions, 12 deletions
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 903da2ee7c..9cea6ddc77 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -179,7 +179,6 @@ struct _Efl_Canvas_Object_Animation_Event
179 * @{ 179 * @{
180 */ 180 */
181#include "canvas/efl_canvas_group.eo.h" 181#include "canvas/efl_canvas_group.eo.h"
182#include "canvas/efl_canvas_group_object.eo.h"
183/** 182/**
184 * @} 183 * @}
185 */ 184 */
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index eb9fc15aff..eecb255ad3 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -1,4 +1,4 @@
1abstract Efl.Canvas.Group (Efl.Canvas.Object) 1class Efl.Canvas.Group (Efl.Canvas.Object)
2{ 2{
3 [[A group object is a container for other canvas objects. Its children 3 [[A group object is a container for other canvas objects. Its children
4 move along their parent and are often clipped with a common clipper. 4 move along their parent and are often clipped with a common clipper.
diff --git a/src/lib/evas/canvas/efl_canvas_group_object.eo b/src/lib/evas/canvas/efl_canvas_group_object.eo
deleted file mode 100644
index 42650b10b7..0000000000
--- a/src/lib/evas/canvas/efl_canvas_group_object.eo
+++ /dev/null
@@ -1,7 +0,0 @@
1class Efl.Canvas.Group_Object(Efl.Canvas.Group)
2{
3 [[A class which makes Efl.Canvas.Group instanceable.
4 For further information, please see @Efl.Canvas.Group.
5 ]]
6 data: null;
7}
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index a8dbacb833..7f0daf7331 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -675,7 +675,7 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s)
675 675
676 eo_e = evas_find(eo_e); 676 eo_e = evas_find(eo_e);
677 EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(eo_e, EVAS_CANVAS_CLASS), NULL); 677 EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(eo_e, EVAS_CANVAS_CLASS), NULL);
678 eo_obj = efl_add(EFL_CANVAS_GROUP_OBJECT_CLASS, eo_e, efl_canvas_object_legacy_ctor(efl_added)); 678 eo_obj = efl_add(EFL_CANVAS_GROUP_CLASS, eo_e, efl_canvas_object_legacy_ctor(efl_added));
679 evas_object_smart_attach(eo_obj, s); 679 evas_object_smart_attach(eo_obj, s);
680 return eo_obj; 680 return eo_obj;
681} 681}
@@ -1849,4 +1849,3 @@ EOAPI EFL_VOID_FUNC_BODYV(efl_canvas_group_clipped_set, EFL_FUNC_CALL(enable), E
1849 EFL_OBJECT_OP_FUNC(efl_canvas_group_clipped_set, _efl_canvas_group_group_clipped_set) 1849 EFL_OBJECT_OP_FUNC(efl_canvas_group_clipped_set, _efl_canvas_group_group_clipped_set)
1850 1850
1851#include "canvas/efl_canvas_group.eo.c" 1851#include "canvas/efl_canvas_group.eo.c"
1852#include "canvas/efl_canvas_group_object.eo.c"
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index 1b384c03f7..c7e8810f63 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -74,7 +74,6 @@ pub_eo_files = [
74 'efl_canvas_vg_gradient_radial.eo', 74 'efl_canvas_vg_gradient_radial.eo',
75 'efl_canvas_vg_gradient_linear.eo', 75 'efl_canvas_vg_gradient_linear.eo',
76 'efl_canvas_group.eo', 76 'efl_canvas_group.eo',
77 'efl_canvas_group_object.eo',
78 'efl_gfx_map.eo', 77 'efl_gfx_map.eo',
79 'efl_canvas_event_grabber.eo', 78 'efl_canvas_event_grabber.eo',
80 'efl_canvas_text.eo' 79 'efl_canvas_text.eo'