From 5a5707e0542e7e9063dc03e310a90a5102a8001a Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Tue, 27 Dec 2016 16:58:07 +0100 Subject: [PATCH] ecore con: use new property impl syntax --- src/lib/ecore_con/efl_net_dialer_http.eo | 13 +++++-------- src/lib/ecore_con/efl_net_dialer_simple.eo | 6 +++--- src/lib/ecore_con/efl_net_dialer_ssl.eo | 2 +- src/lib/ecore_con/efl_net_dialer_websocket.eo | 12 +++++------- src/lib/ecore_con/efl_net_server_fd.eo | 2 +- src/lib/ecore_con/efl_net_server_simple.eo | 6 +++--- src/lib/ecore_con/efl_net_server_ssl.eo | 6 +++--- src/lib/ecore_con/efl_net_server_udp_client.eo | 2 +- src/lib/ecore_con/efl_net_socket_fd.eo | 10 +++++----- src/lib/ecore_con/efl_net_socket_simple.eo | 6 +++--- src/lib/ecore_con/efl_net_socket_ssl.eo | 6 +++--- src/lib/ecore_con/efl_net_socket_tcp.eo | 2 +- src/lib/ecore_con/efl_net_socket_udp.eo | 2 +- src/lib/ecore_con/efl_net_socket_unix.eo | 2 +- 14 files changed, 36 insertions(+), 41 deletions(-) diff --git a/src/lib/ecore_con/efl_net_dialer_http.eo b/src/lib/ecore_con/efl_net_dialer_http.eo index af4e38aa15..84299cf051 100644 --- a/src/lib/ecore_con/efl_net_dialer_http.eo +++ b/src/lib/ecore_con/efl_net_dialer_http.eo @@ -402,18 +402,15 @@ class Efl.Net.Dialer.Http (Efl.Loop_User, Efl.Net.Dialer, Efl.Io.Sizer) { Efl.Net.Socket.address_local; Efl.Net.Socket.address_remote; Efl.Io.Reader.read; - Efl.Io.Reader.can_read.get; - Efl.Io.Reader.can_read.set; - Efl.Io.Reader.eos.get; - Efl.Io.Reader.eos.set; + Efl.Io.Reader.can_read { get; set; } + Efl.Io.Reader.eos { get; set; } Efl.Io.Writer.write; - Efl.Io.Writer.can_write.get; - Efl.Io.Writer.can_write.set; + Efl.Io.Writer.can_write { get; set; } Efl.Io.Closer.close; - Efl.Io.Closer.closed.get; + Efl.Io.Closer.closed { get; } Efl.Io.Closer.close_on_exec; Efl.Io.Closer.close_on_destructor; Efl.Io.Sizer.resize; - Efl.Io.Sizer.size.get; + Efl.Io.Sizer.size { get; } } } diff --git a/src/lib/ecore_con/efl_net_dialer_simple.eo b/src/lib/ecore_con/efl_net_dialer_simple.eo index 22e40b0910..054c81575e 100644 --- a/src/lib/ecore_con/efl_net_dialer_simple.eo +++ b/src/lib/ecore_con/efl_net_dialer_simple.eo @@ -70,10 +70,10 @@ class Efl.Net.Dialer.Simple (Efl.Net.Socket.Simple, Efl.Net.Dialer) { implements { Efl.Object.finalize; Efl.Object.destructor; - Efl.Io.Buffered_Stream.inner_io.set; + Efl.Io.Buffered_Stream.inner_io { set; } Efl.Net.Dialer.dial; - Efl.Net.Dialer.address_dial.get; - Efl.Net.Dialer.connected.get; + Efl.Net.Dialer.address_dial { get; } + Efl.Net.Dialer.connected { get; } Efl.Net.Dialer.proxy; Efl.Net.Dialer.timeout_dial; Efl.Io.Buffered_Stream.timeout_inactivity; diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.eo b/src/lib/ecore_con/efl_net_dialer_ssl.eo index a4f8d259f6..ce45dcc86a 100644 --- a/src/lib/ecore_con/efl_net_dialer_ssl.eo +++ b/src/lib/ecore_con/efl_net_dialer_ssl.eo @@ -69,7 +69,7 @@ class Efl.Net.Dialer.Ssl (Efl.Net.Socket.Ssl, Efl.Net.Dialer) { Efl.Object.destructor; Efl.Object.finalize; Efl.Net.Dialer.dial; - Efl.Net.Dialer.address_dial.get; + Efl.Net.Dialer.address_dial { get; } Efl.Net.Dialer.connected; Efl.Net.Dialer.proxy; Efl.Net.Dialer.timeout_dial; diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.eo b/src/lib/ecore_con/efl_net_dialer_websocket.eo index 5ab37409b7..d3e8fdf129 100644 --- a/src/lib/ecore_con/efl_net_dialer_websocket.eo +++ b/src/lib/ecore_con/efl_net_dialer_websocket.eo @@ -320,17 +320,15 @@ class Efl.Net.Dialer.Websocket (Efl.Loop_User, Efl.Net.Dialer) { Efl.Net.Dialer.connected; Efl.Net.Dialer.proxy; Efl.Net.Dialer.timeout_dial; - Efl.Net.Socket.address_local.get; + Efl.Net.Socket.address_local { get; } Efl.Net.Socket.address_remote; Efl.Io.Reader.read; - Efl.Io.Reader.can_read.get; - Efl.Io.Reader.can_read.set; - Efl.Io.Reader.eos.get; + Efl.Io.Reader.can_read { get; set; } + Efl.Io.Reader.eos { get; } Efl.Io.Writer.write; - Efl.Io.Writer.can_write.get; - Efl.Io.Writer.can_write.set; + Efl.Io.Writer.can_write { get; set; } Efl.Io.Closer.close; - Efl.Io.Closer.closed.get; + Efl.Io.Closer.closed { get; } Efl.Io.Closer.close_on_exec; Efl.Io.Closer.close_on_destructor; } diff --git a/src/lib/ecore_con/efl_net_server_fd.eo b/src/lib/ecore_con/efl_net_server_fd.eo index 10fe7127ec..2a32bb746a 100644 --- a/src/lib/ecore_con/efl_net_server_fd.eo +++ b/src/lib/ecore_con/efl_net_server_fd.eo @@ -155,7 +155,7 @@ class Efl.Net.Server.Fd (Efl.Loop.Fd, Efl.Net.Server) { Efl.Object.finalize; Efl.Object.constructor; Efl.Object.destructor; - Efl.Loop.Fd.fd.set; + Efl.Loop.Fd.fd { set; } Efl.Net.Server.address; Efl.Net.Server.clients_count; Efl.Net.Server.clients_limit; diff --git a/src/lib/ecore_con/efl_net_server_simple.eo b/src/lib/ecore_con/efl_net_server_simple.eo index ec2af1188c..c8abf290a1 100644 --- a/src/lib/ecore_con/efl_net_server_simple.eo +++ b/src/lib/ecore_con/efl_net_server_simple.eo @@ -47,9 +47,9 @@ class Efl.Net.Server.Simple (Efl.Loop_User, Efl.Net.Server) { Efl.Object.destructor; Efl.Net.Server.serve; Efl.Net.Server.client_announce; - Efl.Net.Server.address.get; - Efl.Net.Server.clients_count.get; + Efl.Net.Server.address { get; } + Efl.Net.Server.clients_count { get; } Efl.Net.Server.clients_limit; - Efl.Net.Server.serving.get; + Efl.Net.Server.serving { get; } } } diff --git a/src/lib/ecore_con/efl_net_server_ssl.eo b/src/lib/ecore_con/efl_net_server_ssl.eo index 0caadb85a4..a8c0c93aba 100644 --- a/src/lib/ecore_con/efl_net_server_ssl.eo +++ b/src/lib/ecore_con/efl_net_server_ssl.eo @@ -139,9 +139,9 @@ class Efl.Net.Server.Ssl (Efl.Loop_User, Efl.Net.Server) { Efl.Object.destructor; Efl.Net.Server.serve; Efl.Net.Server.client_announce; - Efl.Net.Server.address.get; - Efl.Net.Server.clients_count.get; + Efl.Net.Server.address { get; } + Efl.Net.Server.clients_count { get; } Efl.Net.Server.clients_limit; - Efl.Net.Server.serving.get; + Efl.Net.Server.serving { get; } } } diff --git a/src/lib/ecore_con/efl_net_server_udp_client.eo b/src/lib/ecore_con/efl_net_server_udp_client.eo index 9cf3d6f2f9..e65fbe7649 100644 --- a/src/lib/ecore_con/efl_net_server_udp_client.eo +++ b/src/lib/ecore_con/efl_net_server_udp_client.eo @@ -28,7 +28,7 @@ class Efl.Net.Server.Udp.Client (Efl.Object, Efl.Net.Socket) { Efl.Object.finalize; Efl.Object.destructor; Efl.Io.Closer.close; - Efl.Io.Closer.closed.get; + Efl.Io.Closer.closed { get; } Efl.Io.Closer.close_on_destructor; Efl.Io.Closer.close_on_exec; Efl.Io.Reader.can_read; diff --git a/src/lib/ecore_con/efl_net_socket_fd.eo b/src/lib/ecore_con/efl_net_socket_fd.eo index 8250800eec..3878a10f29 100644 --- a/src/lib/ecore_con/efl_net_socket_fd.eo +++ b/src/lib/ecore_con/efl_net_socket_fd.eo @@ -33,14 +33,14 @@ class Efl.Net.Socket.Fd (Efl.Loop.Fd, Efl.Io.Reader.Fd, Efl.Io.Writer.Fd, Efl.Io Efl.Object.finalize; Efl.Object.constructor; Efl.Object.destructor; - Efl.Loop.Fd.fd.set; + Efl.Loop.Fd.fd { set; } Efl.Io.Closer.close; - Efl.Io.Closer.closed.get; + Efl.Io.Closer.closed { get; } Efl.Io.Reader.read; - Efl.Io.Reader.can_read.set; - Efl.Io.Reader.eos.set; + Efl.Io.Reader.can_read { set; } + Efl.Io.Reader.eos { set; } Efl.Io.Writer.write; - Efl.Io.Writer.can_write.set; + Efl.Io.Writer.can_write { set; } Efl.Net.Socket.address_local; Efl.Net.Socket.address_remote; } diff --git a/src/lib/ecore_con/efl_net_socket_simple.eo b/src/lib/ecore_con/efl_net_socket_simple.eo index bfdd24f5e6..d7260a8d4f 100644 --- a/src/lib/ecore_con/efl_net_socket_simple.eo +++ b/src/lib/ecore_con/efl_net_socket_simple.eo @@ -38,8 +38,8 @@ class Efl.Net.Socket.Simple (Efl.Io.Buffered_Stream, Efl.Net.Socket) { ]] implements { - Efl.Io.Buffered_Stream.inner_io.set; - Efl.Net.Socket.address_local.get; - Efl.Net.Socket.address_remote.get; + Efl.Io.Buffered_Stream.inner_io { set; } + Efl.Net.Socket.address_local { get; } + Efl.Net.Socket.address_remote { get; } } } diff --git a/src/lib/ecore_con/efl_net_socket_ssl.eo b/src/lib/ecore_con/efl_net_socket_ssl.eo index b9ea98f560..44460e40b3 100644 --- a/src/lib/ecore_con/efl_net_socket_ssl.eo +++ b/src/lib/ecore_con/efl_net_socket_ssl.eo @@ -87,7 +87,7 @@ class Efl.Net.Socket.Ssl (Efl.Loop_User, Efl.Net.Socket) { Efl.Object.destructor; Efl.Object.finalize; Efl.Io.Closer.close; - Efl.Io.Closer.closed.get; + Efl.Io.Closer.closed { get; } Efl.Io.Closer.close_on_exec; Efl.Io.Closer.close_on_destructor; Efl.Io.Reader.read; @@ -95,7 +95,7 @@ class Efl.Net.Socket.Ssl (Efl.Loop_User, Efl.Net.Socket) { Efl.Io.Reader.eos; Efl.Io.Writer.write; Efl.Io.Writer.can_write; - Efl.Net.Socket.address_remote.get; - Efl.Net.Socket.address_local.get; + Efl.Net.Socket.address_remote { get; } + Efl.Net.Socket.address_local { get; } } } diff --git a/src/lib/ecore_con/efl_net_socket_tcp.eo b/src/lib/ecore_con/efl_net_socket_tcp.eo index e7390d286c..7509f7b69a 100644 --- a/src/lib/ecore_con/efl_net_socket_tcp.eo +++ b/src/lib/ecore_con/efl_net_socket_tcp.eo @@ -43,6 +43,6 @@ class Efl.Net.Socket.Tcp (Efl.Net.Socket.Fd) { } implements { - Efl.Loop.Fd.fd.set; + Efl.Loop.Fd.fd { set; } } } diff --git a/src/lib/ecore_con/efl_net_socket_udp.eo b/src/lib/ecore_con/efl_net_socket_udp.eo index 13d0c3fff3..5b9db692cb 100644 --- a/src/lib/ecore_con/efl_net_socket_udp.eo +++ b/src/lib/ecore_con/efl_net_socket_udp.eo @@ -176,7 +176,7 @@ class Efl.Net.Socket.Udp (Efl.Net.Socket.Fd) { implements { Efl.Object.constructor; Efl.Object.destructor; - Efl.Loop.Fd.fd.set; + Efl.Loop.Fd.fd { set; } Efl.Io.Reader.read; Efl.Io.Writer.write; } diff --git a/src/lib/ecore_con/efl_net_socket_unix.eo b/src/lib/ecore_con/efl_net_socket_unix.eo index 48ea4cdcac..bd9ca70e20 100644 --- a/src/lib/ecore_con/efl_net_socket_unix.eo +++ b/src/lib/ecore_con/efl_net_socket_unix.eo @@ -8,6 +8,6 @@ class Efl.Net.Socket.Unix (Efl.Net.Socket.Fd) { ]] implements { - Efl.Loop.Fd.fd.set; + Efl.Loop.Fd.fd { set; } } }