summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-27 10:26:27 -0400
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-09-30 10:01:00 +0200
commit0e21ce343d034e095b2778aec41deac92b59531a (patch)
treeaa2846ada41d82080e80cb59c9bfe2242e72012d
parentbcb6734166cc9e15c5979dae1404b4db6806b4a5 (diff)
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 Differential Revision: https://phab.enlightenment.org/D10227
-rw-r--r--src/lib/edje/Edje_Common.h2
-rw-r--r--src/lib/edje/Edje_Eo.h2
-rw-r--r--src/lib/edje/efl_canvas_layout_part.eo2
-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.build2
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 @@
1#include "edje_types.eot.h"
2
3/** All available cursor states 1/** All available cursor states
4 * 2 *
5 * @ingroup Edje 3 * @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 @@
6#include "efl_canvas_layout.eo.h" 6#include "efl_canvas_layout.eo.h"
7#include "edje_edit_eo.h" 7#include "edje_edit_eo.h"
8 8
9#include <efl_canvas_layout_types.eot.h>
10
9#include "efl_canvas_layout_part.eo.h" 11#include "efl_canvas_layout_part.eo.h"
10#include "efl_canvas_layout_part_box.eo.h" 12#include "efl_canvas_layout_part_box.eo.h"
11#include "efl_canvas_layout_part_table.eo.h" 13#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 @@
1import edje_types; 1import efl_canvas_layout_types;
2 2
3class @beta Efl.Canvas.Layout_Part extends Efl.Object implements Efl.Gfx.Entity, Efl.Ui.Drag 3class @beta Efl.Canvas.Layout_Part extends Efl.Object implements Efl.Gfx.Entity, Efl.Ui.Drag
4{ 4{
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
52endforeach 52endforeach
53 53
54pub_eo_types_files = [ 54pub_eo_types_files = [
55 'edje_types.eot' 55 'efl_canvas_layout_types.eot'
56] 56]
57 57
58foreach eo_file : pub_eo_types_files 58foreach eo_file : pub_eo_types_files