summaryrefslogtreecommitdiff
path: root/src/lib
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
parentf80b8979ba11ade8e5c9365d4464eebc57cd50c3 (diff)
xxx - fix eina_future_then calls to pass sotrage val - fix warns
Diffstat (limited to 'src/lib')
-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
-rw-r--r--src/lib/eina/eina_promise.c4
-rw-r--r--src/lib/eio/eio_model.c6
-rw-r--r--src/lib/elementary/efl_ui_list_view.c2
-rw-r--r--src/lib/elementary/efl_ui_list_view_precise_layouter.c2
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.c2
-rw-r--r--src/lib/elementary/elc_fileselector.c6
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c2
-rw-r--r--src/lib/elementary/elm_view_list.c4
11 files changed, 27 insertions, 27 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}
diff --git a/src/lib/eina/eina_promise.c b/src/lib/eina/eina_promise.c
index d771581e06..b9adbe8e4d 100644
--- a/src/lib/eina/eina_promise.c
+++ b/src/lib/eina/eina_promise.c
@@ -686,7 +686,7 @@ eina_future_as_value(Eina_Future *f)
686 EINA_FUTURE_CHECK_RETURN_VAL(f, v); 686 EINA_FUTURE_CHECK_RETURN_VAL(f, v);
687 p = eina_promise_new(_scheduler_get(f), _dummy_cancel, NULL); 687 p = eina_promise_new(_scheduler_get(f), _dummy_cancel, NULL);
688 EINA_SAFETY_ON_NULL_GOTO(p, err_promise); 688 EINA_SAFETY_ON_NULL_GOTO(p, err_promise);
689 r_future = eina_future_then(f, _future_proxy, p); 689 r_future = eina_future_then(f, _future_proxy, p, NULL);
690 //If eina_future_then() fails f will be cancelled 690 //If eina_future_then() fails f will be cancelled
691 EINA_SAFETY_ON_NULL_GOTO(r_future, err_future); 691 EINA_SAFETY_ON_NULL_GOTO(r_future, err_future);
692 692
@@ -1305,7 +1305,7 @@ promise_proxy_of_future_array_create(Eina_Future *array[],
1305 1305
1306 for (i = 0; i < ctx->futures_len; i++) 1306 for (i = 0; i < ctx->futures_len; i++)
1307 { 1307 {
1308 ctx->futures[i] = eina_future_then(array[i], future_cb, ctx); 1308 ctx->futures[i] = eina_future_then(array[i], future_cb, ctx, NULL);
1309 //Futures will be cancelled by the caller... 1309 //Futures will be cancelled by the caller...
1310 EINA_SAFETY_ON_NULL_GOTO(ctx->futures[i], err_then); 1310 EINA_SAFETY_ON_NULL_GOTO(ctx->futures[i], err_then);
1311 } 1311 }
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index 3b3c2bea3d..62e52f46dd 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -455,7 +455,7 @@ _eio_build_mime_now(void *data, const Eina_Value v, const Eina_Future *dead_futu
455 if (delayed_queue || ecore_time_get() - ecore_loop_time_get() > 0.004) 455 if (delayed_queue || ecore_time_get() - ecore_loop_time_get() > 0.004)
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); 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_Eina_FutureXXX_then(model, f));
460 } 460 }
461 461
@@ -484,7 +484,7 @@ _eio_build_mime(const Efl_Object *model, Eio_Model_Data *pd)
484 efl_wref_add(efl_provider_find(model, EFL_LOOP_CLASS), &pd->loop); 484 efl_wref_add(efl_provider_find(model, EFL_LOOP_CLASS), &pd->loop);
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); 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_Eina_FutureXXX_then(model, f);
489} 489}
490 490
@@ -808,7 +808,7 @@ _eio_model_efl_model_children_count_get(const Eo *obj, Eio_Model_Data *pd)
808 808
809 f = efl_io_manager_direct_ls(iom, pd->path, EINA_FALSE, 809 f = efl_io_manager_direct_ls(iom, pd->path, EINA_FALSE,
810 (void*) obj, _eio_model_children_list, NULL); 810 (void*) obj, _eio_model_children_list, NULL);
811 f = eina_future_then(f, _eio_model_children_list_on, pd); 811 f = eina_future_then(f, _eio_model_children_list_on, pd, NULL);
812 pd->request.listing = efl_future_Eina_FutureXXX_then(obj, f); 812 pd->request.listing = efl_future_Eina_FutureXXX_then(obj, f);
813 } 813 }
814 814
diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index 515f49c8ac..e76ce05067 100644
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -997,7 +997,7 @@ _efl_ui_list_view_efl_ui_list_view_model_load_range_set(Eo* obj, Efl_Ui_List_Vie
997 if (efl_model_children_count_get(pd->model)) 997 if (efl_model_children_count_get(pd->model))
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); 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_Eina_FutureXXX_then(obj, f);
1002 } 1002 }
1003} 1003}
diff --git a/src/lib/elementary/efl_ui_list_view_precise_layouter.c b/src/lib/elementary/efl_ui_list_view_precise_layouter.c
index e192d7a9bc..3beac4d468 100644
--- a/src/lib/elementary/efl_ui_list_view_precise_layouter.c
+++ b/src/lib/elementary/efl_ui_list_view_precise_layouter.c
@@ -245,7 +245,7 @@ _child_added_cb(void *data, const Efl_Event *event)
245 r->pd = pd; 245 r->pd = pd;
246 246
247 f = efl_model_children_slice_get(pd->model, evt->index, 1); 247 f = efl_model_children_slice_get(pd->model, evt->index, 1);
248 f = eina_future_then(f, _children_get, r); 248 f = eina_future_then(f, _children_get, r, NULL);
249} 249}
250 250
251static void 251static void
diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c
index 25c2787876..21d2c032de 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.c
+++ b/src/lib/elementary/efl_ui_scroll_manager.c
@@ -738,7 +738,7 @@ _scroll_wheel_post_event_go(Efl_Ui_Scroll_Manager_Data *sd, int x, int y)
738 Eina_Future *f; 738 Eina_Future *f;
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); 741 _scroll_wheel_post_event_job, sd, NULL);
742 efl_future_Eina_FutureXXX_then(sd->obj, f); 742 efl_future_Eina_FutureXXX_then(sd->obj, f);
743 } 743 }
744 else 744 else
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 1cbb41cea8..274dcd87bd 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1031,7 +1031,7 @@ _populate(Evas_Object *obj,
1031 if (efl_model_children_count_get(model)) 1031 if (efl_model_children_count_get(model))
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); 1034 future = eina_future_then(future, _process_children_cb, lreq, NULL);
1035 efl_future_Eina_FutureXXX_then(obj, future); 1035 efl_future_Eina_FutureXXX_then(obj, future);
1036 } 1036 }
1037 else 1037 else
@@ -1498,7 +1498,7 @@ _on_text_activated(void *data, const Efl_Event *event)
1498 efl_key_data_set(fs, _text_activated_path_key, eina_stringshare_add(path)); 1498 efl_key_data_set(fs, _text_activated_path_key, eina_stringshare_add(path));
1499 efl_key_ref_set(fs, _text_activated_model_key, model); 1499 efl_key_ref_set(fs, _text_activated_model_key, model);
1500 efl_ref(fs); 1500 efl_ref(fs);
1501 eina_future_then(future, _on_text_activated_set_path_then, fs); 1501 eina_future_then(future, _on_text_activated_set_path_then, fs, NULL);
1502 1502
1503 elm_object_focus_set(event->object, EINA_FALSE); 1503 elm_object_focus_set(event->object, EINA_FALSE);
1504} 1504}
@@ -1687,7 +1687,7 @@ _resource_created(void *data, const Efl_Event *event)
1687 return; 1687 return;
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); 1690 f = eina_future_then(f, _resource_created_then, fs, NULL);
1691 efl_future_Eina_FutureXXX_then(fs, f); 1691 efl_future_Eina_FutureXXX_then(fs, f);
1692} 1692}
1693 1693
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index f5fc08361d..022e03ef7a 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -2004,7 +2004,7 @@ _scroll_wheel_post_event_go(Elm_Scrollable_Smart_Interface_Data *sid, int x, int
2004 Eina_Future *f; 2004 Eina_Future *f;
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); 2007 _scroll_wheel_post_event_job, sid, NULL);
2008 efl_future_Eina_FutureXXX_then(sid->obj, f); 2008 efl_future_Eina_FutureXXX_then(sid->obj, f);
2009 } 2009 }
2010 else 2010 else
diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c
index 4360fa1d20..709c1fdfe8 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -284,7 +284,7 @@ _efl_model_load_children(View_List_ItemData *pdata)
284 284
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); 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_Eina_FutureXXX_then(pdata->priv->genlist, f);
289} 289}
290 290
@@ -317,7 +317,7 @@ _efl_model_children_added_cb(void *data, const Efl_Event *event)
317 Eina_Future *f; 317 Eina_Future *f;
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); 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_Eina_FutureXXX_then(idata->priv->genlist, f);
322} 322}
323 323