summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-12-13 14:49:57 -0800
committerCedric BAIL <cedric@osg.samsung.com>2017-12-13 14:54:57 -0800
commitdf032058fd313b07cdc7288a8811ccf88f9ba247 (patch)
tree7fe1b3569290a23d163013feeeb9d04fe6b4e96e
parent433c7ef8fe1c8d5a910e40a7af95574bff6d1d84 (diff)
ecore: rename Efl.Loop_User to Efl.Loop.Consumer.
-rw-r--r--src/Makefile_Ecore.am4
-rw-r--r--src/lib/ecore/Ecore_Eo.h2
-rw-r--r--src/lib/ecore/ecore_timer.c2
-rw-r--r--src/lib/ecore/efl_io_buffered_stream.eo2
-rw-r--r--src/lib/ecore/efl_io_copier.eo2
-rw-r--r--src/lib/ecore/efl_loop_consumer.c32
-rw-r--r--src/lib/ecore/efl_loop_consumer.eo (renamed from src/lib/ecore/efl_loop_user.eo)4
-rw-r--r--src/lib/ecore/efl_loop_fd.eo2
-rw-r--r--src/lib/ecore/efl_loop_timer.eo2
-rw-r--r--src/lib/ecore/efl_loop_user.c32
-rw-r--r--src/lib/ecore/efl_promise.eo2
-rw-r--r--src/lib/ecore_con/efl_net_control.eo2
-rw-r--r--src/lib/ecore_con/efl_net_control_access_point.eo2
-rw-r--r--src/lib/ecore_con/efl_net_control_technology.eo2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.eo2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_websocket.eo2
-rw-r--r--src/lib/ecore_con/efl_net_server_simple.eo2
-rw-r--r--src/lib/ecore_con/efl_net_server_windows.eo2
-rw-r--r--src/lib/ecore_con/efl_net_session.eo2
-rw-r--r--src/lib/ecore_con/efl_net_socket_ssl.eo2
-rw-r--r--src/lib/ecore_con/efl_net_socket_windows.eo2
-rw-r--r--src/lib/eio/efl_io_manager.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo4
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
26 files changed, 60 insertions, 60 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index d1d79cd7e4..f96773852a 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -7,7 +7,7 @@ ecore_eolian_files_legacy = \
7 7
8ecore_eolian_files_public = \ 8ecore_eolian_files_public = \
9 lib/ecore/efl_loop.eo \ 9 lib/ecore/efl_loop.eo \
10 lib/ecore/efl_loop_user.eo \ 10 lib/ecore/efl_loop_consumer.eo \
11 lib/ecore/efl_loop_fd.eo \ 11 lib/ecore/efl_loop_fd.eo \
12 lib/ecore/efl_io_closer_fd.eo \ 12 lib/ecore/efl_io_closer_fd.eo \
13 lib/ecore/efl_io_positioner_fd.eo \ 13 lib/ecore/efl_io_positioner_fd.eo \
@@ -84,7 +84,7 @@ lib/ecore/ecore_idle_exiter.c \
84lib/ecore/ecore_idler.c \ 84lib/ecore/ecore_idler.c \
85lib/ecore/ecore_job.c \ 85lib/ecore/ecore_job.c \
86lib/ecore/ecore_main.c \ 86lib/ecore/ecore_main.c \
87lib/ecore/efl_loop_user.c \ 87lib/ecore/efl_loop_consumer.c \
88lib/ecore/efl_loop_fd.c \ 88lib/ecore/efl_loop_fd.c \
89lib/ecore/efl_io_closer_fd.c \ 89lib/ecore/efl_io_closer_fd.c \
90lib/ecore/efl_io_positioner_fd.c \ 90lib/ecore/efl_io_positioner_fd.c \
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index 851f6a86bf..9203bf1e4d 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -51,7 +51,7 @@ EAPI void efl_exit(int exit_code);
51 51
52EAPI int efl_loop_exit_code_process(Eina_Value *value); 52EAPI int efl_loop_exit_code_process(Eina_Value *value);
53 53
54#include "efl_loop_user.eo.h" 54#include "efl_loop_consumer.eo.h"
55 55
56EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(Eo *obj); 56EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(Eo *obj);
57 57
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index ed63c72295..b2f8801459 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/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 *
516 else if (first == suspended) 516 else if (first == suspended)
517 suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd)); 517 suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd));
518 518
519 efl_parent_set(efl_super(obj, EFL_LOOP_USER_CLASS), parent); 519 efl_parent_set(efl_super(obj, EFL_LOOP_TIMER_CLASS), parent);
520 520
521 if (efl_parent_get(obj) != parent) 521 if (efl_parent_get(obj) != parent)
522 return ; 522 return ;
diff --git a/src/lib/ecore/efl_io_buffered_stream.eo b/src/lib/ecore/efl_io_buffered_stream.eo
index bad0240648..a6930ef6eb 100644
--- a/src/lib/ecore/efl_io_buffered_stream.eo
+++ b/src/lib/ecore/efl_io_buffered_stream.eo
@@ -1,4 +1,4 @@
1class Efl.Io.Buffered_Stream (Efl.Loop_User, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer) { 1class Efl.Io.Buffered_Stream (Efl.Loop.Consumer, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer) {
2 [[A wrapper object offering an easy to use, buffered streams over existing I/O class. 2 [[A wrapper object offering an easy to use, buffered streams over existing I/O class.
3 3
4 The buffered stream encapsulates an actual @Efl.Io.Reader or 4 The buffered stream encapsulates an actual @Efl.Io.Reader or
diff --git a/src/lib/ecore/efl_io_copier.eo b/src/lib/ecore/efl_io_copier.eo
index f1d254d45a..12e9990f1d 100644
--- a/src/lib/ecore/efl_io_copier.eo
+++ b/src/lib/ecore/efl_io_copier.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3class Efl.Io.Copier (Efl.Loop_User, Efl.Io.Closer) { 3class Efl.Io.Copier (Efl.Loop.Consumer, Efl.Io.Closer) {
4 [[Copy from an @Efl.Io.Reader source to @Efl.Io.Writer destination. 4 [[Copy from an @Efl.Io.Reader source to @Efl.Io.Writer destination.
5 5
6 During usage it will keep reference to @.source and 6 During usage it will keep reference to @.source and
diff --git a/src/lib/ecore/efl_loop_consumer.c b/src/lib/ecore/efl_loop_consumer.c
new file mode 100644
index 0000000000..d436da82ff
--- /dev/null
+++ b/src/lib/ecore/efl_loop_consumer.c
@@ -0,0 +1,32 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include <Ecore.h>
6
7#include "ecore_private.h"
8
9typedef struct _Efl_Loop_Consumer_Data Efl_Loop_Consumer_Data;
10struct _Efl_Loop_Consumer_Data
11{
12};
13
14static Efl_Loop *
15_efl_loop_consumer_loop_get(Eo *obj, Efl_Loop_Consumer_Data *pd EINA_UNUSED)
16{
17 return efl_provider_find(obj, EFL_LOOP_CLASS);
18}
19
20static void
21_efl_loop_consumer_efl_object_parent_set(Eo *obj, Efl_Loop_Consumer_Data *pd EINA_UNUSED, Efl_Object *parent)
22{
23 if (parent != NULL && efl_provider_find(parent, EFL_LOOP_CLASS) == NULL)
24 {
25 ERR("parent=%p is not a provider of EFL_LOOP_CLASS!", parent);
26 return;
27 }
28
29 efl_parent_set(efl_super(obj, EFL_LOOP_CONSUMER_CLASS), parent);
30}
31
32#include "efl_loop_consumer.eo.c"
diff --git a/src/lib/ecore/efl_loop_user.eo b/src/lib/ecore/efl_loop_consumer.eo
index 048888bbca..fd0c56288c 100644
--- a/src/lib/ecore/efl_loop_user.eo
+++ b/src/lib/ecore/efl_loop_consumer.eo
@@ -1,6 +1,6 @@
1class Efl.Loop_User (Efl.Object) 1class Efl.Loop.Consumer (Efl.Object)
2{ 2{
3 [[An Efl.Loop_User is a class that require one of the parent to provide 3 [[An Efl.Loop.Consumer is a class that require one of the parent to provide
4 an Efl.Loop interface when doing provider_find. It will enforce this by 4 an Efl.Loop interface when doing provider_find. It will enforce this by
5 only allowing parent that provide such interface or NULL.]] 5 only allowing parent that provide such interface or NULL.]]
6 eo_prefix: efl_loop; 6 eo_prefix: efl_loop;
diff --git a/src/lib/ecore/efl_loop_fd.eo b/src/lib/ecore/efl_loop_fd.eo
index 6fd2eff82b..2d0955ba02 100644
--- a/src/lib/ecore/efl_loop_fd.eo
+++ b/src/lib/ecore/efl_loop_fd.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3class Efl.Loop.Fd (Efl.Loop_User) 3class Efl.Loop.Fd (Efl.Loop.Consumer)
4{ 4{
5 [[Fds are objects that what the activity on a given 5 [[Fds are objects that what the activity on a given
6 file descriptor. This file descriptor can be a 6 file descriptor. This file descriptor can be a
diff --git a/src/lib/ecore/efl_loop_timer.eo b/src/lib/ecore/efl_loop_timer.eo
index f576663d44..7fbd044ff7 100644
--- a/src/lib/ecore/efl_loop_timer.eo
+++ b/src/lib/ecore/efl_loop_timer.eo
@@ -1,4 +1,4 @@
1class Efl.Loop.Timer (Efl.Loop_User) 1class Efl.Loop.Timer (Efl.Loop.Consumer)
2{ 2{
3 [[Timers are objects that will call a given callback at some point 3 [[Timers are objects that will call a given callback at some point
4 in the future and repeat that tick at a given interval. 4 in the future and repeat that tick at a given interval.
diff --git a/src/lib/ecore/efl_loop_user.c b/src/lib/ecore/efl_loop_user.c
deleted file mode 100644
index 530772fc64..0000000000
--- a/src/lib/ecore/efl_loop_user.c
+++ /dev/null
@@ -1,32 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include <Ecore.h>
6
7#include "ecore_private.h"
8
9typedef struct _Efl_Loop_User_Data Efl_Loop_User_Data;
10struct _Efl_Loop_User_Data
11{
12};
13
14static Efl_Loop *
15_efl_loop_user_loop_get(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED)
16{
17 return efl_provider_find(obj, EFL_LOOP_CLASS);
18}
19
20static void
21_efl_loop_user_efl_object_parent_set(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED, Efl_Object *parent)
22{
23 if (parent != NULL && efl_provider_find(parent, EFL_LOOP_CLASS) == NULL)
24 {
25 ERR("parent=%p is not a provider of EFL_LOOP_CLASS!", parent);
26 return;
27 }
28
29 efl_parent_set(efl_super(obj, EFL_LOOP_USER_CLASS), parent);
30}
31
32#include "efl_loop_user.eo.c"
diff --git a/src/lib/ecore/efl_promise.eo b/src/lib/ecore/efl_promise.eo
index c68f9e56f0..40a164b343 100644
--- a/src/lib/ecore/efl_promise.eo
+++ b/src/lib/ecore/efl_promise.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3class Efl.Promise (Efl.Loop_User) 3class Efl.Promise (Efl.Loop.Consumer)
4{ 4{
5 [[Efl promise class]] 5 [[Efl promise class]]
6 methods { 6 methods {
diff --git a/src/lib/ecore_con/efl_net_control.eo b/src/lib/ecore_con/efl_net_control.eo
index 809c33e5f5..1f9810522d 100644
--- a/src/lib/ecore_con/efl_net_control.eo
+++ b/src/lib/ecore_con/efl_net_control.eo
@@ -65,7 +65,7 @@ struct Efl.Net.Control.Agent_Browser_Url {
65 url: string; [[The URL to point the browser at.]] 65 url: string; [[The URL to point the browser at.]]
66} 66}
67 67
68class Efl.Net.Control (Efl.Loop_User) { 68class Efl.Net.Control (Efl.Loop.Consumer) {
69 [[Controls network connectivity. 69 [[Controls network connectivity.
70 70
71 This class and its children objects are only useful to implement 71 This class and its children objects are only useful to implement
diff --git a/src/lib/ecore_con/efl_net_control_access_point.eo b/src/lib/ecore_con/efl_net_control_access_point.eo
index 17df79f6fa..1e52774235 100644
--- a/src/lib/ecore_con/efl_net_control_access_point.eo
+++ b/src/lib/ecore_con/efl_net_control_access_point.eo
@@ -74,7 +74,7 @@ enum Efl.Net.Control.Access_Point.Proxy_Method {
74 unset, [[Only to be used with @Efl.Net.Control.Access_Point.configuration_proxy]] 74 unset, [[Only to be used with @Efl.Net.Control.Access_Point.configuration_proxy]]
75} 75}
76 76
77class Efl.Net.Control.Access_Point (Efl.Loop_User) { 77class Efl.Net.Control.Access_Point (Efl.Loop.Consumer) {
78 [[An access point for network connectivity. 78 [[An access point for network connectivity.
79 79
80 The @Efl.Net.Control is composed of multiple technologies, each 80 The @Efl.Net.Control is composed of multiple technologies, each
diff --git a/src/lib/ecore_con/efl_net_control_technology.eo b/src/lib/ecore_con/efl_net_control_technology.eo
index b9fc4ccc17..2dd1784650 100644
--- a/src/lib/ecore_con/efl_net_control_technology.eo
+++ b/src/lib/ecore_con/efl_net_control_technology.eo
@@ -15,7 +15,7 @@ enum Efl.Net.Control.Technology.Type {
15 p2p, [[Type: Peer-2-Peer]] 15 p2p, [[Type: Peer-2-Peer]]
16} 16}
17 17
18class Efl.Net.Control.Technology (Efl.Loop_User) { 18class Efl.Net.Control.Technology (Efl.Loop.Consumer) {
19 [[A technology that enables network access points to be controlled. 19 [[A technology that enables network access points to be controlled.
20 20
21 The @Efl.Net.Control is composed of multiple technologies, each 21 The @Efl.Net.Control is composed of multiple technologies, each
diff --git a/src/lib/ecore_con/efl_net_dialer_http.eo b/src/lib/ecore_con/efl_net_dialer_http.eo
index 9115cf2a0b..3c2e524b2f 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.eo
+++ b/src/lib/ecore_con/efl_net_dialer_http.eo
@@ -7,7 +7,7 @@ enum Efl.Net.Dialer.Http.Primary_Mode {
7 upload, [[HTTP upload mode]] 7 upload, [[HTTP upload mode]]
8} 8}
9 9
10class Efl.Net.Dialer.Http (Efl.Loop_User, Efl.Net.Dialer, Efl.Io.Sizer) { 10class Efl.Net.Dialer.Http (Efl.Loop.Consumer, Efl.Net.Dialer, Efl.Io.Sizer) {
11 [[HTTP Dialer (Client). 11 [[HTTP Dialer (Client).
12 12
13 The effective URL in use, if @.allow_redirects is $true will be 13 The effective URL in use, if @.allow_redirects is $true will be
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.eo b/src/lib/ecore_con/efl_net_dialer_websocket.eo
index 4aef2b4e8e..27f797482a 100644
--- a/src/lib/ecore_con/efl_net_dialer_websocket.eo
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.eo
@@ -47,7 +47,7 @@ struct Efl.Net.Dialer.Websocket.Closed_Reason {
47 message: string; [[Textual closing reason message]] 47 message: string; [[Textual closing reason message]]
48} 48}
49 49
50class Efl.Net.Dialer.Websocket (Efl.Loop_User, Efl.Net.Dialer) { 50class Efl.Net.Dialer.Websocket (Efl.Loop.Consumer, Efl.Net.Dialer) {
51 [[WebSocket Dialer (Client). 51 [[WebSocket Dialer (Client).
52 52
53 The WebSocket Protocol (https://tools.ietf.org/html/rfc6455) is 53 The WebSocket Protocol (https://tools.ietf.org/html/rfc6455) is
diff --git a/src/lib/ecore_con/efl_net_server_simple.eo b/src/lib/ecore_con/efl_net_server_simple.eo
index 72c2633060..3dbd3ceede 100644
--- a/src/lib/ecore_con/efl_net_server_simple.eo
+++ b/src/lib/ecore_con/efl_net_server_simple.eo
@@ -1,4 +1,4 @@
1class Efl.Net.Server.Simple (Efl.Loop_User, Efl.Net.Server) { 1class Efl.Net.Server.Simple (Efl.Loop.Consumer, Efl.Net.Server) {
2 [[A network server wrapper that creates clients based on @Efl.Net.Socket.Simple. 2 [[A network server wrapper that creates clients based on @Efl.Net.Socket.Simple.
3 3
4 This is just a wrapper server, it will take an actual server 4 This is just a wrapper server, it will take an actual server
diff --git a/src/lib/ecore_con/efl_net_server_windows.eo b/src/lib/ecore_con/efl_net_server_windows.eo
index 31137efc39..00c4ee273c 100644
--- a/src/lib/ecore_con/efl_net_server_windows.eo
+++ b/src/lib/ecore_con/efl_net_server_windows.eo
@@ -1,4 +1,4 @@
1class Efl.Net.Server.Windows (Efl.Loop_User, Efl.Net.Server) { 1class Efl.Net.Server.Windows (Efl.Loop.Consumer, Efl.Net.Server) {
2 [[A Windows NamedPipe server. 2 [[A Windows NamedPipe server.
3 3
4 The @Efl.Net.Server.serve method will call CreateNamedPipe() 4 The @Efl.Net.Server.serve method will call CreateNamedPipe()
diff --git a/src/lib/ecore_con/efl_net_session.eo b/src/lib/ecore_con/efl_net_session.eo
index 9a449ec2de..a6adf93607 100644
--- a/src/lib/ecore_con/efl_net_session.eo
+++ b/src/lib/ecore_con/efl_net_session.eo
@@ -27,7 +27,7 @@ enum Efl.Net.Session.Technology {
27 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]] 27 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]]
28} 28}
29 29
30class Efl.Net.Session (Efl.Loop_User) { 30class Efl.Net.Session (Efl.Loop.Consumer) {
31 [[Used by application to request network connectivity. 31 [[Used by application to request network connectivity.
32 32
33 This API is targeted at applications that need access to the 33 This API is targeted at applications that need access to the
diff --git a/src/lib/ecore_con/efl_net_socket_ssl.eo b/src/lib/ecore_con/efl_net_socket_ssl.eo
index dea5c80586..b9a9020843 100644
--- a/src/lib/ecore_con/efl_net_socket_ssl.eo
+++ b/src/lib/ecore_con/efl_net_socket_ssl.eo
@@ -1,7 +1,7 @@
1var Efl.Net.Socket.Ssl.Error.HANDSHAKE: Eina.Error; [[Failed SSL handshake]] 1var Efl.Net.Socket.Ssl.Error.HANDSHAKE: Eina.Error; [[Failed SSL handshake]]
2var Efl.Net.Socket.Ssl.Error.CERTIFICATE_VERIFY_FAILED: Eina.Error; [[Failed to verify peer's certificate]] 2var Efl.Net.Socket.Ssl.Error.CERTIFICATE_VERIFY_FAILED: Eina.Error; [[Failed to verify peer's certificate]]
3 3
4class Efl.Net.Socket.Ssl (Efl.Loop_User, Efl.Net.Socket) { 4class Efl.Net.Socket.Ssl (Efl.Loop.Consumer, Efl.Net.Socket) {
5 [[A wrapper socket doing SSL (Secure Sockets Layer). 5 [[A wrapper socket doing SSL (Secure Sockets Layer).
6 6
7 Use this wrapper around an existing socket to do secure 7 Use this wrapper around an existing socket to do secure
diff --git a/src/lib/ecore_con/efl_net_socket_windows.eo b/src/lib/ecore_con/efl_net_socket_windows.eo
index e53d10df54..6e4d2c4382 100644
--- a/src/lib/ecore_con/efl_net_socket_windows.eo
+++ b/src/lib/ecore_con/efl_net_socket_windows.eo
@@ -1,4 +1,4 @@
1class Efl.Net.Socket.Windows (Efl.Loop_User, Efl.Net.Socket) { 1class Efl.Net.Socket.Windows (Efl.Loop.Consumer, Efl.Net.Socket) {
2 [[A base Windows NamedPipe socket. 2 [[A base Windows NamedPipe socket.
3 3
4 This is the common class and takes an existing file HANDLE, 4 This is the common class and takes an existing file HANDLE,
diff --git a/src/lib/eio/efl_io_manager.eo b/src/lib/eio/efl_io_manager.eo
index dfa33b439a..84ac7700b6 100644
--- a/src/lib/eio/efl_io_manager.eo
+++ b/src/lib/eio/efl_io_manager.eo
@@ -21,7 +21,7 @@ function EflIoDirectInfo {
21 } 21 }
22}; 22};
23 23
24class Efl.Io.Manager (Efl.Loop_User) 24class Efl.Io.Manager (Efl.Loop.Consumer)
25{ 25{
26 [[Class representing an asynchronous file operation.]] 26 [[Class representing an asynchronous file operation.]]
27 27
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 011865d570..e6af97e97f 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -3,7 +3,7 @@ import efl_animation_types;
3 3
4abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, 4abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
5 Efl.Input.Interface, Efl.Gfx.Size.Hint, 5 Efl.Input.Interface, Efl.Gfx.Size.Hint,
6 Efl.Gfx.Map, Efl.Loop_User, Efl.Ui.Base, Efl.Canvas.Pointer) 6 Efl.Gfx.Map, Efl.Loop.Consumer, Efl.Ui.Base, Efl.Canvas.Pointer)
7{ 7{
8 [[Efl canvas object abstract class]] 8 [[Efl canvas object abstract class]]
9 legacy_prefix: evas_object; 9 legacy_prefix: evas_object;
@@ -619,7 +619,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
619 Efl.Gfx.Size.Hint.hint_weight { get; set; } 619 Efl.Gfx.Size.Hint.hint_weight { get; set; }
620 Efl.Gfx.scale { set; get; } 620 Efl.Gfx.scale { set; get; }
621 Efl.Input.Interface.seat_event_filter { get; set; } 621 Efl.Input.Interface.seat_event_filter { get; set; }
622 Efl.Loop_User.loop { get; } 622 Efl.Loop.Consumer.loop { get; }
623 Efl.Canvas.Pointer.pointer_inside { get; } 623 Efl.Canvas.Pointer.pointer_inside { get; }
624 } 624 }
625} 625}
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index 72292a86c8..ab8627a897 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -1,7 +1,7 @@
1import efl_input_types; 1import efl_input_types;
2 2
3class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface, 3class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
4 Efl.Loop_User, Efl.Canvas.Pointer) 4 Efl.Loop.Consumer, Efl.Canvas.Pointer)
5{ 5{
6 [[Evas canvas class]] 6 [[Evas canvas class]]
7 legacy_prefix: evas; 7 legacy_prefix: evas;
@@ -1127,7 +1127,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
1127 Efl.Object.event_thaw; 1127 Efl.Object.event_thaw;
1128 Efl.Object.event_freeze; 1128 Efl.Object.event_freeze;
1129 Efl.Object.provider_find; 1129 Efl.Object.provider_find;
1130 Efl.Loop_User.loop { get; } 1130 Efl.Loop.Consumer.loop { get; }
1131 //Efl.Canvas.seats; 1131 //Efl.Canvas.seats;
1132 Efl.Canvas.Pointer.pointer_inside { get; } 1132 Efl.Canvas.Pointer.pointer_inside { get; }
1133 Efl.Canvas.device { get; } 1133 Efl.Canvas.device { get; }
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 28c0da1829..f9f7dff5df 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/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,
842} 842}
843 843
844EOLIAN static Efl_Loop * 844EOLIAN static Efl_Loop *
845_evas_canvas_efl_loop_user_loop_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e EINA_UNUSED) 845_evas_canvas_efl_loop_consumer_loop_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e EINA_UNUSED)
846{ 846{
847 return ecore_main_loop_get(); 847 return ecore_main_loop_get();
848} 848}
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index afee978ced..b8d2a0a333 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2441,7 +2441,7 @@ fallback:
2441} 2441}
2442 2442
2443EOLIAN static Efl_Loop * 2443EOLIAN static Efl_Loop *
2444_efl_canvas_object_efl_loop_user_loop_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED) 2444_efl_canvas_object_efl_loop_consumer_loop_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED)
2445{ 2445{
2446 return ecore_main_loop_get(); 2446 return ecore_main_loop_get();
2447} 2447}