summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/ecore/efl_loop.eo6
-rw-r--r--src/lib/ecore/efl_task.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_ip_address.eo2
-rw-r--r--src/lib/efl/interfaces/efl_model.eo5
-rw-r--r--src/lib/eio/efl_io_manager.eo18
-rw-r--r--src/lib/elementary/efl_selection.eo2
-rw-r--r--src/lib/elementary/efl_selection_manager.eo2
-rw-r--r--src/lib/eo/eina_types.eot22
-rw-r--r--src/lib/evas/canvas/efl_canvas_text.eo2
11 files changed, 42 insertions, 23 deletions
diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo
index 6da5da4..e1d5c3f 100644
--- a/src/lib/ecore/efl_loop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -50,7 +50,7 @@ class Efl.Loop (Efl.Task)
50 This has higher priority, for low priority use 50 This has higher priority, for low priority use
51 @.idle 51 @.idle
52 ]] 52 ]]
53 return: ptr(Eina.Future) @owned /* TODO: future<void> */; [[The future handle.]] 53 return: future<void> @owned; [[The future handle.]]
54 } 54 }
55 @property throttle { 55 @property throttle {
56 [[Slow down the loop execution by forcing sleep for a small 56 [[Slow down the loop execution by forcing sleep for a small
@@ -75,7 +75,7 @@ class Efl.Loop (Efl.Task)
75 75
76 This is a low priority version of @.job 76 This is a low priority version of @.job
77 ]] 77 ]]
78 return: ptr(Eina.Future) @owned /* TODO: future<void> */; [[The future handle.]] 78 return: future<void> @owned; [[The future handle.]]
79 } 79 }
80 timeout { 80 timeout {
81 [[A future promise that will be resolved from a clean main 81 [[A future promise that will be resolved from a clean main
@@ -83,7 +83,7 @@ class Efl.Loop (Efl.Task)
83 params { 83 params {
84 @in time: double; [[The time from now in second that the main loop will wait before triggering it.]] 84 @in time: double; [[The time from now in second that the main loop will wait before triggering it.]]
85 } 85 }
86 return: ptr(Eina.Future) @owned /* future<void> */; [[The future handle.]] 86 return: future<void> @owned; [[The future handle.]]
87 } 87 }
88 register { 88 register {
89 [[Will register a manager of a specific class to be answered by eo.provider_find.]] 89 [[Will register a manager of a specific class to be answered by eo.provider_find.]]
diff --git a/src/lib/ecore/efl_task.eo b/src/lib/ecore/efl_task.eo
index cc5d17d..3d4e6e9 100644
--- a/src/lib/ecore/efl_task.eo
+++ b/src/lib/ecore/efl_task.eo
@@ -143,7 +143,7 @@ class Efl.Task (Efl.Object, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer)
143 } 143 }
144 run { 144 run {
145 [[ Actually run the task ]] 145 [[ Actually run the task ]]
146 return: ptr(Eina.Future) @owned; [[ A future triggered when task exits and is passed int exit code ]] 146 return: future<void> @owned; [[ A future triggered when task exits and is passed int exit code ]]
147 } 147 }
148 end { 148 end {
149 [[ Request the task end (may send a signal or interrupt 149 [[ Request the task end (may send a signal or interrupt
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 dc26209..f97ba2d 100644
--- a/src/lib/ecore_con/efl_net_control_access_point.eo
+++ b/src/lib/ecore_con/efl_net_control_access_point.eo
@@ -108,7 +108,7 @@ class Efl.Net.Control.Access_Point (Efl.Loop_Consumer) {
108 EINPROGRESS (the connection was already ongoing) and 108 EINPROGRESS (the connection was already ongoing) and
109 EALREADY (the connection was already established). 109 EALREADY (the connection was already established).
110 ]] 110 ]]
111 return: ptr(Eina.Future) @owned; [[Future for asynchronous connect]] /* NOTE: This should be future<void> */ 111 return: future<void> @owned; [[Future for asynchronous connect]]
112 } 112 }
113 113
114 disconnect { 114 disconnect {
diff --git a/src/lib/ecore_con/efl_net_control_technology.eo b/src/lib/ecore_con/efl_net_control_technology.eo
index 68c9446..eecf21a 100644
--- a/src/lib/ecore_con/efl_net_control_technology.eo
+++ b/src/lib/ecore_con/efl_net_control_technology.eo
@@ -90,7 +90,7 @@ class Efl.Net.Control.Technology (Efl.Loop_Consumer) {
90 state. Otherwise allow the system to perform 90 state. Otherwise allow the system to perform
91 passive scans in a timely manner. 91 passive scans in a timely manner.
92 ]] 92 ]]
93 return: ptr(Eina.Future) @owned; [[Future return for finished background scan]] 93 return: future<void> @owned; [[Future return for finished background scan]]
94 } 94 }
95 } 95 }
96 96
diff --git a/src/lib/ecore_con/efl_net_ip_address.eo b/src/lib/ecore_con/efl_net_ip_address.eo
index dfb9953..e715a0c 100644
--- a/src/lib/ecore_con/efl_net_ip_address.eo
+++ b/src/lib/ecore_con/efl_net_ip_address.eo
@@ -112,7 +112,7 @@ class Efl.Net.Ip_Address (Efl.Object) {
112 family: int @optional; [[Preferred family. AF_UNSPEC or 0 for both, otherwise one of AF_INET or AF_INET6]] 112 family: int @optional; [[Preferred family. AF_UNSPEC or 0 for both, otherwise one of AF_INET or AF_INET6]]
113 flags: int @optional; [[Flags to use with getaddrinfo(). If 0, default flags are used (AI_V4MAPPED | AI_ADDRCONFIG, if these exist in your system).]] 113 flags: int @optional; [[Flags to use with getaddrinfo(). If 0, default flags are used (AI_V4MAPPED | AI_ADDRCONFIG, if these exist in your system).]]
114 } 114 }
115 return: ptr(Eina.Future); [[The resolve results. It contains a list of Efl.Net.Ip_Address, they will be automatically deleted unless you keep a reference to it.]] 115 return: future<const(Efl.Net.Ip_Address.Resolve_Results)>; [[The resolve results. It contains a list of Efl.Net.Ip_Address, they will be automatically deleted unless you keep a reference to it.]]
116 } 116 }
117 117
118 @property string { 118 @property string {
diff --git a/src/lib/efl/interfaces/efl_model.eo b/src/lib/efl/interfaces/efl_model.eo
index 2fae595..cc46f56 100644
--- a/src/lib/efl/interfaces/efl_model.eo
+++ b/src/lib/efl/interfaces/efl_model.eo
@@ -46,7 +46,7 @@ interface Efl.Model ()
46 46
47 @since 1.14 47 @since 1.14
48 ]] 48 ]]
49 return: ptr(Eina.Future); [[Return an error in case the property could not be set, the value that was set otherwise.]] 49 return: future<any_value_ptr>; [[Return an error in case the property could not be set, the value that was set otherwise.]]
50 } 50 }
51 get { 51 get {
52 [[Retrieve the value of a given property name. 52 [[Retrieve the value of a given property name.
@@ -98,7 +98,8 @@ interface Efl.Model ()
98 @in count: uint; [[Range size. If count is 0, start is 98 @in count: uint; [[Range size. If count is 0, start is
99 ignored.]] 99 ignored.]]
100 } 100 }
101 return: ptr(Eina.Future); [[Array of childrens]] 101 /* XXX: is this right? */
102 return: future<accessor<Efl.Object>>; [[Array of childrens]]
102 } 103 }
103 @property children_count { 104 @property children_count {
104 get { 105 get {
diff --git a/src/lib/eio/efl_io_manager.eo b/src/lib/eio/efl_io_manager.eo
index 6267fa2..75a2094 100644
--- a/src/lib/eio/efl_io_manager.eo
+++ b/src/lib/eio/efl_io_manager.eo
@@ -34,7 +34,7 @@ class Efl.Io.Manager (Efl.Loop_Consumer)
34 @in path: string; [[Path we want to list entries for]] 34 @in path: string; [[Path we want to list entries for]]
35 paths: EflIoPath; [[Callback called for each packet of files found]] 35 paths: EflIoPath; [[Callback called for each packet of files found]]
36 } 36 }
37 return: ptr(Eina.Future) @owned; [[Amount of files found during the listing of the directory]] 37 return: future<uint64> @owned; [[Amount of files found during the listing of the directory]]
38 } 38 }
39 39
40 direct_ls @const { 40 direct_ls @const {
@@ -44,7 +44,7 @@ class Efl.Io.Manager (Efl.Loop_Consumer)
44 @in recursive: bool; [[If $true, list entries recursively, $false otherwise]] 44 @in recursive: bool; [[If $true, list entries recursively, $false otherwise]]
45 info: EflIoDirectInfo; [[Callback called for each packet of @Eina.File.Direct.Info]] 45 info: EflIoDirectInfo; [[Callback called for each packet of @Eina.File.Direct.Info]]
46 } 46 }
47 return: ptr(Eina.Future) @owned; [[Amount of files found during the listing of the directory]] 47 return: future<uint64> @owned; [[Amount of files found during the listing of the directory]]
48 } 48 }
49 49
50 stat_ls @const { 50 stat_ls @const {
@@ -54,7 +54,7 @@ class Efl.Io.Manager (Efl.Loop_Consumer)
54 @in recursive: bool; [[If $true, list entries recursively, $false otherwise]] 54 @in recursive: bool; [[If $true, list entries recursively, $false otherwise]]
55 info: EflIoDirectInfo; [[Callback called for each packet of @Eina.File.Direct.Info]] 55 info: EflIoDirectInfo; [[Callback called for each packet of @Eina.File.Direct.Info]]
56 } 56 }
57 return: ptr(Eina.Future) @owned; [[Amount of files found during the listing of the directory]] 57 return: future<uint64> @owned; [[Amount of files found during the listing of the directory]]
58 } 58 }
59 59
60 // Extended attributes 60 // Extended attributes
@@ -64,7 +64,7 @@ class Efl.Io.Manager (Efl.Loop_Consumer)
64 @in path: string; [[Path we want to list entries for]] 64 @in path: string; [[Path we want to list entries for]]
65 paths: EflIoPath; [[Callback called for each packet of extended attributes found.]] 65 paths: EflIoPath; [[Callback called for each packet of extended attributes found.]]
66 } 66 }
67 return: ptr(Eina.Future) @owned; [[Amount of extended attributes found]] 67 return: future<uint64> @owned; [[Amount of extended attributes found]]
68 } 68 }
69 69
70 stat @const { 70 stat @const {
@@ -72,7 +72,7 @@ class Efl.Io.Manager (Efl.Loop_Consumer)
72 params { 72 params {
73 @in path: string; [[Path we want to get stat information for]] 73 @in path: string; [[Path we want to get stat information for]]
74 } 74 }
75 return: ptr(Eina.Future); [[Stat information]] 75 return: future<Eina.Stat>; [[Stat information]]
76 } 76 }
77 77
78 // FIXME: Add helper for Eina.Value to Xattr 78 // FIXME: Add helper for Eina.Value to Xattr
@@ -83,10 +83,10 @@ class Efl.Io.Manager (Efl.Loop_Consumer)
83 data: ptr(Eina.Binbuf); [[Data to set as information]] 83 data: ptr(Eina.Binbuf); [[Data to set as information]]
84 flags: Eina.Xattr.Flags; [[Extended attributes flags]] 84 flags: Eina.Xattr.Flags; [[Extended attributes flags]]
85 } 85 }
86 return: ptr(Eina.Future) @owned; [[Future for asynchronous set operation]] 86 return: future<uint64> @owned; [[Future for asynchronous set operation]]
87 } 87 }
88 get { 88 get {
89 return: ptr(Eina.Future) @owned; [[Information]] 89 return: future<Eina.Binbuf> @owned; [[Information]]
90 } 90 }
91 keys { 91 keys {
92 path: string; [[File path]] 92 path: string; [[File path]]
@@ -103,7 +103,7 @@ class Efl.Io.Manager (Efl.Loop_Consumer)
103 @in path: string; [[Path to file]] 103 @in path: string; [[Path to file]]
104 @in shared: bool; [[$true if the file can be accessed by others, $false otherwise]] 104 @in shared: bool; [[$true if the file can be accessed by others, $false otherwise]]
105 } 105 }
106 return: ptr(Eina.Future) @owned; [[Eina file handle]] 106 return: future<Eina.File> @owned; [[Eina file handle]]
107 } 107 }
108 close @const { 108 close @const {
109 [[Closes an open Eina.File.]] 109 [[Closes an open Eina.File.]]
@@ -111,7 +111,7 @@ class Efl.Io.Manager (Efl.Loop_Consumer)
111 @in file: ptr(Eina.File); [[Eina file handle]] 111 @in file: ptr(Eina.File); [[Eina file handle]]
112 // Here we're just interested whether the promise was fullfilled or not. No value needed. 112 // Here we're just interested whether the promise was fullfilled or not. No value needed.
113 } 113 }
114 return: ptr(Eina.Future) @owned; [[Close return code]] 114 return: future<int> @owned; [[Close return code]]
115 } 115 }
116 } 116 }
117} 117}
diff --git a/src/lib/elementary/efl_selection.eo b/src/lib/elementary/efl_selection.eo
index 2f83656..bdb6d51 100644
--- a/src/lib/elementary/efl_selection.eo
+++ b/src/lib/elementary/efl_selection.eo
@@ -12,7 +12,7 @@ mixin Efl.Selection {
12 @in data: Eina.Slice; 12 @in data: Eina.Slice;
13 @in seat: uint;[[Specified seat for multiple seats case.]] 13 @in seat: uint;[[Specified seat for multiple seats case.]]
14 } 14 }
15 return: ptr(Eina.Future); [[Future for tracking when the selection is lost]] 15 return: future<void>; [[Future for tracking when the selection is lost]]
16 } 16 }
17 selection_get { 17 selection_get {
18 [[Get the data from the object that has selection]] 18 [[Get the data from the object that has selection]]
diff --git a/src/lib/elementary/efl_selection_manager.eo b/src/lib/elementary/efl_selection_manager.eo
index 33c25c9..8556d06 100644
--- a/src/lib/elementary/efl_selection_manager.eo
+++ b/src/lib/elementary/efl_selection_manager.eo
@@ -11,7 +11,7 @@ class Efl.Selection_Manager (Efl.Object) {
11 @in data: Eina.Slice; [[Selection data]] 11 @in data: Eina.Slice; [[Selection data]]
12 @in seat: uint @optional;[[Specified seat for multiple seats case.]] 12 @in seat: uint @optional;[[Specified seat for multiple seats case.]]
13 } 13 }
14 return: ptr(Eina.Future); [[Future for tracking when the selection is lost]] 14 return: future<void>; [[Future for tracking when the selection is lost]]
15 } 15 }
16 selection_get @beta { 16 selection_get @beta {
17 [[Get selection]] 17 [[Get selection]]
diff --git a/src/lib/eo/eina_types.eot b/src/lib/eo/eina_types.eot
index fc0fca0..3858b36 100644
--- a/src/lib/eo/eina_types.eot
+++ b/src/lib/eo/eina_types.eot
@@ -78,5 +78,23 @@ struct @extern Eina.Rw_Slice {
78} 78}
79 79
80struct @extern Eina.Value.Type; [[Eina value type]] 80struct @extern Eina.Value.Type; [[Eina value type]]
81struct @extern Eina.Future; [[Eina_Future handle]] 81
82struct @extern Eina.Promise; [[Eina_Promise handle]] 82struct @extern Eina.Stat {
83 [[The structure to store some file statistics.]]
84 dev : ulong; [[The device where this file is located]]
85 ino : ulong; [[The inode]]
86 mode : uint; [[The mode]]
87 nlink : uint; [[The link number]]
88 uid : uint; [[The owner user id]]
89 gid : uint; [[The owner group id]]
90 rdev : ulong; [[The remote device]]
91 size : ulong; [[The file size in bytes]]
92 blksize : ulong; [[The block size in bytes]]
93 blocks : ulong; [[The number of blocks allocated]]
94 atime : ulong; [[The tilestamp when the file was last accessed]]
95 atimensec: ulong; [[The nano version of the timestmap when the file was last accessed]]
96 mtime : ulong; [[The tilestamp when the file was modified]]
97 mtimensec: ulong; [[The nano version of the timestmap when the file was modified]]
98 ctime : ulong; [[The tilestamp when the file was created]]
99 ctimensec: ulong; [[The nano version of the timestmap when the file was created]]
100} \ No newline at end of file
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index 49c1357..62fcf37 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -263,7 +263,7 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
263 @since 1.21 263 @since 1.21
264 ]] 264 ]]
265 legacy: null; 265 legacy: null;
266 return: ptr(Eina.Future) @owned; [[Future for layout result]] 266 return: future<Eina.Rect> @owned; [[Future for layout result]]
267 } 267 }
268 } 268 }
269 implements { 269 implements {