summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-04-02 11:42:00 +0100
committerTom Hacohen <tom@stosb.com>2014-04-10 04:20:21 +0100
commit374af9b9cad96e499cfd9d3de99b30d2096d8cab (patch)
treec989a4dff16d1e7900030e1a1103afa406edb0a0 /src
parent1866909ba1084d1b2cbcd324c9c8a81ab80405f0 (diff)
Eo: eo_base's data_*->key_data_*.
Diffstat (limited to 'src')
-rw-r--r--src/examples/ecore/ecore_audio_playback.c2
-rw-r--r--src/examples/eo/evas/evas_evas_obj.h4
-rw-r--r--src/lib/ecore_audio/ecore_audio.eo2
-rw-r--r--src/lib/ecore_audio/ecore_audio_in_tone.eo6
-rw-r--r--src/lib/edje/edje_multisense.c2
-rw-r--r--src/lib/eo/Eo.h22
-rw-r--r--src/lib/eo/eo2_base_class.c20
-rw-r--r--src/lib/eo/eo_base.eo2
-rw-r--r--src/lib/evas/canvas/evas_data.c6
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c12
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c2
-rw-r--r--src/tests/eo/signals/signals_simple.c2
-rw-r--r--src/tests/eo/suite/eo_test_general.c52
14 files changed, 68 insertions, 68 deletions
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index 6c93fd565a..56bfa070f9 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -266,7 +266,7 @@ main(int argc, const char *argv[])
266 { 266 {
267 if (!strncmp(val, "freq=", 5)) { 267 if (!strncmp(val, "freq=", 5)) {
268 freq = atoi(&val[5]); 268 freq = atoi(&val[5]);
269 eo_do(in, eo_base_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &freq, NULL)); 269 eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &freq, NULL));
270 } else if (!strncmp(val, "duration=", 9)) { 270 } else if (!strncmp(val, "duration=", 9)) {
271 eo_do(in, ecore_audio_obj_in_length_set(atof(&val[9]))); 271 eo_do(in, ecore_audio_obj_in_length_set(atof(&val[9])));
272 } 272 }
diff --git a/src/examples/eo/evas/evas_evas_obj.h b/src/examples/eo/evas/evas_evas_obj.h
index 7aa761c648..cda796023d 100644
--- a/src/examples/eo/evas/evas_evas_obj.h
+++ b/src/examples/eo/evas/evas_evas_obj.h
@@ -76,7 +76,7 @@ static inline Evas_Object *
76eo_evas_object_get(const Eo *obj) 76eo_evas_object_get(const Eo *obj)
77{ 77{
78 void *data; 78 void *data;
79 eo_do((Eo *) obj, eo_base_data_get(EXEVAS_OBJ_STR, &data)); 79 eo_do((Eo *) obj, eo_key_data_get(EXEVAS_OBJ_STR, &data));
80 return data; 80 return data;
81} 81}
82 82
@@ -84,7 +84,7 @@ eo_evas_object_get(const Eo *obj)
84static inline void 84static inline void
85eo_evas_object_set(Eo *obj, Evas_Object *evas_obj) 85eo_evas_object_set(Eo *obj, Evas_Object *evas_obj)
86{ 86{
87 eo_do(obj, eo_base_data_set(EXEVAS_OBJ_STR, evas_obj, NULL)); 87 eo_do(obj, eo_key_data_set(EXEVAS_OBJ_STR, evas_obj, NULL));
88} 88}
89 89
90#endif 90#endif
diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo
index b5dcf99b33..ace7e801b6 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -110,7 +110,7 @@ class Ecore_Audio (Eo_Base)
110 params { 110 params {
111 Ecore_Audio_Vio *vio; /*The @ref Ecore_Audio_Vio struct with the function callbacks*/ 111 Ecore_Audio_Vio *vio; /*The @ref Ecore_Audio_Vio struct with the function callbacks*/
112 void *data; /*User data to pass to the VIO functions*/ 112 void *data; /*User data to pass to the VIO functions*/
113 eo_base_data_free_func free_func; /*This function takes care to clean up @ref data when he VIO is destroyed. NULL means do nothing.*/ 113 eo_key_data_free_func free_func; /*This function takes care to clean up @ref data when he VIO is destroyed. NULL means do nothing.*/
114 } 114 }
115 } 115 }
116 } 116 }
diff --git a/src/lib/ecore_audio/ecore_audio_in_tone.eo b/src/lib/ecore_audio/ecore_audio_in_tone.eo
index 6b3e489368..d0970519b8 100644
--- a/src/lib/ecore_audio/ecore_audio_in_tone.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_tone.eo
@@ -3,10 +3,10 @@ class Ecore_Audio_In_Tone (Ecore_Audio_In)
3 eo_prefix: ecore_audio_obj_in_tone; 3 eo_prefix: ecore_audio_obj_in_tone;
4 implements { 4 implements {
5 Eo_Base::constructor; 5 Eo_Base::constructor;
6 Eo_Base::data_set; 6 Eo_Base::key_data_set;
7 Eo_Base::data_get; 7 Eo_Base::key_data_get;
8 Ecore_Audio_In::length::set; 8 Ecore_Audio_In::length::set;
9 Ecore_Audio_In::seek; 9 Ecore_Audio_In::seek;
10 Ecore_Audio_In::read_internal; 10 Ecore_Audio_In::read_internal;
11 } 11 }
12} \ No newline at end of file 12}
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index 07653a15ea..7fc8fc54ed 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -264,7 +264,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
264 { 264 {
265 in = eo_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL); 265 in = eo_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL);
266 eo_do(in, ecore_audio_obj_name_set("tone")); 266 eo_do(in, ecore_audio_obj_name_set("tone"));
267 eo_do(in, eo_base_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value, NULL)); 267 eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value, NULL));
268 eo_do(in, ecore_audio_obj_in_length_set(duration)); 268 eo_do(in, ecore_audio_obj_in_length_set(duration));
269 eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL)); 269 eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
270 270
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 6258960f9f..57dca7e1ce 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -942,10 +942,10 @@ EAPI const Eo_Class *eo_class_class_get(void);
942EAPI const Eo_Class *eo_base_class_get(void); 942EAPI const Eo_Class *eo_base_class_get(void);
943 943
944/** 944/**
945 * @typedef eo_base_data_free_func 945 * @typedef eo_key_data_free_func
946 * Data free func prototype. 946 * Data free func prototype.
947 */ 947 */
948typedef void (*eo_base_data_free_func)(void *); 948typedef void (*eo_key_data_free_func)(void *);
949 949
950/** 950/**
951 * @brief Set generic data to object. 951 * @brief Set generic data to object.
@@ -953,20 +953,20 @@ typedef void (*eo_base_data_free_func)(void *);
953 * @param[in] data the data to set. 953 * @param[in] data the data to set.
954 * @param[in] free_func the func to free data with (NULL means "do nothing"). 954 * @param[in] free_func the func to free data with (NULL means "do nothing").
955 * 955 *
956 * @see #eo_base_data_get 956 * @see #eo_key_data_get
957 * @see #eo_base_data_del 957 * @see #eo_key_data_del
958 */ 958 */
959EAPI void eo_base_data_set(const char *key, const void *data, eo_base_data_free_func free_func); 959EAPI void eo_key_data_set(const char *key, const void *data, eo_key_data_free_func free_func);
960 960
961/** 961/**
962 * @brief Get generic data from object. 962 * @brief Get generic data from object.
963 * @param[in] key the key associated with the data 963 * @param[in] key the key associated with the data
964 * @param[out] data the data for the key 964 * @param[out] data the data for the key
965 * 965 *
966 * @see #eo_base_data_set 966 * @see #eo_key_data_set
967 * @see #eo_base_data_del 967 * @see #eo_key_data_del
968 */ 968 */
969EAPI void *eo_base_data_get(const char *key); 969EAPI void *eo_key_data_get(const char *key);
970 970
971/** 971/**
972 * @brief Get dbg information from the object. 972 * @brief Get dbg information from the object.
@@ -978,10 +978,10 @@ EAPI void eo_dbg_info_get(Eo_Dbg_Info *root_node);
978 * @brief Del generic data from object. 978 * @brief Del generic data from object.
979 * @param[in] key the key associated with the data 979 * @param[in] key the key associated with the data
980 * 980 *
981 * @see #eo_base_data_set 981 * @see #eo_key_data_set
982 * @see #eo_base_data_get 982 * @see #eo_key_data_get
983 */ 983 */
984EAPI void eo_base_data_del(const char *key); 984EAPI void eo_key_data_del(const char *key);
985 985
986/** 986/**
987 * @brief Set the parent of an object 987 * @brief Set the parent of an object
diff --git a/src/lib/eo/eo2_base_class.c b/src/lib/eo/eo2_base_class.c
index e41433d538..2ed01fcecd 100644
--- a/src/lib/eo/eo2_base_class.c
+++ b/src/lib/eo/eo2_base_class.c
@@ -31,7 +31,7 @@ typedef struct
31 EINA_INLIST; 31 EINA_INLIST;
32 Eina_Stringshare *key; 32 Eina_Stringshare *key;
33 void *data; 33 void *data;
34 eo_base_data_free_func free_func; 34 eo_key_data_free_func free_func;
35} Eo_Generic_Data_Node; 35} Eo_Generic_Data_Node;
36 36
37static void 37static void
@@ -60,7 +60,7 @@ _eo_generic_data_del_all(Private_Data *pd)
60 60
61static void 61static void
62_data_set(Eo *obj, void *class_data, 62_data_set(Eo *obj, void *class_data,
63 const char *key, const void *data, eo_base_data_free_func free_func) 63 const char *key, const void *data, eo_key_data_free_func free_func)
64{ 64{
65 Private_Data *pd = class_data; 65 Private_Data *pd = class_data;
66 66
@@ -68,7 +68,7 @@ _data_set(Eo *obj, void *class_data,
68 68
69 if (!key) return; 69 if (!key) return;
70 70
71 eo_do(obj, eo_base_data_del(key); ); 71 eo_do(obj, eo_key_data_del(key); );
72 72
73 node = malloc(sizeof(Eo_Generic_Data_Node)); 73 node = malloc(sizeof(Eo_Generic_Data_Node));
74 if (!node) return; 74 if (!node) return;
@@ -78,8 +78,8 @@ _data_set(Eo *obj, void *class_data,
78 pd->generic_data = eina_inlist_prepend(pd->generic_data, 78 pd->generic_data = eina_inlist_prepend(pd->generic_data,
79 EINA_INLIST_GET(node)); 79 EINA_INLIST_GET(node));
80} 80}
81EAPI EO_VOID_FUNC_BODYV(eo_base_data_set, EO_FUNC_CALL(key, data, free_func), 81EAPI EO_VOID_FUNC_BODYV(eo_key_data_set, EO_FUNC_CALL(key, data, free_func),
82 const char *key, const void *data, eo_base_data_free_func free_func); 82 const char *key, const void *data, eo_key_data_free_func free_func);
83 83
84static void * 84static void *
85_data_get(Eo *obj EINA_UNUSED, void *class_data, const char *key) 85_data_get(Eo *obj EINA_UNUSED, void *class_data, const char *key)
@@ -102,7 +102,7 @@ _data_get(Eo *obj EINA_UNUSED, void *class_data, const char *key)
102 102
103 return NULL; 103 return NULL;
104} 104}
105EAPI EO_FUNC_BODYV(eo_base_data_get, void*, NULL, EO_FUNC_CALL(key), const char *key); 105EAPI EO_FUNC_BODYV(eo_key_data_get, void*, NULL, EO_FUNC_CALL(key), const char *key);
106 106
107static void 107static void
108_parent_set(Eo *obj, void *class_data, Eo *parent_id) 108_parent_set(Eo *obj, void *class_data, Eo *parent_id)
@@ -289,7 +289,7 @@ _data_del(Eo *obj EINA_UNUSED, void *class_data, const char *key)
289 } 289 }
290 } 290 }
291} 291}
292EAPI EO_VOID_FUNC_BODYV(eo_base_data_del, EO_FUNC_CALL(key), const char *key); 292EAPI EO_VOID_FUNC_BODYV(eo_key_data_del, EO_FUNC_CALL(key), const char *key);
293 293
294/* Weak reference. */ 294/* Weak reference. */
295 295
@@ -961,9 +961,9 @@ static Eo_Op_Description op_descs [] = {
961 EO_OP_FUNC(eo_parent_set, _parent_set, "Set parent."), 961 EO_OP_FUNC(eo_parent_set, _parent_set, "Set parent."),
962 EO_OP_FUNC(eo_parent_get, _parent_get, "Get parent."), 962 EO_OP_FUNC(eo_parent_get, _parent_get, "Get parent."),
963 EO_OP_FUNC(eo_children_iterator_new, _children_iterator_new, "Get Children Iterator."), 963 EO_OP_FUNC(eo_children_iterator_new, _children_iterator_new, "Get Children Iterator."),
964 EO_OP_FUNC(eo_base_data_set, _data_set, "Set data for key."), 964 EO_OP_FUNC(eo_key_data_set, _data_set, "Set data for key."),
965 EO_OP_FUNC(eo_base_data_get, _data_get, "Get data for key."), 965 EO_OP_FUNC(eo_key_data_get, _data_get, "Get data for key."),
966 EO_OP_FUNC(eo_base_data_del, _data_del, "Del key."), 966 EO_OP_FUNC(eo_key_data_del, _data_del, "Del key."),
967 EO_OP_FUNC(eo_wref_add, _wref_add, "Add a weak ref to the object."), 967 EO_OP_FUNC(eo_wref_add, _wref_add, "Add a weak ref to the object."),
968 EO_OP_FUNC(eo_wref_del, _wref_del, "Delete the weak ref."), 968 EO_OP_FUNC(eo_wref_del, _wref_del, "Delete the weak ref."),
969 EO_OP_FUNC(eo_event_callback_priority_add, _ev_cb_priority_add, "Add an event callback with a priority."), 969 EO_OP_FUNC(eo_event_callback_priority_add, _ev_cb_priority_add, "Add an event callback with a priority."),
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index d44b9154b4..d3980544b2 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -82,7 +82,7 @@ Should not be used with #eo_do. Only use it with #eo_do_super. */
82 params { 82 params {
83 @in const char* key; /*@ the key associated with the data */ 83 @in const char* key; /*@ the key associated with the data */
84 @in const void* data; /*@ the data to set */ 84 @in const void* data; /*@ the data to set */
85 @in eo_base_data_free_func free_func; /*@ the func to free data with (NULL means */ 85 @in eo_key_data_free_func free_func; /*@ the func to free data with (NULL means */
86 } 86 }
87 } 87 }
88 key_data_get { 88 key_data_get {
diff --git a/src/lib/evas/canvas/evas_data.c b/src/lib/evas/canvas/evas_data.c
index 14a384886a..4686595d36 100644
--- a/src/lib/evas/canvas/evas_data.c
+++ b/src/lib/evas/canvas/evas_data.c
@@ -8,7 +8,7 @@ evas_object_data_set(Evas_Object *obj, const char *key, const void *data)
8 MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); 8 MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
9 return; 9 return;
10 MAGIC_CHECK_END(); 10 MAGIC_CHECK_END();
11 eo_do(obj, eo_base_data_set(key, data, NULL)); 11 eo_do(obj, eo_key_data_set(key, data, NULL));
12} 12}
13 13
14EAPI void * 14EAPI void *
@@ -18,7 +18,7 @@ evas_object_data_get(const Evas_Object *obj, const char *key)
18 return NULL; 18 return NULL;
19 MAGIC_CHECK_END(); 19 MAGIC_CHECK_END();
20 void *data = NULL; 20 void *data = NULL;
21 eo_do((Evas_Object *)obj, data = eo_base_data_get(key)); 21 eo_do((Evas_Object *)obj, data = eo_key_data_get(key));
22 return data; 22 return data;
23} 23}
24 24
@@ -29,6 +29,6 @@ evas_object_data_del(Evas_Object *obj, const char *key)
29 return NULL; 29 return NULL;
30 MAGIC_CHECK_END(); 30 MAGIC_CHECK_END();
31 void *data = NULL; 31 void *data = NULL;
32 eo_do(obj, data = eo_base_data_get(key), eo_base_data_del(key)); 32 eo_do(obj, data = eo_key_data_get(key), eo_key_data_del(key));
33 return data; 33 return data;
34} 34}
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index d62838422e..04782ce916 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -116,7 +116,7 @@ START_TEST(ecore_test_ecore_audio_cleanup)
116 116
117 in = eo_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL); 117 in = eo_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL);
118 fail_if(!in); 118 fail_if(!in);
119 eo_do(in, eo_base_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &freq, NULL)); 119 eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &freq, NULL));
120 eo_do(in, ecore_audio_obj_in_length_set(2)); 120 eo_do(in, ecore_audio_obj_in_length_set(2));
121 121
122 out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL); 122 out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
@@ -166,17 +166,17 @@ START_TEST(ecore_test_ecore_audio_obj_tone)
166 eo_do(in, ecore_audio_obj_in_remaining_get(&len)); 166 eo_do(in, ecore_audio_obj_in_remaining_get(&len));
167 fail_if(len != 2.5); 167 fail_if(len != 2.5);
168 168
169 eo_do(in, eo_base_data_get(ECORE_AUDIO_ATTR_TONE_FREQ, (void **)&freq)); 169 eo_do(in, eo_key_data_get(ECORE_AUDIO_ATTR_TONE_FREQ, (void **)&freq));
170 fail_if(freq != 1000); 170 fail_if(freq != 1000);
171 171
172 freq = 2000; 172 freq = 2000;
173 eo_do(in, eo_base_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &freq, NULL)); 173 eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &freq, NULL));
174 174
175 eo_do(in, eo_base_data_get(ECORE_AUDIO_ATTR_TONE_FREQ, (void **)&freq)); 175 eo_do(in, eo_key_data_get(ECORE_AUDIO_ATTR_TONE_FREQ, (void **)&freq));
176 fail_if(freq != 2000); 176 fail_if(freq != 2000);
177 177
178 eo_do(in, eo_base_data_set("foo", "bar", NULL)); 178 eo_do(in, eo_key_data_set("foo", "bar", NULL));
179 eo_do(in, eo_base_data_get("foo", (void **)&tmp)); 179 eo_do(in, eo_key_data_get("foo", (void **)&tmp));
180 ck_assert_str_eq(tmp, "bar"); 180 ck_assert_str_eq(tmp, "bar");
181 181
182 eo_do(in, ecore_audio_obj_in_seek(5.0, SEEK_SET, &len)); 182 eo_do(in, ecore_audio_obj_in_seek(5.0, SEEK_SET, &len));
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index c711ffe28f..8d4756be5b 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -31,7 +31,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
31 fail_if(eo_composite_is(obj)); 31 fail_if(eo_composite_is(obj));
32 fail_if(!eo_composite_is(simple)); 32 fail_if(!eo_composite_is(simple));
33 33
34 eo_do(obj, eo_base_data_set("simple-obj", simple, NULL)); 34 eo_do(obj, eo_key_data_set("simple-obj", simple, NULL));
35 35
36 eo_unref(simple); 36 eo_unref(simple);
37} 37}
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index ecf5983cb0..9c3d95c426 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -45,7 +45,7 @@ main(int argc, char *argv[])
45 45
46 /* disable the callback forwarder, and fail if it's still called. */ 46 /* disable the callback forwarder, and fail if it's still called. */
47 Eo *simple = NULL; 47 Eo *simple = NULL;
48 eo_do(obj, simple = eo_base_data_get("simple-obj")); 48 eo_do(obj, simple = eo_key_data_get("simple-obj"));
49 eo_ref(simple); 49 eo_ref(simple);
50 eo_do(simple, eo_event_callback_forwarder_del(EV_A_CHANGED, obj)); 50 eo_do(simple, eo_event_callback_forwarder_del(EV_A_CHANGED, obj));
51 51
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 6786aae8fb..f370a2794b 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -68,7 +68,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
68 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, NULL)); 68 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, NULL));
69 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, NULL)); 69 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, NULL));
70 70
71 eo_do(obj, eo_base_data_set("cb_count", (intptr_t) 0, NULL)); 71 eo_do(obj, eo_key_data_set("cb_count", (intptr_t) 0, NULL));
72} 72}
73 73
74EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); 74EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index a5e9f3340c..2f6d79e4cc 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -519,56 +519,56 @@ START_TEST(eo_generic_data)
519 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 519 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
520 void *data = NULL; 520 void *data = NULL;
521 521
522 eo_do(obj, eo_base_data_set("test1", (void *) 1, NULL)); 522 eo_do(obj, eo_key_data_set("test1", (void *) 1, NULL));
523 eo_do(obj, data = eo_base_data_get("test1")); 523 eo_do(obj, data = eo_key_data_get("test1"));
524 fail_if(1 != (intptr_t) data); 524 fail_if(1 != (intptr_t) data);
525 eo_do(obj, eo_base_data_del("test1")); 525 eo_do(obj, eo_key_data_del("test1"));
526 eo_do(obj, data = eo_base_data_get("test1")); 526 eo_do(obj, data = eo_key_data_get("test1"));
527 fail_if(data); 527 fail_if(data);
528 528
529 eo_do(obj, eo_base_data_set("test1", (void *) 1, NULL)); 529 eo_do(obj, eo_key_data_set("test1", (void *) 1, NULL));
530 eo_do(obj, eo_base_data_set("test2", (void *) 2, NULL)); 530 eo_do(obj, eo_key_data_set("test2", (void *) 2, NULL));
531 eo_do(obj, data = eo_base_data_get("test1")); 531 eo_do(obj, data = eo_key_data_get("test1"));
532 fail_if(1 != (intptr_t) data); 532 fail_if(1 != (intptr_t) data);
533 eo_do(obj, data = eo_base_data_get("test2")); 533 eo_do(obj, data = eo_key_data_get("test2"));
534 fail_if(2 != (intptr_t) data); 534 fail_if(2 != (intptr_t) data);
535 535
536 eo_do(obj, data = eo_base_data_get("test2")); 536 eo_do(obj, data = eo_key_data_get("test2"));
537 fail_if(2 != (intptr_t) data); 537 fail_if(2 != (intptr_t) data);
538 eo_do(obj, eo_base_data_del("test2")); 538 eo_do(obj, eo_key_data_del("test2"));
539 eo_do(obj, data = eo_base_data_get("test2")); 539 eo_do(obj, data = eo_key_data_get("test2"));
540 fail_if(data); 540 fail_if(data);
541 541
542 eo_do(obj, data = eo_base_data_get("test1")); 542 eo_do(obj, data = eo_key_data_get("test1"));
543 fail_if(1 != (intptr_t) data); 543 fail_if(1 != (intptr_t) data);
544 eo_do(obj, eo_base_data_del("test1")); 544 eo_do(obj, eo_key_data_del("test1"));
545 eo_do(obj, data = eo_base_data_get("test1")); 545 eo_do(obj, data = eo_key_data_get("test1"));
546 fail_if(data); 546 fail_if(data);
547 547
548 int a = 0; 548 int a = 0;
549 eo_do(obj, eo_base_data_set("test3", &a, _fake_free_func)); 549 eo_do(obj, eo_key_data_set("test3", &a, _fake_free_func));
550 eo_do(obj, data = eo_base_data_get("test3")); 550 eo_do(obj, data = eo_key_data_get("test3"));
551 fail_if(&a != data); 551 fail_if(&a != data);
552 eo_do(obj, eo_base_data_get("test3")); 552 eo_do(obj, eo_key_data_get("test3"));
553 eo_do(obj, eo_base_data_del("test3")); 553 eo_do(obj, eo_key_data_del("test3"));
554 fail_if(a != 1); 554 fail_if(a != 1);
555 555
556 a = 0; 556 a = 0;
557 eo_do(obj, eo_base_data_set("test3", &a, _fake_free_func)); 557 eo_do(obj, eo_key_data_set("test3", &a, _fake_free_func));
558 eo_do(obj, eo_base_data_set("test3", NULL, _fake_free_func)); 558 eo_do(obj, eo_key_data_set("test3", NULL, _fake_free_func));
559 fail_if(a != 1); 559 fail_if(a != 1);
560 a = 0; 560 a = 0;
561 data = (void *) 123; 561 data = (void *) 123;
562 eo_do(obj, eo_base_data_set(NULL, &a, _fake_free_func)); 562 eo_do(obj, eo_key_data_set(NULL, &a, _fake_free_func));
563 eo_do(obj, data = eo_base_data_get(NULL)); 563 eo_do(obj, data = eo_key_data_get(NULL));
564 fail_if(data); 564 fail_if(data);
565 eo_do(obj, eo_base_data_del(NULL)); 565 eo_do(obj, eo_key_data_del(NULL));
566 566
567 a = 0; 567 a = 0;
568 eo_do(obj, eo_base_data_set("test3", &a, _fake_free_func)); 568 eo_do(obj, eo_key_data_set("test3", &a, _fake_free_func));
569 eo_do(obj, eo_base_data_set("test3", NULL, NULL)); 569 eo_do(obj, eo_key_data_set("test3", NULL, NULL));
570 fail_if(a != 1); 570 fail_if(a != 1);
571 eo_do(obj, eo_base_data_set("test3", &a, _fake_free_func)); 571 eo_do(obj, eo_key_data_set("test3", &a, _fake_free_func));
572 572
573 eo_unref(obj); 573 eo_unref(obj);
574 fail_if(a != 2); 574 fail_if(a != 2);