summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-16 17:54:37 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-16 20:47:49 +0900
commita96b7edb41cf10988846a09bfa5105bb31aba7f3 (patch)
tree6c30d1afea176a6f9ad10b6e10c3a5d16653f3d5
parentd974e708c22871bac99ec73b417aad27cc9fb21b (diff)
evas: Rename evas_types to evas_canvas3d_types
Now evas_types has nothing but canvas3d definitions. Fixes T5312
-rw-r--r--src/Makefile_Evas.am2
-rw-r--r--src/lib/evas/Evas_Common.h2
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_camera.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_light.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_object.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_primitive.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_types.eot (renamed from src/lib/evas/canvas/evas_types.eot)0
11 files changed, 10 insertions, 10 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 14ee6e0..75b1595 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -66,7 +66,7 @@ evas_eolian_priv_files = \
66 lib/evas/include/evas_ector_buffer.eo 66 lib/evas/include/evas_ector_buffer.eo
67 67
68evas_eolian_type_files = \ 68evas_eolian_type_files = \
69 lib/evas/canvas/evas_types.eot 69 lib/evas/canvas/evas_canvas3d_types.eot
70 70
71evas_eolian_priv_c = $(evas_eolian_priv_files:%.eo=%.eo.c) 71evas_eolian_priv_c = $(evas_eolian_priv_files:%.eo=%.eo.c)
72evas_eolian_priv_h = $(evas_eolian_priv_files:%.eo=%.eo.h) \ 72evas_eolian_priv_h = $(evas_eolian_priv_files:%.eo=%.eo.h) \
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 7b2bac7..476a46c 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -2,8 +2,6 @@
2# error You shall not include this header directly 2# error You shall not include this header directly
3#endif 3#endif
4 4
5#include "canvas/evas_types.eot.h"
6
7/** 5/**
8 * @def EVAS_VERSION_MAJOR 6 * @def EVAS_VERSION_MAJOR
9 * The major number of evas version 7 * The major number of evas version
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 2b72b15..6306849 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -74,6 +74,8 @@
74 * @ingroup Evas 74 * @ingroup Evas
75 */ 75 */
76 76
77#include "canvas/evas_canvas3d_types.eot.h"
78
77/** 79/**
78 * @page evas_canvas3d_main Evas 3D 80 * @page evas_canvas3d_main Evas 3D
79 * 81 *
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.eo b/src/lib/evas/canvas/evas_canvas3d_camera.eo
index 7ed400f..b427e8b 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.eo
@@ -1,4 +1,4 @@
1import evas_types; 1import evas_canvas3d_types;
2 2
3class Evas.Canvas3D.Camera (Evas.Canvas3D.Object) 3class Evas.Canvas3D.Camera (Evas.Canvas3D.Object)
4{ 4{
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.eo b/src/lib/evas/canvas/evas_canvas3d_light.eo
index ecd5770..371040c 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_light.eo
@@ -1,4 +1,4 @@
1import evas_types; 1import evas_canvas3d_types;
2 2
3class Evas.Canvas3D.Light (Evas.Canvas3D.Object) 3class Evas.Canvas3D.Light (Evas.Canvas3D.Object)
4{ 4{
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
index 87fee7a..8502d3b 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
@@ -1,5 +1,5 @@
1import eina_types; 1import eina_types;
2import evas_types; 2import evas_canvas3d_types;
3 3
4class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Efl.File) 4class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Efl.File)
5{ 5{
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.eo b/src/lib/evas/canvas/evas_canvas3d_node.eo
index 0b361e4..0c19fe9 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_node.eo
@@ -1,4 +1,4 @@
1import evas_types; 1import evas_canvas3d_types;
2 2
3class Evas.Canvas3D.Node (Evas.Canvas3D.Object) 3class Evas.Canvas3D.Node (Evas.Canvas3D.Object)
4{ 4{
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.eo b/src/lib/evas/canvas/evas_canvas3d_object.eo
index 681e282..4a6f56b 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_object.eo
@@ -1,4 +1,4 @@
1import evas_types; 1import evas_canvas3d_types;
2 2
3class Evas.Canvas3D.Object (Efl.Object) 3class Evas.Canvas3D.Object (Efl.Object)
4{ 4{
diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.eo b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
index f7f8611..e06f6f5 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
@@ -1,4 +1,4 @@
1import evas_types; 1import evas_canvas3d_types;
2 2
3class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object) 3class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object)
4{ 4{
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.eo b/src/lib/evas/canvas/evas_canvas3d_scene.eo
index 6323f6d..3c8b287 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.eo
@@ -1,4 +1,4 @@
1import evas_types; 1import evas_canvas3d_types;
2 2
3class Evas.Canvas3D.Scene (Evas.Canvas3D.Object) 3class Evas.Canvas3D.Scene (Evas.Canvas3D.Object)
4{ 4{
diff --git a/src/lib/evas/canvas/evas_types.eot b/src/lib/evas/canvas/evas_canvas3d_types.eot
index 84153ae..84153ae 100644
--- a/src/lib/evas/canvas/evas_types.eot
+++ b/src/lib/evas/canvas/evas_canvas3d_types.eot