summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2016-06-02 12:54:59 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2016-06-02 13:00:26 +0100
commitb1946ca5d611585572f1296088c57e4fd3c76279 (patch)
treea08cbd03656e2ff2d5a09fcac75ddd6081af80e6 /src
parent69ea4145c95a28c79c43de89079fdbbca628054b (diff)
eolian: utilize the new void_ptr builtin across eo files
This lets me narrow down the remaining cases of pointers across the EFL. The void pointers will later need to be reevaluated on per-case basis and replaced appropriately where possible/feasible.
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore/ecore_animator.eo4
-rw-r--r--src/lib/ecore/ecore_exe.eo2
-rw-r--r--src/lib/ecore/ecore_poller.eo2
-rw-r--r--src/lib/ecore/efl_loop.eo8
-rw-r--r--src/lib/ecore_audio/ecore_audio.eo2
-rw-r--r--src/lib/ecore_audio/ecore_audio_in.eo4
-rw-r--r--src/lib/ecore_con/ecore_con_eet_base.eo8
-rw-r--r--src/lib/ecore_con/efl_network.eo6
-rw-r--r--src/lib/ector/cairo/ector_cairo_surface.eo4
-rw-r--r--src/lib/ector/ector_buffer.eo6
-rw-r--r--src/lib/edje/edje_object.eo36
-rw-r--r--src/lib/edje/efl_canvas_layout_internal.eo4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_buffer.eo10
-rw-r--r--src/lib/efl/interfaces/efl_pack_layout.eo4
-rw-r--r--src/lib/eio/eio_job.eo2
-rw-r--r--src/lib/eio/eio_model.eo2
-rw-r--r--src/lib/elementary/elm_app_client.eo2
-rw-r--r--src/lib/elementary/elm_app_client_view.eo6
-rw-r--r--src/lib/elementary/elm_box.eo2
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo4
-rw-r--r--src/lib/elementary/elm_ctxpopup_item.eo2
-rw-r--r--src/lib/elementary/elm_diskselector.eo2
-rw-r--r--src/lib/elementary/elm_diskselector_item.eo2
-rw-r--r--src/lib/elementary/elm_entry.eo18
-rw-r--r--src/lib/elementary/elm_flipselector.eo4
-rw-r--r--src/lib/elementary/elm_gengrid.eo20
-rw-r--r--src/lib/elementary/elm_gengrid_item.eo2
-rw-r--r--src/lib/elementary/elm_genlist.eo22
-rw-r--r--src/lib/elementary/elm_genlist_item.eo2
-rw-r--r--src/lib/elementary/elm_gesture_layer.eo6
-rw-r--r--src/lib/elementary/elm_hoversel.eo2
-rw-r--r--src/lib/elementary/elm_index.eo12
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.eo4
-rw-r--r--src/lib/elementary/elm_interface_fileselector.eo2
-rw-r--r--src/lib/elementary/elm_layout.eo4
-rw-r--r--src/lib/elementary/elm_list.eo10
-rw-r--r--src/lib/elementary/elm_list_item.eo2
-rw-r--r--src/lib/elementary/elm_map.eo8
-rw-r--r--src/lib/elementary/elm_menu.eo2
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo16
-rw-r--r--src/lib/elementary/elm_naviframe_item.eo2
-rw-r--r--src/lib/elementary/elm_popup.eo2
-rw-r--r--src/lib/elementary/elm_route.eo2
-rw-r--r--src/lib/elementary/elm_slideshow.eo4
-rw-r--r--src/lib/elementary/elm_sys_notify_interface.eo2
-rw-r--r--src/lib/elementary/elm_toolbar.eo8
-rw-r--r--src/lib/elementary/elm_toolbar_item.eo8
-rw-r--r--src/lib/elementary/elm_web.eo12
-rw-r--r--src/lib/elementary/elm_widget.eo16
-rw-r--r--src/lib/elementary/elm_widget_item.eo6
-rw-r--r--src/lib/eo/eo_base.eo16
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_x11.eo4
-rw-r--r--src/lib/evas/canvas/efl_event_pointer.eo2
-rw-r--r--src/lib/evas/canvas/evas_box.eo20
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.eo12
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_object.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_texture.eo2
-rw-r--r--src/lib/evas/canvas/evas_filter.eo6
-rw-r--r--src/lib/evas/canvas/evas_object.eo2
-rw-r--r--src/lib/evas/canvas/evas_object_smart.eo2
-rw-r--r--src/lib/evas/include/evas_ector_buffer.eo2
-rw-r--r--src/tests/eolian/generated_promise.eo4
-rw-r--r--src/tests/eolian_cxx/callback.eo6
-rw-r--r--src/tests/eolian_cxx/generic.eo4
66 files changed, 205 insertions, 205 deletions
diff --git a/src/lib/ecore/ecore_animator.eo b/src/lib/ecore/ecore_animator.eo
index 5712214..c2eb9d5 100644
--- a/src/lib/ecore/ecore_animator.eo
+++ b/src/lib/ecore/ecore_animator.eo
@@ -17,7 +17,7 @@ class Ecore.Animator (Eo.Base)
17 params { 17 params {
18 @in runtime: double; [[Animation runtime in seconds.]] 18 @in runtime: double; [[Animation runtime in seconds.]]
19 @in func: Ecore_Timeline_Cb; [[Animation callback function.]] 19 @in func: Ecore_Timeline_Cb; [[Animation callback function.]]
20 @in data: const(void)*; [[Private data passed to callback functions.]] 20 @in data: const(void_ptr); [[Private data passed to callback functions.]]
21 } 21 }
22 } 22 }
23 constructor { 23 constructor {
@@ -25,7 +25,7 @@ class Ecore.Animator (Eo.Base)
25 legacy: null; 25 legacy: null;
26 params { 26 params {
27 @in func: Ecore_Task_Cb; [[Animation callback function.]] 27 @in func: Ecore_Task_Cb; [[Animation callback function.]]
28 @in data: const(void)*; [[Private data passed to callback functions.]] 28 @in data: const(void_ptr); [[Private data passed to callback functions.]]
29 } 29 }
30 } 30 }
31 } 31 }
diff --git a/src/lib/ecore/ecore_exe.eo b/src/lib/ecore/ecore_exe.eo
index 6a2bb68..cbcac3d 100644
--- a/src/lib/ecore/ecore_exe.eo
+++ b/src/lib/ecore/ecore_exe.eo
@@ -14,7 +14,7 @@ struct Ecore.Exe.Event_Data.Line
14struct Ecore.Exe.Event_Data 14struct Ecore.Exe.Event_Data
15{ 15{
16 exe: Eo.Base; [[The handle to the process. FIXME: should actually be Ecore.Exe, workaround cyclic]] 16 exe: Eo.Base; [[The handle to the process. FIXME: should actually be Ecore.Exe, workaround cyclic]]
17 data: void *; [[the raw binary data from the child process that was received]] 17 data: void_ptr; [[the raw binary data from the child process that was received]]
18 size: int; [[the size of this data in bytes]] 18 size: int; [[the size of this data in bytes]]
19 lines: Ecore.Exe.Event_Data.Line *; [[an array of line data if line buffered, the last one has it's line member set to $NULL]] 19 lines: Ecore.Exe.Event_Data.Line *; [[an array of line data if line buffered, the last one has it's line member set to $NULL]]
20} 20}
diff --git a/src/lib/ecore/ecore_poller.eo b/src/lib/ecore/ecore_poller.eo
index 62ffe4f..804d106 100644
--- a/src/lib/ecore/ecore_poller.eo
+++ b/src/lib/ecore/ecore_poller.eo
@@ -35,7 +35,7 @@ class Ecore.Poller (Eo.Base)
35 for the poller.]] 35 for the poller.]]
36 @in interval: int; [[The tick interval; must be a power of 2 and <= 32768.]] 36 @in interval: int; [[The tick interval; must be a power of 2 and <= 32768.]]
37 @in func: Ecore_Task_Cb; [[Ecore poller callback function.]] 37 @in func: Ecore_Task_Cb; [[Ecore poller callback function.]]
38 @in data: const(void)*; [[Private data passed to callback function.]] 38 @in data: const(void_ptr); [[Private data passed to callback function.]]
39 } 39 }
40 } 40 }
41 @property interval { 41 @property interval {
diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo
index b81ba06..2f5459d 100644
--- a/src/lib/ecore/efl_loop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -33,17 +33,17 @@ class Efl.Loop (Eo.Base)
33 job { 33 job {
34 [[Will execute that promise in the near future.]] 34 [[Will execute that promise in the near future.]]
35 params { 35 params {
36 @in data: const(void)* @optional; [[The data to be given when the promise is done.]] 36 @in data: const(void_ptr) @optional; [[The data to be given when the promise is done.]]
37 } 37 }
38 return: promise<void*>; [[The promise that will be triggered.]] 38 return: promise<void_ptr>; [[The promise that will be triggered.]]
39 } 39 }
40 timeout { 40 timeout {
41 [[Will trigger this promise when the specified timeout occur.]] 41 [[Will trigger this promise when the specified timeout occur.]]
42 params { 42 params {
43 @in time: double; [[The time from now in second that the main loop will wait before triggering it.]] 43 @in time: double; [[The time from now in second that the main loop will wait before triggering it.]]
44 @in data: const(void)* @optional; [[The data to be given when the promise is done.]] 44 @in data: const(void_ptr) @optional; [[The data to be given when the promise is done.]]
45 } 45 }
46 return: promise<void*>; [[The promise that will be triggered.]] 46 return: promise<void_ptr>; [[The promise that will be triggered.]]
47 } 47 }
48 args_add { 48 args_add {
49 [[Add a new set of arguments to the loop that makes an args event.]] 49 [[Add a new set of arguments to the loop that makes an args event.]]
diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo
index 8502534..7e146de 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -111,7 +111,7 @@ class Ecore.Audio (Eo.Base)
111 vio: Ecore.Audio.Vio *; [[the @Ecore.Audio.Vio struct with 111 vio: Ecore.Audio.Vio *; [[the @Ecore.Audio.Vio struct with
112 the function callbacks 112 the function callbacks
113 ]] 113 ]]
114 data: void *; [[user data to pass to the VIO functions]] 114 data: void_ptr; [[user data to pass to the VIO functions]]
115 free_func: eo_key_data_free_func; [[this function takes care to 115 free_func: eo_key_data_free_func; [[this function takes care to
116 clean up $data when he VIO is 116 clean up $data when he VIO is
117 destroyed. NULL means do 117 destroyed. NULL means do
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo
index 91e93e1..57457c2 100644
--- a/src/lib/ecore_audio/ecore_audio_in.eo
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -119,7 +119,7 @@ class Ecore.Audio.In (Ecore.Audio)
119 ]] 119 ]]
120 return: ssize; [[The amount of samples written to buf]] 120 return: ssize; [[The amount of samples written to buf]]
121 params { 121 params {
122 @in buf: void *; [[The buffer to read into]] 122 @in buf: void_ptr; [[The buffer to read into]]
123 @in len: size; [[The amount of samples to read]] 123 @in len: size; [[The amount of samples to read]]
124 } 124 }
125 } 125 }
@@ -130,7 +130,7 @@ class Ecore.Audio.In (Ecore.Audio)
130 ]] 130 ]]
131 return: ssize; [[The amount of samples written to buf]] 131 return: ssize; [[The amount of samples written to buf]]
132 params { 132 params {
133 @in buf: void *; [[The buffer to read into]] 133 @in buf: void_ptr; [[The buffer to read into]]
134 @in len: size; [[The amount of samples to read]] 134 @in len: size; [[The amount of samples to read]]
135 } 135 }
136 } 136 }
diff --git a/src/lib/ecore_con/ecore_con_eet_base.eo b/src/lib/ecore_con/ecore_con_eet_base.eo
index 667d2f8..4e55273 100644
--- a/src/lib/ecore_con/ecore_con_eet_base.eo
+++ b/src/lib/ecore_con/ecore_con_eet_base.eo
@@ -30,7 +30,7 @@ class Ecore.Con.Eet.Base (Eo.Base) {
30 values { 30 values {
31 name: string; [[The name of the eet stream.]] 31 name: string; [[The name of the eet stream.]]
32 func: Ecore_Con_Eet_Data_Cb; [[The callback function.]] 32 func: Ecore_Con_Eet_Data_Cb; [[The callback function.]]
33 data: const (void) *; [[The data (if any) that should be 33 data: const(void_ptr); [[The data (if any) that should be
34 passed to callback function.]] 34 passed to callback function.]]
35 } 35 }
36 } 36 }
@@ -42,7 +42,7 @@ class Ecore.Con.Eet.Base (Eo.Base) {
42 values { 42 values {
43 name: string; [[The name of the eet stream.]] 43 name: string; [[The name of the eet stream.]]
44 func: Ecore_Con_Eet_Raw_Data_Cb; [[The callback function.]] 44 func: Ecore_Con_Eet_Raw_Data_Cb; [[The callback function.]]
45 data: const (void) *; [[The data (if any) that should be 45 data: const(void_ptr); [[The data (if any) that should be
46 passed to callback function.]] 46 passed to callback function.]]
47 } 47 }
48 } 48 }
@@ -74,7 +74,7 @@ class Ecore.Con.Eet.Base (Eo.Base) {
74 reply: Ecore.Con.Reply *; [[Contains the ecore_con_eet object 74 reply: Ecore.Con.Reply *; [[Contains the ecore_con_eet object
75 to which the data has to be sent.]] 75 to which the data has to be sent.]]
76 name: string; [[The name of the eet stream.]] 76 name: string; [[The name of the eet stream.]]
77 value: void *; [[Actual data]] 77 value: void_ptr; [[Actual data]]
78 } 78 }
79 } 79 }
80 raw_send { 80 raw_send {
@@ -84,7 +84,7 @@ class Ecore.Con.Eet.Base (Eo.Base) {
84 to which the data has to be sent.]] 84 to which the data has to be sent.]]
85 protocol_name: string; [[The name of the eet stream.]] 85 protocol_name: string; [[The name of the eet stream.]]
86 section: string; [[Name of section in the eet descriptor.]] 86 section: string; [[Name of section in the eet descriptor.]]
87 value: void *; [[The value of the section.]] 87 value: void_ptr; [[The value of the section.]]
88 length: uint; [[The length of the data that is being sent.]] 88 length: uint; [[The length of the data that is being sent.]]
89 } 89 }
90 } 90 }
diff --git a/src/lib/ecore_con/efl_network.eo b/src/lib/ecore_con/efl_network.eo
index bb7bf54..64f88cf 100644
--- a/src/lib/ecore_con/efl_network.eo
+++ b/src/lib/ecore_con/efl_network.eo
@@ -149,7 +149,7 @@ abstract Efl.Network (Eo.Base) {
149 legacy: null; 149 legacy: null;
150 150
151 params { 151 params {
152 data: const(void)*; [[The given data]] 152 data: const(void_ptr); [[The given data]]
153 size: int; [[Length of the data, in bytes.]] 153 size: int; [[Length of the data, in bytes.]]
154 } 154 }
155 return: int; [[The number of bytes sent. 0 will be returned if there 155 return: int; [[The number of bytes sent. 0 will be returned if there
@@ -170,7 +170,7 @@ abstract Efl.Network (Eo.Base) {
170 params { 170 params {
171 name: string @nonull; [[IP address or server name to translate.]] 171 name: string @nonull; [[IP address or server name to translate.]]
172 done_cb: Ecore_Con_Dns_Cb; [[Callback to notify when done.]] 172 done_cb: Ecore_Con_Dns_Cb; [[Callback to notify when done.]]
173 data: const(void)*; [[User data to be given to done_cb.]] 173 data: const(void_ptr); [[User data to be given to done_cb.]]
174 } 174 }
175 return: bool; [[true if the request did not fail to be set up, false otherwise.]] 175 return: bool; [[true if the request did not fail to be set up, false otherwise.]]
176 } 176 }
@@ -184,7 +184,7 @@ abstract Efl.Network (Eo.Base) {
184 184
185/* FIXME: Should actually be a binbuf. */ 185/* FIXME: Should actually be a binbuf. */
186struct Ecore.Con.Event_Data.Received { 186struct Ecore.Con.Event_Data.Received {
187 data: void *; [[The data that got sent.]] 187 data: void_ptr; [[The data that got sent.]]
188 size: int; [[The length of the data sent.]] 188 size: int; [[The length of the data sent.]]
189} 189}
190 190
diff --git a/src/lib/ector/cairo/ector_cairo_surface.eo b/src/lib/ector/cairo/ector_cairo_surface.eo
index 0237ed7..80b40ff 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_surface.eo
@@ -1,4 +1,4 @@
1type @extern cairo_t: void *; 1type @extern cairo_t: void_ptr;
2 2
3class Ector.Cairo.Surface (Eo.Base, Ector.Surface) 3class Ector.Cairo.Surface (Eo.Base, Ector.Surface)
4{ 4{
@@ -19,7 +19,7 @@ class Ector.Cairo.Surface (Eo.Base, Ector.Surface)
19 } 19 }
20 } 20 }
21 symbol_get { 21 symbol_get {
22 return: void * @warn_unused; 22 return: void_ptr @warn_unused;
23 params { 23 params {
24 @in name: string; 24 @in name: string;
25 } 25 }
diff --git a/src/lib/ector/ector_buffer.eo b/src/lib/ector/ector_buffer.eo
index 14bfa88..cdee089 100644
--- a/src/lib/ector/ector_buffer.eo
+++ b/src/lib/ector/ector_buffer.eo
@@ -61,19 +61,19 @@ mixin Ector.Buffer
61 map should try to convert the data into a new buffer]] 61 map should try to convert the data into a new buffer]]
62 @out stride: uint @optional; [[Returns the length in bytes of a mapped line]] 62 @out stride: uint @optional; [[Returns the length in bytes of a mapped line]]
63 } 63 }
64 return: void* @warn_unused; [[Pointer to the top-left pixel data. Returns $null in case of failure]] 64 return: void_ptr @warn_unused; [[Pointer to the top-left pixel data. Returns $null in case of failure]]
65 } 65 }
66 unmap @virtual_pure { 66 unmap @virtual_pure {
67 [[Unmap a region of this buffer, and upload data to the GPU (if needed).]] 67 [[Unmap a region of this buffer, and upload data to the GPU (if needed).]]
68 params { 68 params {
69 @in data: void*; [[Data pointer returned by a previous call to map]] 69 @in data: void_ptr; [[Data pointer returned by a previous call to map]]
70 @in length: uint; [[Must be the same as returned by map.]] 70 @in length: uint; [[Must be the same as returned by map.]]
71 } 71 }
72 } 72 }
73 pixels_set @virtual_pure { 73 pixels_set @virtual_pure {
74 [[Set the source pixels for this buffer, or allocate a new memory region]] 74 [[Set the source pixels for this buffer, or allocate a new memory region]]
75 params { 75 params {
76 @in pixels: void*; [[If $null, allocates an empty buffer]] 76 @in pixels: void_ptr; [[If $null, allocates an empty buffer]]
77 @in width: int; [[Buffer width]] 77 @in width: int; [[Buffer width]]
78 @in height: int; [[Buffer height]] 78 @in height: int; [[Buffer height]]
79 @in stride: int; [[Can be 0]] 79 @in stride: int; [[Can be 0]]
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 15e949c..df0e093 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -185,7 +185,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
185 } 185 }
186 values { 186 values {
187 func: Edje.Text.Change_Cb; [[The callback function to handle the text change]] 187 func: Edje.Text.Change_Cb; [[The callback function to handle the text change]]
188 data: void *; [[The data associated to the callback function.]] 188 data: void_ptr; [[The data associated to the callback function.]]
189 } 189 }
190 } 190 }
191 @property part_text_cursor_begin { 191 @property part_text_cursor_begin {
@@ -281,7 +281,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
281 } 281 }
282 values { 282 values {
283 func: Edje.Item_Provider_Cb; [[The function to call (or $null to disable) to get item objects]] 283 func: Edje.Item_Provider_Cb; [[The function to call (or $null to disable) to get item objects]]
284 data: void *; [[The data pointer to pass to the func callback]] 284 data: void_ptr; [[The data pointer to pass to the func callback]]
285 } 285 }
286 } 286 }
287 @property part_text_cursor_line_begin { 287 @property part_text_cursor_line_begin {
@@ -310,7 +310,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
310 } 310 }
311 values { 311 values {
312 func: Edje.Message_Handler_Cb; [[The function to handle messages coming from obj]] 312 func: Edje.Message_Handler_Cb; [[The function to handle messages coming from obj]]
313 data: void *; [[Auxiliary data to be passed to func]] 313 data: void_ptr; [[Auxiliary data to be passed to func]]
314 } 314 }
315 } 315 }
316 @property size_min { 316 @property size_min {
@@ -467,11 +467,11 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
467 467
468 @since 1.2.0]] 468 @since 1.2.0]]
469 469
470 return: void *; [[The same data pointer if successful, or $null otherwise]] 470 return: void_ptr; [[The same data pointer if successful, or $null otherwise]]
471 params { 471 params {
472 @in part: string; [[The part name]] 472 @in part: string; [[The part name]]
473 @in func: Edje.Markup_Filter_Cb; [[The function callback to remove]] 473 @in func: Edje.Markup_Filter_Cb; [[The function callback to remove]]
474 @in data: void *; [[The data passed to the callback function]] 474 @in data: void_ptr; [[The data passed to the callback function]]
475 } 475 }
476 } 476 }
477 part_drag_step_set { 477 part_drag_step_set {
@@ -512,7 +512,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
512 otherwise, the returned pointer is an Ecore_IMF 512 otherwise, the returned pointer is an Ecore_IMF
513 513
514 @since 1.2.0]] 514 @since 1.2.0]]
515 return: void *; [[The input method context (Ecore_IMF_Context *) in entry]] 515 return: void_ptr; [[The input method context (Ecore_IMF_Context *) in entry]]
516 params { 516 params {
517 @in part: string; [[The part name]] 517 @in part: string; [[The part name]]
518 } 518 }
@@ -547,12 +547,12 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
547 \@ref edje_object_signal_callback_del_full().]] 547 \@ref edje_object_signal_callback_del_full().]]
548 548
549 legacy: null; 549 legacy: null;
550 return: void *; [[The data pointer]] 550 return: void_ptr; [[The data pointer]]
551 params { 551 params {
552 @in emission: string; [[The emission string.]] 552 @in emission: string; [[The emission string.]]
553 @in source: string; [[The source string.]] 553 @in source: string; [[The source string.]]
554 @in func: Edje.Signal_Cb; [[The callback function.]] 554 @in func: Edje.Signal_Cb; [[The callback function.]]
555 @in data: void *; [[The callback function.]] 555 @in data: void_ptr; [[The callback function.]]
556 } 556 }
557 } 557 }
558 part_text_cursor_next { 558 part_text_cursor_next {
@@ -656,11 +656,11 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
656 656
657 See also @.text_insert_filter_callback_add and @.text_insert_filter_callback_del]] 657 See also @.text_insert_filter_callback_add and @.text_insert_filter_callback_del]]
658 658
659 return: void *; [[The same data pointer if successful, or $null otherwise]] 659 return: void_ptr; [[The same data pointer if successful, or $null otherwise]]
660 params { 660 params {
661 @in part: string; [[The part name]] 661 @in part: string; [[The part name]]
662 @in func: Edje.Text.Filter_Cb; [[The function callback to remove]] 662 @in func: Edje.Text.Filter_Cb; [[The function callback to remove]]
663 @in data: void *; [[The data passed to the callback function]] 663 @in data: void_ptr; [[The data passed to the callback function]]
664 } 664 }
665 } 665 }
666 part_text_style_user_pop { 666 part_text_style_user_pop {
@@ -683,7 +683,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
683 683
684 params { 684 params {
685 @in part: string; [[The part name]] 685 @in part: string; [[The part name]]
686 @in data: const(void)*; [[The specific data to be set to the input panel.]] 686 @in data: const(void_ptr); [[The specific data to be set to the input panel.]]
687 @in len: int; [[the length of data, in bytes, to send to the input panel]] 687 @in len: int; [[the length of data, in bytes, to send to the input panel]]
688 } 688 }
689 } 689 }
@@ -693,7 +693,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
693 @since 1.2.0]] 693 @since 1.2.0]]
694 params { 694 params {
695 @in part: string; [[The part name]] 695 @in part: string; [[The part name]]
696 @in data: void *; [[The specific data to be got from the input panel]] 696 @in data: void_ptr; [[The specific data to be got from the input panel]]
697 @in len: int *; [[The length of data]] 697 @in len: int *; [[The length of data]]
698 } 698 }
699 } 699 }
@@ -1082,7 +1082,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
1082 params { 1082 params {
1083 @in type: Edje.Message_Type; [[The type of message to send to obj]] 1083 @in type: Edje.Message_Type; [[The type of message to send to obj]]
1084 @in id: int; [[A identification number for the message to be sent]] 1084 @in id: int; [[A identification number for the message to be sent]]
1085 @in msg: void *; [[The message's body, a struct depending on type]] 1085 @in msg: void_ptr; [[The message's body, a struct depending on type]]
1086 } 1086 }
1087 } 1087 }
1088 part_text_select_none @const { 1088 part_text_select_none @const {
@@ -1154,7 +1154,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
1154 1154
1155 See also @.text_insert_filter_callback_add and @.text_insert_filter_callback_del_full]] 1155 See also @.text_insert_filter_callback_add and @.text_insert_filter_callback_del_full]]
1156 1156
1157 return: void *; [[The user data pointer if successful, or $null otherwise]] 1157 return: void_ptr; [[The user data pointer if successful, or $null otherwise]]
1158 params { 1158 params {
1159 @in part: string; [[The part name]] 1159 @in part: string; [[The part name]]
1160 @in func: Edje.Text.Filter_Cb; [[The function callback to remove]] 1160 @in func: Edje.Text.Filter_Cb; [[The function callback to remove]]
@@ -1262,7 +1262,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
1262 @in source: string; [[The signal's "source" string]] 1262 @in source: string; [[The signal's "source" string]]
1263 @in func: Edje.Signal_Cb; [[The callback function to be executed when the signal is 1263 @in func: Edje.Signal_Cb; [[The callback function to be executed when the signal is
1264 emitted.]] 1264 emitted.]]
1265 @in data: void *; [[A pointer to data to pass in to func.]] 1265 @in data: void_ptr; [[A pointer to data to pass in to func.]]
1266 } 1266 }
1267 } 1267 }
1268 part_text_select_all @const { 1268 part_text_select_all @const {
@@ -1397,7 +1397,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
1397 params { 1397 params {
1398 @in part: string; [[The part name]] 1398 @in part: string; [[The part name]]
1399 @in func: Edje.Markup_Filter_Cb; [[The callback function that will act as markup filter]] 1399 @in func: Edje.Markup_Filter_Cb; [[The callback function that will act as markup filter]]
1400 @in data: void *; [[User provided data to pass to the filter function]] 1400 @in data: void_ptr; [[User provided data to pass to the filter function]]
1401 } 1401 }
1402 } 1402 }
1403 message_signal_process { 1403 message_signal_process {
@@ -1876,7 +1876,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
1876 params { 1876 params {
1877 @in part: string; [[The part name]] 1877 @in part: string; [[The part name]]
1878 @in func: Edje.Text.Filter_Cb; [[The callback function that will act as filter]] 1878 @in func: Edje.Text.Filter_Cb; [[The callback function that will act as filter]]
1879 @in data: void *; [[User provided data to pass to the filter function]] 1879 @in data: void_ptr; [[User provided data to pass to the filter function]]
1880 } 1880 }
1881 } 1881 }
1882 part_text_input_panel_show @const { 1882 part_text_input_panel_show @const {
@@ -1916,7 +1916,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
1916 1916
1917 @since 1.2.0]] 1917 @since 1.2.0]]
1918 1918
1919 return: void *; [[The user data pointer if successful, or $null otherwise]] 1919 return: void_ptr; [[The user data pointer if successful, or $null otherwise]]
1920 params { 1920 params {
1921 @in part: string; [[The part name]] 1921 @in part: string; [[The part name]]
1922 @in func: Edje.Markup_Filter_Cb; [[The function callback to remove]] 1922 @in func: Edje.Markup_Filter_Cb; [[The function callback to remove]]
diff --git a/src/lib/edje/efl_canvas_layout_internal.eo b/src/lib/edje/efl_canvas_layout_internal.eo
index cb63e09..4070be8 100644
--- a/src/lib/edje/efl_canvas_layout_internal.eo
+++ b/src/lib/edje/efl_canvas_layout_internal.eo
@@ -6,8 +6,8 @@ interface Efl.Canvas.Layout_Internal ()
6 @property real_part @protected { 6 @property real_part @protected {
7 set {} 7 set {}
8 values { 8 values {
9 ed: void*; 9 ed: void_ptr;
10 rp: void*; 10 rp: void_ptr;
11 part: string; 11 part: string;
12 } 12 }
13 } 13 }
diff --git a/src/lib/efl/interfaces/efl_gfx_buffer.eo b/src/lib/efl/interfaces/efl_gfx_buffer.eo
index c1afd4e..7716424 100644
--- a/src/lib/efl/interfaces/efl_gfx_buffer.eo
+++ b/src/lib/efl/interfaces/efl_gfx_buffer.eo
@@ -141,7 +141,7 @@ interface Efl.Gfx.Buffer ()
141 argb8888 by default.]] 141 argb8888 by default.]]
142 @out stride: int @optional; [[Returns the length in bytes of a mapped line]] 142 @out stride: int @optional; [[Returns the length in bytes of a mapped line]]
143 } 143 }
144 return: void* @warn_unused; [[Pointer to the top-left pixel data. Returns $null in case of failure]] 144 return: void_ptr @warn_unused; [[Pointer to the top-left pixel data. Returns $null in case of failure]]
145 } 145 }
146 buffer_unmap { 146 buffer_unmap {
147 [[Unmap a region of this buffer, and update the internal data if needed. 147 [[Unmap a region of this buffer, and update the internal data if needed.
@@ -149,7 +149,7 @@ interface Efl.Gfx.Buffer ()
149 EFL will update the internal image if the map had write access. 149 EFL will update the internal image if the map had write access.
150 ]] 150 ]]
151 params { 151 params {
152 @in data: void*; [[Data pointer returned by a previous call to map]] 152 @in data: void_ptr; [[Data pointer returned by a previous call to map]]
153 @in length: int; [[Must be the same as returned by map.]] 153 @in length: int; [[Must be the same as returned by map.]]
154 } 154 }
155 return: bool; [[This will return $false in case of failure (invalid 155 return: bool; [[This will return $false in case of failure (invalid
@@ -174,7 +174,7 @@ interface Efl.Gfx.Buffer ()
174 internally. 174 internally.
175 ]] 175 ]]
176 params { 176 params {
177 @in pixels: void* @nullable; [[If $null, allocates an empty buffer]] 177 @in pixels: void_ptr @nullable; [[If $null, allocates an empty buffer]]
178 @in width: int; 178 @in width: int;
179 @in height: int; 179 @in height: int;
180 @in stride: int @optional; [[If 0, automatically guessed from the $width.]] 180 @in stride: int @optional; [[If 0, automatically guessed from the $width.]]
@@ -200,7 +200,7 @@ interface Efl.Gfx.Buffer ()
200 $pixels should not be the return value of @.buffer_data_get. 200 $pixels should not be the return value of @.buffer_data_get.
201 ]] 201 ]]
202 params { 202 params {
203 @in pixels: const(void)* @nullable; [[If $null, allocates an empty buffer]] 203 @in pixels: const(void_ptr) @nullable; [[If $null, allocates an empty buffer]]
204 @in width: int; 204 @in width: int;
205 @in height: int; 205 @in height: int;
206 @in stride: int @optional; [[If 0, automatically guessed from the $width.]] 206 @in stride: int @optional; [[If 0, automatically guessed from the $width.]]
@@ -217,7 +217,7 @@ interface Efl.Gfx.Buffer ()
217 Note: This is different from the legacy API data, which is now 217 Note: This is different from the legacy API data, which is now
218 replaced by map/unmap. 218 replaced by map/unmap.
219 ]] 219 ]]
220 return: void* @warn_unused; 220 return: void_ptr @warn_unused;
221 } 221 }
222 /* Note: border, span and buffer flags not imported from ector buffer */ 222 /* Note: border, span and buffer flags not imported from ector buffer */
223 } 223 }
diff --git a/src/lib/efl/interfaces/efl_pack_layout.eo b/src/lib/efl/interfaces/efl_pack_layout.eo
index 5da7ae4..e559b90 100644
--- a/src/lib/efl/interfaces/efl_pack_layout.eo
+++ b/src/lib/efl/interfaces/efl_pack_layout.eo
@@ -16,7 +16,7 @@ interface Efl.Pack.Layout ()
16 values { 16 values {
17 /* FIXME: engine is an Eo.Class */ 17 /* FIXME: engine is an Eo.Class */
18 engine: const(Eo.Base); [[Must be an $Efl.Pack.Layout subclass.]] 18 engine: const(Eo.Base); [[Must be an $Efl.Pack.Layout subclass.]]
19 data: const(void)*; [[Any data to pass along to $Efl.Pack.Layout.layout_do. 19 data: const(void_ptr); [[Any data to pass along to $Efl.Pack.Layout.layout_do.
20 Owned by the caller. Depends on the layout engine.]] 20 Owned by the caller. Depends on the layout engine.]]
21 } 21 }
22 } 22 }
@@ -37,7 +37,7 @@ interface Efl.Pack.Layout ()
37 [[Lay out (resize and move) children objects of $pack.]] 37 [[Lay out (resize and move) children objects of $pack.]]
38 params { 38 params {
39 pack: Efl.Gfx; [[The container to lay out.]] 39 pack: Efl.Gfx; [[The container to lay out.]]
40 data: const(void)* @optional; [[Extra data passed by the caller.]] 40 data: const(void_ptr) @optional; [[Extra data passed by the caller.]]
41 } 41 }
42 } 42 }
43 } 43 }
diff --git a/src/lib/eio/eio_job.eo b/src/lib/eio/eio_job.eo
index 6fc9fae..c7fa877 100644
--- a/src/lib/eio/eio_job.eo
+++ b/src/lib/eio/eio_job.eo
@@ -3,7 +3,7 @@ import eina_types;
3struct Eio.Data 3struct Eio.Data
4{ 4{
5 [[A structure to handle arbitrary data to be sent over Promises.]] 5 [[A structure to handle arbitrary data to be sent over Promises.]]
6 data: void *; 6 data: void_ptr;
7 size: uint; 7 size: uint;
8} 8}
9 9
diff --git a/src/lib/eio/eio_model.eo b/src/lib/eio/eio_model.eo
index 0f9799c..ca459f8 100644
--- a/src/lib/eio/eio_model.eo
+++ b/src/lib/eio/eio_model.eo
@@ -20,7 +20,7 @@ class Eio.Model (Eo.Base, Efl.Model)
20 ]] 20 ]]
21 params { 21 params {
22 filter_cb: Eio_Filter_Direct_Cb; [[Filter callback]] 22 filter_cb: Eio_Filter_Direct_Cb; [[Filter callback]]
23 userdata: void *; [[User's private data]] 23 userdata: void_ptr; [[User's private data]]
24 } 24 }
25 } 25 }
26 path_set { 26 path_set {
diff --git a/src/lib/elementary/elm_app_client.eo b/src/lib/elementary/elm_app_client.eo
index f32b1b4..61163b3 100644
--- a/src/lib/elementary/elm_app_client.eo
+++ b/src/lib/elementary/elm_app_client.eo
@@ -40,7 +40,7 @@ class Elm.App.Client (Eo.Base)
40 params { 40 params {
41 @in args: generic_value * @optional; [[an array of.]] 41 @in args: generic_value * @optional; [[an array of.]]
42 @in view_open_cb: Elm_App_Client_Open_View_Cb @optional; [[callback to be called when view open]] 42 @in view_open_cb: Elm_App_Client_Open_View_Cb @optional; [[callback to be called when view open]]
43 @in data: const(void)* @optional; [[callback user data]] 43 @in data: const(void_ptr) @optional; [[callback user data]]
44 } 44 }
45 return: Elm_App_Client_Pending *; [[handler to cancel the view opening if it takes to long ]] 45 return: Elm_App_Client_Pending *; [[handler to cancel the view opening if it takes to long ]]
46 } 46 }
diff --git a/src/lib/elementary/elm_app_client_view.eo b/src/lib/elementary/elm_app_client_view.eo
index ecca3e0..236ee5f 100644
--- a/src/lib/elementary/elm_app_client_view.eo
+++ b/src/lib/elementary/elm_app_client_view.eo
@@ -93,21 +93,21 @@ class Elm.App.Client.View (Eo.Base)
93 [[Pause view]] 93 [[Pause view]]
94 params { 94 params {
95 @in cb: Elm_App_Client_View_Cb @optional; [[callback to be called when view was paused ]] 95 @in cb: Elm_App_Client_View_Cb @optional; [[callback to be called when view was paused ]]
96 @in data: const(void)* @optional; [[callback user data]] 96 @in data: const(void_ptr) @optional; [[callback user data]]
97 } 97 }
98 } 98 }
99 resume { 99 resume {
100 [[Resume view]] 100 [[Resume view]]
101 params { 101 params {
102 @in cb: Elm_App_Client_View_Cb @optional; [[callback to be called when view was resumed]] 102 @in cb: Elm_App_Client_View_Cb @optional; [[callback to be called when view was resumed]]
103 @in data: const(void)* @optional; [[callback user data]] 103 @in data: const(void_ptr) @optional; [[callback user data]]
104 } 104 }
105 } 105 }
106 close { 106 close {
107 [[Close view]] 107 [[Close view]]
108 params { 108 params {
109 @in cb: Elm_App_Client_View_Cb @optional; [[callback to be called when view was closed]] 109 @in cb: Elm_App_Client_View_Cb @optional; [[callback to be called when view was closed]]
110 @in data: const(void)* @optional; [[callback user data]] 110 @in data: const(void_ptr) @optional; [[callback user data]]
111 } 111 }
112 } 112 }
113 } 113 }
diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo
index 11f0217..985e7a3 100644
--- a/src/lib/elementary/elm_box.eo
+++ b/src/lib/elementary/elm_box.eo
@@ -125,7 +125,7 @@ class Elm.Box (Elm.Widget)
125 } 125 }
126 values { 126 values {
127 cb: Evas_Object_Box_Layout @nullable; [[The callback function used for layout]] 127 cb: Evas_Object_Box_Layout @nullable; [[The callback function used for layout]]
128 data: const(void)* @optional; [[Data that will be passed to layout function]] 128 data: const(void_ptr) @optional; [[Data that will be passed to layout function]]
129 free_data: Ecore_Cb @optional; [[Function called to free $data]] 129 free_data: Ecore_Cb @optional; [[Function called to free $data]]
130 } 130 }
131 } 131 }
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index 2c4a551..638004c 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -177,7 +177,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
177 @in label: string; [[The Label of the new item]] 177 @in label: string; [[The Label of the new item]]
178 @in icon: Evas.Object @optional; [[Icon to be set on new item]] 178 @in icon: Evas.Object @optional; [[Icon to be set on new item]]
179 @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]] 179 @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]]
180 @in data: const(void)* @optional; [[Data passed to $func]] 180 @in data: const(void_ptr) @optional; [[Data passed to $func]]
181 } 181 }
182 } 182 }
183 item_prepend { 183 item_prepend {
@@ -196,7 +196,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
196 @in label: string; [[The Label of the new item]] 196 @in label: string; [[The Label of the new item]]
197 @in icon: Evas.Object @optional; [[Icon to be set on new item]] 197 @in icon: Evas.Object @optional; [[Icon to be set on new item]]
198 @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]] 198 @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]]
199 @in data: const(void)* @optional; [[Data passed to $func]] 199 @in data: const(void_ptr) @optional; [[Data passed to $func]]
200 } 200 }
201 } 201 }
202 } 202 }
diff --git a/src/lib/elementary/elm_ctxpopup_item.eo b/src/lib/elementary/elm_ctxpopup_item.eo
index 35bf447..657e69a 100644
--- a/src/lib/elementary/elm_ctxpopup_item.eo
+++ b/src/lib/elementary/elm_ctxpopup_item.eo
@@ -34,7 +34,7 @@ class Elm.Ctxpopup.Item(Elm.Widget.Item)
34 init { 34 init {
35 params { 35 params {
36 func: Evas_Smart_Cb @nullable; 36 func: Evas_Smart_Cb @nullable;
37 data: const(void) * @optional; 37 data: const(void_ptr) @optional;
38 } 38 }
39 } 39 }
40 } 40 }
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index 9a86234..b60764e 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -183,7 +183,7 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
183 icon can be any Evas object, but usually it is an icon created 183 icon can be any Evas object, but usually it is an icon created
184 with elm_icon_add(). ]] 184 with elm_icon_add(). ]]
185 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]] 185 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]]
186 @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]] 186 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
187 } 187 }
188 } 188 }
189 clear { 189 clear {
diff --git a/src/lib/elementary/elm_diskselector_item.eo b/src/lib/elementary/elm_diskselector_item.eo
index 28d7b04..f04dcef 100644
--- a/src/lib/elementary/elm_diskselector_item.eo
+++ b/src/lib/elementary/elm_diskselector_item.eo
@@ -76,7 +76,7 @@ class Elm.Diskselector.Item(Elm.Widget.Item)
76 /* init { FIXME 76 /* init { FIXME
77 params { 77 params {
78 Evas_Smart_Cb func; 78 Evas_Smart_Cb func;
79 const(void)* data; 79 const(void_ptr) data;
80 } 80 }
81 }*/ 81 }*/
82 } 82 }
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index faee11b..69aabe5 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -603,7 +603,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
603 IMPORTANT: Many functions may change (i.e delete and create a new one) 603 IMPORTANT: Many functions may change (i.e delete and create a new one)
604 the internal input method context. Do NOT cache the returned object. 604 the internal input method context. Do NOT cache the returned object.
605 ]] 605 ]]
606 return: void *; 606 return: void_ptr;
607 } 607 }
608 } 608 }
609 @property cursor_is_format { 609 @property cursor_is_format {
@@ -679,7 +679,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
679 This prepends the given callback.]] 679 This prepends the given callback.]]
680 params { 680 params {
681 @in func: Elm_Entry_Item_Provider_Cb; [[The function called to provide the item object.]] 681 @in func: Elm_Entry_Item_Provider_Cb; [[The function called to provide the item object.]]
682 @in data: void * @optional; [[The data passed to $func.]] 682 @in data: void_ptr @optional; [[The data passed to $func.]]
683 } 683 }
684 } 684 }
685 input_panel_show { 685 input_panel_show {
@@ -746,7 +746,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
746 ]] 746 ]]
747 params { 747 params {
748 @in func: Elm_Entry_Item_Provider_Cb; [[The function called to provide the item object.]] 748 @in func: Elm_Entry_Item_Provider_Cb; [[The function called to provide the item object.]]
749 @in data: void * @optional; [[The data passed to $func.]] 749 @in data: void_ptr @optional; [[The data passed to $func.]]
750 } 750 }
751 } 751 }
752 text_style_user_peek @const { 752 text_style_user_peek @const {
@@ -796,7 +796,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
796 The size and format of data are defined by the input panel. 796 The size and format of data are defined by the input panel.
797 ]] 797 ]]
798 params { 798 params {
799 @in data: const(void)*; [[The specific data to be set to the input panel.]] 799 @in data: const(void_ptr); [[The specific data to be set to the input panel.]]
800 @in len: int; [[The length of data, in bytes, to send to the input panel.]] 800 @in len: int; [[The length of data, in bytes, to send to the input panel.]]
801 } 801 }
802 } 802 }
@@ -851,7 +851,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
851 ]] 851 ]]
852 params { 852 params {
853 @in func: Elm_Entry_Filter_Cb; [[The filter function to remove.]] 853 @in func: Elm_Entry_Filter_Cb; [[The filter function to remove.]]
854 @in data: void * @optional; [[The user data passed when adding the function.]] 854 @in data: void_ptr @optional; [[The user data passed when adding the function.]]
855 } 855 }
856 } 856 }
857 item_provider_append { 857 item_provider_append {
@@ -868,7 +868,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
868 ]] 868 ]]
869 params { 869 params {
870 @in func: Elm_Entry_Item_Provider_Cb; [[The function called to provide the item object.]] 870 @in func: Elm_Entry_Item_Provider_Cb; [[The function called to provide the item object.]]
871 @in data: void * @optional; [[The data passed to $func.]] 871 @in data: void_ptr @optional; [[The data passed to $func.]]
872 } 872 }
873 } 873 }
874 markup_filter_append { 874 markup_filter_append {
@@ -885,7 +885,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
885 ]] 885 ]]
886 params { 886 params {
887 @in func: Elm_Entry_Filter_Cb; [[The function to use as text filter.]] 887 @in func: Elm_Entry_Filter_Cb; [[The function to use as text filter.]]
888 @in data: void * @optional; [[User data to pass to $func.]] 888 @in data: void_ptr @optional; [[User data to pass to $func.]]
889 } 889 }
890 } 890 }
891 entry_append { 891 entry_append {
@@ -919,7 +919,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
919 @in icon_file: string @optional; [[The item's icon file.]] 919 @in icon_file: string @optional; [[The item's icon file.]]
920 @in icon_type: Elm.Icon.Type; [[The item's icon type.]] 920 @in icon_type: Elm.Icon.Type; [[The item's icon type.]]
921 @in func: Evas_Smart_Cb @optional; [[The callback to execute when the item is clicked.]] 921 @in func: Evas_Smart_Cb @optional; [[The callback to execute when the item is clicked.]]
922 @in data: const(void)* @optional; [[The data to associate with the item for related functions.]] 922 @in data: const(void_ptr) @optional; [[The data to associate with the item for related functions.]]
923 } 923 }
924 } 924 }
925 markup_filter_prepend { 925 markup_filter_prepend {
@@ -928,7 +928,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
928 Prepend the given callback to the list.]] 928 Prepend the given callback to the list.]]
929 params { 929 params {
930 @in func: Elm_Entry_Filter_Cb; [[The function to use as text filter.]] 930 @in func: Elm_Entry_Filter_Cb; [[The function to use as text filter.]]
931 @in data: void * @optional; [[User data to pass to $func.]] 931 @in data: void_ptr @optional; [[User data to pass to $func.]]
932 } 932 }
933 } 933 }
934 } 934 }
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index 4d8cd1a..f056898 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -79,7 +79,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
79 @in label: string; [[The (text) label of the new item.]] 79 @in label: string; [[The (text) label of the new item.]]
80 @in func: Evas_Smart_Cb @optional; [[Convenience callback function to take place when 80 @in func: Evas_Smart_Cb @optional; [[Convenience callback function to take place when
81 item is selected.]] 81 item is selected.]]
82 @in data: void * @optional; [[Data passed to $func, above.]] 82 @in data: void_ptr @optional; [[Data passed to $func, above.]]
83 } 83 }
84 } 84 }
85 flip_next { 85 flip_next {
@@ -110,7 +110,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
110 @in label: string; [[The (text) label of the new item.]] 110 @in label: string; [[The (text) label of the new item.]]
111 @in func: Evas_Smart_Cb @optional; [[Convenience callback function to take place when 111 @in func: Evas_Smart_Cb @optional; [[Convenience callback function to take place when
112 item is selected.]] 112 item is selected.]]
113 @in data: const(void)* @optional; [[Data passed to $func, above.]] 113 @in data: const(void_ptr) @optional; [[Data passed to $func, above.]]
114 } 114 }
115 } 115 }
116 flip_prev { 116 flip_prev {
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index 0a346c5..e3fae4b 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -374,11 +374,11 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
374 return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]] 374 return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
375 params { 375 params {
376 @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]] 376 @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]]
377 @in data: const(void)*; [[The item data.]] 377 @in data: const(void_ptr); [[The item data.]]
378 @in relative: Elm.Widget.Item; [[The item to place this new one before.]] 378 @in relative: Elm.Widget.Item; [[The item to place this new one before.]]
379 @in func: Evas_Smart_Cb @optional; [[Convenience function called 379 @in func: Evas_Smart_Cb @optional; [[Convenience function called
380 when the item is selected.]] 380 when the item is selected.]]
381 @in func_data: const(void)* @optional; [[Data to be passed to $func.]] 381 @in func_data: const(void_ptr) @optional; [[Data to be passed to $func.]]
382 } 382 }
383 } 383 }
384 realized_items_update { 384 realized_items_update {
@@ -400,11 +400,11 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
400 return: Elm.Widget.Item; [[A handle to the item added or $null on error.]] 400 return: Elm.Widget.Item; [[A handle to the item added or $null on error.]]
401 params { 401 params {
402 @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]] 402 @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]]
403 @in data: const(void)*; [[The item data.]] 403 @in data: const(void_ptr); [[The item data.]]
404 @in relative: Elm.Widget.Item; [[The item to place this new one after.]] 404 @in relative: Elm.Widget.Item; [[The item to place this new one after.]]
405 @in func: Evas_Smart_Cb @optional; [[Convenience function called 405 @in func: Evas_Smart_Cb @optional; [[Convenience function called
406 when the item is selected.]] 406 when the item is selected.]]
407 @in func_data: const(void)* @optional; [[Data to be passed to $func.]] 407 @in func_data: const(void_ptr) @optional; [[Data to be passed to $func.]]
408 } 408 }
409 } 409 }
410 items_count @const { 410 items_count @const {
@@ -448,10 +448,10 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
448 return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]] 448 return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
449 params { 449 params {
450 @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]] 450 @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]]
451 @in data: const(void)*; [[The item data.]] 451 @in data: const(void_ptr); [[The item data.]]
452 @in func: Evas_Smart_Cb @optional; [[Convenience function called 452 @in func: Evas_Smart_Cb @optional; [[Convenience function called
453 when the item is selected.]] 453 when the item is selected.]]
454 @in func_data: const(void)* @optional; [[Data to be passed to $func.]] 454 @in func_data: const(void_ptr) @optional; [[Data to be passed to $func.]]
455 } 455 }
456 } 456 }
457 item_prepend { 457 item_prepend {
@@ -462,10 +462,10 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
462 return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]] 462 return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
463 params { 463 params {
464 @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]] 464 @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]]
465 @in data: const(void)*; [[The item data.]] 465 @in data: const(void_ptr); [[The item data.]]
466 @in func: Evas_Smart_Cb @optional; [[Convenience function called 466 @in func: Evas_Smart_Cb @optional; [[Convenience function called
467 when the item is selected.]] 467 when the item is selected.]]
468 @in func_data: const(void)* @optional; [[Data to be passed to $func.]] 468 @in func_data: const(void_ptr) @optional; [[Data to be passed to $func.]]
469 } 469 }
470 } 470 }
471 clear { 471 clear {
@@ -487,13 +487,13 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
487 return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]] 487 return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
488 params { 488 params {
489 @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]] 489 @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]]
490 @in data: const(void)*; [[The item data.]] 490 @in data: const(void_ptr); [[The item data.]]
491 @in comp: Eina_Compare_Cb; [[User defined comparison function 491 @in comp: Eina_Compare_Cb; [[User defined comparison function
492 that defines the sort order based 492 that defines the sort order based
493 on gengrid item and its data. 493 on gengrid item and its data.
494 ]] 494 ]]
495 @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]] 495 @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]]
496 @in func_data: const(void)* @optional; [[Data to be passed to $func.]] 496 @in func_data: const(void_ptr) @optional; [[Data to be passed to $func.]]
497 } 497 }
498 } 498 }
499 search_by_text_item_get { 499 search_by_text_item_get {
diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo
index abfdbf3..8ff492d 100644
--- a/src/lib/elementary/elm_gengrid_item.eo
+++ b/src/lib/elementary/elm_gengrid_item.eo
@@ -132,7 +132,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item)
132 /* init { FIXME 132 /* init { FIXME
133 params { 133 params {
134 Evas_Smart_Cb func; 134 Evas_Smart_Cb func;
135 const(void)* data; 135 const(void_ptr) data;
136 } 136 }
137 }*/ 137 }*/
138 show { 138 show {
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index dee65d7..67c65dd 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -346,12 +346,12 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
346 return: Elm.Widget.Item; 346 return: Elm.Widget.Item;
347 params { 347 params {
348 @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]] 348 @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]]
349 @in data: const(void)*; [[The item data.]] 349 @in data: const(void_ptr); [[The item data.]]
350 @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]] 350 @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]]
351 @in before_it: Elm.Widget.Item; [[The item to place this new one before.]] 351 @in before_it: Elm.Widget.Item; [[The item to place this new one before.]]
352 @in type: Elm.Genlist.Item.Type; [[Item type.]] 352 @in type: Elm.Genlist.Item.Type; [[Item type.]]
353 @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]] 353 @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]]
354 @in func_data: const(void)* @optional; [[Data passed to $func above.]] 354 @in func_data: const(void_ptr) @optional; [[Data passed to $func above.]]
355 } 355 }
356 } 356 }
357 realized_items_update { 357 realized_items_update {
@@ -374,12 +374,12 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
374 return: Elm.Widget.Item; 374 return: Elm.Widget.Item;
375 params { 375 params {
376 @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]] 376 @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]]
377 @in data: const(void)*; [[The item data.]] 377 @in data: const(void_ptr); [[The item data.]]
378 @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]] 378 @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]]
379 @in after_it: Elm.Widget.Item; [[The item to place this new one after.]] 379 @in after_it: Elm.Widget.Item; [[The item to place this new one after.]]
380 @in type: Elm.Genlist.Item.Type; [[Item type.]] 380 @in type: Elm.Genlist.Item.Type; [[Item type.]]
381 @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]] 381 @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]]
382 @in func_data: const(void)* @optional; [[Data passed to $func above.]] 382 @in func_data: const(void_ptr) @optional; [[Data passed to $func above.]]
383 } 383 }
384 } 384 }
385 at_xy_item_get @const { 385 at_xy_item_get @const {
@@ -415,7 +415,7 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
415 ]] 415 ]]
416 } 416 }
417 values { 417 values {
418 key: void *; [[Filter key]] 418 key: void_ptr; [[Filter key]]
419 } 419 }
420 } 420 }
421 filter_iterator_new { 421 filter_iterator_new {
@@ -452,11 +452,11 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
452 return: Elm.Widget.Item; 452 return: Elm.Widget.Item;
453 params { 453 params {
454 @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]] 454 @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]]
455 @in data: const(void)*; [[The item data.]] 455 @in data: const(void_ptr); [[The item data.]]
456 @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]] 456 @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]]
457 @in type: Elm.Genlist.Item.Type; [[Item type.]] 457 @in type: Elm.Genlist.Item.Type; [[Item type.]]
458 @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]] 458 @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]]
459 @in func_data: const(void)* @optional; [[Data passed to $func above.]] 459 @in func_data: const(void_ptr) @optional; [[Data passed to $func above.]]
460 } 460 }
461 } 461 }
462 clear { 462 clear {
@@ -474,11 +474,11 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
474 return: Elm.Widget.Item; 474 return: Elm.Widget.Item;
475 params { 475 params {
476 @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]] 476 @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]]
477 @in data: const(void)*; [[The item data.]] 477 @in data: const(void_ptr); [[The item data.]]
478 @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]] 478 @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]]
479 @in type: Elm.Genlist.Item.Type; [[Item type.]] 479 @in type: Elm.Genlist.Item.Type; [[Item type.]]
480 @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]] 480 @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]]
481 @in func_data: const(void)* @optional; [[Data passed to $func above.]] 481 @in func_data: const(void_ptr) @optional; [[Data passed to $func above.]]
482 } 482 }
483 } 483 }
484 item_sorted_insert { 484 item_sorted_insert {
@@ -491,12 +491,12 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
491 return: Elm.Widget.Item; 491 return: Elm.Widget.Item;
492 params { 492 params {
493 @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]] 493 @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]]
494 @in data: const(void)*; [[The item data.]] 494 @in data: const(void_ptr); [[The item data.]]
495 @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]] 495 @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]]
496 @in type: Elm.Genlist.Item.Type; [[Item type.]] 496 @in type: Elm.Genlist.Item.Type; [[Item type.]]
497 @in comp: Eina_Compare_Cb; [[The function called for the sort.]] 497 @in comp: Eina_Compare_Cb; [[The function called for the sort.]]
498 @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]] 498 @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]]
499 @in func_data: const(void)* @optional; [[Data passed to $func above.]] 499 @in func_data: const(void_ptr) @optional; [[Data passed to $func above.]]
500 } 500 }
501 } 501 }
502 search_by_text_item_get { 502 search_by_text_item_get {
diff --git a/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo
index 5b7c9f1..1decfa5 100644
--- a/src/lib/elementary/elm_genlist_item.eo
+++ b/src/lib/elementary/elm_genlist_item.eo
@@ -265,7 +265,7 @@ class Elm.Genlist.Item(Elm.Widget.Item)
265 /* init { FIXME 265 /* init { FIXME
266 params { 266 params {
267 Evas_Smart_Cb func; 267 Evas_Smart_Cb func;
268 const(void)* data; 268 const(void_ptr) data;
269 } 269 }
270 }*/ 270 }*/
271 subitems_count { 271 subitems_count {
diff --git a/src/lib/elementary/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo
index ec6a498..3281e14 100644
--- a/src/lib/elementary/elm_gesture_layer.eo
+++ b/src/lib/elementary/elm_gesture_layer.eo
@@ -109,7 +109,7 @@ class Elm.Gesture_Layer (Elm.Widget)
109 idx: Elm.Gesture.Type; [[The gesture you want to track state of.]] 109 idx: Elm.Gesture.Type; [[The gesture you want to track state of.]]
110 cb_type: Elm.Gesture.State; [[The event the callback tracks (START, MOVE, END, ABORT).]] 110 cb_type: Elm.Gesture.State; [[The event the callback tracks (START, MOVE, END, ABORT).]]
111 cb: Elm_Gesture_Event_Cb; [[The callback itself.]] 111 cb: Elm_Gesture_Event_Cb; [[The callback itself.]]
112 data: void * @optional; [[Custom data to be passed.]] 112 data: void_ptr @optional; [[Custom data to be passed.]]
113 } 113 }
114 } 114 }
115 attach { 115 attach {
@@ -130,7 +130,7 @@ class Elm.Gesture_Layer (Elm.Widget)
130 @in idx: Elm.Gesture.Type; [[The gesture you want to track state of.]] 130 @in idx: Elm.Gesture.Type; [[The gesture you want to track state of.]]
131 @in cb_type: Elm.Gesture.State; [[The event the callback tracks (START, MOVE, END, ABORT).]] 131 @in cb_type: Elm.Gesture.State; [[The event the callback tracks (START, MOVE, END, ABORT).]]
132 @in cb: Elm_Gesture_Event_Cb; [[The callback itself.]] 132 @in cb: Elm_Gesture_Event_Cb; [[The callback itself.]]
133 @in data: void * @nullable; [[Custom callback data.]] 133 @in data: void_ptr @nullable; [[Custom callback data.]]
134 } 134 }
135 } 135 }
136 cb_add { 136 cb_add {
@@ -148,7 +148,7 @@ class Elm.Gesture_Layer (Elm.Widget)
148 @in idx: Elm.Gesture.Type; [[The gesture you want to track state of.]] 148 @in idx: Elm.Gesture.Type; [[The gesture you want to track state of.]]
149 @in cb_type: Elm.Gesture.State; [[The event the callback tracks (START, MOVE, END, ABORT).]] 149 @in cb_type: Elm.Gesture.State; [[The event the callback tracks (START, MOVE, END, ABORT).]]
150 @in cb: Elm_Gesture_Event_Cb; [[The callback itself.]] 150 @in cb: Elm_Gesture_Event_Cb; [[The callback itself.]]
151 @in data: void * @optional; [[Custom data to be passed.]] 151 @in data: void_ptr @optional; [[Custom data to be passed.]]
152 } 152 }
153 } 153 }
154 } 154 }
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index a5f0bbc..0eb2c7b 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -84,7 +84,7 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
84 @in icon_file: string @optional; [[An image file path on disk to use for the icon or standard icon name (NULL if not desired)]] 84 @in icon_file: string @optional; [[An image file path on disk to use for the icon or standard icon name (NULL if not desired)]]
85 @in icon_type: Elm.Icon.Type; [[The icon type if relevant]] 85 @in icon_type: Elm.Icon.Type; [[The icon type if relevant]]
86 @in func: Evas_Smart_Cb @optional; [[Convenience function to call when this item is selected. The last parameter $event_info of $func is the selected item pointer.]] 86 @in func: Evas_Smart_Cb @optional; [[Convenience function to call when this item is selected. The last parameter $event_info of $func is the selected item pointer.]]
87 @in data: const(void)* @optional; [[Data to pass to item-related functions]] 87 @in data: const(void_ptr) @optional; [[Data to pass to item-related functions]]
88 } 88 }
89 } 89 }
90 } 90 }
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 6795602..236f4f8 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -102,7 +102,7 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
102 params { 102 params {
103 @in letter: string; [[Letter under which the item should be indexed]] 103 @in letter: string; [[Letter under which the item should be indexed]]
104 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]] 104 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]]
105 @in data: const(void)* @optional; [[The item data to set for the index's item]] 105 @in data: const(void_ptr) @optional; [[The item data to set for the index's item]]
106 } 106 }
107 } 107 }
108 item_clear { 108 item_clear {
@@ -129,7 +129,7 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
129 @in after: Elm.Widget.Item; [[The index item to insert after.]] 129 @in after: Elm.Widget.Item; [[The index item to insert after.]]
130 @in letter: string; [[Letter under which the item should be indexed]] 130 @in letter: string; [[Letter under which the item should be indexed]]
131 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 131 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
132 @in data: const(void)* @optional; [[The item data to set for the index's item]] 132 @in data: const(void_ptr) @optional; [[The item data to set for the index's item]]
133 } 133 }
134 } 134 }
135 item_find { 135 item_find {
@@ -137,7 +137,7 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
137 137
138 return: Elm.Widget.Item; [[The index item handle, if found, or $NULL otherwise]] 138 return: Elm.Widget.Item; [[The index item handle, if found, or $NULL otherwise]]
139 params { 139 params {
140 @in data: const(void)*; [[The item data pointed to by the desired index item]] 140 @in data: const(void_ptr); [[The item data pointed to by the desired index item]]
141 } 141 }
142 } 142 }
143 item_insert_before { 143 item_insert_before {
@@ -158,7 +158,7 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
158 @in before: Elm.Widget.Item; [[The index item to insert after.]] 158 @in before: Elm.Widget.Item; [[The index item to insert after.]]
159 @in letter: string; [[Letter under which the item should be indexed]] 159 @in letter: string; [[Letter under which the item should be indexed]]
160 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 160 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
161 @in data: const(void)* @optional; [[The item data to set for the index's item]] 161 @in data: const(void_ptr) @optional; [[The item data to set for the index's item]]
162 } 162 }
163 } 163 }
164 item_append { 164 item_append {
@@ -175,7 +175,7 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
175 params { 175 params {
176 @in letter: string; [[Letter under which the item should be indexed]] 176 @in letter: string; [[Letter under which the item should be indexed]]
177 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]] 177 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]]
178 @in data: const(void)* @optional; [[The item data to set for the index's item]] 178 @in data: const(void_ptr) @optional; [[The item data to set for the index's item]]
179 } 179 }
180 } 180 }
181 selected_item_get @const { 181 selected_item_get @const {
@@ -200,7 +200,7 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
200 params { 200 params {
201 @in letter: string; [[Letter under which the item should be indexed]] 201 @in letter: string; [[Letter under which the item should be indexed]]
202 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 202 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
203 @in data: const(void)* @optional; [[The item data to set for the index's item]] 203 @in data: const(void_ptr) @optional; [[The item data to set for the index's item]]
204 @in cmp_func: Eina_Compare_Cb; [[The comparing function to be used to sort index items by index item handles]] 204 @in cmp_func: Eina_Compare_Cb; [[The comparing function to be used to sort index items by index item handles]]
205 @in cmp_data_func: Eina_Compare_Cb @optional; [[A fallback function to be called for the 205 @in cmp_data_func: Eina_Compare_Cb @optional; [[A fallback function to be called for the
206 sorting of index items by item data). It will be used 206 sorting of index items by item data). It will be used
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.eo b/src/lib/elementary/elm_interface_atspi_accessible.eo
index 342c9fe..c178a23 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.eo
+++ b/src/lib/elementary/elm_interface_atspi_accessible.eo
@@ -329,7 +329,7 @@ mixin Elm.Interface.Atspi_Accessible ()
329 [[Register accessibility event listener]] 329 [[Register accessibility event listener]]
330 params { 330 params {
331 @in cb: Eo_Event_Cb; [[callback]] 331 @in cb: Eo_Event_Cb; [[callback]]
332 @in data: void*; [[data]] 332 @in data: void_ptr; [[data]]
333 } 333 }
334 return: Elm.Atspi.Event.Handler*; [[Event handler]] 334 return: Elm.Atspi.Event.Handler*; [[Event handler]]
335 } 335 }
@@ -343,7 +343,7 @@ mixin Elm.Interface.Atspi_Accessible ()
343 params { 343 params {
344 @in accessible: Elm.Interface.Atspi_Accessible; [[Accessibility object.]] 344 @in accessible: Elm.Interface.Atspi_Accessible; [[Accessibility object.]]
345 @in event: const(Eo.Event.Description)*; [[Accessibility event type.]] 345 @in event: const(Eo.Event.Description)*; [[Accessibility event type.]]
346 @in event_info: void*; [[Accessibility event details.]] 346 @in event_info: void_ptr; [[Accessibility event details.]]
347 } 347 }
348 } 348 }
349 @property translation_domain { 349 @property translation_domain {
diff --git a/src/lib/elementary/elm_interface_fileselector.eo b/src/lib/elementary/elm_interface_fileselector.eo
index 9484719..389857e 100644
--- a/src/lib/elementary/elm_interface_fileselector.eo
+++ b/src/lib/elementary/elm_interface_fileselector.eo
@@ -163,7 +163,7 @@ interface Elm.Interface.Fileselector ()
163 [[Append custom filter into filter list]] 163 [[Append custom filter into filter list]]
164 params { 164 params {
165 @in func: Elm_Fileselector_Filter_Func; [[function]] 165 @in func: Elm_Fileselector_Filter_Func; [[function]]
166 @in data: void *; 166 @in data: void_ptr;
167 @in filter_name: string; 167 @in filter_name: string;
168 } 168 }
169 return: bool; 169 return: bool;
diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo
index e7dc9ef..8788da4 100644
--- a/src/lib/elementary/elm_layout.eo
+++ b/src/lib/elementary/elm_layout.eo
@@ -219,7 +219,7 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File)
219 @in source: string; [[The signal's source string.]] 219 @in source: string; [[The signal's source string.]]
220 @in func: Edje.Signal_Cb; [[The callback function to be executed 220 @in func: Edje.Signal_Cb; [[The callback function to be executed
221 when the signal is emitted.]] 221 when the signal is emitted.]]
222 @in data: void * @optional; [[A pointer to data to pass in to the 222 @in data: void_ptr @optional; [[A pointer to data to pass in to the
223 callback function.]] 223 callback function.]]
224 } 224 }
225 } 225 }
@@ -279,7 +279,7 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File)
279 previous call to @.signal_callback_add. The data pointer that 279 previous call to @.signal_callback_add. The data pointer that
280 was passed to this call will be returned. 280 was passed to this call will be returned.
281 ]] 281 ]]
282 return: void *; [[The data pointer of the signal callback (passed on 282 return: void_ptr; [[The data pointer of the signal callback (passed on
283 @.signal_callback_add) or $null on errors.]] 283 @.signal_callback_add) or $null on errors.]]
284 params { 284 params {
285 @in emission: string; [[The signal's name string.]] 285 @in emission: string; [[The signal's name string.]]
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 6a8a11c..2f3215c 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -231,7 +231,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
231 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] 231 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
232 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] 232 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
233 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 233 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
234 @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]] 234 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
235 } 235 }
236 } 236 }
237 go { 237 go {
@@ -278,7 +278,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
278 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] 278 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
279 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] 279 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
280 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 280 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
281 @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]] 281 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
282 } 282 }
283 } 283 }
284 at_xy_item_get @const { 284 at_xy_item_get @const {
@@ -348,7 +348,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
348 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] 348 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
349 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] 349 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
350 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 350 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
351 @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]] 351 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
352 } 352 }
353 } 353 }
354 item_prepend { 354 item_prepend {
@@ -379,7 +379,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
379 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] 379 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
380 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] 380 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
381 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 381 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
382 @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]] 382 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
383 } 383 }
384 } 384 }
385 clear { 385 clear {
@@ -417,7 +417,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
417 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] 417 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
418 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] 418 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
419 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 419 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
420 @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]] 420 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
421 @in cmp_func: Eina_Compare_Cb; [[The comparing function to be used to sort list 421 @in cmp_func: Eina_Compare_Cb; [[The comparing function to be used to sort list
422 items by #Elm.Widget.Item item handles. This function will 422 items by #Elm.Widget.Item item handles. This function will
423 receive two items and compare them, returning a non-negative integer 423 receive two items and compare them, returning a non-negative integer
diff --git a/src/lib/elementary/elm_list_item.eo b/src/lib/elementary/elm_list_item.eo
index 4a79135..939048b 100644
--- a/src/lib/elementary/elm_list_item.eo
+++ b/src/lib/elementary/elm_list_item.eo
@@ -83,7 +83,7 @@ class Elm.List.Item(Elm.Widget.Item)
83 /* init { FIXME 83 /* init { FIXME
84 params { 84 params {
85 Evas_Smart_Cb func; 85 Evas_Smart_Cb func;
86 const(void)* data; 86 const(void_ptr) data;
87 } 87 }
88 }*/ 88 }*/
89 show { 89 show {
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index ead23a0..20d3253 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -343,14 +343,14 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
343 @in tlon: double; [[The destination longitude.]] 343 @in tlon: double; [[The destination longitude.]]
344 @in tlat: double; [[The destination latitude.]] 344 @in tlat: double; [[The destination latitude.]]
345 @in route_cb: Elm_Map_Route_Cb @optional; [[The route to be traced.]] 345 @in route_cb: Elm_Map_Route_Cb @optional; [[The route to be traced.]]
346 @in data: void * @optional; [[A pointer of user data.]] 346 @in data: void_ptr @optional; [[A pointer of user data.]]
347 } 347 }
348 } 348 }
349 track_add { 349 track_add {
350 [[Add a track on the map.]] 350 [[Add a track on the map.]]
351 return: Evas.Object; [[The route object. This is an elm object of type Route.]] 351 return: Evas.Object; [[The route object. This is an elm object of type Route.]]
352 params { 352 params {
353 @in emap: void *; [[The emap route object.]] 353 @in emap: void_ptr; [[The emap route object.]]
354 } 354 }
355 } 355 }
356 region_to_canvas_convert @const { 356 region_to_canvas_convert @const {
@@ -495,7 +495,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
495 @in lon: double; [[The longitude.]] 495 @in lon: double; [[The longitude.]]
496 @in lat: double; [[The latitude.]] 496 @in lat: double; [[The latitude.]]
497 @in name_cb: Elm_Map_Name_Cb @optional; [[The callback function.]] 497 @in name_cb: Elm_Map_Name_Cb @optional; [[The callback function.]]
498 @in data: void * @optional; [[The user callback data.]] 498 @in data: void_ptr @optional; [[The user callback data.]]
499 } 499 }
500 } 500 }
501 name_search @const { 501 name_search @const {
@@ -508,7 +508,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
508 params { 508 params {
509 @in address: string; [[The address.]] 509 @in address: string; [[The address.]]
510 @in name_cb: Elm_Map_Name_List_Cb @optional; [[The callback function.]] 510 @in name_cb: Elm_Map_Name_List_Cb @optional; [[The callback function.]]
511 @in data: void * @optional; [[The user callback data.]] 511 @in data: void_ptr @optional; [[The user callback data.]]
512 } 512 }
513 } 513 }
514 region_bring_in { 514 region_bring_in {
diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo
index 89bc483..60a570e 100644
--- a/src/lib/elementary/elm_menu.eo
+++ b/src/lib/elementary/elm_menu.eo
@@ -51,7 +51,7 @@ class Elm.Menu (Elm.Widget, Evas.Clickable_Interface, Elm.Interface.Atspi.Select
51 @in icon: string @optional; [[An icon display on the item. The icon will be destroyed by the menu.]] 51 @in icon: string @optional; [[An icon display on the item. The icon will be destroyed by the menu.]]
52 @in label: string; [[The label of the item.]] 52 @in label: string; [[The label of the item.]]
53 @in func: Evas_Smart_Cb @optional; [[Function called when the user select the item.]] 53 @in func: Evas_Smart_Cb @optional; [[Function called when the user select the item.]]
54 @in data: const(void)* @optional; [[Data sent by the callback.]] 54 @in data: const(void_ptr) @optional; [[Data sent by the callback.]]
55 } 55 }
56 } 56 }
57 close { 57 close {
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index 12560f6..d98caf7 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -43,7 +43,7 @@ class Elm.Multibuttonentry (Elm.Layout)
43 } 43 }
44 values { 44 values {
45 format_function: Elm_Multibuttonentry_Format_Cb @nullable; [[format_function The actual format function]] 45 format_function: Elm_Multibuttonentry_Format_Cb @nullable; [[format_function The actual format function]]
46 data: const(void)* @optional; [[data User data to passed to $format_function]] 46 data: const(void_ptr) @optional; [[data User data to passed to $format_function]]
47 } 47 }
48 } 48 }
49 @property items { 49 @property items {
@@ -90,7 +90,7 @@ class Elm.Multibuttonentry (Elm.Layout)
90 params { 90 params {
91 @in label: string; [[The label of new item]] 91 @in label: string; [[The label of new item]]
92 @in func: Evas_Smart_Cb @optional; [[The callback function to be invoked when this item is pressed.]] 92 @in func: Evas_Smart_Cb @optional; [[The callback function to be invoked when this item is pressed.]]
93 @in data: void * @optional; [[The pointer to the data to be attached]] 93 @in data: void_ptr @optional; [[The pointer to the data to be attached]]
94 } 94 }
95 } 95 }
96 clear { 96 clear {
@@ -105,7 +105,7 @@ class Elm.Multibuttonentry (Elm.Layout)
105 105
106 params { 106 params {
107 @in func: Elm_Multibuttonentry_Item_Filter_Cb; [[The filter function to remove]] 107 @in func: Elm_Multibuttonentry_Item_Filter_Cb; [[The filter function to remove]]
108 @in data: void *; [[The user data passed when adding the function]] 108 @in data: void_ptr; [[The user data passed when adding the function]]
109 } 109 }
110 } 110 }
111 item_insert_before { 111 item_insert_before {
@@ -118,7 +118,7 @@ class Elm.Multibuttonentry (Elm.Layout)
118 @in before: Elm.Widget.Item; [[The item before which to add it]] 118 @in before: Elm.Widget.Item; [[The item before which to add it]]
119 @in label: string; [[The label of new item]] 119 @in label: string; [[The label of new item]]
120 @in func: Evas_Smart_Cb @optional; [[The callback function to be invoked when this item is pressed.]] 120 @in func: Evas_Smart_Cb @optional; [[The callback function to be invoked when this item is pressed.]]
121 @in data: void * @optional; [[The pointer to the data to be attached]] 121 @in data: void_ptr @optional; [[The pointer to the data to be attached]]
122 } 122 }
123 } 123 }
124 item_append { 124 item_append {
@@ -130,7 +130,7 @@ class Elm.Multibuttonentry (Elm.Layout)
130 params { 130 params {
131 @in label: string; [[The label of new item]] 131 @in label: string; [[The label of new item]]
132 @in func: Evas_Smart_Cb @optional; [[The callback function to be invoked when this item is pressed.]] 132 @in func: Evas_Smart_Cb @optional; [[The callback function to be invoked when this item is pressed.]]
133 @in data: void * @optional; [[The pointer to the data to be attached]] 133 @in data: void_ptr @optional; [[The pointer to the data to be attached]]
134 } 134 }
135 } 135 }
136 item_filter_prepend { 136 item_filter_prepend {
@@ -140,7 +140,7 @@ class Elm.Multibuttonentry (Elm.Layout)
140 for more information]] 140 for more information]]
141 params { 141 params {
142 @in func: Elm_Multibuttonentry_Item_Filter_Cb; [[The function to use as text filter]] 142 @in func: Elm_Multibuttonentry_Item_Filter_Cb; [[The function to use as text filter]]
143 @in data: void *; [[User data to pass to $func]] 143 @in data: void_ptr; [[User data to pass to $func]]
144 } 144 }
145 } 145 }
146 item_filter_append { 146 item_filter_append {
@@ -156,7 +156,7 @@ class Elm.Multibuttonentry (Elm.Layout)
156 156
157 params { 157 params {
158 @in func: Elm_Multibuttonentry_Item_Filter_Cb; [[The function to use as item filter]] 158 @in func: Elm_Multibuttonentry_Item_Filter_Cb; [[The function to use as item filter]]
159 @in data: void *; [[User data to pass to $func]] 159 @in data: void_ptr; [[User data to pass to $func]]
160 } 160 }
161 } 161 }
162 item_insert_after { 162 item_insert_after {
@@ -169,7 +169,7 @@ class Elm.Multibuttonentry (Elm.Layout)
169 @in after: Elm.Widget.Item; [[The item after which to add it]] 169 @in after: Elm.Widget.Item; [[The item after which to add it]]
170 @in label: string; [[The label of new item]] 170 @in label: string; [[The label of new item]]
171 @in func: Evas_Smart_Cb @optional; [[The callback function to be invoked when this item is pressed.]] 171 @in func: Evas_Smart_Cb @optional; [[The callback function to be invoked when this item is pressed.]]
172 @in data: void * @optional; [[The pointer to the data to be attached]] 172 @in data: void_ptr @optional; [[The pointer to the data to be attached]]
173 } 173 }
174 } 174 }
175 } 175 }
diff --git a/src/lib/elementary/elm_naviframe_item.eo b/src/lib/elementary/elm_naviframe_item.eo
index c110710..bd5a1ef 100644
--- a/src/lib/elementary/elm_naviframe_item.eo
+++ b/src/lib/elementary/elm_naviframe_item.eo
@@ -70,7 +70,7 @@ class Elm.Naviframe.Item(Elm.Widget.Item)
70 ]] 70 ]]
71 params { 71 params {
72 @in func: Elm_Naviframe_Item_Pop_Cb @nullable; [[The callback function.]] 72 @in func: Elm_Naviframe_Item_Pop_Cb @nullable; [[The callback function.]]
73 @in data: void * @optional; [[Data to be passed to func call.]] 73 @in data: void_ptr @optional; [[Data to be passed to func call.]]
74 } 74 }
75 } 75 }
76 } 76 }
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index dfc72fd..0f8ac58 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -155,7 +155,7 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
155 @in label: string; [[The Label of the new item.]] 155 @in label: string; [[The Label of the new item.]]
156 @in icon: Evas.Object @optional; [[Icon to be set on new item.]] 156 @in icon: Evas.Object @optional; [[Icon to be set on new item.]]
157 @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected.]] 157 @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected.]]
158 @in data: const(void)* @optional; [[Data passed to $func above.]] 158 @in data: const(void_ptr) @optional; [[Data passed to $func above.]]
159 } 159 }
160 } 160 }
161 dismiss { 161 dismiss {
diff --git a/src/lib/elementary/elm_route.eo b/src/lib/elementary/elm_route.eo
index 7e0a7bc..c51f42e 100644
--- a/src/lib/elementary/elm_route.eo
+++ b/src/lib/elementary/elm_route.eo
@@ -8,7 +8,7 @@ class Elm.Route (Elm.Widget)
8 [[No description supplied by the EAPI.]] 8 [[No description supplied by the EAPI.]]
9 } 9 }
10 values { 10 values {
11 emap: void *; 11 emap: void_ptr;
12 } 12 }
13 } 13 }
14 @property longitude_min_max { 14 @property longitude_min_max {
diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index d0eb6a9..8045633 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -276,7 +276,7 @@ class Elm.Slideshow (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
276 return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]] 276 return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
277 params { 277 params {
278 @in itc: const(Elm_Slideshow_Item_Class)*; [[The item class for the item.]] 278 @in itc: const(Elm_Slideshow_Item_Class)*; [[The item class for the item.]]
279 @in data: const(void)*; [[The item's data.]] 279 @in data: const(void_ptr); [[The item's data.]]
280 } 280 }
281 } 281 }
282 item_sorted_insert { 282 item_sorted_insert {
@@ -294,7 +294,7 @@ class Elm.Slideshow (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
294 on success, or $null on errors.]] 294 on success, or $null on errors.]]
295 params { 295 params {
296 @in itc: const(Elm_Slideshow_Item_Class)*; [[The item class for the item.]] 296 @in itc: const(Elm_Slideshow_Item_Class)*; [[The item class for the item.]]
297 @in data: const(void)*; [[The item's data.]] 297 @in data: const(void_ptr); [[The item's data.]]
298 @in func: Eina_Compare_Cb; [[The comparing function to be used to sort the slideshow 298 @in func: Eina_Compare_Cb; [[The comparing function to be used to sort the slideshow
299 items by #Elm_Slideshow_Item_Class item handles.]] 299 items by #Elm_Slideshow_Item_Class item handles.]]
300 } 300 }
diff --git a/src/lib/elementary/elm_sys_notify_interface.eo b/src/lib/elementary/elm_sys_notify_interface.eo
index 54d4775..0ad9d32 100644
--- a/src/lib/elementary/elm_sys_notify_interface.eo
+++ b/src/lib/elementary/elm_sys_notify_interface.eo
@@ -35,7 +35,7 @@ interface Elm.Sys_Notify_Interface
35 @in timeout: int; [[Timeout display in milliseconds]] 35 @in timeout: int; [[Timeout display in milliseconds]]
36 @in cb: Elm_Sys_Notify_Send_Cb; [[Callback used to retrieve the notification id 36 @in cb: Elm_Sys_Notify_Send_Cb; [[Callback used to retrieve the notification id
37 returned by the Notification Server]] 37 returned by the Notification Server]]
38 @in cb_data: const(void) * @optional; [[Optional context data]] 38 @in cb_data: const(void_ptr) @optional; [[Optional context data]]
39 } 39 }
40 } 40 }
41 simple_send @const { 41 simple_send @const {
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index 4691bca..ea23a5a 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -226,7 +226,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
226 @in icon: string @optional; [[A string with icon name or the absolute path of an image file.]] 226 @in icon: string @optional; [[A string with icon name or the absolute path of an image file.]]
227 @in label: string; [[The label of the item.]] 227 @in label: string; [[The label of the item.]]
228 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 228 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
229 @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]] 229 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
230 } 230 }
231 } 231 }
232 item_insert_after { 232 item_insert_after {
@@ -260,7 +260,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
260 @in icon: string @optional; [[A string with icon name or the absolute path of an image file.]] 260 @in icon: string @optional; [[A string with icon name or the absolute path of an image file.]]
261 @in label: string; [[The label of the item.]] 261 @in label: string; [[The label of the item.]]
262 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 262 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
263 @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]] 263 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
264 } 264 }
265 } 265 }
266 item_append { 266 item_append {
@@ -293,7 +293,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
293 @in icon: string @optional; [[A string with icon name or the absolute path of an image file.]] 293 @in icon: string @optional; [[A string with icon name or the absolute path of an image file.]]
294 @in label: string; [[The label of the item.]] 294 @in label: string; [[The label of the item.]]
295 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 295 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
296 @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]] 296 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
297 } 297 }
298 } 298 }
299 items_count @const { 299 items_count @const {
@@ -330,7 +330,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
330 @in icon: string @optional; [[A string with icon name or the absolute path of an image file.]] 330 @in icon: string @optional; [[A string with icon name or the absolute path of an image file.]]
331 @in label: string; [[The label of the item.]] 331 @in label: string; [[The label of the item.]]
332 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 332 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
333 @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]] 333 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
334 } 334 }
335 } 335 }
336 item_find_by_label @const { 336 item_find_by_label @const {
diff --git a/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo
index b0bc555..55746e6 100644
--- a/src/lib/elementary/elm_toolbar_item.eo
+++ b/src/lib/elementary/elm_toolbar_item.eo
@@ -20,7 +20,7 @@ struct Elm.Toolbar.Item.State
20 icon_str: string; 20 icon_str: string;
21 icon: Evas.Object; 21 icon: Evas.Object;
22 func: Evas_Smart_Cb ; 22 func: Evas_Smart_Cb ;
23 data: const(void)*; 23 data: const(void_ptr);
24} 24}
25 25
26class Elm.Toolbar.Item(Elm.Widget.Item) 26class Elm.Toolbar.Item(Elm.Widget.Item)
@@ -185,7 +185,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item)
185 /* init { FIXME 185 /* init { FIXME
186 params { 186 params {
187 Evas_Smart_Cb func; 187 Evas_Smart_Cb func;
188 const(void)* data; 188 const(void_ptr) data;
189 } 189 }
190 }*/ 190 }*/
191 icon_memfile_set { 191 icon_memfile_set {
@@ -195,7 +195,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item)
195 @.icon.set. 195 @.icon.set.
196 ]] 196 ]]
197 params { 197 params {
198 @in img: const (void) *; [[The binary data that will be used as an image.]] 198 @in img: const(void_ptr); [[The binary data that will be used as an image.]]
199 @in size: size; [[The size of binary data $img.]] 199 @in size: size; [[The size of binary data $img.]]
200 @in format: string; [[Optional format of $img to pass to the image loader.]] 200 @in format: string; [[Optional format of $img to pass to the image loader.]]
201 @in key: string; [[Optional key of $img to pass to the image loader (eg. if $img is an edje file).]] 201 @in key: string; [[Optional key of $img to pass to the image loader (eg. if $img is an edje file).]]
@@ -229,7 +229,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item)
229 @in icon: string; [[A string with icon name or the absolute path of an image file.]] 229 @in icon: string; [[A string with icon name or the absolute path of an image file.]]
230 @in label: string; [[The label of the new state.]] 230 @in label: string; [[The label of the new state.]]
231 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked when this state is selected.]] 231 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked when this state is selected.]]
232 @in data: const (void) * @optional; [[The data to associate with the state.]] 232 @in data: const(void_ptr) @optional; [[The data to associate with the state.]]
233 } 233 }
234 return: Elm.Toolbar.Item.State *; [[The toolbar item state, or $null upon failure.]] 234 return: Elm.Toolbar.Item.State *; [[The toolbar item state, or $null upon failure.]]
235 } 235 }
diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo
index fdc7106..b0f01d4 100644
--- a/src/lib/elementary/elm_web.eo
+++ b/src/lib/elementary/elm_web.eo
@@ -201,7 +201,7 @@ class Elm.Web (Elm.Widget)
201 } 201 }
202 values { 202 values {
203 func: Elm_Web_Console_Message; [[The callback function to be used.]] 203 func: Elm_Web_Console_Message; [[The callback function to be used.]]
204 data: void *; [[User data.]] 204 data: void_ptr; [[User data.]]
205 } 205 }
206 } 206 }
207 @property window_create_hook { 207 @property window_create_hook {
@@ -217,7 +217,7 @@ class Elm.Web (Elm.Widget)
217 } 217 }
218 values { 218 values {
219 func: Elm_Web_Window_Open @nullable; [[The hook function to be called when a window is requested.]] 219 func: Elm_Web_Window_Open @nullable; [[The hook function to be called when a window is requested.]]
220 data: void * @optional; [[User data.]] 220 data: void_ptr @optional; [[User data.]]
221 } 221 }
222 } 222 }
223 @property dialog_file_selector_hook { 223 @property dialog_file_selector_hook {
@@ -232,7 +232,7 @@ class Elm.Web (Elm.Widget)
232 } 232 }
233 values { 233 values {
234 func: Elm_Web_Dialog_File_Selector @nullable; [[The callback function to be used.]] 234 func: Elm_Web_Dialog_File_Selector @nullable; [[The callback function to be used.]]
235 data: void * @optional; [[User data.]] 235 data: void_ptr @optional; [[User data.]]
236 } 236 }
237 } 237 }
238 @property dialog_confirm_hook { 238 @property dialog_confirm_hook {
@@ -246,7 +246,7 @@ class Elm.Web (Elm.Widget)
246 } 246 }
247 values { 247 values {
248 func: Elm_Web_Dialog_Confirm @nullable; [[The callback function to be used.]] 248 func: Elm_Web_Dialog_Confirm @nullable; [[The callback function to be used.]]
249 data: void * @optional; [[User data.]] 249 data: void_ptr @optional; [[User data.]]
250 } 250 }
251 } 251 }
252 @property popup_selected { 252 @property popup_selected {
@@ -275,7 +275,7 @@ class Elm.Web (Elm.Widget)
275 } 275 }
276 values { 276 values {
277 func: Elm_Web_Dialog_Prompt @nullable; [[The callback function to be used.]] 277 func: Elm_Web_Dialog_Prompt @nullable; [[The callback function to be used.]]
278 data: void * @optional; [[User data.]] 278 data: void_ptr @optional; [[User data.]]
279 } 279 }
280 } 280 }
281 @property dialog_alert_hook { 281 @property dialog_alert_hook {
@@ -289,7 +289,7 @@ class Elm.Web (Elm.Widget)
289 } 289 }
290 values { 290 values {
291 func: Elm_Web_Dialog_Alert @nullable; [[callback function to be used.]] 291 func: Elm_Web_Dialog_Alert @nullable; [[callback function to be used.]]
292 data: void * @optional; [[User data.]] 292 data: void_ptr @optional; [[User data.]]
293 } 293 }
294 } 294 }
295 @property forward_possible { 295 @property forward_possible {
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index ad8402c..db604a5 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -300,7 +300,7 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
300 } 300 }
301 values { 301 values {
302 func: region_hook_func_type @nullable; 302 func: region_hook_func_type @nullable;
303 data: void * @optional; 303 data: void_ptr @optional;
304 } 304 }
305 } 305 }
306 @property domain_part_text_translatable { 306 @property domain_part_text_translatable {
@@ -562,14 +562,14 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
562 params { 562 params {
563 @in source: Evas.Object; 563 @in source: Evas.Object;
564 @in type: Evas.Callback_Type; 564 @in type: Evas.Callback_Type;
565 @in event_info: void *; 565 @in event_info: void_ptr;
566 } 566 }
567 return: bool; 567 return: bool;
568 } 568 }
569 event_callback_add { 569 event_callback_add {
570 params { 570 params {
571 @in func: Elm_Event_Cb; 571 @in func: Elm_Event_Cb;
572 @in data: const(void)* @optional; 572 @in data: const(void_ptr) @optional;
573 } 573 }
574 } 574 }
575 access { 575 access {
@@ -585,10 +585,10 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
585 } 585 }
586 } 586 }
587 event_callback_del { 587 event_callback_del {
588 return: void *; 588 return: void_ptr;
589 params { 589 params {
590 @in func: Elm_Event_Cb; 590 @in func: Elm_Event_Cb;
591 @in data: const(void)* @nullable; 591 @in data: const(void_ptr) @nullable;
592 } 592 }
593 } 593 }
594 on_focus { 594 on_focus {
@@ -630,7 +630,7 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
630 return: bool; 630 return: bool;
631 params { 631 params {
632 @in type: Evas.Callback_Type; 632 @in type: Evas.Callback_Type;
633 @in event_info: void *; 633 @in event_info: void_ptr;
634 @in event_flags: Efl.Event.Flags *; 634 @in event_flags: Efl.Event.Flags *;
635 } 635 }
636 } 636 }
@@ -639,7 +639,7 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
639 @in emission: string; 639 @in emission: string;
640 @in source: string; 640 @in source: string;
641 @in func: Edje.Signal_Cb; 641 @in func: Edje.Signal_Cb;
642 @in data: void *; 642 @in data: void_ptr;
643 } 643 }
644 } 644 }
645 focus_next_manager_is { 645 focus_next_manager_is {
@@ -776,7 +776,7 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
776 } 776 }
777 } 777 }
778 signal_callback_del { 778 signal_callback_del {
779 return: void *; 779 return: void_ptr;
780 params { 780 params {
781 @in emission: string; 781 @in emission: string;
782 @in source: string; 782 @in source: string;
diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo
index f7e6e09..ea87eef 100644
--- a/src/lib/elementary/elm_widget_item.eo
+++ b/src/lib/elementary/elm_widget_item.eo
@@ -278,7 +278,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
278 emission: string; [[The signal's name.]] 278 emission: string; [[The signal's name.]]
279 source: string; [[The signal's source.]] 279 source: string; [[The signal's source.]]
280 func: Elm_Object_Item_Signal_Cb; [[The callback function to be executed when the signal is emitted.]] 280 func: Elm_Object_Item_Signal_Cb; [[The callback function to be executed when the signal is emitted.]]
281 data: void *; [[A pointer to data to pass to the callback function.]] 281 data: void_ptr; [[A pointer to data to pass to the callback function.]]
282 } 282 }
283 } 283 }
284 signal_callback_del { 284 signal_callback_del {
@@ -299,7 +299,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
299 source: string; [[The signal's source.]] 299 source: string; [[The signal's source.]]
300 func: Elm_Object_Item_Signal_Cb; [[The callback function to be executed when the signal is emitted.]] 300 func: Elm_Object_Item_Signal_Cb; [[The callback function to be executed when the signal is emitted.]]
301 } 301 }
302 return: void*; [[The data pointer of the signal callback or $NULL, on errors.]] 302 return: void_ptr; [[The data pointer of the signal callback or $NULL, on errors.]]
303 } 303 }
304 signal_emit { 304 signal_emit {
305 [[Send a signal to the edje object of the widget item. 305 [[Send a signal to the edje object of the widget item.
@@ -463,7 +463,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
463 See: elm_object_tooltip_content_cb_set() for more details.]] 463 See: elm_object_tooltip_content_cb_set() for more details.]]
464 params { 464 params {
465 func: Elm_Tooltip_Item_Content_Cb @nullable; [[the function used to create the tooltip contents.]] 465 func: Elm_Tooltip_Item_Content_Cb @nullable; [[the function used to create the tooltip contents.]]
466 data: const (void) * @optional; [[what to provide to $func as callback data/context.]] 466 data: const(void_ptr) @optional; [[what to provide to $func as callback data/context.]]
467 del_cb: Evas_Smart_Cb @optional; [[called when data is not needed anymore, either when another callback replaces $func, the tooltip is unset with @.tooltip_unset or the owner $item dies. This callback receives as the first parameter the given $data, and $event_info is the item.]] 467 del_cb: Evas_Smart_Cb @optional; [[called when data is not needed anymore, either when another callback replaces $func, the tooltip is unset with @.tooltip_unset or the owner $item dies. This callback receives as the first parameter the given $data, and $event_info is the item.]]
468 468
469 } 469 }
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index 5ce07d8..acc8baf 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -12,7 +12,7 @@ struct Eo.Event {
12 [[Parameter passed in event callbacks holding extra event parameters]] 12 [[Parameter passed in event callbacks holding extra event parameters]]
13 object: Eo.Base; [[The object the event was called on.]] 13 object: Eo.Base; [[The object the event was called on.]]
14 desc: const(Eo.Event.Description) *; [[The event description.]] 14 desc: const(Eo.Event.Description) *; [[The event description.]]
15 info: void *; [[Extra event information passed by the event caller.]] 15 info: void_ptr; [[Extra event information passed by the event caller.]]
16} 16}
17 17
18type Eo.Event_Cb: __builtin_event_cb; [[An event callback prototype. 18type Eo.Event_Cb: __builtin_event_cb; [[An event callback prototype.
@@ -220,12 +220,12 @@ abstract Eo.Base ()
220 } 220 }
221 set { 221 set {
222 values { 222 values {
223 data: const(void) *; [[the data to set]] 223 data: const(void_ptr); [[the data to set]]
224 } 224 }
225 } 225 }
226 get { 226 get {
227 values { 227 values {
228 data: void *; [[the data to set]] 228 data: void_ptr; [[the data to set]]
229 } 229 }
230 } 230 }
231 } 231 }
@@ -306,7 +306,7 @@ abstract Eo.Base ()
306 @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]] 306 @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]]
307 @in priority: Eo.Callback_Priority; [[The priority of the callback]] 307 @in priority: Eo.Callback_Priority; [[The priority of the callback]]
308 @in cb: Eo.Event_Cb; [[the callback to call]] 308 @in cb: Eo.Event_Cb; [[the callback to call]]
309 @in data: const(void)*; [[additional data to pass to the callback]] 309 @in data: const(void_ptr); [[additional data to pass to the callback]]
310 } 310 }
311 } 311 }
312 event_callback_del { 312 event_callback_del {
@@ -315,7 +315,7 @@ abstract Eo.Base ()
315 params { 315 params {
316 @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]] 316 @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]]
317 @in func: Eo.Event_Cb; [[the callback to delete]] 317 @in func: Eo.Event_Cb; [[the callback to delete]]
318 @in user_data: const(void)*; [[The data to compare]] 318 @in user_data: const(void_ptr); [[The data to compare]]
319 } 319 }
320 } 320 }
321 event_callback_array_priority_add { 321 event_callback_array_priority_add {
@@ -328,7 +328,7 @@ abstract Eo.Base ()
328 params { 328 params {
329 @in array: const(Eo.Callback_Array_Item)*; [[an #Eo_Callback_Array_Item of events to listen to]] 329 @in array: const(Eo.Callback_Array_Item)*; [[an #Eo_Callback_Array_Item of events to listen to]]
330 @in priority: Eo.Callback_Priority; [[The priority of the callback]] 330 @in priority: Eo.Callback_Priority; [[The priority of the callback]]
331 @in data: const(void)*; [[additional data to pass to the callback]] 331 @in data: const(void_ptr); [[additional data to pass to the callback]]
332 } 332 }
333 } 333 }
334 event_callback_array_del { 334 event_callback_array_del {
@@ -338,14 +338,14 @@ abstract Eo.Base ()
338 return: bool; [[Return true when the callback has been successfully removed.]] 338 return: bool; [[Return true when the callback has been successfully removed.]]
339 params { 339 params {
340 @in array: const(Eo.Callback_Array_Item)*; [[an #Eo_Callback_Array_Item of events to listen to]] 340 @in array: const(Eo.Callback_Array_Item)*; [[an #Eo_Callback_Array_Item of events to listen to]]
341 @in user_data: const(void)*; [[The data to compare]] 341 @in user_data: const(void_ptr); [[The data to compare]]
342 } 342 }
343 } 343 }
344 event_callback_call { 344 event_callback_call {
345 [[Call the callbacks for an event of an object.]] 345 [[Call the callbacks for an event of an object.]]
346 params { 346 params {
347 @in desc: const(Eo.Event.Description)*; [[The description of the event to call]] 347 @in desc: const(Eo.Event.Description)*; [[The description of the event to call]]
348 @in event_info: void *; [[Extra event info to pass to the callbacks]] 348 @in event_info: void_ptr; [[Extra event info to pass to the callbacks]]
349 } 349 }
350 return: bool; [[$true if one of the callbacks aborted the call, 350 return: bool; [[$true if one of the callbacks aborted the call,
351 $false otherwise 351 $false otherwise
diff --git a/src/lib/evas/canvas/efl_canvas_surface.eo b/src/lib/evas/canvas/efl_canvas_surface.eo
index ae61ddd..91408f5 100644
--- a/src/lib/evas/canvas/efl_canvas_surface.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface.eo
@@ -22,7 +22,7 @@ mixin Efl.Canvas.Surface (Evas.Image)
22 return: bool @warn_unused; 22 return: bool @warn_unused;
23 } 23 }
24 values { 24 values {
25 buffer: void*; [[The external buffer, depends on its type.]] 25 buffer: void_ptr; [[The external buffer, depends on its type.]]
26 } 26 }
27 } 27 }
28 } 28 }
diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.eo b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
index c454f46..18d84a7 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_x11.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
@@ -1,7 +1,7 @@
1struct Efl.Canvas.Surface.X11_Pixmap 1struct Efl.Canvas.Surface.X11_Pixmap
2{ 2{
3 [[The type used by @Efl.Canvas.Surface.native_buffer.]] 3 [[The type used by @Efl.Canvas.Surface.native_buffer.]]
4 visual: void *; [[X11 Visual for this Pixmap.]] 4 visual: void_ptr; [[X11 Visual for this Pixmap.]]
5 pixmap: ulong; [[X11 Pixmap ID.]] 5 pixmap: ulong; [[X11 Pixmap ID.]]
6} 6}
7 7
@@ -15,7 +15,7 @@ class Efl.Canvas.Surface.X11 (Efl.Canvas.Surface)
15 get {} 15 get {}
16 set { return: bool; } 16 set { return: bool; }
17 values { 17 values {
18 visual: void *; [[X11 Visual for this Pixmap.]] 18 visual: void_ptr; [[X11 Visual for this Pixmap.]]
19 pixmap: ulong; [[X11 Pixmap ID.]] 19 pixmap: ulong; [[X11 Pixmap ID.]]
20 } 20 }
21 } 21 }
diff --git a/src/lib/evas/canvas/efl_event_pointer.eo b/src/lib/evas/canvas/efl_event_pointer.eo
index 811afe9..b6def27 100644
--- a/src/lib/evas/canvas/efl_event_pointer.eo
+++ b/src/lib/evas/canvas/efl_event_pointer.eo
@@ -131,7 +131,7 @@ class Efl.Event.Pointer (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input)
131 ]] 131 ]]
132 params { 132 params {
133 @in owner: Eo.Base; [[The parent object.]] 133 @in owner: Eo.Base; [[The parent object.]]
134 @out priv: void*; [[Pointer to the internal data of the object.]] 134 @out priv: void_ptr; [[Pointer to the internal data of the object.]]
135 } 135 }
136 return: own(Efl.Event.Pointer); 136 return: own(Efl.Event.Pointer);
137 } 137 }
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index d33ec74..5e74b80 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -74,7 +74,7 @@ class Evas.Box (Evas.Smart.Clipped)
74 } 74 }
75 values { 75 values {
76 cb: Evas_Object_Box_Layout @nonull; [[The new layout function to set on $o.]] 76 cb: Evas_Object_Box_Layout @nonull; [[The new layout function to set on $o.]]
77 data: const(void)*; [[Data pointer to be passed to $cb.]] 77 data: const(void_ptr); [[Data pointer to be passed to $cb.]]
78 free_data: Eina_Free_Cb; [[Function to free $data, if need be.]] 78 free_data: Eina_Free_Cb; [[Function to free $data, if need be.]]
79 } 79 }
80 } 80 }
@@ -128,7 +128,7 @@ class Evas.Box (Evas.Smart.Clipped)
128 functions.]] 128 functions.]]
129 params { 129 params {
130 priv: Evas_Object_Box_Data *; 130 priv: Evas_Object_Box_Data *;
131 data: void *; 131 data: void_ptr;
132 } 132 }
133 } 133 }
134 layout_vertical { 134 layout_vertical {
@@ -139,7 +139,7 @@ class Evas.Box (Evas.Smart.Clipped)
139 behaviour can be derived from that function's documentation.]] 139 behaviour can be derived from that function's documentation.]]
140 params { 140 params {
141 priv: Evas_Object_Box_Data *; 141 priv: Evas_Object_Box_Data *;
142 data: void *; 142 data: void_ptr;
143 } 143 }
144 } 144 }
145 layout_homogeneous_max_size_horizontal { 145 layout_homogeneous_max_size_horizontal {
@@ -185,7 +185,7 @@ class Evas.Box (Evas.Smart.Clipped)
185 (respecting the max hint on the child's height).]] 185 (respecting the max hint on the child's height).]]
186 params { 186 params {
187 priv: Evas_Object_Box_Data *; 187 priv: Evas_Object_Box_Data *;
188 data: void *; 188 data: void_ptr;
189 } 189 }
190 190
191 } 191 }
@@ -205,7 +205,7 @@ class Evas.Box (Evas.Smart.Clipped)
205 behaviour can be derived from that function's documentation.]] 205 behaviour can be derived from that function's documentation.]]
206 params { 206 params {
207 priv: Evas_Object_Box_Data *; 207 priv: Evas_Object_Box_Data *;
208 data: void *; 208 data: void_ptr;
209 } 209 }
210 } 210 }
211 internal_option_free { 211 internal_option_free {
@@ -491,7 +491,7 @@ class Evas.Box (Evas.Smart.Clipped)
491 (respecting the maximum size hint on the child's height).]] 491 (respecting the maximum size hint on the child's height).]]
492 params { 492 params {
493 @in priv: Evas_Object_Box_Data *; 493 @in priv: Evas_Object_Box_Data *;
494 @in data: void *; 494 @in data: void_ptr;
495 } 495 }
496 } 496 }
497 internal_option_new { 497 internal_option_new {
@@ -512,7 +512,7 @@ class Evas.Box (Evas.Smart.Clipped)
512 documentation.]] 512 documentation.]]
513 params { 513 params {
514 @in priv: Evas_Object_Box_Data *; 514 @in priv: Evas_Object_Box_Data *;
515 @in data: void *; 515 @in data: void_ptr;
516 } 516 }
517 } 517 }
518 internal_insert_after { 518 internal_insert_after {
@@ -594,7 +594,7 @@ class Evas.Box (Evas.Smart.Clipped)
594 same applies to the vertical axis.]] 594 same applies to the vertical axis.]]
595 params { 595 params {
596 @in priv: Evas_Object_Box_Data *; 596 @in priv: Evas_Object_Box_Data *;
597 @in data: void *; 597 @in data: void_ptr;
598 } 598 }
599 } 599 }
600 layout_homogeneous_vertical { 600 layout_homogeneous_vertical {
@@ -606,7 +606,7 @@ class Evas.Box (Evas.Smart.Clipped)
606 of its behaviour can be derived from that function's documentation.]] 606 of its behaviour can be derived from that function's documentation.]]
607 params { 607 params {
608 priv: Evas_Object_Box_Data *; 608 priv: Evas_Object_Box_Data *;
609 data: void *; 609 data: void_ptr;
610 } 610 }
611 } 611 }
612 layout_flow_horizontal { 612 layout_flow_horizontal {
@@ -645,7 +645,7 @@ class Evas.Box (Evas.Smart.Clipped)
645 height required by a child object in the actual row.]] 645 height required by a child object in the actual row.]]
646 params { 646 params {
647 priv: Evas_Object_Box_Data *; 647 priv: Evas_Object_Box_Data *;
648 data: void *; 648 data: void_ptr;
649 } 649 }
650 } 650 }
651 count { 651 count {
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index 9333431..12f6ed3 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -187,7 +187,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface, Efl.Animator,
187 [[Returns the pointer attached by @.data_attach.set.]] 187 [[Returns the pointer attached by @.data_attach.set.]]
188 } 188 }
189 values { 189 values {
190 data: void *; [[The attached pointer.]] 190 data: void_ptr; [[The attached pointer.]]
191 } 191 }
192 } 192 }
193 @property font_hinting { 193 @property font_hinting {
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
index e82ae8f..9064f25 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
@@ -22,7 +22,7 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
22 @in frame: int; [[The number of the key frame.]] 22 @in frame: int; [[The number of the key frame.]]
23 @in attrib: Evas.Canvas3D.Vertex_Attrib; [[Vertex attribute ID.]] 23 @in attrib: Evas.Canvas3D.Vertex_Attrib; [[Vertex attribute ID.]]
24 @in stride: int; [[Stride to go to the next vertex (in bytes).]] 24 @in stride: int; [[Stride to go to the next vertex (in bytes).]]
25 @in data: const(void)*; [[Pointer to the vertex data buffer.]] 25 @in data: const(void_ptr); [[Pointer to the vertex data buffer.]]
26 } 26 }
27 } 27 }
28 28
@@ -39,7 +39,7 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
39 @in frame: int; [[The number of the key frame.]] 39 @in frame: int; [[The number of the key frame.]]
40 @in attrib: Evas.Canvas3D.Vertex_Attrib; [[Vertex attribute ID.]] 40 @in attrib: Evas.Canvas3D.Vertex_Attrib; [[Vertex attribute ID.]]
41 @in stride: int; [[Stride to go to the next vertex (in bytes).]] 41 @in stride: int; [[Stride to go to the next vertex (in bytes).]]
42 @in data: const(void)*; [[Pointer to the vertex data buffer.]] 42 @in data: const(void_ptr); [[Pointer to the vertex data buffer.]]
43 } 43 }
44 } 44 }
45 45
@@ -52,7 +52,7 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
52 original buffer will be returned. Otherwise, the returned pointer 52 original buffer will be returned. Otherwise, the returned pointer
53 can differ every time calling this function. 53 can differ every time calling this function.
54 ]] 54 ]]
55 return: void *; [[Starting address of the mapped vertex buffer.]] 55 return: void_ptr; [[Starting address of the mapped vertex buffer.]]
56 params { 56 params {
57 @in frame: int; [[The number of the key frame.]] 57 @in frame: int; [[The number of the key frame.]]
58 @in attrib: Evas.Canvas3D.Vertex_Attrib; [[Vertex attribute ID.]] 58 @in attrib: Evas.Canvas3D.Vertex_Attrib; [[Vertex attribute ID.]]
@@ -95,7 +95,7 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
95 params { 95 params {
96 @in format: Evas.Canvas3D.Index_Format; [[Vertex index data format.]] 96 @in format: Evas.Canvas3D.Index_Format; [[Vertex index data format.]]
97 @in count: int; [[Vertex index count.]] 97 @in count: int; [[Vertex index count.]]
98 @in indices: const(void)*; [[Pointer to the index data.]] 98 @in indices: const(void_ptr); [[Pointer to the index data.]]
99 } 99 }
100 } 100 }
101 101
@@ -122,7 +122,7 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
122 params { 122 params {
123 @in format: Evas.Canvas3D.Index_Format; [[Vertex index data format.]] 123 @in format: Evas.Canvas3D.Index_Format; [[Vertex index data format.]]
124 @in count: int; [[Vertex index count.]] 124 @in count: int; [[Vertex index count.]]
125 @in indices: const(void)*; [[Pointer to the index data.]] 125 @in indices: const(void_ptr); [[Pointer to the index data.]]
126 } 126 }
127 } 127 }
128 128
@@ -155,7 +155,7 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
155 be returned, otherwise, the returned pointer may differ every 155 be returned, otherwise, the returned pointer may differ every
156 time you call this function. 156 time you call this function.
157 ]] 157 ]]
158 return: void *; [[Pointer to the mapped buffer.]] 158 return: void_ptr; [[Pointer to the mapped buffer.]]
159 } 159 }
160 160
161 index_data_unmap { 161 index_data_unmap {
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.eo b/src/lib/evas/canvas/evas_canvas3d_object.eo
index ee4894c..8220274 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_object.eo
@@ -53,7 +53,7 @@ class Evas.Canvas3D.Object (Eo.Base, Evas.Common_Interface)
53 [[Pure virtual register samrt callback function.]] 53 [[Pure virtual register samrt callback function.]]
54 params { 54 params {
55 @in event: string; [[Event type.]] 55 @in event: string; [[Event type.]]
56 @in data: const(void)*; [[User data.]] 56 @in data: const(void_ptr); [[User data.]]
57 } 57 }
58 } 58 }
59 callback_unregister @virtual_pure { 59 callback_unregister @virtual_pure {
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.eo b/src/lib/evas/canvas/evas_canvas3d_texture.eo
index d63edc2..cd0a5a1 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.eo
@@ -52,7 +52,7 @@ class Evas.Canvas3D.Texture (Evas.Canvas3D.Object, Evas.Common_Interface)
52 @in color_format: Evas_Colorspace; [[Color format of the texture.]] 52 @in color_format: Evas_Colorspace; [[Color format of the texture.]]
53 @in w: int; [[Width of the data.]] 53 @in w: int; [[Width of the data.]]
54 @in h: int; [[Height of the data.]] 54 @in h: int; [[Height of the data.]]
55 @in data: const(void)*; [[Pointer to the data.]] 55 @in data: const(void_ptr); [[Pointer to the data.]]
56 } 56 }
57 } 57 }
58 58
diff --git a/src/lib/evas/canvas/evas_filter.eo b/src/lib/evas/canvas/evas_filter.eo
index cd825c2..7812a2a 100644
--- a/src/lib/evas/canvas/evas_filter.eo
+++ b/src/lib/evas/canvas/evas_filter.eo
@@ -31,8 +31,8 @@ mixin Evas.Filter (Efl.Gfx.Filter, Eo.Base)
31 ]] 31 ]]
32 return: bool; [[Indicates success from the object render function.]] 32 return: bool; [[Indicates success from the object render function.]]
33 params { 33 params {
34 filter: void*; [[Evas_Filter_Context]] 34 filter: void_ptr; [[Evas_Filter_Context]]
35 drawctx: void*; 35 drawctx: void_ptr;
36 l: int; 36 l: int;
37 r: int; 37 r: int;
38 t: int; 38 t: int;
@@ -54,7 +54,7 @@ mixin Evas.Filter (Efl.Gfx.Filter, Eo.Base)
54 ]] 54 ]]
55 } 55 }
56 values { 56 values {
57 buffer: void*; 57 buffer: void_ptr;
58 } 58 }
59 } 59 }
60 } 60 }
diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo
index c2174c3..2bc9d56 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -915,7 +915,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack,
915 @property smart_data { 915 @property smart_data {
916 get { 916 get {
917 [[Retrieve user data stored on a given smart object.]] 917 [[Retrieve user data stored on a given smart object.]]
918 return: void * @warn_unused; [[A pointer to data or $null.]] 918 return: void_ptr @warn_unused; [[A pointer to data or $null.]]
919 } 919 }
920 } 920 }
921 @property smart_clipped_clipper { 921 @property smart_clipped_clipper {
diff --git a/src/lib/evas/canvas/evas_object_smart.eo b/src/lib/evas/canvas/evas_object_smart.eo
index 982ba23..9d1188d 100644
--- a/src/lib/evas/canvas/evas_object_smart.eo
+++ b/src/lib/evas/canvas/evas_object_smart.eo
@@ -77,7 +77,7 @@ class Evas.Object.Smart (Evas.Object, Evas.Signal_Interface)
77 See also @.data.get.]] 77 See also @.data.get.]]
78 } 78 }
79 values { 79 values {
80 data: void *; [[A pointer to user data.]] 80 data: void_ptr; [[A pointer to user data.]]
81 } 81 }
82 } 82 }
83 @property members { 83 @property members {
diff --git a/src/lib/evas/include/evas_ector_buffer.eo b/src/lib/evas/include/evas_ector_buffer.eo
index df15b75..1edac4b 100644
--- a/src/lib/evas/include/evas_ector_buffer.eo
+++ b/src/lib/evas/include/evas_ector_buffer.eo
@@ -10,7 +10,7 @@ interface Evas.Ector.Buffer
10 set { [[This Buffer will hold a reference to the evas image struct.]] } 10 set { [[This Buffer will hold a reference to the evas image struct.]] }
11 values { 11 values {
12 evas: Evas.Canvas; [[The current Evas.]] 12 evas: Evas.Canvas; [[The current Evas.]]
13 image: void *; [[The engine-specific image struct.]] 13 image: void_ptr; [[The engine-specific image struct.]]
14 } 14 }
15 } 15 }
16 } 16 }
diff --git a/src/tests/eolian/generated_promise.eo b/src/tests/eolian/generated_promise.eo
index 5363da0..eccf34e 100644
--- a/src/tests/eolian/generated_promise.eo
+++ b/src/tests/eolian/generated_promise.eo
@@ -14,12 +14,12 @@ class Generated_Promise (Eo.Base)
14 method_multiple_args_1 { 14 method_multiple_args_1 {
15 params { 15 params {
16 @inout promise1: promise<int>; 16 @inout promise1: promise<int>;
17 @in data: void*; 17 @in data: void_ptr;
18 } 18 }
19 } 19 }
20 method_multiple_args_2 { 20 method_multiple_args_2 {
21 params { 21 params {
22 @in data: void*; 22 @in data: void_ptr;
23 @inout promise1: promise<int>; 23 @inout promise1: promise<int>;
24 } 24 }
25 } 25 }
diff --git a/src/tests/eolian_cxx/callback.eo b/src/tests/eolian_cxx/callback.eo
index 9dad09b..c05f64e 100644
--- a/src/tests/eolian_cxx/callback.eo
+++ b/src/tests/eolian_cxx/callback.eo
@@ -7,20 +7,20 @@ class Callback (Eo.Base)
7 onecallback { 7 onecallback {
8 params { 8 params {
9 @in cb: Ecore_Cb; 9 @in cb: Ecore_Cb;
10 @in data: void*; 10 @in data: void_ptr;
11 } 11 }
12 } 12 }
13 twocallback { 13 twocallback {
14 params { 14 params {
15 @in cb: Ecore_Cb; 15 @in cb: Ecore_Cb;
16 @in data: void*; 16 @in data: void_ptr;
17 @in cb2: Ecore_Cb; 17 @in cb2: Ecore_Cb;
18 } 18 }
19 } 19 }
20 test_global_callbacks @class { 20 test_global_callbacks @class {
21 params { 21 params {
22 @in cb: Ecore_Cb; 22 @in cb: Ecore_Cb;
23 @in data: void*; 23 @in data: void_ptr;
24 } 24 }
25 } 25 }
26 } 26 }
diff --git a/src/tests/eolian_cxx/generic.eo b/src/tests/eolian_cxx/generic.eo
index 8b8a606..cbff67a 100644
--- a/src/tests/eolian_cxx/generic.eo
+++ b/src/tests/eolian_cxx/generic.eo
@@ -26,7 +26,7 @@ class Generic (Eo.Base)
26 required_ctor_b { 26 required_ctor_b {
27 params { 27 params {
28 @in cb: Ecore_Cb; 28 @in cb: Ecore_Cb;
29 @in data: void*; 29 @in data: void_ptr;
30 } 30 }
31 } 31 }
32 optional_ctor_a { 32 optional_ctor_a {
@@ -37,7 +37,7 @@ class Generic (Eo.Base)
37 optional_ctor_b { 37 optional_ctor_b {
38 params { 38 params {
39 @in cb: Ecore_Cb; 39 @in cb: Ecore_Cb;
40 @in data: void*; 40 @in data: void_ptr;
41 } 41 }
42 } 42 }
43 call_req_ctor_b_callback { 43 call_req_ctor_b_callback {