q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8f6ba61011bc13cd3c6288ea36d8ffa365fda543
commit 8f6ba61011bc13cd3c6288ea36d8ffa365fda543
Author: Daniel Kolesa <d.kol...@osg.samsung.com>
Date: Fri Sep 15 16:51:37 2017 +0200
ecore: convert existing eo files to new ownership
---
src/lib/ecore/efl_io_copier.eo | 2 +-
src/lib/ecore/efl_loop.eo | 6 +++---
src/lib/ecore/efl_model_container.eo | 4 ++--
src/lib/ecore_con/efl_net_control.eo | 4 ++--
src/lib/ecore_con/efl_net_control_access_point.eo | 20 ++++++++++----------
src/lib/ecore_con/efl_net_dialer_http.eo | 8 ++++----
src/lib/ecore_con/efl_net_dialer_websocket.eo | 6 +++---
src/lib/ecore_con/efl_net_ip_address.eo | 6 +++---
src/lib/ecore_con/efl_net_server_udp.eo | 2 +-
src/lib/ecore_con/efl_net_socket_udp.eo | 2 +-
src/lib/ecore_con/efl_net_ssl_context.eo | 8 ++++----
11 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/lib/ecore/efl_io_copier.eo b/src/lib/ecore/efl_io_copier.eo
index 5eb59b88bc..5096c1d6c8 100644
--- a/src/lib/ecore/efl_io_copier.eo
+++ b/src/lib/ecore/efl_io_copier.eo
@@ -310,7 +310,7 @@ class Efl.Io.Copier (Efl.Loop_User, Efl.Io.Closer) {
this case you should wait for "done", "data" or "line"
events and then call it to retrieve (and own!) the data.
]]
- return: free(own(ptr(Eina.Binbuf)), eina_binbuf_free) @warn_unused;
[[Binbuf]]
+ return: free(ptr(Eina.Binbuf), eina_binbuf_free) @owned
@warn_unused; [[Binbuf]]
}
@property pending_size {
diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo
index a5610c20e2..1fc0fac9ff 100644
--- a/src/lib/ecore/efl_loop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -89,7 +89,7 @@ class Efl.Loop (Efl.Object)
This has higher priority, for low priority use
@.Eina_FutureXXX_idle
]]
- return: own(ptr(Eina.Future)) /* TODO: future<void> */; [[The future
handle.]]
+ return: ptr(Eina.Future) @owned /* TODO: future<void> */; [[The
future handle.]]
}
Eina_FutureXXX_idle {
[[A future promise that will be resolved from a clean main
@@ -97,7 +97,7 @@ class Efl.Loop (Efl.Object)
This is a low priority version of @.Eina_FutureXXX_job
]]
- return: own(ptr(Eina.Future)) /* TODO: future<void> */; [[The future
handle.]]
+ return: ptr(Eina.Future) @owned /* TODO: future<void> */; [[The
future handle.]]
}
Eina_FutureXXX_timeout {
[[A future promise that will be resolved from a clean main
@@ -105,7 +105,7 @@ class Efl.Loop (Efl.Object)
params {
@in time: double; [[The time from now in second that the main loop
will wait before triggering it.]]
}
- return: own(ptr(Eina.Future)) /* future<void> */; [[The future
handle.]]
+ return: ptr(Eina.Future) @owned /* future<void> */; [[The future
handle.]]
}
job {
[[Will execute that promise in the near future.]]
diff --git a/src/lib/ecore/efl_model_container.eo
b/src/lib/ecore/efl_model_container.eo
index a3305d4cf8..1b1a0f1ad4 100644
--- a/src/lib/ecore/efl_model_container.eo
+++ b/src/lib/ecore/efl_model_container.eo
@@ -26,7 +26,7 @@ class Efl.Model.Container (Efl.Object, Efl.Model)
params {
name: string; [[Property name]]
}
- return: free(own(iterator<void_ptr>), eina_iterator_free)
@warn_unused;
+ return: iterator<void_ptr> @owned @warn_unused;
[[The currently wrapped values]]
}
child_property_add {
@@ -41,7 +41,7 @@ class Efl.Model.Container (Efl.Object, Efl.Model)
params {
name: string; [[Property name]]
type: ptr(const(Eina.Value.Type)); [[Property type]]
- values: own(iterator<const(void_ptr)>); [[Values to be added]]
+ values: iterator<const(void_ptr)> @owned; [[Values to be added]]
}
return: bool; [[$true on success, $false otherwise]]
}
diff --git a/src/lib/ecore_con/efl_net_control.eo
b/src/lib/ecore_con/efl_net_control.eo
index 6103240cb5..3e8b70d1a8 100644
--- a/src/lib/ecore_con/efl_net_control.eo
+++ b/src/lib/ecore_con/efl_net_control.eo
@@ -163,7 +163,7 @@ class Efl.Net.Control (Efl.Loop_User) {
]]
get { }
values {
- access_points:
free(own(iterator<Efl.Net.Control.Access_Point>), eina_iterator_free);
[[Iterator of current access points]]
+ access_points: iterator<Efl.Net.Control.Access_Point> @owned;
[[Iterator of current access points]]
}
}
@@ -177,7 +177,7 @@ class Efl.Net.Control (Efl.Loop_User) {
]]
get { }
values {
- technologies: free(own(iterator<Efl.Net.Control.Technology>),
eina_iterator_free); [[Iterator of current technologies]]
+ technologies: iterator<Efl.Net.Control.Technology> @owned;
[[Iterator of current technologies]]
}
}
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 7bc50a0819..17df79f6fa 100644
--- a/src/lib/ecore_con/efl_net_control_access_point.eo
+++ b/src/lib/ecore_con/efl_net_control_access_point.eo
@@ -266,7 +266,7 @@ class Efl.Net.Control.Access_Point (Efl.Loop_User) {
]]
get { }
values {
- name_servers: free(own(iterator<string>), eina_iterator_free);
[[Iterator to DNS server]]
+ name_servers: iterator<string> @owned; [[Iterator to DNS
server]]
}
}
@@ -280,7 +280,7 @@ class Efl.Net.Control.Access_Point (Efl.Loop_User) {
]]
get { }
values {
- time_servers: free(own(iterator<string>), eina_iterator_free);
[[Iterator to time server]]
+ time_servers: iterator<string> @owned; [[Iterator to time
server]]
}
}
@@ -294,7 +294,7 @@ class Efl.Net.Control.Access_Point (Efl.Loop_User) {
]]
get { }
values {
- domains: free(own(iterator<string>), eina_iterator_free);
[[Iterator to search domains]]
+ domains: iterator<string> @owned; [[Iterator to search
domains]]
}
}
@@ -345,8 +345,8 @@ class Efl.Net.Control.Access_Point (Efl.Loop_User) {
values {
method: Efl.Net.Control.Access_Point.Proxy_Method; [[Proxy
method]]
url: string; [[If
@Efl.Net.Control.Access_Point.Proxy_Method.auto, then states the URL to use for
proxy auto-configuration]]
- servers: free(own(iterator<string>), eina_iterator_free); [[If
@Efl.Net.Control.Access_Point.Proxy_Method.manual, then states the URI with
proxy servers to use, like "http://proxy.domain.com:911";]]
- excludes: free(own(iterator<string>), eina_iterator_free);
[[If @Efl.Net.Control.Access_Point.Proxy_Method.manual, then states the hosts
or patterns to exclude from proxy access, such as "localhost", ".domain.com",
or "10.0.0.0..."]]
+ servers: iterator<string> @owned; [[If
@Efl.Net.Control.Access_Point.Proxy_Method.manual, then states the URI with
proxy servers to use, like "http://proxy.domain.com:911";]]
+ excludes: iterator<string> @owned; [[If
@Efl.Net.Control.Access_Point.Proxy_Method.manual, then states the hosts or
patterns to exclude from proxy access, such as "localhost", ".domain.com", or
"10.0.0.0..."]]
}
}
@@ -362,7 +362,7 @@ class Efl.Net.Control.Access_Point (Efl.Loop_User) {
set { }
get { }
values {
- name_servers: free(own(iterator<string>), eina_iterator_free);
[[Iterator to user DNS server]]
+ name_servers: iterator<string> @owned; [[Iterator to user DNS
server]]
}
}
@@ -378,7 +378,7 @@ class Efl.Net.Control.Access_Point (Efl.Loop_User) {
set { }
get { }
values {
- time_servers: free(own(iterator<string>), eina_iterator_free);
[[Iterator to user time server]]
+ time_servers: iterator<string> @owned; [[Iterator to user time
server]]
}
}
@@ -394,7 +394,7 @@ class Efl.Net.Control.Access_Point (Efl.Loop_User) {
set { }
get { }
values {
- domains: free(own(iterator<string>), eina_iterator_free);
[[Iterator to user search domains]]
+ domains: iterator<string> @owned; [[Iterator to user search
domains]]
}
}
@@ -451,8 +451,8 @@ class Efl.Net.Control.Access_Point (Efl.Loop_User) {
values {
method: Efl.Net.Control.Access_Point.Proxy_Method; [[Proxy
method]]
url: string; [[If
@Efl.Net.Control.Access_Point.Proxy_Method.auto, then states the URL to use for
proxy auto-configuration]]
- servers: free(own(iterator<string>), eina_iterator_free); [[If
@Efl.Net.Control.Access_Point.Proxy_Method.manual, then states the URI with
proxy servers to use, like "http://proxy.domain.com:911";]]
- excludes: free(own(iterator<string>), eina_iterator_free);
[[If @Efl.Net.Control.Access_Point.Proxy_Method.manual, then states the hosts
or patterns to exclude from proxy access, such as "localhost", ".domain.com",
or "10.0.0.0..."]]
+ servers: iterator<string> @owned; [[If
@Efl.Net.Control.Access_Point.Proxy_Method.manual, then states the URI with
proxy servers to use, like "http://proxy.domain.com:911";]]
+ excludes: iterator<string> @owned; [[If
@Efl.Net.Control.Access_Point.Proxy_Method.manual, then states the hosts or
patterns to exclude from proxy access, such as "localhost", ".domain.com", or
"10.0.0.0..."]]
}
}
}
diff --git a/src/lib/ecore_con/efl_net_dialer_http.eo
b/src/lib/ecore_con/efl_net_dialer_http.eo
index e7051fb2f6..0e6244de9f 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.eo
+++ b/src/lib/ecore_con/efl_net_dialer_http.eo
@@ -189,7 +189,7 @@ class Efl.Net.Dialer.Http (Efl.Loop_User, Efl.Net.Dialer,
Efl.Io.Sizer) {
request_headers_get {
[[Returns an iterator to the key-value pairs for request headers]]
- return: free(own(iterator<Efl.Net.Http.Header>),
eina_iterator_free) @warn_unused; [[Iterator for request headers]]
+ return: iterator<Efl.Net.Http.Header> @owned @warn_unused;
[[Iterator for request headers]]
}
@property request_content_length {
@@ -252,7 +252,7 @@ class Efl.Net.Dialer.Http (Efl.Loop_User, Efl.Net.Dialer,
Efl.Io.Sizer) {
This will be usable after "headers,done" event is dispatched.
]]
- return: free(own(iterator<Efl.Net.Http.Header>),
eina_iterator_free) @warn_unused; [[Iterator for response headers]]
+ return: iterator<Efl.Net.Http.Header> @owned @warn_unused;
[[Iterator for response headers]]
}
response_headers_all_get {
@@ -277,7 +277,7 @@ class Efl.Net.Dialer.Http (Efl.Loop_User, Efl.Net.Dialer,
Efl.Io.Sizer) {
This will be usable after "headers,done" event is dispatched.
]]
- return: free(own(iterator<Efl.Net.Http.Header>),
eina_iterator_free) @warn_unused; [[Iterator for all response headers]]
+ return: iterator<Efl.Net.Http.Header> @owned @warn_unused;
[[Iterator for all response headers]]
}
response_headers_clear {
@@ -383,7 +383,7 @@ class Efl.Net.Dialer.Http (Efl.Loop_User, Efl.Net.Dialer,
Efl.Io.Sizer) {
params {
epochtime: int64; [[UNIX Epoch time - seconds since 1/1/1970]]
}
- return: free(own(ptr(char)), free) @warn_unused; [[Newly allocated
null-terminated string on success or NULL on errors]]
+ return: string @owned @warn_unused; [[Newly allocated
null-terminated string on success or NULL on errors]]
}
}
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.eo
b/src/lib/ecore_con/efl_net_dialer_websocket.eo
index 52c501c967..534f5b7b34 100644
--- a/src/lib/ecore_con/efl_net_dialer_websocket.eo
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.eo
@@ -152,7 +152,7 @@ class Efl.Net.Dialer.Websocket (Efl.Loop_User,
Efl.Net.Dialer) {
request_protocols_get {
[[Returns an iterator to the requested WebSocket protocols]]
- return: free(own(iterator<string>), eina_iterator_free)
@warn_unused; [[Iterator to protocols]]
+ return: iterator<string> @owned @warn_unused; [[Iterator to
protocols]]
}
request_protocols_clear {
@@ -161,7 +161,7 @@ class Efl.Net.Dialer.Websocket (Efl.Loop_User,
Efl.Net.Dialer) {
response_protocols_get {
[[Returns an iterator to the server-replied (response) WebSocket
protocols it supports]]
- return: free(own(iterator<string>), eina_iterator_free)
@warn_unused; [[Iterator to server protocols]]
+ return: iterator<string> @owned @warn_unused; [[Iterator to server
protocols]]
}
@property streaming_mode {
@@ -268,7 +268,7 @@ class Efl.Net.Dialer.Websocket (Efl.Loop_User,
Efl.Net.Dialer) {
request_headers_get {
[[Returns an iterator to the key-value pairs for request headers]]
- return: free(own(iterator<Efl.Net.Http.Header>),
eina_iterator_free) @warn_unused; [[Iterator to key value pairs]]
+ return: iterator<Efl.Net.Http.Header> @owned @warn_unused;
[[Iterator to key value pairs]]
}
@property cookie_jar {
diff --git a/src/lib/ecore_con/efl_net_ip_address.eo
b/src/lib/ecore_con/efl_net_ip_address.eo
index 2cfc6cb98f..b3fc564737 100644
--- a/src/lib/ecore_con/efl_net_ip_address.eo
+++ b/src/lib/ecore_con/efl_net_ip_address.eo
@@ -52,7 +52,7 @@ class Efl.Net.Ip_Address (Efl.Object) {
port: uint16; [[Port number in Host/Native endianess]]
address: const(Eina.Slice); [[Address bytes. If 4 bytes,
AF_INET will be used. If 16 bytes, AF_INET6 will be used. All other sizes will
result in failure.]]
}
- return: own(Efl.Net.Ip_Address); [[Newly created object or $NULL
if parameters were invalid.]]
+ return: Efl.Net.Ip_Address @owned; [[Newly created object or $NULL
if parameters were invalid.]]
}
create_sockaddr @class {
@@ -65,7 +65,7 @@ class Efl.Net.Ip_Address (Efl.Object) {
params {
sockaddr: const(void_ptr) @nonull; [[The pointer to struct
sockaddr-compatible handle as per <netinet/in.h>.]]
}
- return: own(Efl.Net.Ip_Address); [[Newly created object or $NULL
if parameter was invalid.]]
+ return: Efl.Net.Ip_Address @owned; [[Newly created object or $NULL
if parameter was invalid.]]
}
parse @class {
@@ -89,7 +89,7 @@ class Efl.Net.Ip_Address (Efl.Object) {
params {
numeric_address: string; [[The numeric address to parse, such
as '127.0.0.1:1234' or '[::1]:1234']]
}
- return: own(Efl.Net.Ip_Address); [[The new IP address object or
NULL if it failed to parse]]
+ return: Efl.Net.Ip_Address @owned; [[The new IP address object or
NULL if it failed to parse]]
}
resolve @class {
diff --git a/src/lib/ecore_con/efl_net_server_udp.eo
b/src/lib/ecore_con/efl_net_server_udp.eo
index 6166e0c4f3..402ef758eb 100644
--- a/src/lib/ecore_con/efl_net_server_udp.eo
+++ b/src/lib/ecore_con/efl_net_server_udp.eo
@@ -87,7 +87,7 @@ class Efl.Net.Server.Udp (Efl.Net.Server.Fd) {
The iterator is only valid until a new group is joined
or left using @.multicast_join or @.multicast_leave.
]]
- return: free(own(iterator<string>), eina_iterator_free); [[List of
multicast groups]]
+ return: iterator<string> @owned; [[List of multicast groups]]
}
@property multicast_time_to_live {
diff --git a/src/lib/ecore_con/efl_net_socket_udp.eo
b/src/lib/ecore_con/efl_net_socket_udp.eo
index e00c36c98e..de221fac6d 100644
--- a/src/lib/ecore_con/efl_net_socket_udp.eo
+++ b/src/lib/ecore_con/efl_net_socket_udp.eo
@@ -111,7 +111,7 @@ class Efl.Net.Socket.Udp (Efl.Net.Socket.Fd) {
The iterator is only valid until a new group is joined
or left using @.multicast_join or @.multicast_leave.
]]
- return: free(own(iterator<string>), eina_iterator_free);
[[Iterator to multicast groups]]
+ return: iterator<string> @owned; [[Iterator to multicast groups]]
}
@property multicast_time_to_live {
diff --git a/src/lib/ecore_con/efl_net_ssl_context.eo
b/src/lib/ecore_con/efl_net_ssl_context.eo
index bf0f9362e0..50405da825 100644
--- a/src/lib/ecore_con/efl_net_ssl_context.eo
+++ b/src/lib/ecore_con/efl_net_ssl_context.eo
@@ -48,7 +48,7 @@ class Efl.Net.Ssl.Context (Efl.Object) {
Can only be set during object construction!
]]
values {
- paths: free(own(iterator<string>), eina_iterator_free); [[Path
list for certificates]]
+ paths: iterator<string> @owned; [[Path list for certificates]]
}
}
@@ -58,7 +58,7 @@ class Efl.Net.Ssl.Context (Efl.Object) {
Can only be set during object construction!
]]
values {
- paths: free(own(iterator<string>), eina_iterator_free); [[Path
list for private keys]]
+ paths: iterator<string> @owned; [[Path list for private keys]]
}
}
@@ -68,7 +68,7 @@ class Efl.Net.Ssl.Context (Efl.Object) {
Can only be set during object construction!
]]
values {
- paths: free(own(iterator<string>), eina_iterator_free); [[Path
list for CRL's]]
+ paths: iterator<string> @owned; [[Path list for CRL's]]
}
}
@@ -78,7 +78,7 @@ class Efl.Net.Ssl.Context (Efl.Object) {
Can only be set during object construction!
]]
values {
- paths: free(own(iterator<string>), eina_iterator_free); [[Path
list for CA's]]
+ paths: iterator<string> @owned; [[Path list for CA's]]
}
}
--
