summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2018-11-21 17:33:10 -0800
committerCedric BAIL <cedric@osg.samsung.com>2018-11-23 11:39:43 -0800
commit5de51f84fb206a728c5df72739ec187b69e7cc57 (patch)
tree14c8ea12a47f71411cbc5d2a5023f77b7a40c85a /src
parentda01f169d0719a47d420ebe083b18b6b89798891 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/bin/elementary/test_gfx_filters.c2
-rw-r--r--src/lib/ecore/efl_exe.c2
-rw-r--r--src/lib/ecore/efl_io_copier.c4
-rw-r--r--src/lib/ecore/efl_loop.c8
-rw-r--r--src/lib/ecore/efl_model_composite_boolean.c2
-rw-r--r--src/lib/ecore/efl_model_composite_selection.c6
-rw-r--r--src/lib/ecore/efl_model_loop.c2
-rw-r--r--src/lib/ecore/efl_thread.c4
-rw-r--r--src/lib/ecore_con/efl_net_control_access_point-connman.c4
-rw-r--r--src/lib/ecore_con/efl_net_control_technology-connman.c4
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_ssl.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_tcp.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_udp.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_unix.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_websocket.c4
-rw-r--r--src/lib/ecore_con/efl_net_server_windows.c2
-rw-r--r--src/lib/eio/efl_io_manager.c20
-rw-r--r--src/lib/eio/eio_model.c8
-rw-r--r--src/lib/eldbus/eldbus_model_connection.c2
-rw-r--r--src/lib/eldbus/eldbus_model_object.c2
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c2
-rw-r--r--src/lib/elementary/efl_ui_list_view.c2
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.c2
-rw-r--r--src/lib/elementary/elc_fileselector.c4
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c2
-rw-r--r--src/lib/elementary/elm_view_list.c4
-rw-r--r--src/lib/eo/Eo.h6
28 files changed, 54 insertions, 54 deletions
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index 369dc89390..b110894f2a 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -239,7 +239,7 @@ _code_changed_hack(void *data, const Efl_Event *ev EINA_UNUSED)
239 239
240 f = eina_future_then(efl_loop_job(efl_loop_get(data)), 240 f = eina_future_then(efl_loop_job(efl_loop_get(data)),
241 _code_changed, data, NULL); 241 _code_changed, data, NULL);
242 efl_future_Eina_FutureXXX_then(data, f); 242 efl_future_then(data, f);
243} 243}
244 244
245static void 245static void
diff --git a/src/lib/ecore/efl_exe.c b/src/lib/ecore/efl_exe.c
index 684dc53b7e..eff0d246ad 100644
--- a/src/lib/ecore/efl_exe.c
+++ b/src/lib/ecore/efl_exe.c
@@ -487,7 +487,7 @@ _efl_exe_efl_task_run(Eo *obj EINA_UNUSED, Efl_Exe_Data *pd)
487 pd->run = EINA_TRUE; 487 pd->run = EINA_TRUE;
488 pd->promise = efl_loop_promise_new(obj, _run_cancel_cb, obj); 488 pd->promise = efl_loop_promise_new(obj, _run_cancel_cb, obj);
489 Eina_Future *f = eina_future_new(pd->promise); 489 Eina_Future *f = eina_future_new(pd->promise);
490 return efl_future_Eina_FutureXXX_then(obj, f); 490 return efl_future_then(obj, f);
491 } 491 }
492 // this code is in the child here, and is temporary setup until we 492 // this code is in the child here, and is temporary setup until we
493 // exec() the child to replace everything. 493 // exec() the child to replace everything.
diff --git a/src/lib/ecore/efl_io_copier.c b/src/lib/ecore/efl_io_copier.c
index fe729fffc2..28f5ab68aa 100644
--- a/src/lib/ecore/efl_io_copier.c
+++ b/src/lib/ecore/efl_io_copier.c
@@ -85,7 +85,7 @@ _efl_io_copier_timeout_inactivity_reschedule(Eo *o, Efl_Io_Copier_Data *pd)
85 if (pd->inactivity_timer) eina_future_cancel(pd->inactivity_timer); 85 if (pd->inactivity_timer) eina_future_cancel(pd->inactivity_timer);
86 if (pd->timeout_inactivity <= 0.0) return; 86 if (pd->timeout_inactivity <= 0.0) return;
87 87
88 efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_inactivity), 88 efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_inactivity),
89 .success = _efl_io_copier_timeout_inactivity_cb, 89 .success = _efl_io_copier_timeout_inactivity_cb,
90 .storage = &pd->inactivity_timer); 90 .storage = &pd->inactivity_timer);
91} 91}
@@ -143,7 +143,7 @@ _efl_io_copier_job_schedule(Eo *o, Efl_Io_Copier_Data *pd)
143 } 143 }
144 else 144 else
145 { 145 {
146 efl_future_Eina_FutureXXX_then(o, efl_loop_job(efl_loop_get(o)), 146 efl_future_then(o, efl_loop_job(efl_loop_get(o)),
147 .success = _efl_io_copier_job, 147 .success = _efl_io_copier_job,
148 .storage = &pd->job); 148 .storage = &pd->job);
149 } 149 }
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index e18bed43a7..5d24608af3 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -416,7 +416,7 @@ ecore_loop_arguments_send(int argc, const char **argv)
416 416
417 job = eina_future_then(efl_loop_job(efl_main_loop_get()), 417 job = eina_future_then(efl_loop_job(efl_main_loop_get()),
418 _efl_loop_arguments_send, arga, NULL); 418 _efl_loop_arguments_send, arga, NULL);
419 efl_future_Eina_FutureXXX_then(efl_main_loop_get(), job); 419 efl_future_then(efl_main_loop_get(), job);
420} 420}
421 421
422static Eina_Future * 422static Eina_Future *
@@ -424,7 +424,7 @@ _efl_loop_job(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED)
424{ 424{
425 Eina_Future_Scheduler *sched = efl_loop_future_scheduler_get(obj); 425 Eina_Future_Scheduler *sched = efl_loop_future_scheduler_get(obj);
426 // NOTE: Eolian should do efl_future_then() to bind future to object. 426 // NOTE: Eolian should do efl_future_then() to bind future to object.
427 return efl_future_Eina_FutureXXX_then 427 return efl_future_then
428 (obj, eina_future_resolved(sched, EINA_VALUE_EMPTY)); 428 (obj, eina_future_resolved(sched, EINA_VALUE_EMPTY));
429} 429}
430 430
@@ -481,7 +481,7 @@ _efl_loop_idle(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED)
481 d->promise = p; 481 d->promise = p;
482 482
483 // NOTE: Eolian should do efl_future_then() to bind future to object. 483 // NOTE: Eolian should do efl_future_then() to bind future to object.
484 return efl_future_Eina_FutureXXX_then(obj, eina_future_new(p)); 484 return efl_future_then(obj, eina_future_new(p));
485 485
486idler_error: 486idler_error:
487 d->idler = NULL; 487 d->idler = NULL;
@@ -546,7 +546,7 @@ _efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double tim)
546 d->promise = p; 546 d->promise = p;
547 547
548 // NOTE: Eolian should do efl_future_then() to bind future to object. 548 // NOTE: Eolian should do efl_future_then() to bind future to object.
549 return efl_future_Eina_FutureXXX_then(obj, eina_future_new(p)); 549 return efl_future_then(obj, eina_future_new(p));
550 550
551timer_error: 551timer_error:
552 d->timer = NULL; 552 d->timer = NULL;
diff --git a/src/lib/ecore/efl_model_composite_boolean.c b/src/lib/ecore/efl_model_composite_boolean.c
index ef9ec433a5..cb52e85328 100644
--- a/src/lib/ecore/efl_model_composite_boolean.c
+++ b/src/lib/ecore/efl_model_composite_boolean.c
@@ -294,7 +294,7 @@ _efl_model_composite_boolean_efl_model_children_slice_get(Eo *obj,
294 req->parent = efl_ref(obj); 294 req->parent = efl_ref(obj);
295 req->start = start; 295 req->start = start;
296 296
297 return efl_future_Eina_FutureXXX_then 297 return efl_future_then
298 (obj, eina_future_then(f, _efl_model_composite_boolean_then, req, NULL)); 298 (obj, eina_future_then(f, _efl_model_composite_boolean_then, req, NULL));
299} 299}
300 300
diff --git a/src/lib/ecore/efl_model_composite_selection.c b/src/lib/ecore/efl_model_composite_selection.c
index 14a54cb6fd..622d183b60 100644
--- a/src/lib/ecore/efl_model_composite_selection.c
+++ b/src/lib/ecore/efl_model_composite_selection.c
@@ -218,7 +218,7 @@ _efl_model_composite_selection_efl_model_property_set(Eo *obj,
218 if (!success) 218 if (!success)
219 return eina_future_rejected(efl_loop_future_scheduler_get(obj), EFL_MODEL_ERROR_INCORRECT_VALUE); 219 return eina_future_rejected(efl_loop_future_scheduler_get(obj), EFL_MODEL_ERROR_INCORRECT_VALUE);
220 220
221 return efl_future_Eina_FutureXXX_then 221 return efl_future_then
222 (obj, eina_future_then(efl_model_children_slice_get(obj, l, 1), 222 (obj, eina_future_then(efl_model_children_slice_get(obj, l, 1),
223 _select_slice_then, obj, NULL)); 223 _select_slice_then, obj, NULL));
224 } 224 }
@@ -389,7 +389,7 @@ _efl_model_composite_selection_children_efl_model_property_set(Eo *obj,
389 commit_change: 389 commit_change:
390 chain = eina_future_then(chain, _commit_change, obj, NULL); 390 chain = eina_future_then(chain, _commit_change, obj, NULL);
391 391
392 return efl_future_Eina_FutureXXX_then(obj, chain); 392 return efl_future_then(obj, chain);
393} 393}
394 394
395typedef struct _Selection_Children_Request Selection_Children_Request; 395typedef struct _Selection_Children_Request Selection_Children_Request;
@@ -450,7 +450,7 @@ _efl_model_composite_selection_efl_model_children_slice_get(Eo *obj,
450 start, count); 450 start, count);
451 f = eina_future_then(f, _slice_get, req, NULL); 451 f = eina_future_then(f, _slice_get, req, NULL);
452 452
453 return efl_future_Eina_FutureXXX_then(obj, f); 453 return efl_future_then(obj, f);
454} 454}
455 455
456#include "efl_model_composite_selection.eo.c" 456#include "efl_model_composite_selection.eo.c"
diff --git a/src/lib/ecore/efl_model_loop.c b/src/lib/ecore/efl_model_loop.c
index a64b3f851b..81764e3f3f 100644
--- a/src/lib/ecore/efl_model_loop.c
+++ b/src/lib/ecore/efl_model_loop.c
@@ -103,7 +103,7 @@ _efl_model_loop_efl_model_property_ready_get(Eo *obj, void *pd EINA_UNUSED, cons
103 f = eina_future_resolved(efl_loop_future_scheduler_get(obj), 103 f = eina_future_resolved(efl_loop_future_scheduler_get(obj),
104 eina_value_reference_copy(value)); 104 eina_value_reference_copy(value));
105 eina_value_free(value); 105 eina_value_free(value);
106 return efl_future_Eina_FutureXXX_then(obj, f); 106 return efl_future_then(obj, f);
107} 107}
108 108
109#include "efl_model_loop.eo.c" 109#include "efl_model_loop.eo.c"
diff --git a/src/lib/ecore/efl_thread.c b/src/lib/ecore/efl_thread.c
index e39ed50d34..3a650a7d45 100644
--- a/src/lib/ecore/efl_thread.c
+++ b/src/lib/ecore/efl_thread.c
@@ -286,7 +286,7 @@ _efl_thread_main(void *data, Eina_Thread t)
286 for (i = 0; i < thdat->args.argc; i++) 286 for (i = 0; i < thdat->args.argc; i++)
287 efl_task_arg_append(obj, thdat->args.argv[i]); 287 efl_task_arg_append(obj, thdat->args.argv[i]);
288 job = eina_future_then(efl_loop_job(obj), _efl_loop_arguments_send, obj); 288 job = eina_future_then(efl_loop_job(obj), _efl_loop_arguments_send, obj);
289 efl_future_Eina_FutureXXX_then(obj, job); 289 efl_future_then(obj, job);
290 290
291 for (i = 0; i < thdat->args.argc; i++) 291 for (i = 0; i < thdat->args.argc; i++)
292 eina_stringshare_del(thdat->args.argv[i]); 292 eina_stringshare_del(thdat->args.argv[i]);
@@ -781,7 +781,7 @@ _efl_thread_efl_task_run(Eo *obj, Efl_Thread_Data *pd)
781 pd->run = EINA_TRUE; 781 pd->run = EINA_TRUE;
782 pd->promise = efl_loop_promise_new(obj, _run_cancel_cb, obj); 782 pd->promise = efl_loop_promise_new(obj, _run_cancel_cb, obj);
783 Eina_Future *f = eina_future_new(pd->promise); 783 Eina_Future *f = eina_future_new(pd->promise);
784 return efl_future_Eina_FutureXXX_then(obj, f); 784 return efl_future_then(obj, f);
785} 785}
786 786
787EOLIAN static void 787EOLIAN static void
diff --git a/src/lib/ecore_con/efl_net_control_access_point-connman.c b/src/lib/ecore_con/efl_net_control_access_point-connman.c
index 92c491d119..4dc676846e 100644
--- a/src/lib/ecore_con/efl_net_control_access_point-connman.c
+++ b/src/lib/ecore_con/efl_net_control_access_point-connman.c
@@ -786,11 +786,11 @@ _efl_net_control_access_point_connect(Eo *o, Efl_Net_Control_Access_Point_Data *
786 pd->pending = eina_list_append(pd->pending, p); 786 pd->pending = eina_list_append(pd->pending, p);
787 eldbus_pending_data_set(p, ".object", pd); 787 eldbus_pending_data_set(p, ".object", pd);
788 788
789 return efl_future_Eina_FutureXXX_then(o, f); 789 return efl_future_then(o, f);
790 790
791 error_dbus: 791 error_dbus:
792 eina_promise_reject(promise, ENOSYS); 792 eina_promise_reject(promise, ENOSYS);
793 return efl_future_Eina_FutureXXX_then(o, f); 793 return efl_future_then(o, f);
794} 794}
795 795
796static void 796static void
diff --git a/src/lib/ecore_con/efl_net_control_technology-connman.c b/src/lib/ecore_con/efl_net_control_technology-connman.c
index 5dfb51f961..2389498d06 100644
--- a/src/lib/ecore_con/efl_net_control_technology-connman.c
+++ b/src/lib/ecore_con/efl_net_control_technology-connman.c
@@ -413,11 +413,11 @@ _efl_net_control_technology_scan(Eo *o, Efl_Net_Control_Technology_Data *pd)
413 eina_promise_data_set(promise, p); 413 eina_promise_data_set(promise, p);
414 eldbus_pending_data_set(p, ".object", o); 414 eldbus_pending_data_set(p, ".object", o);
415 415
416 return efl_future_Eina_FutureXXX_then(o, f); 416 return efl_future_then(o, f);
417 417
418 error_dbus: 418 error_dbus:
419 eina_promise_reject(promise, ENOSYS); 419 eina_promise_reject(promise, ENOSYS);
420 return efl_future_Eina_FutureXXX_then(o, f); 420 return efl_future_then(o, f);
421} 421}
422 422
423const char * 423const char *
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index f1f18a0c7a..bc004ba264 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -1732,7 +1732,7 @@ _efl_net_dialer_http_efl_io_closer_close(Eo *o, Efl_Net_Dialer_Http_Data *pd)
1732 { 1732 {
1733 if ((!pd->pending_close) && (pd->easy)) 1733 if ((!pd->pending_close) && (pd->easy))
1734 { 1734 {
1735 efl_future_Eina_FutureXXX_then(o, efl_loop_job(efl_loop_get(o)), 1735 efl_future_then(o, efl_loop_job(efl_loop_get(o)),
1736 .success = _efl_net_dialer_http_pending_close, 1736 .success = _efl_net_dialer_http_pending_close,
1737 .storage = &pd->pending_close); 1737 .storage = &pd->pending_close);
1738 DBG("dialer=%p closed from CURL callback, schedule close job=%p", o, pd->pending_close); 1738 DBG("dialer=%p closed from CURL callback, schedule close job=%p", o, pd->pending_close);
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.c b/src/lib/ecore_con/efl_net_dialer_ssl.c
index 58189eea6f..d3e83f69c0 100644
--- a/src/lib/ecore_con/efl_net_dialer_ssl.c
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.c
@@ -142,7 +142,7 @@ _efl_net_dialer_ssl_connect_timeout(Eo *o, const Eina_Value v)
142static void 142static void
143_timeout_schedule(Eo *o, Efl_Net_Dialer_Ssl_Data *pd, double timeout) 143_timeout_schedule(Eo *o, Efl_Net_Dialer_Ssl_Data *pd, double timeout)
144{ 144{
145 efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), timeout), 145 efl_future_then(o, efl_loop_timeout(efl_loop_get(o), timeout),
146 .success = _efl_net_dialer_ssl_connect_timeout, 146 .success = _efl_net_dialer_ssl_connect_timeout,
147 .storage = &pd->connect_timeout); 147 .storage = &pd->connect_timeout);
148} 148}
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c
index 12e24b7238..6b29831aa2 100644
--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@@ -103,7 +103,7 @@ _efl_net_dialer_tcp_connect_timeout(Eo *o, const Eina_Value v)
103static void 103static void
104_timeout_schedule(Eo *o, Efl_Net_Dialer_Tcp_Data *pd) 104_timeout_schedule(Eo *o, Efl_Net_Dialer_Tcp_Data *pd)
105{ 105{
106 efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial), 106 efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
107 .success = _efl_net_dialer_tcp_connect_timeout, 107 .success = _efl_net_dialer_tcp_connect_timeout,
108 .storage = &pd->connect.timeout); 108 .storage = &pd->connect.timeout);
109} 109}
diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c
index 89a7154710..f3e7ef2166 100644
--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@@ -103,7 +103,7 @@ _efl_net_dialer_udp_resolver_timeout(Eo *o, const Eina_Value v)
103static void 103static void
104_timeout_schedule(Eo *o, Efl_Net_Dialer_Udp_Data *pd) 104_timeout_schedule(Eo *o, Efl_Net_Dialer_Udp_Data *pd)
105{ 105{
106 efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial), 106 efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
107 .success = _efl_net_dialer_udp_resolver_timeout, 107 .success = _efl_net_dialer_udp_resolver_timeout,
108 .storage = &pd->resolver.timeout); 108 .storage = &pd->resolver.timeout);
109} 109}
diff --git a/src/lib/ecore_con/efl_net_dialer_unix.c b/src/lib/ecore_con/efl_net_dialer_unix.c
index 683a37b89f..d644d5d629 100644
--- a/src/lib/ecore_con/efl_net_dialer_unix.c
+++ b/src/lib/ecore_con/efl_net_dialer_unix.c
@@ -129,7 +129,7 @@ _efl_net_dialer_unix_connected(void *data, const struct sockaddr *addr, socklen_
129static void 129static void
130_timeout_schedule(Eo *o, Efl_Net_Dialer_Unix_Data *pd) 130_timeout_schedule(Eo *o, Efl_Net_Dialer_Unix_Data *pd)
131{ 131{
132 efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial), 132 efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
133 .success = _efl_net_dialer_unix_connect_timeout, 133 .success = _efl_net_dialer_unix_connect_timeout,
134 .storage = &pd->connect.timeout); 134 .storage = &pd->connect.timeout);
135} 135}
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.c b/src/lib/ecore_con/efl_net_dialer_websocket.c
index 80c598ac4b..3c5339d3a2 100644
--- a/src/lib/ecore_con/efl_net_dialer_websocket.c
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.c
@@ -764,7 +764,7 @@ _efl_net_dialer_websocket_job_schedule(Eo *o, Efl_Net_Dialer_Websocket_Data *pd)
764 loop = efl_loop_get(o); 764 loop = efl_loop_get(o);
765 if (!loop) return; 765 if (!loop) return;
766 766
767 efl_future_Eina_FutureXXX_then(o, efl_loop_job(loop), 767 efl_future_then(o, efl_loop_job(loop),
768 .success = _efl_net_dialer_websocket_job, 768 .success = _efl_net_dialer_websocket_job,
769 .storage = &pd->job); 769 .storage = &pd->job);
770} 770}
@@ -1504,7 +1504,7 @@ _efl_net_dialer_websocket_close_request(Eo *o, Efl_Net_Dialer_Websocket_Data *pd
1504 if (pd->close_timeout) 1504 if (pd->close_timeout)
1505 eina_future_cancel(pd->close_timeout); 1505 eina_future_cancel(pd->close_timeout);
1506 1506
1507 efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), 2.0), 1507 efl_future_then(o, efl_loop_timeout(efl_loop_get(o), 2.0),
1508 .success = _efl_net_dialer_websocket_close_request_timeout, 1508 .success = _efl_net_dialer_websocket_close_request_timeout,
1509 .storage = &pd->close_timeout); 1509 .storage = &pd->close_timeout);
1510 1510
diff --git a/src/lib/ecore_con/efl_net_server_windows.c b/src/lib/ecore_con/efl_net_server_windows.c
index 1e0375ead1..8859036ad2 100644
--- a/src/lib/ecore_con/efl_net_server_windows.c
+++ b/src/lib/ecore_con/efl_net_server_windows.c
@@ -338,7 +338,7 @@ _efl_net_server_windows_pending_announce_job_schedule(Eo *o, Efl_Net_Server_Wind
338 338
339 loop = efl_loop_get(o); 339 loop = efl_loop_get(o);
340 if (!loop) return; 340 if (!loop) return;
341 efl_future_Eina_FutureXXX_then(o, efl_loop_job(loop), 341 efl_future_then(o, efl_loop_job(loop),
342 .success = _efl_net_server_windows_pending_announce_job, 342 .success = _efl_net_server_windows_pending_announce_job,
343 .storage = &pd->pending_announcer_job); 343 .storage = &pd->pending_announcer_job);
344} 344}
diff --git a/src/lib/eio/efl_io_manager.c b/src/lib/eio/efl_io_manager.c
index c4cdfe4e58..6ac1746621 100644
--- a/src/lib/eio/efl_io_manager.c
+++ b/src/lib/eio/efl_io_manager.c
@@ -145,7 +145,7 @@ _efl_io_manager_direct_ls(const Eo *obj,
145 ecore_thread_local_data_add(h->thread, ".info_data", info_data, info_free_cb, EINA_TRUE); 145 ecore_thread_local_data_add(h->thread, ".info_data", info_data, info_free_cb, EINA_TRUE);
146 eina_promise_data_set(p, h); 146 eina_promise_data_set(p, h);
147 147
148 return efl_future_Eina_FutureXXX_then(obj, future); 148 return efl_future_then(obj, future);
149 149
150 end: 150 end:
151 return future; 151 return future;
@@ -188,7 +188,7 @@ _efl_io_manager_stat_ls(const Eo *obj,
188 ecore_thread_local_data_add(h->thread, ".info_data", info_data, info_free_cb, EINA_TRUE); 188 ecore_thread_local_data_add(h->thread, ".info_data", info_data, info_free_cb, EINA_TRUE);
189 eina_promise_data_set(p, h); 189 eina_promise_data_set(p, h);
190 190
191 return efl_future_Eina_FutureXXX_then(obj, future); 191 return efl_future_then(obj, future);
192 192
193 end: 193 end:
194 return future; 194 return future;
@@ -219,7 +219,7 @@ _efl_io_manager_ls(const Eo *obj,
219 ecore_thread_local_data_add(h->thread, ".paths_data", paths_data, paths_free_cb, EINA_TRUE); 219 ecore_thread_local_data_add(h->thread, ".paths_data", paths_data, paths_free_cb, EINA_TRUE);
220 eina_promise_data_set(p, h); 220 eina_promise_data_set(p, h);
221 221
222 return efl_future_Eina_FutureXXX_then(obj, future); 222 return efl_future_then(obj, future);
223 223
224 end: 224 end:
225 return future; 225 return future;
@@ -267,7 +267,7 @@ _efl_io_manager_stat(const Eo *obj,
267 if (!h) goto end; 267 if (!h) goto end;
268 eina_promise_data_set(p, h); 268 eina_promise_data_set(p, h);
269 269
270 return efl_future_Eina_FutureXXX_then(obj, future); 270 return efl_future_then(obj, future);
271 271
272 end: 272 end:
273 return future; 273 return future;
@@ -301,10 +301,10 @@ _efl_io_manager_xattr_ls(const Eo *obj,
301 ecore_thread_local_data_add(h->thread, ".paths_data", paths_data, paths_free_cb, EINA_TRUE); 301 ecore_thread_local_data_add(h->thread, ".paths_data", paths_data, paths_free_cb, EINA_TRUE);
302 eina_promise_data_set(p, h); 302 eina_promise_data_set(p, h);
303 303
304 return efl_future_Eina_FutureXXX_then(obj, future); 304 return efl_future_then(obj, future);
305 305
306 end: 306 end:
307 return efl_future_Eina_FutureXXX_then(obj, future);; 307 return efl_future_then(obj, future);;
308} 308}
309 309
310static void 310static void
@@ -350,7 +350,7 @@ _efl_io_manager_xattr_set(Eo *obj,
350 if (!h) goto end; 350 if (!h) goto end;
351 eina_promise_data_set(p, h); 351 eina_promise_data_set(p, h);
352 352
353 return efl_future_Eina_FutureXXX_then(obj, future); 353 return efl_future_then(obj, future);
354 354
355 end: 355 end:
356 return future; 356 return future;
@@ -378,7 +378,7 @@ _efl_io_manager_xattr_get(const Eo *obj,
378 eina_promise_data_set(p, h); 378 eina_promise_data_set(p, h);
379 379
380 /* XXX const */ 380 /* XXX const */
381 return efl_future_Eina_FutureXXX_then((Eo *)obj, future); 381 return efl_future_then((Eo *)obj, future);
382 382
383 end: 383 end:
384 return future; 384 return future;
@@ -416,7 +416,7 @@ _efl_io_manager_open(const Eo *obj,
416 if (!h) goto end; 416 if (!h) goto end;
417 eina_promise_data_set(p, h); 417 eina_promise_data_set(p, h);
418 418
419 return efl_future_Eina_FutureXXX_then(obj, future); 419 return efl_future_then(obj, future);
420 420
421 end: 421 end:
422 return future; 422 return future;
@@ -442,7 +442,7 @@ _efl_io_manager_close(const Eo *obj,
442 if (!h) goto end; 442 if (!h) goto end;
443 eina_promise_data_set(p, h); 443 eina_promise_data_set(p, h);
444 444
445 return efl_future_Eina_FutureXXX_then(obj, future); 445 return efl_future_then(obj, future);
446 446
447 end: 447 end:
448 return future; 448 return future;
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index b4cb98d262..bf25c4cde8 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -456,7 +456,7 @@ _eio_build_mime_now(void *data, const Eina_Value v, const Eina_Future *dead_futu
456 { 456 {
457 Eina_Future *f = eina_future_then(_build_delay(pd->loop), 457 Eina_Future *f = eina_future_then(_build_delay(pd->loop),
458 _eio_build_mime_now, model, NULL); 458 _eio_build_mime_now, model, NULL);
459 return eina_future_as_value(efl_future_Eina_FutureXXX_then(model, f)); 459 return eina_future_as_value(efl_future_then(model, f));
460 } 460 }
461 461
462 pd->mime_type = efreet_mime_type_get(pd->path); 462 pd->mime_type = efreet_mime_type_get(pd->path);
@@ -485,7 +485,7 @@ _eio_build_mime(const Efl_Object *model, Eio_Model_Data *pd)
485 485
486 f = efl_loop_job(pd->loop); 486 f = efl_loop_job(pd->loop);
487 f = eina_future_then(f, _eio_build_mime_now, model, NULL); 487 f = eina_future_then(f, _eio_build_mime_now, model, NULL);
488 pd->request.mime = efl_future_Eina_FutureXXX_then(model, f); 488 pd->request.mime = efl_future_then(model, f);
489} 489}
490 490
491static Eina_Value * 491static Eina_Value *
@@ -703,7 +703,7 @@ _eio_model_efl_model_property_set(Eo *obj,
703 eina_value_string_init(pd->path)); 703 eina_value_string_init(pd->path));
704 } 704 }
705 705
706 return efl_future_Eina_FutureXXX_then(obj, f); 706 return efl_future_then(obj, f);
707 707
708 on_error: 708 on_error:
709 return eina_future_rejected(efl_loop_future_scheduler_get(loop), err); 709 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)
802 f = efl_io_manager_direct_ls(iom, pd->path, EINA_FALSE, 802 f = efl_io_manager_direct_ls(iom, pd->path, EINA_FALSE,
803 (void*) obj, _eio_model_children_list, NULL); 803 (void*) obj, _eio_model_children_list, NULL);
804 f = eina_future_then(f, _eio_model_children_list_on, pd, NULL); 804 f = eina_future_then(f, _eio_model_children_list_on, pd, NULL);
805 pd->request.listing = efl_future_Eina_FutureXXX_then(obj, f); 805 pd->request.listing = efl_future_then(obj, f);
806 } 806 }
807 807
808 return eina_list_count(pd->files); 808 return eina_list_count(pd->files);
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index 2af0affb06..a2ed5d5b66 100644
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -81,7 +81,7 @@ _eldbus_model_connection_efl_model_children_slice_get(Eo *obj,
81 pd->requests = eina_list_prepend(pd->requests, slice); 81 pd->requests = eina_list_prepend(pd->requests, slice);
82 82
83 _eldbus_model_children_list(obj, pd); 83 _eldbus_model_children_list(obj, pd);
84 return efl_future_Eina_FutureXXX_then(obj, eina_future_new(p));; 84 return efl_future_then(obj, eina_future_new(p));;
85} 85}
86 86
87static unsigned int 87static unsigned int
diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index 02bfc9778c..ece21cf0db 100644
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -139,7 +139,7 @@ _eldbus_model_object_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
139 139
140 if (!pd->pendings) 140 if (!pd->pendings)
141 _eldbus_model_object_introspect(obj, pd, pd->bus, pd->path); 141 _eldbus_model_object_introspect(obj, pd, pd->bus, pd->path);
142 return efl_future_Eina_FutureXXX_then(obj, eina_future_new(p));; 142 return efl_future_then(obj, eina_future_new(p));;
143} 143}
144 144
145static unsigned int 145static unsigned int
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index a159ecd16b..96505caef3 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -310,7 +310,7 @@ _eldbus_model_proxy_efl_model_property_set(Eo *obj EINA_UNUSED,
310 } 310 }
311 311
312 if (pending) pd->pendings = eina_list_append(pd->pendings, pending); 312 if (pending) pd->pendings = eina_list_append(pd->pendings, pending);
313 return efl_future_Eina_FutureXXX_then(obj, eina_future_new(data->promise)); 313 return efl_future_then(obj, eina_future_new(data->promise));
314 314
315 on_error: 315 on_error:
316 return eina_future_rejected(efl_loop_future_scheduler_get(obj), err); 316 return eina_future_rejected(efl_loop_future_scheduler_get(obj), err);
diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index e15081f4d5..690ac43960 100644
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -998,7 +998,7 @@ _efl_ui_list_view_efl_ui_list_view_model_load_range_set(Eo* obj, Efl_Ui_List_Vie
998 { 998 {
999 Eina_Future *f = efl_model_children_slice_get(pd->model, first, count); 999 Eina_Future *f = efl_model_children_slice_get(pd->model, first, count);
1000 f = eina_future_then(f, _children_slice_then, pd, NULL); 1000 f = eina_future_then(f, _children_slice_then, pd, NULL);
1001 pd->slice.future = efl_future_Eina_FutureXXX_then(obj, f); 1001 pd->slice.future = efl_future_then(obj, f);
1002 } 1002 }
1003} 1003}
1004 1004
diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c
index 21d2c032de..37943e9a04 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.c
+++ b/src/lib/elementary/efl_ui_scroll_manager.c
@@ -739,7 +739,7 @@ _scroll_wheel_post_event_go(Efl_Ui_Scroll_Manager_Data *sd, int x, int y)
739 739
740 f = eina_future_then(efl_loop_job(efl_loop_get(sd->obj)), 740 f = eina_future_then(efl_loop_job(efl_loop_get(sd->obj)),
741 _scroll_wheel_post_event_job, sd, NULL); 741 _scroll_wheel_post_event_job, sd, NULL);
742 efl_future_Eina_FutureXXX_then(sd->obj, f); 742 efl_future_then(sd->obj, f);
743 } 743 }
744 else 744 else
745 { 745 {
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 3fdfb7ede9..96f081f8ca 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1032,7 +1032,7 @@ _populate(Evas_Object *obj,
1032 { 1032 {
1033 future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model)); 1033 future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
1034 future = eina_future_then(future, _process_children_cb, lreq, NULL); 1034 future = eina_future_then(future, _process_children_cb, lreq, NULL);
1035 efl_future_Eina_FutureXXX_then(obj, future); 1035 efl_future_then(obj, future);
1036 } 1036 }
1037 else 1037 else
1038 { 1038 {
@@ -1688,7 +1688,7 @@ _resource_created(void *data, const Efl_Event *event)
1688 1688
1689 f = efl_model_children_slice_get(sd->model, evt->index, 1); 1689 f = efl_model_children_slice_get(sd->model, evt->index, 1);
1690 f = eina_future_then(f, _resource_created_then, fs, NULL); 1690 f = eina_future_then(f, _resource_created_then, fs, NULL);
1691 efl_future_Eina_FutureXXX_then(fs, f); 1691 efl_future_then(fs, f);
1692} 1692}
1693 1693
1694static void 1694static void
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 022e03ef7a..d600436a17 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -2005,7 +2005,7 @@ _scroll_wheel_post_event_go(Elm_Scrollable_Smart_Interface_Data *sid, int x, int
2005 2005
2006 f = eina_future_then(efl_loop_job(efl_loop_get(sid->obj)), 2006 f = eina_future_then(efl_loop_job(efl_loop_get(sid->obj)),
2007 _scroll_wheel_post_event_job, sid, NULL); 2007 _scroll_wheel_post_event_job, sid, NULL);
2008 efl_future_Eina_FutureXXX_then(sid->obj, f); 2008 efl_future_then(sid->obj, f);
2009 } 2009 }
2010 else 2010 else
2011 { 2011 {
diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c
index 709c1fdfe8..3ccf1d6f7c 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -285,7 +285,7 @@ _efl_model_load_children(View_List_ItemData *pdata)
285 f = efl_model_children_slice_get(pdata->priv->connect.model, 0, 285 f = efl_model_children_slice_get(pdata->priv->connect.model, 0,
286 efl_model_children_count_get(pdata->priv->connect.model)); 286 efl_model_children_count_get(pdata->priv->connect.model));
287 f = eina_future_then(f, _efl_model_load_children_then, pdata, NULL); 287 f = eina_future_then(f, _efl_model_load_children_then, pdata, NULL);
288 efl_future_Eina_FutureXXX_then(pdata->priv->genlist, f); 288 efl_future_then(pdata->priv->genlist, f);
289} 289}
290 290
291static void 291static void
@@ -318,7 +318,7 @@ _efl_model_children_added_cb(void *data, const Efl_Event *event)
318 318
319 f = efl_model_children_slice_get(idata->priv->connect.model, evt->index, 1); 319 f = efl_model_children_slice_get(idata->priv->connect.model, evt->index, 1);
320 f = eina_future_then(f, _efl_model_load_children_then, idata, NULL); 320 f = eina_future_then(f, _efl_model_load_children_then, idata, NULL);
321 efl_future_Eina_FutureXXX_then(idata->priv->genlist, f); 321 efl_future_then(idata->priv->genlist, f);
322} 322}
323 323
324static void 324static void
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 19af94db41..8cd9f63d07 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -538,7 +538,7 @@ EOAPI Eina_Future_Desc efl_future_cb_from_desc(const Eo *obj, const Efl_Future_C
538 * @endcode 538 * @endcode
539 * 539 *
540 * @see efl_future_cb_from_desc() 540 * @see efl_future_cb_from_desc()
541 * @see efl_future_Eina_FutureXXX_then() 541 * @see efl_future_then()
542 */ 542 */
543#define efl_future_cb(_eo, ...) efl_future_cb_from_desc(_eo, (Efl_Future_Cb_Desc){__VA_ARGS__}) 543#define efl_future_cb(_eo, ...) efl_future_cb_from_desc(_eo, (Efl_Future_Cb_Desc){__VA_ARGS__})
544 544
@@ -547,11 +547,11 @@ EOAPI Eina_Future_Desc efl_future_cb_from_desc(const Eo *obj, const Efl_Future_C
547 * 547 *
548 * Usage: 548 * Usage:
549 * @code 549 * @code
550 * efl_future_Eina_FutureXXX_then(o, future, .success = success, .success_type = EINA_VALUE_TYPE_INT); 550 * efl_future_then(o, future, .success = success, .success_type = EINA_VALUE_TYPE_INT);
551 * @endcode 551 * @endcode
552 * 552 *
553 */ 553 */
554#define efl_future_Eina_FutureXXX_then(_eo, _future, ...) eina_future_then_from_desc(_future, efl_future_cb(_eo, ## __VA_ARGS__)) 554#define efl_future_then(_eo, _future, ...) eina_future_then_from_desc(_future, efl_future_cb(_eo, ## __VA_ARGS__))
555 555
556/** 556/**
557 * Creates a Future chain based on #Efl_Future_Cb_Desc 557 * Creates a Future chain based on #Efl_Future_Cb_Desc