From 8a6e542fefcd0d4dc3c876c1da51f18e2b0e8f44 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Fri, 29 May 2015 15:00:10 +0100
Subject: [PATCH] Evas map: Move opaque type definition to .eo.

---
 src/lib/evas/Evas_Common.h         | 13 -------------
 src/lib/evas/canvas/evas_object.eo |  2 +-
 src/lib/evas/evas_types.eot        |  8 ++++++++
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 795ecde334..d064f8f9f3 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -273,19 +273,6 @@ typedef struct _Evas_Smart_Interface         Evas_Smart_Interface;
  */
 typedef struct _Evas_Smart_Cb_Description Evas_Smart_Cb_Description;
 
-/**
- * @typedef Evas_Map
- *
- * An opaque handle to map points
- *
- * @see evas_map_new()
- * @see evas_map_free()
- * @see evas_map_dup()
- *
- * @ingroup Evas_Object_Group_Map
- */
-typedef struct _Evas_Map Evas_Map;
-
 /**
  * @typedef Evas
  *
diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo
index ea2442a8a1..98f4d01350 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -310,7 +310,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac
             @see evas_object_map_set() */
          }
          values {
-            map: const(Evas_Map)*; /*@ new map to use */
+            map: const(Evas.Map)*; /*@ new map to use */
          }
       }
       @property size_hint_aspect {
diff --git a/src/lib/evas/evas_types.eot b/src/lib/evas/evas_types.eot
index 178337d16b..1d48cba518 100644
--- a/src/lib/evas/evas_types.eot
+++ b/src/lib/evas/evas_types.eot
@@ -7,3 +7,11 @@ enum Evas.Aspect_Control {
    vertical = 3, /**< Use all vertical container space to place an object, using the given aspect */
    both = 4 /**< Use all horizontal @b and vertical container spaces to place an object (never growing it out of those bounds), using the given aspect */
 }
+struct Evas.Map; /*@ An opaque handle to map points
+                  *
+                  * @see evas_map_new()
+                  * @see evas_map_free()
+                  * @see evas_map_dup()
+                  *
+                  * @ingroup Evas_Object_Group_Map
+                  */