From d85c07e4a70e06de04820aebe5277cd491263e64 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 13 Jul 2016 16:05:58 -0700 Subject: [PATCH] eo: rationalize naming to follow other use of ref and wref in our API. --- src/lib/eo/eo_base.eo | 4 ++-- src/lib/eo/eo_base_class.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo index 01ae857..d838777 100644 --- a/src/lib/eo/eo_base.eo +++ b/src/lib/eo/eo_base.eo @@ -228,7 +228,7 @@ abstract Eo.Base () } } } - @property key_obj { + @property key_ref { [[Generic object reference with string key to object. The object will be automatically ref'd when set and unref'd @@ -253,7 +253,7 @@ abstract Eo.Base () } } } - @property key_obj_weak { + @property key_wref { [[Generic weak object reference with string key to object. The object key will be removed if the object is removed, but diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c index 92e10af6..e7742b8 100644 --- a/src/lib/eo/eo_base_class.c +++ b/src/lib/eo/eo_base_class.c @@ -255,7 +255,7 @@ _eo_base_key_data_get(Eo *obj, Eo_Base_Data *pd, const char *key) } EOLIAN static void -_eo_base_key_obj_set(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *key, const Eo *objdata) +_eo_base_key_ref_set(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *key, const Eo *objdata) { Eo_Generic_Data_Node *node; @@ -268,13 +268,13 @@ _eo_base_key_obj_set(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *key, con } EOLIAN static Eo * -_eo_base_key_obj_get(Eo *obj, Eo_Base_Data *pd, const char *key) +_eo_base_key_ref_get(Eo *obj, Eo_Base_Data *pd, const char *key) { return _key_generic_get(obj, pd, key, DATA_OBJ); } EOLIAN static void -_eo_base_key_obj_weak_set(Eo *obj, Eo_Base_Data *pd, const char * key, const Eo_Base *objdata) +_eo_base_key_wref_set(Eo *obj, Eo_Base_Data *pd, const char * key, const Eo_Base *objdata) { Eo_Generic_Data_Node *node; @@ -286,7 +286,7 @@ _eo_base_key_obj_weak_set(Eo *obj, Eo_Base_Data *pd, const char * key, const Eo_ } EOLIAN static Eo * -_eo_base_key_obj_weak_get(Eo *obj, Eo_Base_Data *pd, const char * key) +_eo_base_key_wref_get(Eo *obj, Eo_Base_Data *pd, const char * key) { return _key_generic_get(obj, pd, key, DATA_OBJ_WEAK); } -- 2.7.4