summaryrefslogtreecommitdiff
path: root/src/lib/eio
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/eio
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/eio')
-rw-r--r--src/lib/eio/efl_io_manager.c20
-rw-r--r--src/lib/eio/eio_model.c8
2 files changed, 14 insertions, 14 deletions
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);