e_client/e_view: replace code to use E_Layer from short

Change-Id: I7e5c170817d76a9f83bf33f7d9702de6b7c26e24

diff --git a/src/bin/core/e_canvas.c b/src/bin/core/e_canvas.c
index 5acbf09856781ba1b0484d7e6d63849ed69b1dd1..79139d0b929a0174e1ca15d9f3759f6b9695cdde 100644 (file)
--- a/src/bin/core/e_canvas.c
+++ b/src/bin/core/e_canvas.c
@@ -332,7 +332,7 @@ e_canvas_util_e_layer_map(short e_layer)
      }
 }
 
-EINTERN short
+EINTERN E_Layer
 e_canvas_util_layer_map(E_Canvas_Layer layer)
 {
    return _canvas_layer_map_to(layer);

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index 575c436a3c8ff0cfe4780717a817ddb3a7258ad6..1d871cc3f39a0adff9103f8d551a00737e72a175 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -6286,7 +6286,7 @@ e_client_layer_set(E_Client *ec,
 E_API E_Layer
 e_client_layer_get(E_Client *ec)
 {
-   short layer;
+   E_Layer layer;
    E_Canvas_Layer canvas_layer;
 
    E_OBJECT_CHECK_RETURN(ec, E_LAYER_BOTTOM);

diff --git a/src/bin/core/e_view_intern.h b/src/bin/core/e_view_intern.h
index 8982b1cf21568d542db06b14307e3a3fa37bb61e..153ab95d653e6fb6c914227abdd1bfe89cadbe66 100644 (file)
--- a/src/bin/core/e_view_intern.h
+++ b/src/bin/core/e_view_intern.h
@@ -186,7 +186,7 @@ void e_canvas_size_get(E_Canvas *canvas, int *width, int *height);
 
 E_Canvas_Layer e_canvas_util_e_layer_map(short layer);
 
-short e_canvas_util_layer_map(E_Canvas_Layer layer);
+E_Layer e_canvas_util_layer_map(E_Canvas_Layer layer);
 
 void e_view_init(E_View *view, E_View_Type type, E_View_Impl *impl, Evas_Object *eo, E_View_Tree *parent);
 void e_view_reorderable_set(E_View *view, bool reorderable);

diff --git a/src/include/e_view.h b/src/include/e_view.h
index 41a3a7f09c361f1103aa0630c94499473943205c..d7ae2ab3e6585dbc4258d20824da1b577596ab2b 100644 (file)
--- a/src/include/e_view.h
+++ b/src/include/e_view.h
@@ -1,6 +1,8 @@
 #ifndef E_VIEW_H
 #define E_VIEW_H
 
+#include <e_types.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif