From 9fa35820ca9f6ed8115d60a4d177ce7920854bab Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Fri, 27 Sep 2013 00:40:09 +0200 Subject: [PATCH] eo: ojb_ref -> class_ref --- src/lib/eo/eo.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index d851fe5..303a65c 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -389,18 +389,18 @@ eo_do_internal(const char *file, int line, const Eo *obj_id, ...) { Eina_Bool ret = EINA_TRUE; va_list p_list; - Eina_Bool obj_ref = !_eo_is_a_class(obj_id); + Eina_Bool class_ref = _eo_is_a_class(obj_id); va_start(p_list, obj_id); - if (obj_ref) + if (class_ref) { - EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_FALSE); - ret = _eo_obj_dov_internal(file, line, obj, &p_list); + EO_CLASS_POINTER_RETURN_VAL(obj_id, klass, EINA_FALSE); + ret = _eo_class_dov_internal(file, line, klass, &p_list); } else { - EO_CLASS_POINTER_RETURN_VAL(obj_id, klass, EINA_FALSE); - ret = _eo_class_dov_internal(file, line, klass, &p_list); + EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_FALSE); + ret = _eo_obj_dov_internal(file, line, obj, &p_list); } va_end(p_list); @@ -410,17 +410,17 @@ eo_do_internal(const char *file, int line, const Eo *obj_id, ...) EAPI Eina_Bool eo_vdo_internal(const char *file, int line, const Eo *obj_id, va_list *ops) { - Eina_Bool obj_ref = !_eo_is_a_class(obj_id); + Eina_Bool class_ref = _eo_is_a_class(obj_id); - if (obj_ref) + if (class_ref) { - EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_FALSE); - return _eo_obj_dov_internal(file, line, obj, ops); + EO_CLASS_POINTER_RETURN_VAL(obj_id, klass, EINA_FALSE); + return _eo_class_dov_internal(file, line, klass, ops); } else { - EO_CLASS_POINTER_RETURN_VAL(obj_id, klass, EINA_FALSE); - return _eo_class_dov_internal(file, line, klass, ops); + EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_FALSE); + return _eo_obj_dov_internal(file, line, obj, ops); } } -- 2.7.4