ecore: rename efl_loop_Eina_FutureXXX_timeout to efl_loop_timeout.

diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 6847722..f8ae9da 100644 (file)
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -93,7 +93,7 @@ _key_up(void *data, const Efl_Event *ev)
      }
 
    if (td->f) eina_future_cancel(td->f);
-   td->f = efl_loop_Eina_FutureXXX_timeout(efl_provider_find(ev->object, EFL_LOOP_CLASS), 0.5);
+   td->f = efl_loop_timeout(efl_provider_find(ev->object, EFL_LOOP_CLASS), 0.5);
    eina_future_then(td->f, _ecore_timeout_cb, td);
 }
 

diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index be6ef32..e0099f0 100644 (file)
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -3250,7 +3250,7 @@ _efl_loop_Eina_FutureXXX_idle(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED)
 }
 
 static void
-_efl_loop_Eina_FutureXXX_timeout_cancel(void *data, const Eina_Promise *dead_ptr EINA_UNUSED)
+_efl_loop_timeout_cancel(void *data, const Eina_Promise *dead_ptr EINA_UNUSED)
 {
    Efl_Loop_Promise_Simple_Data *d = data;
    ecore_timer_del(d->timer);
@@ -3258,7 +3258,7 @@ _efl_loop_Eina_FutureXXX_timeout_cancel(void *data, const Eina_Promise *dead_ptr
 }
 
 static Eina_Bool
-_efl_loop_Eina_FutureXXX_timeout_done(void *data)
+_efl_loop_timeout_done(void *data)
 {
    Efl_Loop_Promise_Simple_Data *d = data;
    eina_promise_resolve(d->promise, EINA_VALUE_EMPTY);
@@ -3267,7 +3267,7 @@ _efl_loop_Eina_FutureXXX_timeout_done(void *data)
 }
 
 static Eina_Future *
-_efl_loop_Eina_FutureXXX_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double time)
+_efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double time)
 {
    Efl_Loop_Promise_Simple_Data *d;
    Eina_Promise *p;
@@ -3275,11 +3275,11 @@ _efl_loop_Eina_FutureXXX_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double
    d = efl_loop_promise_simple_data_calloc(1);
    EINA_SAFETY_ON_NULL_RETURN_VAL(d, NULL);
 
-   d->timer = ecore_timer_add(time, _efl_loop_Eina_FutureXXX_timeout_done, d);
+   d->timer = ecore_timer_add(time, _efl_loop_timeout_done, d);
    EINA_SAFETY_ON_NULL_GOTO(d->timer, timer_error);
 
    p = eina_promise_new(efl_loop_future_scheduler_get(obj),
-                        _efl_loop_Eina_FutureXXX_timeout_cancel, d);
+                        _efl_loop_timeout_cancel, d);
    // d is dead if p is NULL
    EINA_SAFETY_ON_NULL_RETURN_VAL(p, NULL);
    d->promise = p;

diff --git a/src/lib/ecore/efl_io_copier.c b/src/lib/ecore/efl_io_copier.c
index e9d7d23..240b077 100644 (file)
--- 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)
    if (pd->inactivity_timer) eina_future_cancel(pd->inactivity_timer);
    if (pd->timeout_inactivity <= 0.0) return;
 
-   efl_future_Eina_FutureXXX_then(o, efl_loop_Eina_FutureXXX_timeout(efl_loop_get(o), pd->timeout_inactivity),
+   efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_inactivity),
                                   .success = _efl_io_copier_timeout_inactivity_cb,
                                   .storage = &pd->inactivity_timer);
 }

diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo
index f1aa491..17cf0c7 100644 (file)
--- a/src/lib/ecore/efl_loop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -87,7 +87,7 @@ class Efl.Loop (Efl.Object)
          ]]
           return: ptr(Eina.Future) @owned /* TODO: future<void> */; [[The future handle.]]
       }
-      Eina_FutureXXX_timeout {
+      timeout {
          [[A future promise that will be resolved from a clean main
            loop context after $time seconds.]]
          params {

diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.c b/src/lib/ecore_con/efl_net_dialer_ssl.c
index eb68859..93dabfa 100644 (file)
--- a/src/lib/ecore_con/efl_net_dialer_ssl.c
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.c
@@ -151,7 +151,7 @@ _efl_net_dialer_ssl_connect_timeout(Eo *o, const Eina_Value v)
 static void
 _timeout_schedule(Eo *o, Efl_Net_Dialer_Ssl_Data *pd, double timeout)
 {
-   efl_future_Eina_FutureXXX_then(o, efl_loop_Eina_FutureXXX_timeout(efl_loop_get(o), timeout),
+   efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), timeout),
                                   .success = _efl_net_dialer_ssl_connect_timeout,
                                   .storage = &pd->connect_timeout);
 }

diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c
index 3b45044..1caf1ac 100644 (file)
--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@@ -97,7 +97,7 @@ _efl_net_dialer_tcp_connect_timeout(Eo *o, const Eina_Value v)
 static void
 _timeout_schedule(Eo *o, Efl_Net_Dialer_Tcp_Data *pd)
 {
-   efl_future_Eina_FutureXXX_then(o, efl_loop_Eina_FutureXXX_timeout(efl_loop_get(o), pd->timeout_dial),
+   efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
                                   .success = _efl_net_dialer_tcp_connect_timeout,
                                   .storage = &pd->connect.timeout);
 }

diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c
index c7541de..6d253b3 100644 (file)
--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@@ -97,7 +97,7 @@ _efl_net_dialer_udp_resolver_timeout(Eo *o, const Eina_Value v)
 static void
 _timeout_schedule(Eo *o, Efl_Net_Dialer_Udp_Data *pd)
 {
-   efl_future_Eina_FutureXXX_then(o, efl_loop_Eina_FutureXXX_timeout(efl_loop_get(o), pd->timeout_dial),
+   efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
                                   .success = _efl_net_dialer_udp_resolver_timeout,
                                   .storage = &pd->resolver.timeout);
 }

diff --git a/src/lib/ecore_con/efl_net_dialer_unix.c b/src/lib/ecore_con/efl_net_dialer_unix.c
index 8a1db4b..4527940 100644 (file)
--- a/src/lib/ecore_con/efl_net_dialer_unix.c
+++ b/src/lib/ecore_con/efl_net_dialer_unix.c
@@ -123,7 +123,7 @@ _efl_net_dialer_unix_connected(void *data, const struct sockaddr *addr, socklen_
 static void
 _timeout_schedule(Eo *o, Efl_Net_Dialer_Unix_Data *pd)
 {
-   efl_future_Eina_FutureXXX_then(o, efl_loop_Eina_FutureXXX_timeout(efl_loop_get(o), pd->timeout_dial),
+   efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
                                   .success = _efl_net_dialer_unix_connect_timeout,
                                   .storage = &pd->connect.timeout);
 }

diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.c b/src/lib/ecore_con/efl_net_dialer_websocket.c
index 596f5b4..e7b6725 100644 (file)
--- a/src/lib/ecore_con/efl_net_dialer_websocket.c
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.c
@@ -1499,7 +1499,7 @@ _efl_net_dialer_websocket_close_request(Eo *o, Efl_Net_Dialer_Websocket_Data *pd
    if (pd->close_timeout)
      eina_future_cancel(pd->close_timeout);
 
-   efl_future_Eina_FutureXXX_then(o, efl_loop_Eina_FutureXXX_timeout(efl_loop_get(o), 2.0),
+   efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), 2.0),
                                   .success = _efl_net_dialer_websocket_close_request_timeout,
                                   .storage = &pd->close_timeout);
 

diff --git a/src/tests/ecore/ecore_test_promise2.c b/src/tests/ecore/ecore_test_promise2.c
index b1a78f3..3554dc7 100644 (file)
--- a/src/tests/ecore/ecore_test_promise2.c
+++ b/src/tests/ecore/ecore_test_promise2.c
@@ -490,7 +490,7 @@ START_TEST(efl_test_timeout)
    Eina_Bool done = EINA_FALSE;
 
    fail_if(!ecore_init());
-   f = eina_future_then(efl_loop_Eina_FutureXXX_timeout(ecore_main_loop_get(), 0.0001),
+   f = eina_future_then(efl_loop_timeout(ecore_main_loop_get(), 0.0001),
                         _promise_empty_done, &done);
    fail_if(!f);
    ecore_main_loop_begin();

diff --git a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
index d6768b3..249aa84 100644 (file)
--- a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
+++ b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
@@ -117,7 +117,7 @@ _timeout(void *data,
   do \
     { \
        Eina_Bool _did_timeout = EINA_FALSE; \
-       Eina_Future *_timeout_future = efl_loop_Eina_FutureXXX_timeout(ecore_main_loop_get(), t); \
+       Eina_Future *_timeout_future = efl_loop_timeout(ecore_main_loop_get(), t); \
        eina_future_then(_timeout_future, _timeout, &_did_timeout); \
        mark_point(); \
        ecore_main_loop_begin(); \