From fd80e26f06fcb0a6853ea6f369e3ae263deeb544 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Mon, 21 Mar 2016 16:31:26 -0700 Subject: evas: make no longer supported object, legacy only. So I forgot to clean my hard drive from previously generated files, and obviously everything still worked. This lead to having to roll back evas_smart_clipped.eo as a public eo object until we merge elementary. Still I would like someone to take a look at elm_pan.eo and figure out how to not rely on smart clipped there. --- src/Makefile_Evas.am | 5 +-- src/lib/edje/edje_box_layout.c | 2 ++ src/lib/edje/edje_calc.c | 2 ++ src/lib/edje/edje_text.c | 2 ++ src/lib/edje/edje_util.c | 4 +++ src/lib/evas/Evas_Eo.h | 63 ------------------------------------- src/lib/evas/include/evas_private.h | 8 +++++ 7 files changed, 21 insertions(+), 65 deletions(-) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 0e4f44df66..6af2412ea9 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -42,6 +42,7 @@ evas_eolian_pub_files = \ lib/evas/canvas/efl_canvas_surface_x11.eo \ lib/evas/canvas/efl_canvas_surface_wayland.eo \ lib/evas/canvas/evas_filter.eo \ + lib/evas/canvas/evas_smart_clipped.eo \ $(NULL) evas_eolian_legacy_files = \ @@ -49,7 +50,6 @@ evas_eolian_legacy_files = \ lib/evas/canvas/evas_table.eo \ lib/evas/canvas/evas_grid.eo \ lib/evas/canvas/evas_box.eo\ - lib/evas/canvas/evas_smart_clipped.eo \ lib/evas/canvas/evas_out.eo \ lib/evas/canvas/evas_text.eo \ lib/evas/canvas/evas_textgrid.eo \ @@ -62,7 +62,8 @@ evas_eolian_type_files = \ lib/evas/canvas/evas_types.eot evas_eolian_priv_c = $(evas_eolian_priv_files:%.eo=%.eo.c) -evas_eolian_priv_h = $(evas_eolian_priv_files:%.eo=%.eo.h) +evas_eolian_priv_h = $(evas_eolian_priv_files:%.eo=%.eo.h) \ + $(evas_eolian_legacy_files:%.eo=%.eo.h) evas_eolian_pub_c = $(evas_eolian_pub_files:%.eo=%.eo.c) evas_eolian_pub_h = $(evas_eolian_pub_files:%.eo=%.eo.h) \ diff --git a/src/lib/edje/edje_box_layout.c b/src/lib/edje/edje_box_layout.c index 35bcd2d673..2cffd6f991 100644 --- a/src/lib/edje/edje_box_layout.c +++ b/src/lib/edje/edje_box_layout.c @@ -1,5 +1,7 @@ #include "edje_private.h" +#include "../evas/canvas/evas_box.eo.h" + #include typedef struct _Edje_Transition_Animation_Data Edje_Transition_Animation_Data; diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 57de6a4c52..a8e3f6d2b0 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -2,6 +2,8 @@ #include "edje_private.h" +#include "../evas/canvas/evas_table.eo.h" + static void _edje_part_make_rtl(Edje_Part_Description_Common *desc); static Edje_Part_Description_Common *_edje_get_description_by_orientation(Edje *ed, Edje_Part_Description_Common *src, Edje_Part_Description_Common **dst, unsigned char type); diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c index b68e8b68a8..28f7e7c42c 100644 --- a/src/lib/edje/edje_text.c +++ b/src/lib/edje/edje_text.c @@ -1,6 +1,8 @@ #include "edje_private.h" #define _ELLIP_STR "\xE2\x80\xA6" +#include "../evas/canvas/evas_text.eo.h" + /* returns with and height for this part. * * depending on the value of the use_alternate_font_metrics flag, it will diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index d8a2371de6..cb6300d2c8 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -1,5 +1,9 @@ #include "edje_private.h" +#include "../evas/canvas/evas_box.eo.h" +#include "../evas/canvas/evas_line.eo.h" +#include "../evas/canvas/evas_text.eo.h" + typedef struct _Edje_Box_Layout Edje_Box_Layout; struct _Edje_Box_Layout { diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 02d01b7710..76c52643c7 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -29,16 +29,6 @@ * @} */ -/** - * @ingroup Evas_Object_Text - * - * @{ - */ -#include "canvas/evas_text.eo.h" -/** - * @} - */ - /** * @ingroup Evas_Object_Textblock * @@ -49,26 +39,6 @@ * @} */ -/** - * @ingroup Evas_Object_Textgrid - * - * @{ - */ -#include "canvas/evas_textgrid.eo.h" -/** - * @} - */ - -/** - * @ingroup Evas_Object_Line - * - * @{ - */ -#include "canvas/evas_line.eo.h" -/** - * @} - */ - /** * @ingroup Evas_Object_Polygon * @@ -99,43 +69,10 @@ * @} */ -/** - * @ingroup Evas_Object_Box - * - * @{ - */ -#include "canvas/evas_box.eo.h" -/** - * @} - */ - -/** - * @ingroup Evas_Object_Table - * - * @{ - */ -#include "canvas/evas_table.eo.h" -/** - * @} - */ - -/** - * @ingroup Evas_Object_Grid - * - * @{ - */ -#include "canvas/evas_grid.eo.h" -/** - * @} - */ - #include "canvas/evas_common_interface.eo.h" #include "canvas/evas_object.eo.h" -#include "canvas/evas_out.eo.h" - - /** * @defgroup Evas_3D Evas 3D Extensions * diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h index b0ed3a17a0..744d394098 100644 --- a/src/lib/evas/include/evas_private.h +++ b/src/lib/evas/include/evas_private.h @@ -42,6 +42,14 @@ # endif #endif /* ! _WIN32 */ +#include "canvas/evas_text.eo.h" +#include "canvas/evas_textgrid.eo.h" +#include "canvas/evas_line.eo.h" +#include "canvas/evas_box.eo.h" +#include "canvas/evas_table.eo.h" +#include "canvas/evas_grid.eo.h" +#include "canvas/evas_out.eo.h" + #define RENDER_METHOD_INVALID 0x00000000 typedef struct _Evas_Layer Evas_Layer; -- cgit v1.2.1