From 5dad0ee30468c7cd70d43bce7ffad3d148fb5843 Mon Sep 17 00:00:00 2001
From: Jaehyun Cho <jae_hyun.cho@samsung.com>
Date: Wed, 19 Oct 2016 18:17:34 +0900
Subject: [PATCH] Fix eo compilation.

This commit applies the following efl commits.

evas: Mark group_add/del as internal
evas/elm: Remove function group_move
evas/elm: Remove function group_move
evas/elm: Remove group_show and group_hide
evas: Move clip_unset to legacy, remove group_clip
---
 src/lib/enventor_object.eo | 10 ++++------
 src/lib/enventor_smart.c   | 33 ++++++++++-----------------------
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo
index 8199215..3e21afb 100644
--- a/src/lib/enventor_object.eo
+++ b/src/lib/enventor_object.eo
@@ -213,14 +213,12 @@ class Enventor.Object (Elm.Widget, Efl.File) {
    implements {
       class.constructor;
       Efl.Object.constructor;
+      Efl.Gfx.visible.set;
+      Efl.Gfx.position.set;
+      Efl.Gfx.size.set;
+      Efl.Canvas.Object.clip.set;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
-      Efl.Canvas.Group.group_move;
-      Efl.Canvas.Group.group_resize;
-      Efl.Canvas.Group.group_show;
-      Efl.Canvas.Group.group_hide;
-      Efl.Canvas.Group.group_clip.set;
-      Efl.Canvas.Group.group_clip_unset;
       Efl.Canvas.Group.group_member_add;
       Efl.File.file.set;
    }
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 414f3b3..e34542c 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -4,6 +4,8 @@
 
 #define ELM_INTERNAL_API_ARGESFSDFEFC 1
 #define EFL_CANVAS_OBJECT_PROTECTED 1
+#define EFL_CANVAS_GROUP_PROTECTED
+#define EFL_CANVAS_GROUP_BETA
 
 #include <Enventor.h>
 #include <Eio.h>
@@ -327,7 +329,7 @@ _enventor_object_efl_canvas_group_group_member_add(Eo *obj, Enventor_Object_Data
 }
 
 EOLIAN static void
-_enventor_object_efl_canvas_group_group_move(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
+_enventor_object_efl_gfx_position_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
 {
    Eina_Iterator *it = evas_object_smart_iterator_new(obj);
    Evas_Object *o;
@@ -337,7 +339,7 @@ _enventor_object_efl_canvas_group_group_move(Eo *obj, Enventor_Object_Data *pd E
 }
 
 EOLIAN static void
-_enventor_object_efl_canvas_group_group_resize(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
+_enventor_object_efl_gfx_size_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
 {
    Eina_Iterator *it = evas_object_smart_iterator_new(obj);
    Evas_Object *o;
@@ -347,23 +349,18 @@ _enventor_object_efl_canvas_group_group_resize(Eo *obj, Enventor_Object_Data *pd
 }
 
 EOLIAN static void
-_enventor_object_efl_canvas_group_group_show(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd)
+_enventor_object_efl_gfx_visible_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, Eina_Bool vis)
 {
    if (!pd->focused_it) return;
    Evas_Object *o = edit_obj_get(pd->focused_it->ed);
-   evas_object_show(o);
+   if (vis)
+     evas_object_show(o);
+   else
+     evas_object_hide(o);
 }
 
 EOLIAN static void
-_enventor_object_efl_canvas_group_group_hide(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd)
-{
-   if (!pd->focused_it) return;
-   Evas_Object *o = edit_obj_get(pd->focused_it->ed);
-   evas_object_hide(o);
-}
-
-EOLIAN static void
-_enventor_object_efl_canvas_group_group_clip_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *clip)
+_enventor_object_efl_canvas_object_clip_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *clip)
 {
    Eina_Iterator *it = evas_object_smart_iterator_new(obj);
    Evas_Object *o;
@@ -372,16 +369,6 @@ _enventor_object_efl_canvas_group_group_clip_set(Eo *obj, Enventor_Object_Data *
    eina_iterator_free(it);
 }
 
-EOLIAN static void
-_enventor_object_efl_canvas_group_group_clip_unset(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED)
-{
-   Eina_Iterator *it = evas_object_smart_iterator_new(obj);
-   Evas_Object *o;
-   EINA_ITERATOR_FOREACH(it, o)
-     evas_object_clip_unset(o);
-   eina_iterator_free(it);
-}
-
 EOLIAN static Eo *
 _enventor_object_efl_object_constructor(Eo *obj,
                                      Enventor_Object_Data *pd EINA_UNUSED)