summaryrefslogtreecommitdiff
path: root/src/lib/ecore
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/lib/ecore
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/lib/ecore')
-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
7 files changed, 14 insertions, 14 deletions
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