diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-06 11:56:50 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-13 09:57:05 +0900 |
| commit | 9ed6838f17e43621eea6f388eb2f5eceba14ecad (patch) | |
| tree | f32f2d1726cd03cf8b150f6e9a5caf266bd27122 | |
| parent | 8572cd5def291aa14c79bb21ea578d024eb36999 (diff) | |
| download | efl-9ed6838f17e43621eea6f388eb2f5eceba14ecad.tar.gz | |
evas: Remove class Efl.Canvas.Group.Clipped
The functionality is now merged inside the core Group class, which will
allow us to clean up its API.
| -rw-r--r-- | src/Makefile_Evas.am | 1 | ||||
| -rw-r--r-- | src/lib/evas/Evas_Eo.h | 6 | ||||
| -rw-r--r-- | src/lib/evas/canvas/efl_canvas_group_clipped.eo | 10 | ||||
| -rw-r--r-- | src/lib/evas/canvas/evas_object_smart_clipped.c | 12 |
4 files changed, 0 insertions, 29 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index f743d435f7..9b141d17b8 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -36,7 +36,6 @@ evas_eolian_pub_files = \ lib/evas/canvas/efl_canvas_surface_x11.eo \ lib/evas/canvas/efl_canvas_surface_wayland.eo \ lib/evas/canvas/efl_canvas_filter_internal.eo \ - lib/evas/canvas/efl_canvas_group_clipped.eo \ lib/evas/canvas/efl_input_state.eo \ lib/evas/canvas/efl_input_interface.eo \ lib/evas/canvas/efl_input_event.eo \ diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index bcd1b80dc0..24a4047eb8 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -48,12 +48,6 @@ */ /** - * @ingroup Evas_Smart_Object_Clipped - * - * @{ - */ -#include "canvas/efl_canvas_group_clipped.eo.h" -/** * @} */ diff --git a/src/lib/evas/canvas/efl_canvas_group_clipped.eo b/src/lib/evas/canvas/efl_canvas_group_clipped.eo deleted file mode 100644 index 2f995f9cc3..0000000000 --- a/src/lib/evas/canvas/efl_canvas_group_clipped.eo +++ /dev/null @@ -1,10 +0,0 @@ -/* FIXME: This class needs to disappear and its functionality merged into - * standard smart objects (Efl.Canvas.Group). */ -abstract Efl.Canvas.Group.Clipped (Efl.Canvas.Group) -{ - [[Internal class representing a canvas object group with a clipper.]] - data: null; - implements { - Efl.Object.constructor; - } -} diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c index 776c7fd68e..d3bfb98e5c 100644 --- a/src/lib/evas/canvas/evas_object_smart_clipped.c +++ b/src/lib/evas/canvas/evas_object_smart_clipped.c @@ -4,8 +4,6 @@ #include "evas_common_private.h" #include "evas_private.h" -#define MY_CLASS EFL_CANVAS_GROUP_CLIPPED_CLASS - #define CSO_DATA_GET(eo_obj, ptr) \ Evas_Object_Smart_Clipped_Data *ptr = evas_object_smart_data_get(eo_obj); @@ -107,14 +105,6 @@ evas_object_smart_clipped_smart_member_del(Evas_Object *eo_obj, Evas_Object *mem evas_object_hide(cso->clipper); } -EOLIAN static Eo * -_efl_canvas_group_clipped_efl_object_constructor(Eo *eo_obj, void *_pd EINA_UNUSED) -{ - // Setting this flag before the parent constructor on purpose. - efl_canvas_group_unclipped_set(eo_obj, EINA_FALSE); - return efl_constructor(efl_super(eo_obj, MY_CLASS)); -} - /* Legacy only */ EAPI void evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc) @@ -148,5 +138,3 @@ evas_object_smart_clipped_class_get(void) class = &_sc; return class; } - -#include "canvas/efl_canvas_group_clipped.eo.c" |