evas: Rename evas_types to evas_canvas3d_types

Now evas_types has nothing but canvas3d definitions.

Fixes T5312

11 files changed, 10 insertions, 10 deletions

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 14ee6e0587..75b159575d 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -66,7 +66,7 @@ evas_eolian_priv_files = \
 	lib/evas/include/evas_ector_buffer.eo
 
 evas_eolian_type_files = \
-    lib/evas/canvas/evas_types.eot
+    lib/evas/canvas/evas_canvas3d_types.eot
 
 evas_eolian_priv_c = $(evas_eolian_priv_files:%.eo=%.eo.c)
 evas_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 7b2bac7a02..476a46c93f 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -2,8 +2,6 @@
 # error You shall not include this header directly
 #endif
 
-#include "canvas/evas_types.eot.h"
-
 /**
  * @def EVAS_VERSION_MAJOR
  * The major number of evas version
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 2b72b15561..6306849614 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -74,6 +74,8 @@
  * @ingroup Evas
  */
 
+#include "canvas/evas_canvas3d_types.eot.h"
+
 /**
  * @page evas_canvas3d_main Evas 3D
  *
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.eo b/src/lib/evas/canvas/evas_canvas3d_camera.eo
index 7ed400f015..b427e8b167 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.eo
@@ -1,4 +1,4 @@
-import evas_types;
+import evas_canvas3d_types;
 
 class Evas.Canvas3D.Camera (Evas.Canvas3D.Object)
 {
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.eo b/src/lib/evas/canvas/evas_canvas3d_light.eo
index ecd5770c2f..371040c6c6 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_light.eo
@@ -1,4 +1,4 @@
-import evas_types;
+import evas_canvas3d_types;
 
 class Evas.Canvas3D.Light (Evas.Canvas3D.Object)
 {
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
index 87fee7a4d2..8502d3b0df 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
@@ -1,5 +1,5 @@
 import eina_types;
-import evas_types;
+import evas_canvas3d_types;
 
 class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Efl.File)
 {
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.eo b/src/lib/evas/canvas/evas_canvas3d_node.eo
index 0b361e4174..0c19fe9107 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_node.eo
@@ -1,4 +1,4 @@
-import evas_types;
+import evas_canvas3d_types;
 
 class Evas.Canvas3D.Node (Evas.Canvas3D.Object)
 {
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.eo b/src/lib/evas/canvas/evas_canvas3d_object.eo
index 681e2821e0..4a6f56b022 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_object.eo
@@ -1,4 +1,4 @@
-import evas_types;
+import evas_canvas3d_types;
 
 class Evas.Canvas3D.Object (Efl.Object)
 {
diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.eo b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
index f7f86112d3..e06f6f50c6 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
@@ -1,4 +1,4 @@
-import evas_types;
+import evas_canvas3d_types;
 
 class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object)
 {
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.eo b/src/lib/evas/canvas/evas_canvas3d_scene.eo
index 6323f6d069..3c8b287b99 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.eo
@@ -1,4 +1,4 @@
-import evas_types;
+import evas_canvas3d_types;
 
 class Evas.Canvas3D.Scene (Evas.Canvas3D.Object)
 {
diff --git a/src/lib/evas/canvas/evas_types.eot b/src/lib/evas/canvas/evas_canvas3d_types.eot
index 84153ae201..84153ae201 100644
--- a/src/lib/evas/canvas/evas_types.eot
+++ b/src/lib/evas/canvas/evas_canvas3d_types.eot