cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=77ab3523cdafe3e128d1fa911e93ede14fac96b6
commit 77ab3523cdafe3e128d1fa911e93ede14fac96b6 Author: Cedric Bail <[email protected]> Date: Wed Sep 18 10:33:23 2019 -0700 ecore: remove unused piece of code. Reviewed-by: Mike Blumenkrantz <[email protected]> Differential Revision: https://phab.enlightenment.org/D10030 --- src/lib/ecore/efl_model_accessor_view.c | 133 ------------------------ src/lib/ecore/efl_model_accessor_view_private.h | 5 - src/lib/ecore/meson.build | 2 - 3 files changed, 140 deletions(-) diff --git a/src/lib/ecore/efl_model_accessor_view.c b/src/lib/ecore/efl_model_accessor_view.c deleted file mode 100644 index a73e9459a5..0000000000 --- a/src/lib/ecore/efl_model_accessor_view.c +++ /dev/null @@ -1,133 +0,0 @@ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - -#include "Eina.h" -#include "Eo.h" - -#include "efl_model_accessor_view_private.h" - -typedef struct _Efl_Model_Accessor -{ - Eina_Accessor vtable; - Eina_Accessor *real_accessor; - void *pdata; - Efl_Model_Accessor_View_Constructor_Cb cb; - Eina_Array *children; -} Efl_Model_Accessor; - -static void -_efl_model_accessor_setup(Efl_Model_Accessor *acc, - Eina_Accessor* real_accessor, - Efl_Model_Accessor_View_Constructor_Cb ctor, - void* pdata); - -static Eina_Bool -_efl_model_acessor_get_at(Efl_Model_Accessor *acc, unsigned int idx, void **data) -{ - void* eo; - Eo *p; - Eo *child; - - if(eina_accessor_data_get(acc->real_accessor, idx, &eo)) - { - p = eo; - child = acc->cb(acc->pdata, p); - if(!acc->children) - { - acc->children = eina_array_new(32); - } - eina_array_push(acc->children, child); - *data = child; - return !!*data; - } - else - return EINA_FALSE; -} - -static void * -_efl_model_acessor_get_container(Efl_Model_Accessor *acc) -{ - return eina_accessor_container_get(acc->real_accessor); -} - -static void -_efl_model_acessor_free(Efl_Model_Accessor *acc) -{ - if (acc->real_accessor) - { - eina_accessor_free(acc->real_accessor); - acc->real_accessor = NULL; - } - - if(acc->children) - { - unsigned i; - Eina_Array_Iterator iterator; - Eo* item; - - EINA_ARRAY_ITER_NEXT(acc->children, i, item, iterator) - { - efl_unref(item); - } - eina_array_free(acc->children); - acc->children = NULL; - } - - free(acc); -} - -static Eina_Bool -_efl_model_acessor_lock(Efl_Model_Accessor *acc) -{ - return eina_accessor_lock(acc->real_accessor); -} - -static Eina_Bool -_efl_model_acessor_unlock(Efl_Model_Accessor *acc) -{ - return eina_accessor_unlock(acc->real_accessor); -} - -static Efl_Model_Accessor * -_efl_model_acessor_clone(Efl_Model_Accessor *acc EINA_UNUSED) -{ - Efl_Model_Accessor* accessor = calloc(1, sizeof(Efl_Model_Accessor)); - _efl_model_accessor_setup(accessor, eina_accessor_clone(acc->real_accessor), - acc->cb, acc->pdata); - return accessor; -} - -static void -_efl_model_accessor_setup(Efl_Model_Accessor *acc, - Eina_Accessor* real_accessor, - Efl_Model_Accessor_View_Constructor_Cb ctor, - void* pdata) -{ - acc->vtable.version = EINA_ACCESSOR_VERSION; - acc->vtable.get_at = FUNC_ACCESSOR_GET_AT(_efl_model_acessor_get_at); - acc->vtable.get_container = FUNC_ACCESSOR_GET_CONTAINER(_efl_model_acessor_get_container); - acc->vtable.free = FUNC_ACCESSOR_FREE(_efl_model_acessor_free); - - acc->vtable.lock = FUNC_ACCESSOR_LOCK(_efl_model_acessor_lock); - acc->vtable.unlock = FUNC_ACCESSOR_LOCK(_efl_model_acessor_unlock); - - acc->vtable.clone = FUNC_ACCESSOR_CLONE(_efl_model_acessor_clone); - - EINA_MAGIC_SET(&acc->vtable, EINA_MAGIC_ACCESSOR); - - acc->real_accessor = real_accessor; - acc->cb = ctor; - acc->pdata = pdata; -} - -Eina_Accessor* efl_model_accessor_view_new(Eina_Accessor* accessor, - Efl_Model_Accessor_View_Constructor_Cb ctor, - void* data) -{ - Efl_Model_Accessor* acc = calloc(1, sizeof(Efl_Model_Accessor)); - _efl_model_accessor_setup(acc, accessor, ctor, data); - return &acc->vtable; -} - - diff --git a/src/lib/ecore/efl_model_accessor_view_private.h b/src/lib/ecore/efl_model_accessor_view_private.h deleted file mode 100644 index c44f2ec3cb..0000000000 --- a/src/lib/ecore/efl_model_accessor_view_private.h +++ /dev/null @@ -1,5 +0,0 @@ - -typedef Eo*(*Efl_Model_Accessor_View_Constructor_Cb)(void* data, Eo* child); - -Eina_Accessor* efl_model_accessor_view_new(Eina_Accessor* accessor, - Efl_Model_Accessor_View_Constructor_Cb constructor, void* data); diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build index eb8be6c33f..5e777ae750 100644 --- a/src/lib/ecore/meson.build +++ b/src/lib/ecore/meson.build @@ -139,8 +139,6 @@ ecore_src = [ 'efl_container_model.c', 'efl_composite_model.c', 'efl_boolean_model.c', - 'efl_model_accessor_view.c', - 'efl_model_accessor_view_private.h', 'efl_filter_model.c', 'efl_linear_interpolator.c', 'efl_accelerate_interpolator.c', --
