summaryrefslogtreecommitdiff
path: root/src/lib/ecore
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-11-07 14:52:41 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-11-09 11:43:59 +0000
commit665a75378fcb791600043b5c84e68f441aaaf5d3 (patch)
tree3e5f28ef48f512bec3f01adb5449aa1bd4f7a83c /src/lib/ecore
parentf80b8979ba11ade8e5c9365d4464eebc57cd50c3 (diff)
xxx - fix eina_future_then calls to pass sotrage val - fix warns
Diffstat (limited to 'src/lib/ecore')
-rw-r--r--src/lib/ecore/efl_loop.c2
-rw-r--r--src/lib/ecore/efl_model_composite_boolean.c4
-rw-r--r--src/lib/ecore/efl_model_composite_selection.c20
3 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index 3c2ca6b7a4..e18bed43a7 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -415,7 +415,7 @@ ecore_loop_arguments_send(int argc, const char **argv)
415 } 415 }
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); 418 _efl_loop_arguments_send, arga, NULL);
419 efl_future_Eina_FutureXXX_then(efl_main_loop_get(), job); 419 efl_future_Eina_FutureXXX_then(efl_main_loop_get(), job);
420} 420}
421 421
diff --git a/src/lib/ecore/efl_model_composite_boolean.c b/src/lib/ecore/efl_model_composite_boolean.c
index 5fd6924668..98dbbe5bb1 100644
--- a/src/lib/ecore/efl_model_composite_boolean.c
+++ b/src/lib/ecore/efl_model_composite_boolean.c
@@ -297,8 +297,8 @@ _efl_model_composite_boolean_efl_model_children_slice_get(Eo *obj,
297 req->parent = efl_ref(obj); 297 req->parent = efl_ref(obj);
298 req->start = start; 298 req->start = start;
299 299
300 return efl_future_Eina_FutureXXX_then(obj, 300 return efl_future_Eina_FutureXXX_then
301 eina_future_then(f, _efl_model_composite_boolean_then, req)); 301 (obj, eina_future_then(f, _efl_model_composite_boolean_then, req, NULL));
302} 302}
303 303
304#include "efl_model_composite_boolean.eo.c" 304#include "efl_model_composite_boolean.eo.c"
diff --git a/src/lib/ecore/efl_model_composite_selection.c b/src/lib/ecore/efl_model_composite_selection.c
index 914a45f90a..14a54cb6fd 100644
--- a/src/lib/ecore/efl_model_composite_selection.c
+++ b/src/lib/ecore/efl_model_composite_selection.c
@@ -131,8 +131,8 @@ _check_child_change(Efl_Model *child, Eina_Bool value)
131 else 131 else
132 { 132 {
133 r = efl_model_property_set(child, "selected", eina_value_bool_new(!!value)); 133 r = efl_model_property_set(child, "selected", eina_value_bool_new(!!value));
134 r = eina_future_then(r, _commit_change, child); 134 r = eina_future_then(r, _commit_change, child, NULL);
135 r = eina_future_then(r, _clear_child, child); 135 r = eina_future_then(r, _clear_child, child, NULL);
136 } 136 }
137 137
138 return r; 138 return r;
@@ -218,9 +218,9 @@ _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(obj, 221 return efl_future_Eina_FutureXXX_then
222 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)); 223 _select_slice_then, obj, NULL));
224 } 224 }
225 225
226 return efl_model_property_set(efl_super(obj, EFL_MODEL_COMPOSITE_SELECTION_CLASS), property, value); 226 return efl_model_property_set(efl_super(obj, EFL_MODEL_COMPOSITE_SELECTION_CLASS), property, value);
@@ -281,7 +281,7 @@ _untangle_array(void *data,
281 "selected", eina_value_bool_new(EINA_FALSE)); 281 "selected", eina_value_bool_new(EINA_FALSE));
282 // Once this is done, we need to repropagate the error 282 // Once this is done, we need to repropagate the error
283 eina_value_error_get(&v, error); 283 eina_value_error_get(&v, error);
284 f = eina_future_then(f, _regenerate_error, error); 284 f = eina_future_then(f, _regenerate_error, error, NULL);
285 285
286 return eina_future_as_value(f); 286 return eina_future_as_value(f);
287 } 287 }
@@ -380,14 +380,14 @@ _efl_model_composite_selection_children_efl_model_property_set(Eo *obj,
380 // There was, need to unselect the previous one along setting the new value 380 // There was, need to unselect the previous one along setting the new value
381 chain = eina_future_all(chain, 381 chain = eina_future_all(chain,
382 eina_future_then(efl_model_children_slice_get(efl_parent_get(obj), selected, 1), 382 eina_future_then(efl_model_children_slice_get(efl_parent_get(obj), selected, 1),
383 _unselect_slice_then, NULL)); 383 _unselect_slice_then, NULL, NULL));
384 384
385 chain = eina_future_then(chain, _untangle_array, obj); 385 chain = eina_future_then(chain, _untangle_array, obj, NULL);
386 } 386 }
387 } 387 }
388 388
389 commit_change: 389 commit_change:
390 chain = eina_future_then(chain, _commit_change, obj); 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_Eina_FutureXXX_then(obj, chain);
393} 393}
@@ -448,7 +448,7 @@ _efl_model_composite_selection_efl_model_children_slice_get(Eo *obj,
448 // NOTE: We do jump on purpose EFL_MODEL_COMPOSITE_BOOLEAN_CLASS here 448 // NOTE: We do jump on purpose EFL_MODEL_COMPOSITE_BOOLEAN_CLASS here
449 f = efl_model_children_slice_get(efl_super(obj, EFL_MODEL_COMPOSITE_BOOLEAN_CLASS), 449 f = efl_model_children_slice_get(efl_super(obj, EFL_MODEL_COMPOSITE_BOOLEAN_CLASS),
450 start, count); 450 start, count);
451 f = eina_future_then(f, _slice_get, req); 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_Eina_FutureXXX_then(obj, f);
454} 454}