From 3d1e474fc6d88f5c883e3804d4ba16012f9588d6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Fri, 17 Jun 2016 14:30:44 +0900
Subject: [PATCH] Evas: Move smart data to legacy

---
 src/lib/evas/Evas_Legacy.h               | 15 +++++++++++++++
 src/lib/evas/canvas/evas_object_smart.c  | 10 ++++++----
 src/lib/evas/canvas/evas_object_smart.eo | 14 --------------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index eb827ab..74893f7 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -5177,6 +5177,21 @@ EAPI void evas_object_smart_callback_description_find(const Evas_Object *obj, co
 EAPI Evas_Smart *evas_object_smart_smart_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
 
 /**
+ * @brief Store a pointer to user data for a given smart object.
+ *
+ * This data is stored independently of the one set by evas_object_data_set(),
+ * naturally.
+ *
+ * See also @ref evas_object_smart_data_get.
+ *
+ * @param[in] data A pointer to user data.
+ *
+ * @ingroup Evas_Object_Smart
+ */
+EAPI void evas_object_smart_data_set(Evas_Object *obj, void *data);
+EAPI void *evas_object_smart_data_get(const Evas_Object *obj);
+
+/**
  * This gets the internal counter that counts the number of smart calculations
  *
  * @param e The canvas to get the calculate counter from
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 0a204d1..b304ed2 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -120,17 +120,19 @@ static const Evas_Object_Func object_func =
 
 
 /* public funcs */
-EOLIAN static void
-_evas_object_smart_data_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, void *data)
+EAPI void
+evas_object_smart_data_set(Evas_Object *eo_obj, void *data)
 {
+   EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj);
    if (o->data) eo_data_unref(eo_obj, o->data);
    o->data = data;
    eo_data_ref(eo_obj, NULL);
 }
 
-EOLIAN void *
-_evas_object_smart_data_get(Evas_Object *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
+EAPI void *
+evas_object_smart_data_get(const Evas_Object *eo_obj)
 {
+   EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj, NULL);
    return o->data;
 }
 
diff --git a/src/lib/evas/canvas/evas_object_smart.eo b/src/lib/evas/canvas/evas_object_smart.eo
index 19e94bb..35edfd7 100644
--- a/src/lib/evas/canvas/evas_object_smart.eo
+++ b/src/lib/evas/canvas/evas_object_smart.eo
@@ -62,20 +62,6 @@ class Evas.Object.Smart (Evas.Object)
             a: int;
          }
       }
-      @property data {
-         get {}
-         set {
-            [[Store a pointer to user data for a given smart object.
-
-              This data is stored independently of the one set by
-              evas_object_data_set(), naturally.
-
-              See also @.data.get.]]
-         }
-         values {
-            data: void_ptr; [[A pointer to user data.]]
-         }
-      }
       @property members {
          get {
             [[Retrieves the list of the member objects of a given Evas smart object.
-- 
2.7.4