From a5216d4f7939efbd6ecdc001c8b984e391c0b32d Mon Sep 17 00:00:00 2001
From: Cedric Bail <cedric@osg.samsung.com>
Date: Tue, 17 May 2016 05:16:27 -0700
Subject: [PATCH] elementary: mapbuf is legacy for now and should be automatic
 in the future.

---
 src/Makefile_Elementary.am         |  3 +--
 src/lib/elementary/elm_mapbuf.c    |  1 +
 src/lib/elementary/elm_mapbuf.eo   |  2 +-
 src/lib/elementary/elm_mapbuf.h    |  3 ---
 src/lib/elementary/elm_mapbuf_eo.h | 11 -----------
 5 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 src/lib/elementary/elm_mapbuf_eo.h

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 83dac45cb1..96fcc0a96d 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -59,7 +59,6 @@ elm_public_eolian_files = \
 	lib/elementary/elm_list.eo \
 	lib/elementary/elm_map.eo \
 	lib/elementary/elm_map_pan.eo \
-	lib/elementary/elm_mapbuf.eo \
 	lib/elementary/elm_menu.eo \
 	lib/elementary/elm_multibuttonentry.eo \
 	lib/elementary/elm_naviframe.eo \
@@ -127,6 +126,7 @@ elm_legacy_eolian_files = \
 	lib/elementary/elm_box.eo \
 	lib/elementary/elm_grid.eo \
 	lib/elementary/elm_table.eo \
+	lib/elementary/elm_mapbuf.eo \
 	$(NULL)
 
 elm_eolian_type_files = \
@@ -407,7 +407,6 @@ includesub_HEADERS = \
 	lib/elementary/elm_map_eo.h \
 	lib/elementary/elm_map_legacy.h \
 	lib/elementary/elm_mapbuf.h \
-	lib/elementary/elm_mapbuf_eo.h \
 	lib/elementary/elm_mapbuf_legacy.h \
 	lib/elementary/elm_menu.h \
 	lib/elementary/elm_menu_eo.h \
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index 7049dd0a32..22c33e114a 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -9,6 +9,7 @@
 #include "elm_priv.h"
 #include "elm_widget_mapbuf.h"
 #include "elm_widget_container.h"
+#include "elm_mapbuf.eo.h"
 
 #define MY_CLASS ELM_MAPBUF_CLASS
 
diff --git a/src/lib/elementary/elm_mapbuf.eo b/src/lib/elementary/elm_mapbuf.eo
index 1c11a36fb8..569a31542f 100644
--- a/src/lib/elementary/elm_mapbuf.eo
+++ b/src/lib/elementary/elm_mapbuf.eo
@@ -1,7 +1,7 @@
 class Elm.Mapbuf (Elm.Widget, Efl.Container)
 {
    legacy_prefix: elm_mapbuf;
-   eo_prefix: elm_obj_mapbuf;
+   eo_prefix: elm_private_mapbuf;
    methods {
       @property auto {
          set {
diff --git a/src/lib/elementary/elm_mapbuf.h b/src/lib/elementary/elm_mapbuf.h
index 7714cfda26..2eed3a1fc4 100644
--- a/src/lib/elementary/elm_mapbuf.h
+++ b/src/lib/elementary/elm_mapbuf.h
@@ -36,9 +36,6 @@
  * @{
  */
 
-#ifdef EFL_EO_API_SUPPORT
-#include <elm_mapbuf_eo.h>
-#endif
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include <elm_mapbuf_legacy.h>
 #endif
diff --git a/src/lib/elementary/elm_mapbuf_eo.h b/src/lib/elementary/elm_mapbuf_eo.h
deleted file mode 100644
index dd0c5b852c..0000000000
--- a/src/lib/elementary/elm_mapbuf_eo.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @ingroup Elm_Mapbuf
- *
- * @{
- */
-
-#include "elm_mapbuf.eo.h"
-
-/**
- * @}
- */