From 97655aa2717c1f6b9debd7a954220ec268e1aafd Mon Sep 17 00:00:00 2001 From: barbieri Date: Thu, 2 Feb 2012 12:32:13 +0000 Subject: [PATCH] Change eina_mode_child_search to more descriptive eina_model_child_criteria_match. Patch by: "Jonas M. Gastal" git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@67688 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/include/eina_model.h | 8 ++++---- src/lib/eina_model.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/include/eina_model.h b/src/include/eina_model.h index b450519..6aadefc 100644 --- a/src/include/eina_model.h +++ b/src/include/eina_model.h @@ -315,10 +315,10 @@ EAPI int eina_model_child_find(const Eina_Model *model, unsigned int start_position, const Eina_Model *other) EINA_ARG_NONNULL(1, 3) EINA_WARN_UNUSED_RESULT; -EAPI int eina_model_child_search(const Eina_Model *model, - unsigned int start_position, - Eina_Each_Cb match, - const void *data) EINA_ARG_NONNULL(1, 3) EINA_WARN_UNUSED_RESULT; +EAPI int eina_model_child_criteria_match(const Eina_Model *model, + unsigned int start_position, + Eina_Each_Cb match, + const void *data) EINA_ARG_NONNULL(1, 3) EINA_WARN_UNUSED_RESULT; EAPI Eina_Bool eina_model_child_sort(Eina_Model *model, Eina_Compare_Cb compare) EINA_ARG_NONNULL(1, 2); diff --git a/src/lib/eina_model.c b/src/lib/eina_model.c index 2a8750c..0a72d4d 100644 --- a/src/lib/eina_model.c +++ b/src/lib/eina_model.c @@ -1831,7 +1831,7 @@ _eina_model_type_base_child_filtered_iterator_next(Eina_Iterator *base, void **d it = (Eina_Iterator_Model_Base_Filtered *)base; if (it->count == 0) return EINA_FALSE; - i = eina_model_child_search(it->model, it->current, it->match, it->data); + i = eina_model_child_criteria_match(it->model, it->current, it->match, it->data); if (i < 0) return EINA_FALSE; it->current = i + 1; @@ -4074,7 +4074,7 @@ eina_model_child_find(const Eina_Model *model, unsigned int start_position, cons } EAPI int -eina_model_child_search(const Eina_Model *model, unsigned int start_position, Eina_Each_Cb match, const void *data) +eina_model_child_criteria_match(const Eina_Model *model, unsigned int start_position, Eina_Each_Cb match, const void *data) { EINA_MODEL_INSTANCE_CHECK_VAL(model, -1); EINA_SAFETY_ON_NULL_RETURN_VAL(match, -1); -- 2.7.4