From aa5ac8eed71fb448d05ba05f05de32c6b2f86d7b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Wed, 31 May 2017 16:20:54 +0900
Subject: [PATCH] edje: Rename "data" to "group_data" for EO

Still not happy with the name. I'm trying to avoid a name
clash between other "data" elements in the object. This is
the EDC group "data item".

Ref T5315
---
 src/lib/edje/edje_object.eo | 42 +++++++++++++++++++-----------------------
 src/lib/edje/edje_util.c    |  5 ++---
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index d40a6a3..dc8b72b 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -414,7 +414,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
 
          return: int; [[The frozen state or $0 if the object is not frozen or on error.]]
       }
-      @property data {
+      @property group_data {
          get {
             [[Retrives an EDC data field's value from a given Edje object's group.
 
@@ -424,35 +424,31 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
               application's theme to its code.
 
               EDC data fields always hold  strings as values, hence the return
-              type of this function. Check the complete \@ref edcref "syntax reference"
+              type of this function. Check the complete "syntax reference"
               for EDC files.
 
-              Warning: Do not confuse this call with edje_file_data_get(), which
-              queries for a  global EDC data field on an EDC declaration file.
+              This is how a data item is defined in EDC:
+              collections {
+                 group {
+                    name: "a_group";
+                    data {
+                       item: "key1" "value1";
+                       item: "key2" "value2";
+                    }
+                 }
+              }
 
-              \@ref edje_object_file_set()]]
-              /* FIXME-doc
-               * They look like the following:
-               * @code
-               * collections
-               *   {
-               *      group
-               *        {
-               *           name: "a_group";
-               *           data
-               *             {
-               *                item: "key1" "value1";
-               *                item: "key2" "value2";
-               *             }
-               *        }
-               *  }
-               * @endcode
-               */
-            return: string; [[The data's value string. Must not be freed.]]
+              Warning: Do not confuse this call with edje_file_data_get(), which
+              queries for a global EDC data field on an EDC declaration file.
+            ]]
+            legacy: edje_object_data_get;
          }
          keys {
             key: string; [[The data field's key string]]
          }
+         values {
+            val: string; [[The data's value string.]]
+         }
       }
 
       /* MESSAGE & SIGNAL APIS BEGIN --------------------------------------- */
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 252a4e4..e3699a2 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -449,10 +449,9 @@ _edje_object_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl)
 }
 
 EOLIAN const char *
-_edje_object_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key)
+_edje_object_group_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key)
 {
-   if ((!ed) || (!key))
-     return NULL;
+   if (!key) return NULL;
    if (!ed->collection) return NULL;
    if (!ed->collection->data) return NULL;
 
-- 
2.7.4