dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jean-Philippe Andre 2017-05-31 16:20:54 +09:00
parent 07da746194
commit aa5ac8eed7
2 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/lib/edje/edje_object.eo
View File

@ -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 --------------------------------------- */

5
src/lib/edje/edje_util.c
View File

@ -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;