forked from enlightenment/efl
eo: rename efl_future_Eina_FutureXXX_then in efl_future_then as this has been available for some time.
Reviewed-by: Vitor Sousa da Silva <vitorsousa@expertisesolutions.com.br> Differential Revision: https://phab.enlightenment.org/D7327
This commit is contained in:
parent
da01f169d0
commit
5de51f84fb
|
@ -239,7 +239,7 @@ _code_changed_hack(void *data, const Efl_Event *ev EINA_UNUSED)
|
|||
|
||||
f = eina_future_then(efl_loop_job(efl_loop_get(data)),
|
||||
_code_changed, data, NULL);
|
||||
efl_future_Eina_FutureXXX_then(data, f);
|
||||
efl_future_then(data, f);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -487,7 +487,7 @@ _efl_exe_efl_task_run(Eo *obj EINA_UNUSED, Efl_Exe_Data *pd)
|
|||
pd->run = EINA_TRUE;
|
||||
pd->promise = efl_loop_promise_new(obj, _run_cancel_cb, obj);
|
||||
Eina_Future *f = eina_future_new(pd->promise);
|
||||
return efl_future_Eina_FutureXXX_then(obj, f);
|
||||
return efl_future_then(obj, f);
|
||||
}
|
||||
// this code is in the child here, and is temporary setup until we
|
||||
// exec() the child to replace everything.
|
||||
|
|
|
@ -85,7 +85,7 @@ _efl_io_copier_timeout_inactivity_reschedule(Eo *o, Efl_Io_Copier_Data *pd)
|
|||
if (pd->inactivity_timer) eina_future_cancel(pd->inactivity_timer);
|
||||
if (pd->timeout_inactivity <= 0.0) return;
|
||||
|
||||
efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_inactivity),
|
||||
efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_inactivity),
|
||||
.success = _efl_io_copier_timeout_inactivity_cb,
|
||||
.storage = &pd->inactivity_timer);
|
||||
}
|
||||
|
@ -143,7 +143,7 @@ _efl_io_copier_job_schedule(Eo *o, Efl_Io_Copier_Data *pd)
|
|||
}
|
||||
else
|
||||
{
|
||||
efl_future_Eina_FutureXXX_then(o, efl_loop_job(efl_loop_get(o)),
|
||||
efl_future_then(o, efl_loop_job(efl_loop_get(o)),
|
||||
.success = _efl_io_copier_job,
|
||||
.storage = &pd->job);
|
||||
}
|
||||
|
|
|
@ -416,7 +416,7 @@ ecore_loop_arguments_send(int argc, const char **argv)
|
|||
|
||||
job = eina_future_then(efl_loop_job(efl_main_loop_get()),
|
||||
_efl_loop_arguments_send, arga, NULL);
|
||||
efl_future_Eina_FutureXXX_then(efl_main_loop_get(), job);
|
||||
efl_future_then(efl_main_loop_get(), job);
|
||||
}
|
||||
|
||||
static Eina_Future *
|
||||
|
@ -424,7 +424,7 @@ _efl_loop_job(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED)
|
|||
{
|
||||
Eina_Future_Scheduler *sched = efl_loop_future_scheduler_get(obj);
|
||||
// NOTE: Eolian should do efl_future_then() to bind future to object.
|
||||
return efl_future_Eina_FutureXXX_then
|
||||
return efl_future_then
|
||||
(obj, eina_future_resolved(sched, EINA_VALUE_EMPTY));
|
||||
}
|
||||
|
||||
|
@ -481,7 +481,7 @@ _efl_loop_idle(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED)
|
|||
d->promise = p;
|
||||
|
||||
// NOTE: Eolian should do efl_future_then() to bind future to object.
|
||||
return efl_future_Eina_FutureXXX_then(obj, eina_future_new(p));
|
||||
return efl_future_then(obj, eina_future_new(p));
|
||||
|
||||
idler_error:
|
||||
d->idler = NULL;
|
||||
|
@ -546,7 +546,7 @@ _efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double tim)
|
|||
d->promise = p;
|
||||
|
||||
// NOTE: Eolian should do efl_future_then() to bind future to object.
|
||||
return efl_future_Eina_FutureXXX_then(obj, eina_future_new(p));
|
||||
return efl_future_then(obj, eina_future_new(p));
|
||||
|
||||
timer_error:
|
||||
d->timer = NULL;
|
||||
|
|
|
@ -294,7 +294,7 @@ _efl_model_composite_boolean_efl_model_children_slice_get(Eo *obj,
|
|||
req->parent = efl_ref(obj);
|
||||
req->start = start;
|
||||
|
||||
return efl_future_Eina_FutureXXX_then
|
||||
return efl_future_then
|
||||
(obj, eina_future_then(f, _efl_model_composite_boolean_then, req, NULL));
|
||||
}
|
||||
|
||||
|
|
|
@ -218,7 +218,7 @@ _efl_model_composite_selection_efl_model_property_set(Eo *obj,
|
|||
if (!success)
|
||||
return eina_future_rejected(efl_loop_future_scheduler_get(obj), EFL_MODEL_ERROR_INCORRECT_VALUE);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then
|
||||
return efl_future_then
|
||||
(obj, eina_future_then(efl_model_children_slice_get(obj, l, 1),
|
||||
_select_slice_then, obj, NULL));
|
||||
}
|
||||
|
@ -389,7 +389,7 @@ _efl_model_composite_selection_children_efl_model_property_set(Eo *obj,
|
|||
commit_change:
|
||||
chain = eina_future_then(chain, _commit_change, obj, NULL);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(obj, chain);
|
||||
return efl_future_then(obj, chain);
|
||||
}
|
||||
|
||||
typedef struct _Selection_Children_Request Selection_Children_Request;
|
||||
|
@ -450,7 +450,7 @@ _efl_model_composite_selection_efl_model_children_slice_get(Eo *obj,
|
|||
start, count);
|
||||
f = eina_future_then(f, _slice_get, req, NULL);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(obj, f);
|
||||
return efl_future_then(obj, f);
|
||||
}
|
||||
|
||||
#include "efl_model_composite_selection.eo.c"
|
||||
|
|
|
@ -103,7 +103,7 @@ _efl_model_loop_efl_model_property_ready_get(Eo *obj, void *pd EINA_UNUSED, cons
|
|||
f = eina_future_resolved(efl_loop_future_scheduler_get(obj),
|
||||
eina_value_reference_copy(value));
|
||||
eina_value_free(value);
|
||||
return efl_future_Eina_FutureXXX_then(obj, f);
|
||||
return efl_future_then(obj, f);
|
||||
}
|
||||
|
||||
#include "efl_model_loop.eo.c"
|
||||
|
|
|
@ -286,7 +286,7 @@ _efl_thread_main(void *data, Eina_Thread t)
|
|||
for (i = 0; i < thdat->args.argc; i++)
|
||||
efl_task_arg_append(obj, thdat->args.argv[i]);
|
||||
job = eina_future_then(efl_loop_job(obj), _efl_loop_arguments_send, obj);
|
||||
efl_future_Eina_FutureXXX_then(obj, job);
|
||||
efl_future_then(obj, job);
|
||||
|
||||
for (i = 0; i < thdat->args.argc; i++)
|
||||
eina_stringshare_del(thdat->args.argv[i]);
|
||||
|
@ -781,7 +781,7 @@ _efl_thread_efl_task_run(Eo *obj, Efl_Thread_Data *pd)
|
|||
pd->run = EINA_TRUE;
|
||||
pd->promise = efl_loop_promise_new(obj, _run_cancel_cb, obj);
|
||||
Eina_Future *f = eina_future_new(pd->promise);
|
||||
return efl_future_Eina_FutureXXX_then(obj, f);
|
||||
return efl_future_then(obj, f);
|
||||
}
|
||||
|
||||
EOLIAN static void
|
||||
|
|
|
@ -786,11 +786,11 @@ _efl_net_control_access_point_connect(Eo *o, Efl_Net_Control_Access_Point_Data *
|
|||
pd->pending = eina_list_append(pd->pending, p);
|
||||
eldbus_pending_data_set(p, ".object", pd);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(o, f);
|
||||
return efl_future_then(o, f);
|
||||
|
||||
error_dbus:
|
||||
eina_promise_reject(promise, ENOSYS);
|
||||
return efl_future_Eina_FutureXXX_then(o, f);
|
||||
return efl_future_then(o, f);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -413,11 +413,11 @@ _efl_net_control_technology_scan(Eo *o, Efl_Net_Control_Technology_Data *pd)
|
|||
eina_promise_data_set(promise, p);
|
||||
eldbus_pending_data_set(p, ".object", o);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(o, f);
|
||||
return efl_future_then(o, f);
|
||||
|
||||
error_dbus:
|
||||
eina_promise_reject(promise, ENOSYS);
|
||||
return efl_future_Eina_FutureXXX_then(o, f);
|
||||
return efl_future_then(o, f);
|
||||
}
|
||||
|
||||
const char *
|
||||
|
|
|
@ -1732,7 +1732,7 @@ _efl_net_dialer_http_efl_io_closer_close(Eo *o, Efl_Net_Dialer_Http_Data *pd)
|
|||
{
|
||||
if ((!pd->pending_close) && (pd->easy))
|
||||
{
|
||||
efl_future_Eina_FutureXXX_then(o, efl_loop_job(efl_loop_get(o)),
|
||||
efl_future_then(o, efl_loop_job(efl_loop_get(o)),
|
||||
.success = _efl_net_dialer_http_pending_close,
|
||||
.storage = &pd->pending_close);
|
||||
DBG("dialer=%p closed from CURL callback, schedule close job=%p", o, pd->pending_close);
|
||||
|
|
|
@ -142,7 +142,7 @@ _efl_net_dialer_ssl_connect_timeout(Eo *o, const Eina_Value v)
|
|||
static void
|
||||
_timeout_schedule(Eo *o, Efl_Net_Dialer_Ssl_Data *pd, double timeout)
|
||||
{
|
||||
efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), timeout),
|
||||
efl_future_then(o, efl_loop_timeout(efl_loop_get(o), timeout),
|
||||
.success = _efl_net_dialer_ssl_connect_timeout,
|
||||
.storage = &pd->connect_timeout);
|
||||
}
|
||||
|
|
|
@ -103,7 +103,7 @@ _efl_net_dialer_tcp_connect_timeout(Eo *o, const Eina_Value v)
|
|||
static void
|
||||
_timeout_schedule(Eo *o, Efl_Net_Dialer_Tcp_Data *pd)
|
||||
{
|
||||
efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
|
||||
efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
|
||||
.success = _efl_net_dialer_tcp_connect_timeout,
|
||||
.storage = &pd->connect.timeout);
|
||||
}
|
||||
|
|
|
@ -103,7 +103,7 @@ _efl_net_dialer_udp_resolver_timeout(Eo *o, const Eina_Value v)
|
|||
static void
|
||||
_timeout_schedule(Eo *o, Efl_Net_Dialer_Udp_Data *pd)
|
||||
{
|
||||
efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
|
||||
efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
|
||||
.success = _efl_net_dialer_udp_resolver_timeout,
|
||||
.storage = &pd->resolver.timeout);
|
||||
}
|
||||
|
|
|
@ -129,7 +129,7 @@ _efl_net_dialer_unix_connected(void *data, const struct sockaddr *addr, socklen_
|
|||
static void
|
||||
_timeout_schedule(Eo *o, Efl_Net_Dialer_Unix_Data *pd)
|
||||
{
|
||||
efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
|
||||
efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
|
||||
.success = _efl_net_dialer_unix_connect_timeout,
|
||||
.storage = &pd->connect.timeout);
|
||||
}
|
||||
|
|
|
@ -764,7 +764,7 @@ _efl_net_dialer_websocket_job_schedule(Eo *o, Efl_Net_Dialer_Websocket_Data *pd)
|
|||
loop = efl_loop_get(o);
|
||||
if (!loop) return;
|
||||
|
||||
efl_future_Eina_FutureXXX_then(o, efl_loop_job(loop),
|
||||
efl_future_then(o, efl_loop_job(loop),
|
||||
.success = _efl_net_dialer_websocket_job,
|
||||
.storage = &pd->job);
|
||||
}
|
||||
|
@ -1504,7 +1504,7 @@ _efl_net_dialer_websocket_close_request(Eo *o, Efl_Net_Dialer_Websocket_Data *pd
|
|||
if (pd->close_timeout)
|
||||
eina_future_cancel(pd->close_timeout);
|
||||
|
||||
efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), 2.0),
|
||||
efl_future_then(o, efl_loop_timeout(efl_loop_get(o), 2.0),
|
||||
.success = _efl_net_dialer_websocket_close_request_timeout,
|
||||
.storage = &pd->close_timeout);
|
||||
|
||||
|
|
|
@ -338,7 +338,7 @@ _efl_net_server_windows_pending_announce_job_schedule(Eo *o, Efl_Net_Server_Wind
|
|||
|
||||
loop = efl_loop_get(o);
|
||||
if (!loop) return;
|
||||
efl_future_Eina_FutureXXX_then(o, efl_loop_job(loop),
|
||||
efl_future_then(o, efl_loop_job(loop),
|
||||
.success = _efl_net_server_windows_pending_announce_job,
|
||||
.storage = &pd->pending_announcer_job);
|
||||
}
|
||||
|
|
|
@ -145,7 +145,7 @@ _efl_io_manager_direct_ls(const Eo *obj,
|
|||
ecore_thread_local_data_add(h->thread, ".info_data", info_data, info_free_cb, EINA_TRUE);
|
||||
eina_promise_data_set(p, h);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(obj, future);
|
||||
return efl_future_then(obj, future);
|
||||
|
||||
end:
|
||||
return future;
|
||||
|
@ -188,7 +188,7 @@ _efl_io_manager_stat_ls(const Eo *obj,
|
|||
ecore_thread_local_data_add(h->thread, ".info_data", info_data, info_free_cb, EINA_TRUE);
|
||||
eina_promise_data_set(p, h);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(obj, future);
|
||||
return efl_future_then(obj, future);
|
||||
|
||||
end:
|
||||
return future;
|
||||
|
@ -219,7 +219,7 @@ _efl_io_manager_ls(const Eo *obj,
|
|||
ecore_thread_local_data_add(h->thread, ".paths_data", paths_data, paths_free_cb, EINA_TRUE);
|
||||
eina_promise_data_set(p, h);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(obj, future);
|
||||
return efl_future_then(obj, future);
|
||||
|
||||
end:
|
||||
return future;
|
||||
|
@ -267,7 +267,7 @@ _efl_io_manager_stat(const Eo *obj,
|
|||
if (!h) goto end;
|
||||
eina_promise_data_set(p, h);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(obj, future);
|
||||
return efl_future_then(obj, future);
|
||||
|
||||
end:
|
||||
return future;
|
||||
|
@ -301,10 +301,10 @@ _efl_io_manager_xattr_ls(const Eo *obj,
|
|||
ecore_thread_local_data_add(h->thread, ".paths_data", paths_data, paths_free_cb, EINA_TRUE);
|
||||
eina_promise_data_set(p, h);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(obj, future);
|
||||
return efl_future_then(obj, future);
|
||||
|
||||
end:
|
||||
return efl_future_Eina_FutureXXX_then(obj, future);;
|
||||
return efl_future_then(obj, future);;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -350,7 +350,7 @@ _efl_io_manager_xattr_set(Eo *obj,
|
|||
if (!h) goto end;
|
||||
eina_promise_data_set(p, h);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(obj, future);
|
||||
return efl_future_then(obj, future);
|
||||
|
||||
end:
|
||||
return future;
|
||||
|
@ -378,7 +378,7 @@ _efl_io_manager_xattr_get(const Eo *obj,
|
|||
eina_promise_data_set(p, h);
|
||||
|
||||
/* XXX const */
|
||||
return efl_future_Eina_FutureXXX_then((Eo *)obj, future);
|
||||
return efl_future_then((Eo *)obj, future);
|
||||
|
||||
end:
|
||||
return future;
|
||||
|
@ -416,7 +416,7 @@ _efl_io_manager_open(const Eo *obj,
|
|||
if (!h) goto end;
|
||||
eina_promise_data_set(p, h);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(obj, future);
|
||||
return efl_future_then(obj, future);
|
||||
|
||||
end:
|
||||
return future;
|
||||
|
@ -442,7 +442,7 @@ _efl_io_manager_close(const Eo *obj,
|
|||
if (!h) goto end;
|
||||
eina_promise_data_set(p, h);
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(obj, future);
|
||||
return efl_future_then(obj, future);
|
||||
|
||||
end:
|
||||
return future;
|
||||
|
|
|
@ -456,7 +456,7 @@ _eio_build_mime_now(void *data, const Eina_Value v, const Eina_Future *dead_futu
|
|||
{
|
||||
Eina_Future *f = eina_future_then(_build_delay(pd->loop),
|
||||
_eio_build_mime_now, model, NULL);
|
||||
return eina_future_as_value(efl_future_Eina_FutureXXX_then(model, f));
|
||||
return eina_future_as_value(efl_future_then(model, f));
|
||||
}
|
||||
|
||||
pd->mime_type = efreet_mime_type_get(pd->path);
|
||||
|
@ -485,7 +485,7 @@ _eio_build_mime(const Efl_Object *model, Eio_Model_Data *pd)
|
|||
|
||||
f = efl_loop_job(pd->loop);
|
||||
f = eina_future_then(f, _eio_build_mime_now, model, NULL);
|
||||
pd->request.mime = efl_future_Eina_FutureXXX_then(model, f);
|
||||
pd->request.mime = efl_future_then(model, f);
|
||||
}
|
||||
|
||||
static Eina_Value *
|
||||
|
@ -703,7 +703,7 @@ _eio_model_efl_model_property_set(Eo *obj,
|
|||
eina_value_string_init(pd->path));
|
||||
}
|
||||
|
||||
return efl_future_Eina_FutureXXX_then(obj, f);
|
||||
return efl_future_then(obj, f);
|
||||
|
||||
on_error:
|
||||
return eina_future_rejected(efl_loop_future_scheduler_get(loop), err);
|
||||
|
@ -802,7 +802,7 @@ _eio_model_efl_model_children_count_get(const Eo *obj, Eio_Model_Data *pd)
|
|||
f = efl_io_manager_direct_ls(iom, pd->path, EINA_FALSE,
|
||||
(void*) obj, _eio_model_children_list, NULL);
|
||||
f = eina_future_then(f, _eio_model_children_list_on, pd, NULL);
|
||||
pd->request.listing = efl_future_Eina_FutureXXX_then(obj, f);
|
||||
pd->request.listing = efl_future_then(obj, f);
|
||||
}
|
||||
|
||||
return eina_list_count(pd->files);
|
||||
|
|
|
@ -81,7 +81,7 @@ _eldbus_model_connection_efl_model_children_slice_get(Eo *obj,
|
|||
pd->requests = eina_list_prepend(pd->requests, slice);
|
||||
|
||||
_eldbus_model_children_list(obj, pd);
|
||||
return efl_future_Eina_FutureXXX_then(obj, eina_future_new(p));;
|
||||
return efl_future_then(obj, eina_future_new(p));;
|
||||
}
|
||||
|
||||
static unsigned int
|
||||
|
|
|
@ -139,7 +139,7 @@ _eldbus_model_object_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
|
|||
|
||||
if (!pd->pendings)
|
||||
_eldbus_model_object_introspect(obj, pd, pd->bus, pd->path);
|
||||
return efl_future_Eina_FutureXXX_then(obj, eina_future_new(p));;
|
||||
return efl_future_then(obj, eina_future_new(p));;
|
||||
}
|
||||
|
||||
static unsigned int
|
||||
|
|
|
@ -310,7 +310,7 @@ _eldbus_model_proxy_efl_model_property_set(Eo *obj EINA_UNUSED,
|
|||
}
|
||||
|
||||
if (pending) pd->pendings = eina_list_append(pd->pendings, pending);
|
||||
return efl_future_Eina_FutureXXX_then(obj, eina_future_new(data->promise));
|
||||
return efl_future_then(obj, eina_future_new(data->promise));
|
||||
|
||||
on_error:
|
||||
return eina_future_rejected(efl_loop_future_scheduler_get(obj), err);
|
||||
|
|
|
@ -998,7 +998,7 @@ _efl_ui_list_view_efl_ui_list_view_model_load_range_set(Eo* obj, Efl_Ui_List_Vie
|
|||
{
|
||||
Eina_Future *f = efl_model_children_slice_get(pd->model, first, count);
|
||||
f = eina_future_then(f, _children_slice_then, pd, NULL);
|
||||
pd->slice.future = efl_future_Eina_FutureXXX_then(obj, f);
|
||||
pd->slice.future = efl_future_then(obj, f);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -739,7 +739,7 @@ _scroll_wheel_post_event_go(Efl_Ui_Scroll_Manager_Data *sd, int x, int y)
|
|||
|
||||
f = eina_future_then(efl_loop_job(efl_loop_get(sd->obj)),
|
||||
_scroll_wheel_post_event_job, sd, NULL);
|
||||
efl_future_Eina_FutureXXX_then(sd->obj, f);
|
||||
efl_future_then(sd->obj, f);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -1032,7 +1032,7 @@ _populate(Evas_Object *obj,
|
|||
{
|
||||
future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
|
||||
future = eina_future_then(future, _process_children_cb, lreq, NULL);
|
||||
efl_future_Eina_FutureXXX_then(obj, future);
|
||||
efl_future_then(obj, future);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1688,7 +1688,7 @@ _resource_created(void *data, const Efl_Event *event)
|
|||
|
||||
f = efl_model_children_slice_get(sd->model, evt->index, 1);
|
||||
f = eina_future_then(f, _resource_created_then, fs, NULL);
|
||||
efl_future_Eina_FutureXXX_then(fs, f);
|
||||
efl_future_then(fs, f);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -2005,7 +2005,7 @@ _scroll_wheel_post_event_go(Elm_Scrollable_Smart_Interface_Data *sid, int x, int
|
|||
|
||||
f = eina_future_then(efl_loop_job(efl_loop_get(sid->obj)),
|
||||
_scroll_wheel_post_event_job, sid, NULL);
|
||||
efl_future_Eina_FutureXXX_then(sid->obj, f);
|
||||
efl_future_then(sid->obj, f);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -285,7 +285,7 @@ _efl_model_load_children(View_List_ItemData *pdata)
|
|||
f = efl_model_children_slice_get(pdata->priv->connect.model, 0,
|
||||
efl_model_children_count_get(pdata->priv->connect.model));
|
||||
f = eina_future_then(f, _efl_model_load_children_then, pdata, NULL);
|
||||
efl_future_Eina_FutureXXX_then(pdata->priv->genlist, f);
|
||||
efl_future_then(pdata->priv->genlist, f);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -318,7 +318,7 @@ _efl_model_children_added_cb(void *data, const Efl_Event *event)
|
|||
|
||||
f = efl_model_children_slice_get(idata->priv->connect.model, evt->index, 1);
|
||||
f = eina_future_then(f, _efl_model_load_children_then, idata, NULL);
|
||||
efl_future_Eina_FutureXXX_then(idata->priv->genlist, f);
|
||||
efl_future_then(idata->priv->genlist, f);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -538,7 +538,7 @@ EOAPI Eina_Future_Desc efl_future_cb_from_desc(const Eo *obj, const Efl_Future_C
|
|||
* @endcode
|
||||
*
|
||||
* @see efl_future_cb_from_desc()
|
||||
* @see efl_future_Eina_FutureXXX_then()
|
||||
* @see efl_future_then()
|
||||
*/
|
||||
#define efl_future_cb(_eo, ...) efl_future_cb_from_desc(_eo, (Efl_Future_Cb_Desc){__VA_ARGS__})
|
||||
|
||||
|
@ -547,11 +547,11 @@ EOAPI Eina_Future_Desc efl_future_cb_from_desc(const Eo *obj, const Efl_Future_C
|
|||
*
|
||||
* Usage:
|
||||
* @code
|
||||
* efl_future_Eina_FutureXXX_then(o, future, .success = success, .success_type = EINA_VALUE_TYPE_INT);
|
||||
* efl_future_then(o, future, .success = success, .success_type = EINA_VALUE_TYPE_INT);
|
||||
* @endcode
|
||||
*
|
||||
*/
|
||||
#define efl_future_Eina_FutureXXX_then(_eo, _future, ...) eina_future_then_from_desc(_future, efl_future_cb(_eo, ## __VA_ARGS__))
|
||||
#define efl_future_then(_eo, _future, ...) eina_future_then_from_desc(_future, efl_future_cb(_eo, ## __VA_ARGS__))
|
||||
|
||||
/**
|
||||
* Creates a Future chain based on #Efl_Future_Cb_Desc
|
||||
|
|
Loading…
Reference in New Issue