Efl.Loop.User: Use prefix to rename efl_loop_user_loop_get

efl_loop_user_loop_get is idiotic. efl_loop_get should be good enough.

diff --git a/src/lib/ecore/efl_io_copier.c b/src/lib/ecore/efl_io_copier.c
index 1f571c8..54dcc3f 100644 (file)
--- a/src/lib/ecore/efl_io_copier.c
+++ b/src/lib/ecore/efl_io_copier.c
@@ -102,7 +102,7 @@ _efl_io_copier_job_schedule(Eo *o, Efl_Io_Copier_Data *pd)
 {
    if (pd->job) return;
 
-   efl_future_use(&pd->job, efl_loop_job(efl_loop_user_loop_get(o), o));
+   efl_future_use(&pd->job, efl_loop_job(efl_loop_get(o), o));
    efl_future_then(pd->job, _efl_io_copier_job, NULL, NULL, o);
    efl_future_link(o, pd->job);
 }
@@ -664,7 +664,7 @@ _efl_io_copier_efl_object_finalize(Eo *o, Efl_Io_Copier_Data *pd)
    if (pd->read_chunk_size == 0)
      efl_io_copier_read_chunk_size_set(o, DEF_READ_CHUNK_SIZE);
 
-   if (!efl_loop_user_loop_get(o))
+   if (!efl_loop_get(o))
      {
         ERR("Set a loop provider as parent of this copier!");
         return NULL;

diff --git a/src/lib/ecore/efl_loop_user.eo b/src/lib/ecore/efl_loop_user.eo
index c689f49..ec790de 100644 (file)
--- a/src/lib/ecore/efl_loop_user.eo
+++ b/src/lib/ecore/efl_loop_user.eo
@@ -3,6 +3,7 @@ class Efl.Loop_User (Efl.Object)
    [[An Efl.Loop_User is a class that require one of the parent to provide
      an Efl.Loop interface when doing provider_find. It will enforce this by
      only allowing parent that provide such interface or NULL.]]
+   eo_prefix: efl_loop;
    methods {
       loop_get {
          return: Efl.Loop;
@@ -11,4 +12,4 @@ class Efl.Loop_User (Efl.Object)
    implements {
       Efl.Object.parent.set;
    }
-}
\ No newline at end of file
+}

diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index 9e16d8a..ea70371 100644 (file)
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -1249,7 +1249,7 @@ _efl_net_dialer_http_curl_start(Eo *o, Efl_Net_Dialer_Http_Data *pd)
    // TODO: move this to be per-loop once multiple mainloops are supported
    // this would need to attach something to the loop
    cm = &_cm_global;
-   if (!cm->loop) cm->loop = efl_loop_user_loop_get(o);
+   if (!cm->loop) cm->loop = efl_loop_get(o);
    if (!_efl_net_dialer_http_curlm_add(cm, o, pd->easy))
      {
         ERR("dialer=%p could not add curl easy handle to multi manager", o);
@@ -1671,7 +1671,7 @@ _efl_net_dialer_http_efl_io_closer_close(Eo *o, Efl_Net_Dialer_Http_Data *pd)
      {
         if (!pd->pending_close)
           {
-             efl_future_use(&pd->pending_close, efl_loop_job(efl_loop_user_loop_get(o), o));
+             efl_future_use(&pd->pending_close, efl_loop_job(efl_loop_get(o), o));
              efl_future_then(pd->pending_close, _efl_net_dialer_http_pending_close, NULL, NULL, o);
              DBG("dialer=%p closed from CURL callback, schedule close job=%p", o, pd->pending_close);
           }

diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c
index b490aaa..ad1159a 100644 (file)
--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@@ -168,7 +168,7 @@ _efl_net_dialer_tcp_efl_net_dialer_dial(Eo *o, Efl_Net_Dialer_Tcp_Data *pd EINA_
      efl_future_cancel(pd->connect.timeout);
    if (pd->timeout_dial > 0.0)
      {
-        efl_future_use(&pd->connect.timeout, efl_loop_timeout(efl_loop_user_loop_get(o), pd->timeout_dial, o));
+        efl_future_use(&pd->connect.timeout, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial, o));
         efl_future_then(pd->connect.timeout, _efl_net_dialer_tcp_connect_timeout, NULL, NULL, o);
         efl_future_link(o, pd->connect.timeout);
      }
@@ -209,7 +209,7 @@ _efl_net_dialer_tcp_efl_net_dialer_timeout_dial_set(Eo *o EINA_UNUSED, Efl_Net_D
 
    if ((pd->timeout_dial > 0.0) && (pd->connect.thread))
      {
-        efl_future_use(&pd->connect.timeout, efl_loop_timeout(efl_loop_user_loop_get(o), pd->timeout_dial, o));
+        efl_future_use(&pd->connect.timeout, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial, o));
         efl_future_then(pd->connect.timeout, _efl_net_dialer_tcp_connect_timeout, NULL, NULL, o);
      }
 }

diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.c b/src/lib/ecore_con/efl_net_dialer_websocket.c
index 52c0661..b0a9dc4 100644 (file)
--- a/src/lib/ecore_con/efl_net_dialer_websocket.c
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.c
@@ -761,7 +761,7 @@ _efl_net_dialer_websocket_job_schedule(Eo *o, Efl_Net_Dialer_Websocket_Data *pd)
 
    if (pd->job) return;
 
-   loop = efl_loop_user_loop_get(o);
+   loop = efl_loop_get(o);
    if (!loop) return;
    efl_future_use(&pd->job, efl_loop_job(loop, o));
    efl_future_then(pd->job, _efl_net_dialer_websocket_job, NULL, NULL, o);
@@ -1499,7 +1499,7 @@ _efl_net_dialer_websocket_close_request(Eo *o, Efl_Net_Dialer_Websocket_Data *pd
    if (pd->close_timeout)
      efl_future_cancel(pd->close_timeout);
 
-   efl_future_use(&pd->close_timeout, efl_loop_timeout(efl_loop_user_loop_get(o), 2.0, o));
+   efl_future_use(&pd->close_timeout, efl_loop_timeout(efl_loop_get(o), 2.0, o));
    efl_future_then(pd->close_timeout, _efl_net_dialer_websocket_close_request_timeout, NULL, NULL, o);
    efl_future_link(o, pd->close_timeout);
 

diff --git a/src/lib/eio/efl_io_manager.c b/src/lib/eio/efl_io_manager.c
index 0740f35..51043f8 100644 (file)
--- a/src/lib/eio/efl_io_manager.c
+++ b/src/lib/eio/efl_io_manager.c
@@ -260,7 +260,7 @@ _efl_io_manager_direct_ls(Eo *obj,
    Efl_Promise *p;
    Eio_File *h;
 
-   Eo *loop = efl_loop_user_loop_get(obj);
+   Eo *loop = efl_loop_get(obj);
    p = efl_add(EFL_PROMISE_CLASS, loop);
    if (!p) return NULL;
 
@@ -300,7 +300,7 @@ _efl_io_manager_stat_ls(Eo *obj,
    Efl_Promise *p;
    Eio_File *h;
 
-   Eo *loop = efl_loop_user_loop_get(obj);
+   Eo *loop = efl_loop_get(obj);
    p = efl_add(EFL_PROMISE_CLASS, loop);
    if (!p) return NULL;
 
@@ -339,7 +339,7 @@ _efl_io_manager_ls(Eo *obj,
    Efl_Promise *p;
    Eio_File *h;
 
-   Eo *loop = efl_loop_user_loop_get(obj);
+   Eo *loop = efl_loop_get(obj);
    p = efl_add(EFL_PROMISE_CLASS, loop);
    if (!p) return NULL;
 
@@ -387,7 +387,7 @@ _efl_io_manager_stat(Eo *obj,
    Efl_Promise *p;
    Eio_File *h;
 
-   Eo *loop = efl_loop_user_loop_get(obj);
+   Eo *loop = efl_loop_get(obj);
    p = efl_add(EFL_PROMISE_CLASS, loop);
    if (!p) return NULL;
 
@@ -415,7 +415,7 @@ _efl_io_manager_xattr_ls(Eo *obj,
    Efl_Promise *p;
    Eio_File *h;
 
-   Eo *loop = efl_loop_user_loop_get(obj);
+   Eo *loop = efl_loop_get(obj);
    p = efl_add(EFL_PROMISE_CLASS, loop);
    if (!p) return NULL;
 
@@ -445,7 +445,7 @@ _efl_io_manager_xattr_set(Eo *obj,
    Efl_Promise *p;
    Eio_File *h;
 
-   Eo *loop = efl_loop_user_loop_get(obj);
+   Eo *loop = efl_loop_get(obj);
    p = efl_add(EFL_PROMISE_CLASS, loop);
    if (!p) return NULL;
 
@@ -475,7 +475,7 @@ _efl_io_manager_xattr_get(Eo *obj,
    Efl_Promise *p;
    Eio_File *h;
 
-   Eo *loop = efl_loop_user_loop_get(obj);
+   Eo *loop = efl_loop_get(obj);
    p = efl_add(EFL_PROMISE_CLASS, loop);
    if (!p) return NULL;
 
@@ -514,7 +514,7 @@ _efl_io_manager_open(Eo *obj,
    Efl_Promise *p;
    Eio_File *h;
 
-   Eo *loop = efl_loop_user_loop_get(obj);
+   Eo *loop = efl_loop_get(obj);
    p = efl_add(EFL_PROMISE_CLASS, loop);
    if (!p) return NULL;
 
@@ -541,7 +541,7 @@ _efl_io_manager_close(Eo *obj,
    Efl_Promise *p;
    Eio_File *h;
 
-   Eo *loop = efl_loop_user_loop_get(obj);
+   Eo *loop = efl_loop_get(obj);
    p = efl_add(EFL_PROMISE_CLASS, loop);
    if (!p) return NULL;