From b55ec7a34e12e36ca54541ee0b250e802ab0a13f Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Fri, 4 Mar 2016 14:23:02 +0000 Subject: [PATCH] Eo: remove the long deprecated eo_data_get. It has been deprecated for a while, and now it's time to actually stop using it. --- src/lib/eo/Eo.h | 9 --------- src/lib/eo/eo.c | 6 ------ src/tests/eo/suite/eo_test_general.c | 1 - 3 files changed, 16 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index a0b817cd58..57d1c12354 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -650,15 +650,6 @@ EAPI const Eo_Class *eo_class_get(const Eo *obj); EAPI Eo * _eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent, Eina_Bool ref); -/** - * @brief Get a pointer to the data of an object for a specific class. - * @param obj the object to work on. - * @param klass the klass associated with the data. - * @return a pointer to the data. - * @deprecated use eo_data_scope_get or eo_data_ref instead. - */ -EAPI void *eo_data_get(const Eo *obj, const Eo_Class *klass) EINA_DEPRECATED; - /** * @brief Get a pointer to the data of an object for a specific class. * The data reference count is not incremented. The pointer must be used only diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index cc0c9782f3..996b961b64 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -1453,12 +1453,6 @@ _eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj) #endif } -EAPI void * -eo_data_get(const Eo *obj_id, const Eo_Class *klass_id) -{ - return eo_data_scope_get(obj_id, klass_id); -} - EAPI void * eo_data_scope_get(const Eo *obj_id, const Eo_Class *klass_id) { diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index cfe576723d..c01a621bcf 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -200,7 +200,6 @@ START_TEST(eo_data_fetch) obj = eo_add(klass, NULL); fail_if(!obj); - fail_if(eo_data_get(obj, klass)); fail_if(eo_data_scope_get(obj, klass)); fail_if(!eo_data_scope_get(obj, EO_BASE_CLASS)); eo_unref(obj);