diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2019-09-27 10:26:27 -0400 |
|---|---|---|
| committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-09-30 10:33:25 +0200 |
| commit | 7a82dfbcc780984e4cdf84689392796867e3e802 (patch) | |
| tree | bf3d6c687aff70417f85b027fea75951e6ef5064 | |
| parent | 34a21d7ef95914d9c221605340011769420a78cc (diff) | |
| download | efl-7a82dfbcc780984e4cdf84689392796867e3e802.tar.gz | |
edje: rename edje_types.eot to efl_canvas_types.eot and move include
this has no relation to legacy and should not be included in legacy headers
Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D10227
| -rw-r--r-- | src/lib/edje/Edje_Common.h | 2 | ||||
| -rw-r--r-- | src/lib/edje/Edje_Eo.h | 2 | ||||
| -rw-r--r-- | src/lib/edje/efl_canvas_layout_part.eo | 2 | ||||
| -rw-r--r-- | src/lib/edje/efl_canvas_layout_types.eot (renamed from src/lib/edje/edje_types.eot) | 0 | ||||
| -rw-r--r-- | src/lib/edje/meson.build | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h index 27bc080984..22aa8e667a 100644 --- a/src/lib/edje/Edje_Common.h +++ b/src/lib/edje/Edje_Common.h @@ -1,5 +1,3 @@ -#include "edje_types.eot.h" - /** All available cursor states * * @ingroup Edje diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h index b42fb866e9..d302b44998 100644 --- a/src/lib/edje/Edje_Eo.h +++ b/src/lib/edje/Edje_Eo.h @@ -6,6 +6,8 @@ #include "efl_canvas_layout.eo.h" #include "edje_edit_eo.h" +#include <efl_canvas_layout_types.eot.h> + #include "efl_canvas_layout_part.eo.h" #include "efl_canvas_layout_part_box.eo.h" #include "efl_canvas_layout_part_table.eo.h" diff --git a/src/lib/edje/efl_canvas_layout_part.eo b/src/lib/edje/efl_canvas_layout_part.eo index 72bee1c5d8..eed8aaf0de 100644 --- a/src/lib/edje/efl_canvas_layout_part.eo +++ b/src/lib/edje/efl_canvas_layout_part.eo @@ -1,4 +1,4 @@ -import edje_types; +import efl_canvas_layout_types; class @beta Efl.Canvas.Layout_Part extends Efl.Object implements Efl.Gfx.Entity, Efl.Ui.Drag { diff --git a/src/lib/edje/edje_types.eot b/src/lib/edje/efl_canvas_layout_types.eot index b3eee20d18..b3eee20d18 100644 --- a/src/lib/edje/edje_types.eot +++ b/src/lib/edje/efl_canvas_layout_types.eot diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build index 9c7fb3951a..60452fe672 100644 --- a/src/lib/edje/meson.build +++ b/src/lib/edje/meson.build @@ -52,7 +52,7 @@ foreach eo_file : pub_legacy_eo_files endforeach pub_eo_types_files = [ - 'edje_types.eot' + 'efl_canvas_layout_types.eot' ] foreach eo_file : pub_eo_types_files |