ecore: rename Efl.Loop_User to Efl.Loop.Consumer.

src/Makefile_Ecore.am

@@ -7,7 +7,7 @@ ecore_eolian_files_legacy = \
 
 ecore_eolian_files_public = \
 	lib/ecore/efl_loop.eo \
-	lib/ecore/efl_loop_user.eo \
+	lib/ecore/efl_loop_consumer.eo \
 	lib/ecore/efl_loop_fd.eo \
 	lib/ecore/efl_io_closer_fd.eo \
 	lib/ecore/efl_io_positioner_fd.eo \
@@ -84,7 +84,7 @@ lib/ecore/ecore_idle_exiter.c \
 lib/ecore/ecore_idler.c \
 lib/ecore/ecore_job.c \
 lib/ecore/ecore_main.c \
-lib/ecore/efl_loop_user.c \
+lib/ecore/efl_loop_consumer.c \
 lib/ecore/efl_loop_fd.c \
 lib/ecore/efl_io_closer_fd.c \
 lib/ecore/efl_io_positioner_fd.c \

src/lib/ecore/Ecore_Eo.h

@@ -51,7 +51,7 @@ EAPI void efl_exit(int exit_code);
 
 EAPI int efl_loop_exit_code_process(Eina_Value *value);
 
-#include "efl_loop_user.eo.h"
+#include "efl_loop_consumer.eo.h"
 
 EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(Eo *obj);
 

src/lib/ecore/ecore_timer.c

@@ -516,7 +516,7 @@ _efl_loop_timer_efl_object_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *
    else if (first == suspended)
      suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd));
 
-   efl_parent_set(efl_super(obj, EFL_LOOP_USER_CLASS), parent);
+   efl_parent_set(efl_super(obj, EFL_LOOP_TIMER_CLASS), parent);
 
    if (efl_parent_get(obj) != parent)
      return ;

src/lib/ecore/efl_io_buffered_stream.eo

@@ -1,4 +1,4 @@
-class Efl.Io.Buffered_Stream (Efl.Loop_User, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer) {
+class Efl.Io.Buffered_Stream (Efl.Loop.Consumer, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer) {
     [[A wrapper object offering an easy to use, buffered streams over existing I/O class.
 
       The buffered stream encapsulates an actual @Efl.Io.Reader or

src/lib/ecore/efl_io_copier.eo

@@ -1,6 +1,6 @@
 import eina_types;
 
-class Efl.Io.Copier (Efl.Loop_User, Efl.Io.Closer) {
+class Efl.Io.Copier (Efl.Loop.Consumer, Efl.Io.Closer) {
     [[Copy from an @Efl.Io.Reader source to @Efl.Io.Writer destination.
 
       During usage it will keep reference to @.source and

src/lib/ecore/efl_loop_consumer.c

@@ -0,0 +1,32 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <Ecore.h>
+
+#include "ecore_private.h"
+
+typedef struct _Efl_Loop_Consumer_Data Efl_Loop_Consumer_Data;
+struct _Efl_Loop_Consumer_Data
+{
+};
+
+static Efl_Loop *
+_efl_loop_consumer_loop_get(Eo *obj, Efl_Loop_Consumer_Data *pd EINA_UNUSED)
+{
+   return efl_provider_find(obj, EFL_LOOP_CLASS);
+}
+
+static void
+_efl_loop_consumer_efl_object_parent_set(Eo *obj, Efl_Loop_Consumer_Data *pd EINA_UNUSED, Efl_Object *parent)
+{
+   if (parent != NULL && efl_provider_find(parent, EFL_LOOP_CLASS) == NULL)
+     {
+        ERR("parent=%p is not a provider of EFL_LOOP_CLASS!", parent);
+        return;
+     }
+
+   efl_parent_set(efl_super(obj, EFL_LOOP_CONSUMER_CLASS), parent);
+}
+
+#include "efl_loop_consumer.eo.c"

src/lib/ecore/efl_loop_consumer.eo

@@ -1,6 +1,6 @@
-class Efl.Loop_User (Efl.Object)
+class Efl.Loop.Consumer (Efl.Object)
 {
-   [[An Efl.Loop_User is a class that require one of the parent to provide
+   [[An Efl.Loop.Consumer 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;

src/lib/ecore/efl_loop_fd.eo

@@ -1,6 +1,6 @@
 import eina_types;
 
-class Efl.Loop.Fd (Efl.Loop_User)
+class Efl.Loop.Fd (Efl.Loop.Consumer)
 {
    [[Fds are objects that what the activity on a given
      file descriptor. This file descriptor can be a

src/lib/ecore/efl_loop_timer.eo

@@ -1,4 +1,4 @@
-class Efl.Loop.Timer (Efl.Loop_User)
+class Efl.Loop.Timer (Efl.Loop.Consumer)
 {
    [[Timers are objects that will call a given callback at some point
      in the future and repeat that tick at a given interval.

src/lib/ecore/efl_loop_user.c

@@ -1,32 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <Ecore.h>
-
-#include "ecore_private.h"
-
-typedef struct _Efl_Loop_User_Data Efl_Loop_User_Data;
-struct _Efl_Loop_User_Data
-{
-};
-
-static Efl_Loop *
-_efl_loop_user_loop_get(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED)
-{
-   return efl_provider_find(obj, EFL_LOOP_CLASS);
-}
-
-static void
-_efl_loop_user_efl_object_parent_set(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED, Efl_Object *parent)
-{
-   if (parent != NULL && efl_provider_find(parent, EFL_LOOP_CLASS) == NULL)
-     {
-        ERR("parent=%p is not a provider of EFL_LOOP_CLASS!", parent);
-        return;
-     }
-
-   efl_parent_set(efl_super(obj, EFL_LOOP_USER_CLASS), parent);
-}
-
-#include "efl_loop_user.eo.c"

src/lib/ecore/efl_promise.eo

@@ -1,6 +1,6 @@
 import eina_types;
 
-class Efl.Promise (Efl.Loop_User)
+class Efl.Promise (Efl.Loop.Consumer)
 {
    [[Efl promise class]]
    methods {

src/lib/ecore_con/efl_net_control.eo

@@ -65,7 +65,7 @@ struct Efl.Net.Control.Agent_Browser_Url {
     url: string; [[The URL to point the browser at.]]
 }
 
-class Efl.Net.Control (Efl.Loop_User) {
+class Efl.Net.Control (Efl.Loop.Consumer) {
     [[Controls network connectivity.
 
       This class and its children objects are only useful to implement

src/lib/ecore_con/efl_net_control_access_point.eo

@@ -74,7 +74,7 @@ enum Efl.Net.Control.Access_Point.Proxy_Method {
     unset, [[Only to be used with @Efl.Net.Control.Access_Point.configuration_proxy]]
 }
 
-class Efl.Net.Control.Access_Point (Efl.Loop_User) {
+class Efl.Net.Control.Access_Point (Efl.Loop.Consumer) {
     [[An access point for network connectivity.
 
       The @Efl.Net.Control is composed of multiple technologies, each

src/lib/ecore_con/efl_net_control_technology.eo

@@ -15,7 +15,7 @@ enum Efl.Net.Control.Technology.Type {
     p2p, [[Type: Peer-2-Peer]]
 }
 
-class Efl.Net.Control.Technology (Efl.Loop_User) {
+class Efl.Net.Control.Technology (Efl.Loop.Consumer) {
     [[A technology that enables network access points to be controlled.
 
       The @Efl.Net.Control is composed of multiple technologies, each

src/lib/ecore_con/efl_net_dialer_http.eo

@@ -7,7 +7,7 @@ enum Efl.Net.Dialer.Http.Primary_Mode {
     upload, [[HTTP upload mode]]
 }
 
-class Efl.Net.Dialer.Http (Efl.Loop_User, Efl.Net.Dialer, Efl.Io.Sizer) {
+class Efl.Net.Dialer.Http (Efl.Loop.Consumer, Efl.Net.Dialer, Efl.Io.Sizer) {
     [[HTTP Dialer (Client).
 
       The effective URL in use, if @.allow_redirects is $true will be

src/lib/ecore_con/efl_net_dialer_websocket.eo

@@ -47,7 +47,7 @@ struct Efl.Net.Dialer.Websocket.Closed_Reason {
     message: string; [[Textual closing reason message]]
 }
 
-class Efl.Net.Dialer.Websocket (Efl.Loop_User, Efl.Net.Dialer) {
+class Efl.Net.Dialer.Websocket (Efl.Loop.Consumer, Efl.Net.Dialer) {
     [[WebSocket Dialer (Client).
 
       The WebSocket Protocol (https://tools.ietf.org/html/rfc6455) is

src/lib/ecore_con/efl_net_server_simple.eo

@@ -1,4 +1,4 @@
-class Efl.Net.Server.Simple (Efl.Loop_User, Efl.Net.Server) {
+class Efl.Net.Server.Simple (Efl.Loop.Consumer, Efl.Net.Server) {
     [[A network server wrapper that creates clients based on @Efl.Net.Socket.Simple.
 
       This is just a wrapper server, it will take an actual server

src/lib/ecore_con/efl_net_server_windows.eo

@@ -1,4 +1,4 @@
-class Efl.Net.Server.Windows (Efl.Loop_User, Efl.Net.Server) {
+class Efl.Net.Server.Windows (Efl.Loop.Consumer, Efl.Net.Server) {
     [[A Windows NamedPipe server.
 
       The @Efl.Net.Server.serve method will call CreateNamedPipe()

src/lib/ecore_con/efl_net_session.eo

@@ -27,7 +27,7 @@ enum Efl.Net.Session.Technology {
     all = (Efl.Net.Session.Technology.ethernet | Efl.Net.Session.Technology.wifi | Efl.Net.Session.Technology.bluetooth | Efl.Net.Session.Technology.cellular | Efl.Net.Session.Technology.vpn | Efl.Net.Session.Technology.gadget), [[All technology types]]
 }
 
-class Efl.Net.Session (Efl.Loop_User) {
+class Efl.Net.Session (Efl.Loop.Consumer) {
     [[Used by application to request network connectivity.
 
       This API is targeted at applications that need access to the

src/lib/ecore_con/efl_net_socket_ssl.eo

@@ -1,7 +1,7 @@
 var Efl.Net.Socket.Ssl.Error.HANDSHAKE: Eina.Error; [[Failed SSL handshake]]
 var Efl.Net.Socket.Ssl.Error.CERTIFICATE_VERIFY_FAILED: Eina.Error; [[Failed to verify peer's certificate]]
 
-class Efl.Net.Socket.Ssl (Efl.Loop_User, Efl.Net.Socket) {
+class Efl.Net.Socket.Ssl (Efl.Loop.Consumer, Efl.Net.Socket) {
     [[A wrapper socket doing SSL (Secure Sockets Layer).
 
       Use this wrapper around an existing socket to do secure

src/lib/ecore_con/efl_net_socket_windows.eo

@@ -1,4 +1,4 @@
-class Efl.Net.Socket.Windows (Efl.Loop_User, Efl.Net.Socket) {
+class Efl.Net.Socket.Windows (Efl.Loop.Consumer, Efl.Net.Socket) {
     [[A base Windows NamedPipe socket.
 
       This is the common class and takes an existing file HANDLE,

src/lib/eio/efl_io_manager.eo

@@ -21,7 +21,7 @@ function EflIoDirectInfo {
   }
 };
 
-class Efl.Io.Manager (Efl.Loop_User)
+class Efl.Io.Manager (Efl.Loop.Consumer)
 {
   [[Class representing an asynchronous file operation.]]
 

src/lib/evas/canvas/efl_canvas_object.eo

@@ -3,7 +3,7 @@ import efl_animation_types;
 
 abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
                             Efl.Input.Interface, Efl.Gfx.Size.Hint,
-                            Efl.Gfx.Map, Efl.Loop_User, Efl.Ui.Base, Efl.Canvas.Pointer)
+                            Efl.Gfx.Map, Efl.Loop.Consumer, Efl.Ui.Base, Efl.Canvas.Pointer)
 {
    [[Efl canvas object abstract class]]
    legacy_prefix: evas_object;
@@ -619,7 +619,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
       Efl.Gfx.Size.Hint.hint_weight { get; set; }
       Efl.Gfx.scale { set; get; }
       Efl.Input.Interface.seat_event_filter { get; set; }
-      Efl.Loop_User.loop { get; }
+      Efl.Loop.Consumer.loop { get; }
       Efl.Canvas.Pointer.pointer_inside { get; }
    }
 }

src/lib/evas/canvas/evas_canvas.eo

@@ -1,7 +1,7 @@
 import efl_input_types;
 
 class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
-                   Efl.Loop_User, Efl.Canvas.Pointer)
+                   Efl.Loop.Consumer, Efl.Canvas.Pointer)
 {
    [[Evas canvas class]]
    legacy_prefix: evas;
@@ -1127,7 +1127,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
       Efl.Object.event_thaw;
       Efl.Object.event_freeze;
       Efl.Object.provider_find;
-      Efl.Loop_User.loop { get; }
+      Efl.Loop.Consumer.loop { get; }
       //Efl.Canvas.seats;
       Efl.Canvas.Pointer.pointer_inside { get; }
       Efl.Canvas.device { get; }

src/lib/evas/canvas/evas_main.c

@@ -842,7 +842,7 @@ _evas_canvas_efl_object_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED,
 }
 
 EOLIAN static Efl_Loop *
-_evas_canvas_efl_loop_user_loop_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e EINA_UNUSED)
+_evas_canvas_efl_loop_consumer_loop_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e EINA_UNUSED)
 {
    return ecore_main_loop_get();
 }

src/lib/evas/canvas/evas_object_main.c

@@ -2441,7 +2441,7 @@ fallback:
 }
 
 EOLIAN static Efl_Loop *
-_efl_canvas_object_efl_loop_user_loop_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED)
+_efl_canvas_object_efl_loop_consumer_loop_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED)
 {
    return ecore_main_loop_get();
 }