From a96b7edb41cf10988846a09bfa5105bb31aba7f3 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 16 May 2017 17:54:37 +0900 Subject: [PATCH] evas: Rename evas_types to evas_canvas3d_types Now evas_types has nothing but canvas3d definitions. Fixes T5312 --- src/Makefile_Evas.am | 2 +- src/lib/evas/Evas_Common.h | 2 -- src/lib/evas/Evas_Eo.h | 2 ++ src/lib/evas/canvas/evas_canvas3d_camera.eo | 2 +- src/lib/evas/canvas/evas_canvas3d_light.eo | 2 +- src/lib/evas/canvas/evas_canvas3d_mesh.eo | 2 +- src/lib/evas/canvas/evas_canvas3d_node.eo | 2 +- src/lib/evas/canvas/evas_canvas3d_object.eo | 2 +- src/lib/evas/canvas/evas_canvas3d_primitive.eo | 2 +- src/lib/evas/canvas/evas_canvas3d_scene.eo | 2 +- src/lib/evas/canvas/{evas_types.eot => evas_canvas3d_types.eot} | 0 11 files changed, 10 insertions(+), 10 deletions(-) rename src/lib/evas/canvas/{evas_types.eot => evas_canvas3d_types.eot} (100%) 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 = \ 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 7b2bac7..476a46c 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 2b72b15..6306849 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 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 @@ -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 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 @@ -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 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 @@ 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 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 @@ -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 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 @@ -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 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 @@ -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 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 @@ -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 similarity index 100% rename from src/lib/evas/canvas/evas_types.eot rename to src/lib/evas/canvas/evas_canvas3d_types.eot -- 2.7.4