From 0717b3003a92ddfa16b68c3a59bafe1ede9d40f6 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 22 Nov 2018 16:45:03 -0800 Subject: [PATCH] eldbus: simplify code by using proper helper. efl_loop_promise_new is a helper function that does automatically figure out an available scheduler and create a promise from it. Basically replacing the call to eina_promise_new(efl_loop_future_scheduler_get(o), ...). Reviewed-by: Xavi Artigas Reviewed-by: Vitor Sousa da Silva Differential Revision: https://phab.enlightenment.org/D7335 --- src/lib/eldbus/eldbus_model_connection.c | 3 +-- src/lib/eldbus/eldbus_model_object.c | 3 +-- src/lib/eldbus/eldbus_model_proxy.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c index a2ed5d5..c58faaf 100644 --- a/src/lib/eldbus/eldbus_model_connection.c +++ b/src/lib/eldbus/eldbus_model_connection.c @@ -70,8 +70,7 @@ _eldbus_model_connection_efl_model_children_slice_get(Eo *obj, return eina_future_resolved(efl_loop_future_scheduler_get(obj), v); } - p = eina_promise_new(efl_loop_future_scheduler_get(obj), - _eldbus_eina_promise_cancel, NULL); + p = efl_loop_promise_new(obj, _eldbus_eina_promise_cancel, NULL); slice = calloc(1, sizeof (Eldbus_Children_Slice_Promise)); slice->p = p; diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c index ece21cf..f910683 100644 --- a/src/lib/eldbus/eldbus_model_object.c +++ b/src/lib/eldbus/eldbus_model_object.c @@ -127,8 +127,7 @@ _eldbus_model_object_efl_model_children_slice_get(Eo *obj EINA_UNUSED, return eina_future_resolved(efl_loop_future_scheduler_get(obj), v); } - p = eina_promise_new(efl_loop_future_scheduler_get(obj), - _eldbus_eina_promise_cancel, NULL); + p = efl_loop_promise_new(obj, _eldbus_eina_promise_cancel, NULL); slice = calloc(1, sizeof(struct _Eldbus_Children_Slice_Promise)); slice->p = p; diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c index 96505ca..073baef 100644 --- a/src/lib/eldbus/eldbus_model_proxy.c +++ b/src/lib/eldbus/eldbus_model_proxy.c @@ -293,8 +293,7 @@ _eldbus_model_proxy_efl_model_property_set(Eo *obj EINA_UNUSED, if (!data) goto on_error; data->pd = pd; - data->promise = eina_promise_new(efl_loop_future_scheduler_get(obj), - _eldbus_model_proxy_cancel_cb, data); + data->promise = efl_loop_promise_new(obj, _eldbus_model_proxy_cancel_cb, data); data->property = eina_stringshare_add(property); if (!(data->value = eina_value_dup(value))) goto on_error; -- 2.7.4