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.
author: Daniel Kolesa <d.kolesa@osg.samsung.com> 2016-06-02 12:54:59 +0100
committer: Daniel Kolesa <d.kolesa@osg.samsung.com> 2016-06-02 13:00:26 +0100
commit: b1946ca5d611585572f1296088c57e4fd3c76279 (patch)
tree: a08cbd03656e2ff2d5a09fcac75ddd6081af80e6
parent: 69ea4145c95a28c79c43de89079fdbbca628054b (diff)
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)
         params {
            @in runtime: double; [[Animation runtime in seconds.]]
            @in func: Ecore_Timeline_Cb; [[Animation callback function.]]
-            @in data: const(void)*; [[Private data passed to callback functions.]]
+            @in data: const(void_ptr); [[Private data passed to callback functions.]]
         }
      }
      constructor {
@@ -25,7 +25,7 @@ class Ecore.Animator (Eo.Base)
         legacy: null;
         params {
            @in func: Ecore_Task_Cb; [[Animation callback function.]]
-            @in data: const(void)*; [[Private data passed to callback functions.]]
+            @in data: const(void_ptr); [[Private data passed to callback functions.]]
         }
      }
   }
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
 struct Ecore.Exe.Event_Data
 {
   exe: Eo.Base;  [[The handle to the process. FIXME: should actually be Ecore.Exe, workaround cyclic]]
-   data: void *; [[the raw binary data from the child process that was received]]
+   data: void_ptr; [[the raw binary data from the child process that was received]]
   size: int; [[the size of this data in bytes]]
   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]]
 }
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)
            for the poller.]]
            @in interval: int; [[The tick interval; must be a power of 2 and <= 32768.]]
            @in func: Ecore_Task_Cb; [[Ecore poller callback function.]]
-            @in data: const(void)*; [[Private data passed to callback function.]]
+            @in data: const(void_ptr); [[Private data passed to callback function.]]
         }
      }
      @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)
      job {
         [[Will execute that promise in the near future.]]
         params {
-            @in data: const(void)* @optional; [[The data to be given when the promise is done.]]
+            @in data: const(void_ptr) @optional; [[The data to be given when the promise is done.]]
         }
-         return: promise<void*>; [[The promise that will be triggered.]]
+         return: promise<void_ptr>; [[The promise that will be triggered.]]
      }
      timeout {
         [[Will trigger this promise when the specified timeout occur.]]
         params {
            @in time: double; [[The time from now in second that the main loop will wait before triggering it.]]
-            @in data: const(void)* @optional; [[The data to be given when the promise is done.]]
+            @in data: const(void_ptr) @optional; [[The data to be given when the promise is done.]]
         }
-         return: promise<void*>; [[The promise that will be triggered.]]
+         return: promise<void_ptr>; [[The promise that will be triggered.]]
      }
      args_add {
         [[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)
              vio: Ecore.Audio.Vio *; [[the @Ecore.Audio.Vio struct with
                                        the function callbacks
                                      ]]
-              data: void *; [[user data to pass to the VIO functions]]
+              data: void_ptr; [[user data to pass to the VIO functions]]
              free_func: eo_key_data_free_func; [[this function takes care to
                                                  clean up $data when he VIO is
                                                  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)
         ]]
         return: ssize; [[The amount of samples written to buf]]
         params {
-            @in buf: void *; [[The buffer to read into]]
+            @in buf: void_ptr; [[The buffer to read into]]
            @in len: size; [[The amount of samples to read]]
         }
      }
@@ -130,7 +130,7 @@ class Ecore.Audio.In (Ecore.Audio)
         ]]
         return: ssize; [[The amount of samples written to buf]]
         params {
-            @in buf: void *; [[The buffer to read into]]
+            @in buf: void_ptr; [[The buffer to read into]]
            @in len: size; [[The amount of samples to read]]
         }
      }
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) {
         values {
            name: string; [[The name of the eet stream.]]
            func: Ecore_Con_Eet_Data_Cb; [[The callback function.]]
-            data: const (void) *; [[The data (if any) that should be
+            data: const(void_ptr); [[The data (if any) that should be
                                    passed to callback function.]]
         }
      }
@@ -42,7 +42,7 @@ class Ecore.Con.Eet.Base (Eo.Base) {
         values {
            name: string; [[The name of the eet stream.]]
            func: Ecore_Con_Eet_Raw_Data_Cb; [[The callback function.]]
-            data: const (void) *; [[The data (if any) that should be
+            data: const(void_ptr); [[The data (if any) that should be
                                    passed to callback function.]]
         }
      }
@@ -74,7 +74,7 @@ class Ecore.Con.Eet.Base (Eo.Base) {
            reply: Ecore.Con.Reply *; [[Contains the ecore_con_eet object
                                        to which the data has to be sent.]]
            name: string; [[The name of the eet stream.]]
-            value: void *; [[Actual data]]
+            value: void_ptr; [[Actual data]]
         }
      }
      raw_send {
@@ -84,7 +84,7 @@ class Ecore.Con.Eet.Base (Eo.Base) {
                                        to which the data has to be sent.]]
            protocol_name: string; [[The name of the eet stream.]]
            section: string; [[Name of section in the eet descriptor.]]
-            value: void *; [[The value of the section.]]
+            value: void_ptr; [[The value of the section.]]
            length: uint; [[The length of the data that is being sent.]]
         }
      }
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) {
         legacy: null;
         params {
-            data: const(void)*; [[The given data]]
+            data: const(void_ptr); [[The given data]]
            size: int; [[Length of the data, in bytes.]]
         }
         return: int; [[The number of bytes sent. 0 will be returned if there
@@ -170,7 +170,7 @@ abstract Efl.Network (Eo.Base) {
         params {
            name: string @nonull; [[IP address or server name to translate.]]
            done_cb: Ecore_Con_Dns_Cb; [[Callback to notify when done.]]
-            data: const(void)*; [[User data to be given to done_cb.]]
+            data: const(void_ptr); [[User data to be given to done_cb.]]
         }
         return: bool; [[true if the request did not fail to be set up, false otherwise.]]
      }
@@ -184,7 +184,7 @@ abstract Efl.Network (Eo.Base) {
 /* FIXME: Should actually be a binbuf. */
 struct Ecore.Con.Event_Data.Received {
-    data: void *; [[The data that got sent.]]
+    data: void_ptr; [[The data that got sent.]]
    size: int; [[The length of the data sent.]]
 }
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 @@
-type @extern cairo_t: void *;
+type @extern cairo_t: void_ptr;
 class Ector.Cairo.Surface (Eo.Base, Ector.Surface)
 {
@@ -19,7 +19,7 @@ class Ector.Cairo.Surface (Eo.Base, Ector.Surface)
         }
      }
      symbol_get {
-         return: void * @warn_unused;
+         return: void_ptr @warn_unused;
         params {
            @in name: string;
         }
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
                                              map should try to convert the data into a new buffer]]
            @out stride: uint @optional; [[Returns the length in bytes of a mapped line]]
         }
-         return: void* @warn_unused; [[Pointer to the top-left pixel data. Returns $null in case of failure]]
+         return: void_ptr @warn_unused; [[Pointer to the top-left pixel data. Returns $null in case of failure]]
      }
      unmap @virtual_pure {
         [[Unmap a region of this buffer, and upload data to the GPU (if needed).]]
         params {
-            @in data: void*; [[Data pointer returned by a previous call to map]]
+            @in data: void_ptr; [[Data pointer returned by a previous call to map]]
            @in length: uint; [[Must be the same as returned by map.]]
         }
      }
      pixels_set @virtual_pure {
         [[Set the source pixels for this buffer, or allocate a new memory region]]
         params {
-            @in pixels: void*; [[If $null, allocates an empty buffer]]
+            @in pixels: void_ptr; [[If $null, allocates an empty buffer]]
            @in width: int; [[Buffer width]]
            @in height: int; [[Buffer height]]
            @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)
         }
         values {
            func: Edje.Text.Change_Cb; [[The callback function to handle the text change]]
-            data: void *; [[The data associated to the callback function.]]
+            data: void_ptr; [[The data associated to the callback function.]]
         }
      }
      @property part_text_cursor_begin {
@@ -281,7 +281,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
         }
         values {
            func: Edje.Item_Provider_Cb; [[The function to call (or $null to disable) to get item objects]]
-            data: void *; [[The data pointer to pass to the func callback]]
+            data: void_ptr; [[The data pointer to pass to the func callback]]
         }
      }
      @property part_text_cursor_line_begin {
@@ -310,7 +310,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
         }
         values {
            func: Edje.Message_Handler_Cb; [[The function to handle messages  coming from obj]]
-            data: void *; [[Auxiliary data to be passed to func]]
+            data: void_ptr; [[Auxiliary data to be passed to func]]
         }
      }
      @property size_min {
@@ -467,11 +467,11 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
           @since 1.2.0]]
-         return: void *; [[The same data pointer if successful, or $null otherwise]]
+         return: void_ptr; [[The same data pointer if successful, or $null otherwise]]
         params {
            @in part: string; [[The part name]]
            @in func: Edje.Markup_Filter_Cb; [[The function callback to remove]]
-            @in data: void *; [[The data passed to the callback function]]
+            @in data: void_ptr; [[The data passed to the callback function]]
         }
      }
      part_drag_step_set {
@@ -512,7 +512,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
           otherwise, the returned pointer is an Ecore_IMF
           @since 1.2.0]]
-         return: void *; [[The input method context (Ecore_IMF_Context *) in entry]]
+         return: void_ptr; [[The input method context (Ecore_IMF_Context *) in entry]]
         params {
            @in part: string; [[The part name]]
         }
@@ -547,12 +547,12 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
           \@ref edje_object_signal_callback_del_full().]]
         legacy: null;
-         return: void *; [[The data pointer]]
+         return: void_ptr; [[The data pointer]]
         params {
            @in emission: string; [[The emission string.]]
            @in source: string; [[The source string.]]
            @in func: Edje.Signal_Cb; [[The callback function.]]
-            @in data: void *; [[The callback function.]]
+            @in data: void_ptr; [[The callback function.]]
         }
      }
      part_text_cursor_next {
@@ -656,11 +656,11 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
           See also @.text_insert_filter_callback_add and @.text_insert_filter_callback_del]]
-         return: void *; [[The same data pointer if successful, or $null otherwise]]
+         return: void_ptr; [[The same data pointer if successful, or $null otherwise]]
         params {
            @in part: string; [[The part name]]
            @in func: Edje.Text.Filter_Cb; [[The function callback to remove]]
-            @in data: void *; [[The data passed to the callback function]]
+            @in data: void_ptr; [[The data passed to the callback function]]
         }
      }
      part_text_style_user_pop {
@@ -683,7 +683,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
         params {
            @in part: string; [[The part name]]
-            @in data: const(void)*; [[The specific data to be set to the input panel.]]
+            @in data: const(void_ptr); [[The specific data to be set to the input panel.]]
            @in len: int; [[the length of data, in bytes, to send to the input panel]]
         }
      }
@@ -693,7 +693,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
           @since 1.2.0]]
         params {
            @in part: string; [[The part name]]
-            @in data: void *; [[The specific data to be got from the input panel]]
+            @in data: void_ptr; [[The specific data to be got from the input panel]]
            @in len: int *; [[The length of data]]
         }
      }
@@ -1082,7 +1082,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
         params {
            @in type: Edje.Message_Type; [[The type of message to send to obj]]
            @in id: int; [[A identification number for the message to be sent]]
-            @in msg: void *; [[The message's body, a struct depending on type]]
+            @in msg: void_ptr; [[The message's body, a struct depending on type]]
         }
      }
      part_text_select_none @const {
@@ -1154,7 +1154,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
           See also @.text_insert_filter_callback_add and @.text_insert_filter_callback_del_full]]
-         return: void *; [[The user data pointer if successful, or $null otherwise]]
+         return: void_ptr; [[The user data pointer if successful, or $null otherwise]]
         params {
            @in part: string; [[The part name]]
            @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)
            @in source: string; [[The signal's "source" string]]
            @in func: Edje.Signal_Cb; [[The callback function to be executed when the signal is
                                        emitted.]]
-            @in data: void *; [[A pointer to data to pass in to func.]]
+            @in data: void_ptr; [[A pointer to data to pass in to func.]]
         }
      }
      part_text_select_all @const {
@@ -1397,7 +1397,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
         params {
            @in part: string; [[The part name]]
            @in func: Edje.Markup_Filter_Cb; [[The callback function that will act as markup filter]]
-            @in data: void *; [[User provided data to pass to the filter function]]
+            @in data: void_ptr; [[User provided data to pass to the filter function]]
         }
      }
      message_signal_process {
@@ -1876,7 +1876,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
         params {
            @in part: string; [[The part name]]
            @in func: Edje.Text.Filter_Cb; [[The callback function that will act as filter]]
-            @in data: void *; [[User provided data to pass to the filter function]]
+            @in data: void_ptr; [[User provided data to pass to the filter function]]
         }
      }
      part_text_input_panel_show @const {
@@ -1916,7 +1916,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
           @since 1.2.0]]
-         return: void *; [[The user data pointer if successful, or $null otherwise]]
+         return: void_ptr; [[The user data pointer if successful, or $null otherwise]]
         params {
            @in part: string; [[The part name]]
            @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 ()
      @property real_part @protected {
         set {}
         values {
-            ed: void*;
+            ed: void_ptr;
-            rp: void*;
+            rp: void_ptr;
            part: string;
         }
      }
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 ()
                                                        argb8888 by default.]]
            @out stride: int @optional; [[Returns the length in bytes of a mapped line]]
         }
-         return: void* @warn_unused; [[Pointer to the top-left pixel data. Returns $null in case of failure]]
+         return: void_ptr @warn_unused; [[Pointer to the top-left pixel data. Returns $null in case of failure]]
      }
      buffer_unmap {
         [[Unmap a region of this buffer, and update the internal data if needed.
@@ -149,7 +149,7 @@ interface Efl.Gfx.Buffer ()
           EFL will update the internal image if the map had write access.
         ]]
         params {
-            @in data: void*; [[Data pointer returned by a previous call to map]]
+            @in data: void_ptr; [[Data pointer returned by a previous call to map]]
            @in length: int; [[Must be the same as returned by map.]]
         }
         return: bool; [[This will return $false in case of failure (invalid
@@ -174,7 +174,7 @@ interface Efl.Gfx.Buffer ()
           internally.
         ]]
         params {
-            @in pixels: void* @nullable; [[If $null, allocates an empty buffer]]
+            @in pixels: void_ptr @nullable; [[If $null, allocates an empty buffer]]
            @in width: int;
            @in height: int;
            @in stride: int @optional; [[If 0, automatically guessed from the $width.]]
@@ -200,7 +200,7 @@ interface Efl.Gfx.Buffer ()
           $pixels should not be the return value of @.buffer_data_get.
         ]]
         params {
-            @in pixels: const(void)* @nullable; [[If $null, allocates an empty buffer]]
+            @in pixels: const(void_ptr) @nullable; [[If $null, allocates an empty buffer]]
            @in width: int;
            @in height: int;
            @in stride: int @optional; [[If 0, automatically guessed from the $width.]]
@@ -217,7 +217,7 @@ interface Efl.Gfx.Buffer ()
           Note: This is different from the legacy API data, which is now
           replaced by map/unmap.
         ]]
-         return: void* @warn_unused;
+         return: void_ptr @warn_unused;
      }
      /* Note: border, span and buffer flags not imported from ector buffer */
   }
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 ()
         values {
            /* FIXME: engine is an Eo.Class */
            engine: const(Eo.Base); [[Must be an $Efl.Pack.Layout subclass.]]
-            data: const(void)*;     [[Any data to pass along to $Efl.Pack.Layout.layout_do.
+            data: const(void_ptr);     [[Any data to pass along to $Efl.Pack.Layout.layout_do.
                                      Owned by the caller. Depends on the layout engine.]]
         }
      }
@@ -37,7 +37,7 @@ interface Efl.Pack.Layout ()
         [[Lay out (resize and move) children objects of $pack.]]
         params {
            pack: Efl.Gfx; [[The container to lay out.]]
-            data: const(void)* @optional; [[Extra data passed by the caller.]]
+            data: const(void_ptr) @optional; [[Extra data passed by the caller.]]
         }
      }
   }
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;
 struct Eio.Data
 {
  [[A structure to handle arbitrary data to be sent over Promises.]]
-  data: void *;
+  data: void_ptr;
  size: uint;
 }
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)
          ]]
          params {
             filter_cb: Eio_Filter_Direct_Cb; [[Filter callback]]
-             userdata: void *; [[User's private data]]
+             userdata: void_ptr; [[User's private data]]
          }
       }
       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)
         params {
            @in args: generic_value * @optional; [[an array of.]]
            @in view_open_cb: Elm_App_Client_Open_View_Cb @optional; [[callback to be called when view open]]
-            @in data: const(void)* @optional; [[callback user data]]
+            @in data: const(void_ptr) @optional; [[callback user data]]
         }
         return: Elm_App_Client_Pending *; [[handler to cancel the view opening if it takes to long ]]
      }
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)
         [[Pause view]]
         params {
            @in cb: Elm_App_Client_View_Cb @optional; [[callback to be called when view was paused ]]
-            @in data: const(void)* @optional; [[callback user data]]
+            @in data: const(void_ptr) @optional; [[callback user data]]
         }
      }
      resume {
         [[Resume view]]
         params {
            @in cb: Elm_App_Client_View_Cb @optional; [[callback to be called when view was resumed]]
-            @in data: const(void)* @optional; [[callback user data]]
+            @in data: const(void_ptr) @optional; [[callback user data]]
         }
      }
      close {
         [[Close view]]
         params {
            @in cb: Elm_App_Client_View_Cb @optional; [[callback to be called when view was closed]]
-            @in data: const(void)* @optional; [[callback user data]]
+            @in data: const(void_ptr) @optional; [[callback user data]]
         }
      }
   }
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)
         }
         values {
            cb: Evas_Object_Box_Layout @nullable; [[The callback function used for layout]]
-            data: const(void)* @optional; [[Data that will be passed to layout function]]
+            data: const(void_ptr) @optional; [[Data that will be passed to layout function]]
            free_data: Ecore_Cb @optional; [[Function called to free $data]]
         }
      }
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
            @in label: string; [[The Label of the new item]]
            @in icon: Evas.Object @optional; [[Icon to be set on new item]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]]
-            @in data: const(void)* @optional; [[Data passed to $func]]
+            @in data: const(void_ptr) @optional; [[Data passed to $func]]
         }
      }
      item_prepend {
@@ -196,7 +196,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
            @in label: string; [[The Label of the new item]]
            @in icon: Evas.Object @optional; [[Icon to be set on new item]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]]
-            @in data: const(void)* @optional; [[Data passed to $func]]
+            @in data: const(void_ptr) @optional; [[Data passed to $func]]
         }
      }
   }
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)
      init {
         params {
            func: Evas_Smart_Cb @nullable;
-            data: const(void) * @optional;
+            data: const(void_ptr) @optional;
         }
      }
   }
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,
            icon can be any Evas object, but usually it is an icon created
            with elm_icon_add(). ]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]]
-            @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]]
+            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
      }
      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)
           /*      init { FIXME
                   params {
                   Evas_Smart_Cb func;
-                   const(void)* data;
+                   const(void_ptr) data;
                   }
                   }*/
      }
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,
              IMPORTANT: Many functions may change (i.e delete and create a new one)
              the internal input method context. Do NOT cache the returned object.
            ]]
-            return: void *;
+            return: void_ptr;
         }
      }
      @property cursor_is_format {
@@ -679,7 +679,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
           This prepends the given callback.]]
         params {
            @in func: Elm_Entry_Item_Provider_Cb; [[The function called to provide the item object.]]
-            @in data: void * @optional; [[The data passed to $func.]]
+            @in data: void_ptr @optional; [[The data passed to $func.]]
         }
      }
      input_panel_show {
@@ -746,7 +746,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
         ]]
         params {
            @in func: Elm_Entry_Item_Provider_Cb; [[The function called to provide the item object.]]
-            @in data: void * @optional; [[The data passed to $func.]]
+            @in data: void_ptr @optional; [[The data passed to $func.]]
         }
      }
      text_style_user_peek @const {
@@ -796,7 +796,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
           The size and format of data are defined by the input panel.
         ]]
         params {
-            @in data: const(void)*; [[The specific data to be set to the input panel.]]
+            @in data: const(void_ptr); [[The specific data to be set to the input panel.]]
            @in len: int; [[The length of data, in bytes, to send to the input panel.]]
         }
      }
@@ -851,7 +851,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
         ]]
         params {
            @in func: Elm_Entry_Filter_Cb; [[The filter function to remove.]]
-            @in data: void * @optional; [[The user data passed when adding the function.]]
+            @in data: void_ptr @optional; [[The user data passed when adding the function.]]
         }
      }
      item_provider_append {
@@ -868,7 +868,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
         ]]
         params {
            @in func: Elm_Entry_Item_Provider_Cb; [[The function called to provide the item object.]]
-            @in data: void * @optional; [[The data passed to $func.]]
+            @in data: void_ptr @optional; [[The data passed to $func.]]
         }
      }
      markup_filter_append {
@@ -885,7 +885,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
         ]]
         params {
            @in func: Elm_Entry_Filter_Cb; [[The function to use as text filter.]]
-            @in data: void * @optional; [[User data to pass to $func.]]
+            @in data: void_ptr @optional; [[User data to pass to $func.]]
         }
      }
      entry_append {
@@ -919,7 +919,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
            @in icon_file: string @optional; [[The item's icon file.]]
            @in icon_type: Elm.Icon.Type; [[The item's icon type.]]
            @in func: Evas_Smart_Cb @optional; [[The callback to execute when the item is clicked.]]
-            @in data: const(void)* @optional; [[The data to associate with the item for related functions.]]
+            @in data: const(void_ptr) @optional; [[The data to associate with the item for related functions.]]
         }
      }
      markup_filter_prepend {
@@ -928,7 +928,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
           Prepend the given callback to the list.]]
         params {
            @in func: Elm_Entry_Filter_Cb; [[The function to use as text filter.]]
-            @in data: void * @optional; [[User data to pass to $func.]]
+            @in data: void_ptr @optional; [[User data to pass to $func.]]
         }
      }
   }
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,
            @in label: string; [[The (text) label of the new item.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience callback function to take place when
            item is selected.]]
-            @in data: void * @optional; [[Data passed to $func, above.]]
+            @in data: void_ptr @optional; [[Data passed to $func, above.]]
         }
      }
      flip_next {
@@ -110,7 +110,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
            @in label: string; [[The (text) label of the new item.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience callback function to take place when
            item is selected.]]
-            @in data: const(void)* @optional; [[Data passed to $func, above.]]
+            @in data: const(void_ptr) @optional; [[Data passed to $func, above.]]
         }
      }
      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,
         return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
         params {
            @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]]
-            @in data: const(void)*; [[The item data.]]
+            @in data: const(void_ptr); [[The item data.]]
            @in relative: Elm.Widget.Item; [[The item to place this new one before.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called
                                                 when the item is selected.]]
-            @in func_data: const(void)* @optional; [[Data to be passed to $func.]]
+            @in func_data: const(void_ptr) @optional; [[Data to be passed to $func.]]
         }
      }
      realized_items_update {
@@ -400,11 +400,11 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
         return: Elm.Widget.Item; [[A handle to the item added or $null on error.]]
         params {
            @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]]
-            @in data: const(void)*; [[The item data.]]
+            @in data: const(void_ptr); [[The item data.]]
            @in relative: Elm.Widget.Item; [[The item to place this new one after.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called
                                                 when the item is selected.]]
-            @in func_data: const(void)* @optional; [[Data to be passed to $func.]]
+            @in func_data: const(void_ptr) @optional; [[Data to be passed to $func.]]
         }
      }
      items_count @const {
@@ -448,10 +448,10 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
         return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
         params {
            @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]]
-            @in data: const(void)*; [[The item data.]]
+            @in data: const(void_ptr); [[The item data.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called
                                                 when the item is selected.]]
-            @in func_data: const(void)* @optional; [[Data to be passed to $func.]]
+            @in func_data: const(void_ptr) @optional; [[Data to be passed to $func.]]
         }
      }
      item_prepend {
@@ -462,10 +462,10 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
         return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
         params {
            @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]]
-            @in data: const(void)*; [[The item data.]]
+            @in data: const(void_ptr); [[The item data.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called
                                                 when the item is selected.]]
-            @in func_data: const(void)* @optional; [[Data to be passed to $func.]]
+            @in func_data: const(void_ptr) @optional; [[Data to be passed to $func.]]
         }
      }
      clear {
@@ -487,13 +487,13 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
         return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
         params {
            @in itc: const(Elm.Gengrid.Item.Class)*; [[The item class for the item.]]
-            @in data: const(void)*; [[The item data.]]
+            @in data: const(void_ptr); [[The item data.]]
            @in comp: Eina_Compare_Cb; [[User defined comparison function
                                         that defines the sort order based
                                         on gengrid item and its data.
                                       ]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]]
-            @in func_data: const(void)* @optional; [[Data to be passed to $func.]]
+            @in func_data: const(void_ptr) @optional; [[Data to be passed to $func.]]
         }
      }
      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)
           /*      init { FIXME
                   params {
                   Evas_Smart_Cb func;
-                   const(void)* data;
+                   const(void_ptr) data;
                   }
                   }*/
           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
         return: Elm.Widget.Item;
         params {
            @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]]
-            @in data: const(void)*; [[The item data.]]
+            @in data: const(void_ptr); [[The item data.]]
            @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]]
            @in before_it: Elm.Widget.Item; [[The item to place this new one before.]]
            @in type: Elm.Genlist.Item.Type; [[Item type.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]]
-            @in func_data: const(void)* @optional; [[Data passed to $func above.]]
+            @in func_data: const(void_ptr) @optional; [[Data passed to $func above.]]
         }
      }
      realized_items_update {
@@ -374,12 +374,12 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
         return: Elm.Widget.Item;
         params {
            @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]]
-            @in data: const(void)*; [[The item data.]]
+            @in data: const(void_ptr); [[The item data.]]
            @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]]
            @in after_it: Elm.Widget.Item; [[The item to place this new one after.]]
            @in type: Elm.Genlist.Item.Type; [[Item type.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]]
-            @in func_data: const(void)* @optional; [[Data passed to $func above.]]
+            @in func_data: const(void_ptr) @optional; [[Data passed to $func above.]]
         }
      }
      at_xy_item_get @const {
@@ -415,7 +415,7 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
            ]]
         }
         values {
-            key: void *; [[Filter key]]
+            key: void_ptr; [[Filter key]]
         }
      }
      filter_iterator_new {
@@ -452,11 +452,11 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
         return: Elm.Widget.Item;
         params {
            @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]]
-            @in data: const(void)*; [[The item data.]]
+            @in data: const(void_ptr); [[The item data.]]
            @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]]
            @in type: Elm.Genlist.Item.Type; [[Item type.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]]
-            @in func_data: const(void)* @optional; [[Data passed to $func above.]]
+            @in func_data: const(void_ptr) @optional; [[Data passed to $func above.]]
         }
      }
      clear {
@@ -474,11 +474,11 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
         return: Elm.Widget.Item;
         params {
            @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]]
-            @in data: const(void)*; [[The item data.]]
+            @in data: const(void_ptr); [[The item data.]]
            @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]]
            @in type: Elm.Genlist.Item.Type; [[Item type.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]]
-            @in func_data: const(void)* @optional; [[Data passed to $func above.]]
+            @in func_data: const(void_ptr) @optional; [[Data passed to $func above.]]
         }
      }
      item_sorted_insert {
@@ -491,12 +491,12 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
         return: Elm.Widget.Item;
         params {
            @in itc: const(Elm.Genlist.Item.Class)*; [[The item class for the item.]]
-            @in data: const(void)*; [[The item data.]]
+            @in data: const(void_ptr); [[The item data.]]
            @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]]
            @in type: Elm.Genlist.Item.Type; [[Item type.]]
            @in comp: Eina_Compare_Cb; [[The function called for the sort.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]]
-            @in func_data: const(void)* @optional; [[Data passed to $func above.]]
+            @in func_data: const(void_ptr) @optional; [[Data passed to $func above.]]
         }
      }
      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)
           /*      init { FIXME
                   params {
                   Evas_Smart_Cb func;
-                   const(void)* data;
+                   const(void_ptr) data;
                   }
                   }*/
           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)
            idx: Elm.Gesture.Type; [[The gesture you want to track state of.]]
            cb_type: Elm.Gesture.State; [[The event the callback tracks (START, MOVE, END, ABORT).]]
            cb: Elm_Gesture_Event_Cb; [[The callback itself.]]
-            data: void * @optional; [[Custom data to be passed.]]
+            data: void_ptr @optional; [[Custom data to be passed.]]
         }
      }
      attach {
@@ -130,7 +130,7 @@ class Elm.Gesture_Layer (Elm.Widget)
            @in idx: Elm.Gesture.Type; [[The gesture you want to track state of.]]
            @in cb_type: Elm.Gesture.State; [[The event the callback tracks (START, MOVE, END, ABORT).]]
            @in cb: Elm_Gesture_Event_Cb; [[The callback itself.]]
-            @in data: void * @nullable; [[Custom callback data.]]
+            @in data: void_ptr @nullable; [[Custom callback data.]]
         }
      }
      cb_add {
@@ -148,7 +148,7 @@ class Elm.Gesture_Layer (Elm.Widget)
            @in idx: Elm.Gesture.Type; [[The gesture you want to track state of.]]
            @in cb_type: Elm.Gesture.State; [[The event the callback tracks (START, MOVE, END, ABORT).]]
            @in cb: Elm_Gesture_Event_Cb; [[The callback itself.]]
-            @in data: void * @optional; [[Custom data to be passed.]]
+            @in data: void_ptr @optional; [[Custom data to be passed.]]
         }
      }
   }
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,
            @in icon_file: string @optional; [[An image file path on disk to use for the icon or standard icon name (NULL if not desired)]]
            @in icon_type: Elm.Icon.Type; [[The icon type if relevant]]
            @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.]]
-            @in data: const(void)* @optional; [[Data to pass to item-related functions]]
+            @in data: const(void_ptr) @optional; [[Data to pass to item-related functions]]
         }
      }
   }
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,
         params {
            @in letter: string; [[Letter under which the item should be indexed]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]]
-            @in data: const(void)* @optional; [[The item data to set for the index's item]]
+            @in data: const(void_ptr) @optional; [[The item data to set for the index's item]]
         }
      }
      item_clear {
@@ -129,7 +129,7 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
            @in after: Elm.Widget.Item; [[The index item to insert after.]]
            @in letter: string; [[Letter under which the item should be indexed]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
-            @in data: const(void)* @optional; [[The item data to set for the index's item]]
+            @in data: const(void_ptr) @optional; [[The item data to set for the index's item]]
         }
      }
      item_find {
@@ -137,7 +137,7 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
         return: Elm.Widget.Item; [[The index item handle, if found, or $NULL otherwise]]
         params {
-            @in data: const(void)*; [[The item data pointed to by the desired index item]]
+            @in data: const(void_ptr); [[The item data pointed to by the desired index item]]
         }
      }
      item_insert_before {
@@ -158,7 +158,7 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
            @in before: Elm.Widget.Item; [[The index item to insert after.]]
            @in letter: string; [[Letter under which the item should be indexed]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
-            @in data: const(void)* @optional; [[The item data to set for the index's item]]
+            @in data: const(void_ptr) @optional; [[The item data to set for the index's item]]
         }
      }
      item_append {
@@ -175,7 +175,7 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
         params {
            @in letter: string; [[Letter under which the item should be indexed]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]]
-            @in data: const(void)* @optional; [[The item data to set for the index's item]]
+            @in data: const(void_ptr) @optional; [[The item data to set for the index's item]]
         }
      }
      selected_item_get @const {
@@ -200,7 +200,7 @@ class Elm.Index (Elm.Layout, Efl.Orientation,
         params {
            @in letter: string; [[Letter under which the item should be indexed]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
-            @in data: const(void)* @optional; [[The item data to set for the index's item]]
+            @in data: const(void_ptr) @optional; [[The item data to set for the index's item]]
            @in cmp_func: Eina_Compare_Cb; [[The comparing function to be used to sort index items by index item handles]]
            @in cmp_data_func: Eina_Compare_Cb @optional; [[A fallback function to be called for the
                                                            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 ()
         [[Register accessibility event listener]]
         params {
              @in cb: Eo_Event_Cb; [[callback]]
-              @in data: void*; [[data]]
+              @in data: void_ptr; [[data]]
         }
         return: Elm.Atspi.Event.Handler*; [[Event handler]]
      }
@@ -343,7 +343,7 @@ mixin Elm.Interface.Atspi_Accessible ()
         params {
            @in accessible: Elm.Interface.Atspi_Accessible; [[Accessibility object.]]
            @in event: const(Eo.Event.Description)*; [[Accessibility event type.]]
-            @in event_info: void*; [[Accessibility event details.]]
+            @in event_info: void_ptr; [[Accessibility event details.]]
         }
      }
      @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 ()
         [[Append custom filter into filter list]]
         params {
            @in func: Elm_Fileselector_Filter_Func; [[function]]
-            @in data: void *;
+            @in data: void_ptr;
            @in filter_name: string;
         }
         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)
            @in source: string; [[The signal's source string.]]
            @in func: Edje.Signal_Cb; [[The callback function to be executed
                                        when the signal is emitted.]]
-            @in data: void * @optional; [[A pointer to data to pass in to the
+            @in data: void_ptr @optional; [[A pointer to data to pass in to the
                                          callback function.]]
         }
      }
@@ -279,7 +279,7 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File)
           previous call to @.signal_callback_add. The data pointer that
           was passed to this call will be returned.
         ]]
-         return: void *; [[The data pointer of the signal callback (passed on
+         return: void_ptr; [[The data pointer of the signal callback (passed on
                           @.signal_callback_add) or $null on errors.]]
         params {
            @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,
            @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().]]
            @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
-            @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]]
+            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
      }
      go {
@@ -278,7 +278,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
            @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().]]
            @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
-            @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]]
+            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
      }
      at_xy_item_get @const {
@@ -348,7 +348,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
            @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().]]
            @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
-            @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]]
+            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
      }
      item_prepend {
@@ -379,7 +379,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
            @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().]]
            @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
-            @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]]
+            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
      }
      clear {
@@ -417,7 +417,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
            @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().]]
            @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
-            @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]]
+            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
            @in cmp_func: Eina_Compare_Cb; [[The comparing function to be used to sort list
                                             items by #Elm.Widget.Item item handles. This function will
                                             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)
           /*      init { FIXME
                   params {
                   Evas_Smart_Cb func;
-                   const(void)* data;
+                   const(void_ptr) data;
                   }
                   }*/
           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,
            @in tlon: double; [[The destination longitude.]]
            @in tlat: double; [[The destination latitude.]]
            @in route_cb: Elm_Map_Route_Cb @optional; [[The route to be traced.]]
-            @in data: void * @optional; [[A pointer of user data.]]
+            @in data: void_ptr @optional; [[A pointer of user data.]]
         }
      }
      track_add {
         [[Add a track on the map.]]
         return: Evas.Object; [[The route object. This is an elm object of type Route.]]
         params {
-            @in emap: void *; [[The emap route object.]]
+            @in emap: void_ptr; [[The emap route object.]]
         }
      }
      region_to_canvas_convert @const {
@@ -495,7 +495,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
            @in lon: double; [[The longitude.]]
            @in lat: double; [[The latitude.]]
            @in name_cb: Elm_Map_Name_Cb @optional; [[The callback function.]]
-            @in data: void * @optional; [[The user callback data.]]
+            @in data: void_ptr @optional; [[The user callback data.]]
         }
      }
      name_search @const {
@@ -508,7 +508,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
         params {
            @in address: string; [[The address.]]
            @in name_cb: Elm_Map_Name_List_Cb @optional; [[The callback function.]]
-            @in data: void * @optional; [[The user callback data.]]
+            @in data: void_ptr @optional; [[The user callback data.]]
         }
      }
      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
            @in icon: string @optional; [[An icon display on the item. The icon will be destroyed by the menu.]]
            @in label: string; [[The label of the item.]]
            @in func: Evas_Smart_Cb @optional; [[Function called when the user select the item.]]
-            @in data: const(void)* @optional; [[Data sent by the callback.]]
+            @in data: const(void_ptr) @optional; [[Data sent by the callback.]]
         }
      }
      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)
         }
         values {
            format_function: Elm_Multibuttonentry_Format_Cb @nullable; [[format_function The actual format function]]
-            data: const(void)* @optional; [[data User data to passed to $format_function]]
+            data: const(void_ptr) @optional; [[data User data to passed to $format_function]]
         }
      }
      @property items {
@@ -90,7 +90,7 @@ class Elm.Multibuttonentry (Elm.Layout)
         params {
            @in label: string; [[The label of new item]]
            @in func: Evas_Smart_Cb @optional; [[The callback function to be invoked when this item is pressed.]]
-            @in data: void * @optional; [[The pointer to the data to be attached]]
+            @in data: void_ptr @optional; [[The pointer to the data to be attached]]
         }
      }
      clear {
@@ -105,7 +105,7 @@ class Elm.Multibuttonentry (Elm.Layout)
         params {
            @in func: Elm_Multibuttonentry_Item_Filter_Cb; [[The filter function to remove]]
-            @in data: void *; [[The user data passed when adding the function]]
+            @in data: void_ptr; [[The user data passed when adding the function]]
         }
      }
      item_insert_before {
@@ -118,7 +118,7 @@ class Elm.Multibuttonentry (Elm.Layout)
            @in before: Elm.Widget.Item; [[The item before which to add it]]
            @in label: string; [[The label of new item]]
            @in func: Evas_Smart_Cb @optional; [[The callback function to be invoked when this item is pressed.]]
-            @in data: void * @optional; [[The pointer to the data to be attached]]
+            @in data: void_ptr @optional; [[The pointer to the data to be attached]]
         }
      }
      item_append {
@@ -130,7 +130,7 @@ class Elm.Multibuttonentry (Elm.Layout)
         params {
            @in label: string; [[The label of new item]]
            @in func: Evas_Smart_Cb @optional; [[The callback function to be invoked when this item is pressed.]]
-            @in data: void * @optional; [[The pointer to the data to be attached]]
+            @in data: void_ptr @optional; [[The pointer to the data to be attached]]
         }
      }
      item_filter_prepend {
@@ -140,7 +140,7 @@ class Elm.Multibuttonentry (Elm.Layout)
           for more information]]
         params {
            @in func: Elm_Multibuttonentry_Item_Filter_Cb; [[The function to use as text filter]]
-            @in data: void *; [[User data to pass to $func]]
+            @in data: void_ptr; [[User data to pass to $func]]
         }
      }
      item_filter_append {
@@ -156,7 +156,7 @@ class Elm.Multibuttonentry (Elm.Layout)
         params {
            @in func: Elm_Multibuttonentry_Item_Filter_Cb; [[The function to use as item filter]]
-            @in data: void *; [[User data to pass to $func]]
+            @in data: void_ptr; [[User data to pass to $func]]
         }
      }
      item_insert_after {
@@ -169,7 +169,7 @@ class Elm.Multibuttonentry (Elm.Layout)
            @in after: Elm.Widget.Item; [[The item after which to add it]]
            @in label: string; [[The label of new item]]
            @in func: Evas_Smart_Cb @optional; [[The callback function to be invoked when this item is pressed.]]
-            @in data: void * @optional; [[The pointer to the data to be attached]]
+            @in data: void_ptr @optional; [[The pointer to the data to be attached]]
         }
      }
   }
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)
            ]]
            params {
                  @in func: Elm_Naviframe_Item_Pop_Cb @nullable; [[The callback function.]]
-                  @in data: void * @optional; [[Data to be passed to func call.]]
+                  @in data: void_ptr @optional; [[Data to be passed to func call.]]
            }
        }
   }
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)
            @in label: string; [[The Label of the new item.]]
            @in icon: Evas.Object @optional; [[Icon to be set on new item.]]
            @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected.]]
-            @in data: const(void)* @optional; [[Data passed to $func above.]]
+            @in data: const(void_ptr) @optional; [[Data passed to $func above.]]
         }
      }
      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)
            [[No description supplied by the EAPI.]]
         }
         values {
-            emap: void *;
+            emap: void_ptr;
         }
      }
      @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)
         return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
         params {
            @in itc: const(Elm_Slideshow_Item_Class)*; [[The item class for the item.]]
-            @in data: const(void)*; [[The item's data.]]
+            @in data: const(void_ptr); [[The item's data.]]
         }
      }
      item_sorted_insert {
@@ -294,7 +294,7 @@ class Elm.Slideshow (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
                                      on success, or $null on errors.]]
         params {
            @in itc: const(Elm_Slideshow_Item_Class)*; [[The item class for the item.]]
-            @in data: const(void)*; [[The item's data.]]
+            @in data: const(void_ptr); [[The item's data.]]
            @in func: Eina_Compare_Cb; [[The comparing function to be used to sort the slideshow
                                         items by #Elm_Slideshow_Item_Class item handles.]]
         }
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
            @in timeout: int; [[Timeout display in milliseconds]]
            @in cb: Elm_Sys_Notify_Send_Cb; [[Callback used to retrieve the notification id
                                              returned by the Notification Server]]
-            @in cb_data: const(void) * @optional; [[Optional context data]]
+            @in cb_data: const(void_ptr) @optional; [[Optional context data]]
         }
      }
      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,
            @in icon: string @optional; [[A string with icon name or the absolute path of an image file.]]
            @in label: string; [[The label of the item.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
-            @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]]
+            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
      }
      item_insert_after {
@@ -260,7 +260,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
            @in icon: string @optional; [[A string with icon name or the absolute path of an image file.]]
            @in label: string; [[The label of the item.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
-            @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]]
+            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
      }
      item_append {
@@ -293,7 +293,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
            @in icon: string @optional; [[A string with icon name or the absolute path of an image file.]]
            @in label: string; [[The label of the item.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
-            @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]]
+            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
      }
      items_count @const {
@@ -330,7 +330,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
            @in icon: string @optional; [[A string with icon name or the absolute path of an image file.]]
            @in label: string; [[The label of the item.]]
            @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
-            @in data: const(void)* @optional; [[The data to associate with the item for related callbacks.]]
+            @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
         }
      }
      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
   icon_str: string;
   icon: Evas.Object;
   func: Evas_Smart_Cb ;
-   data: const(void)*;
+   data: const(void_ptr);
 }
 class Elm.Toolbar.Item(Elm.Widget.Item)
@@ -185,7 +185,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item)
           /*      init { FIXME
                   params {
                   Evas_Smart_Cb func;
-                   const(void)* data;
+                   const(void_ptr) data;
                   }
                   }*/
           icon_memfile_set {
@@ -195,7 +195,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item)
                  @.icon.set.
                ]]
                params {
-                     @in img: const (void) *; [[The binary data that will be used as an image.]]
+                     @in img: const(void_ptr); [[The binary data that will be used as an image.]]
                     @in size: size; [[The size of binary data $img.]]
                     @in format: string; [[Optional format of $img to pass to the image loader.]]
                     @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)
                     @in icon: string; [[A string with icon name or the absolute path of an image file.]]
                     @in label: string; [[The label of the new state.]]
                     @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked when this state is selected.]]
-                     @in data: const (void) * @optional; [[The data to associate with the state.]]
+                     @in data: const(void_ptr) @optional; [[The data to associate with the state.]]
                }
                return: Elm.Toolbar.Item.State *; [[The toolbar item state, or $null upon failure.]]
           }
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)
         }
         values {
            func: Elm_Web_Console_Message; [[The callback function to be used.]]
-            data: void *; [[User data.]]
+            data: void_ptr; [[User data.]]
         }
      }
      @property window_create_hook {
@@ -217,7 +217,7 @@ class Elm.Web (Elm.Widget)
         }
         values {
            func: Elm_Web_Window_Open @nullable; [[The hook function to be called when a window is requested.]]
-            data: void * @optional; [[User data.]]
+            data: void_ptr @optional; [[User data.]]
         }
      }
      @property dialog_file_selector_hook {
@@ -232,7 +232,7 @@ class Elm.Web (Elm.Widget)
         }
         values {
            func: Elm_Web_Dialog_File_Selector @nullable; [[The callback function to be used.]]
-            data: void * @optional; [[User data.]]
+            data: void_ptr @optional; [[User data.]]
         }
      }
      @property dialog_confirm_hook {
@@ -246,7 +246,7 @@ class Elm.Web (Elm.Widget)
         }
         values {
            func: Elm_Web_Dialog_Confirm @nullable; [[The callback function to be used.]]
-            data: void * @optional; [[User data.]]
+            data: void_ptr @optional; [[User data.]]
         }
      }
      @property popup_selected {
@@ -275,7 +275,7 @@ class Elm.Web (Elm.Widget)
         }
         values {
            func: Elm_Web_Dialog_Prompt @nullable; [[The callback function to be used.]]
-            data: void * @optional; [[User data.]]
+            data: void_ptr @optional; [[User data.]]
         }
      }
      @property dialog_alert_hook {
@@ -289,7 +289,7 @@ class Elm.Web (Elm.Widget)
         }
         values {
            func: Elm_Web_Dialog_Alert @nullable; [[callback function to be used.]]
-            data: void * @optional; [[User data.]]
+            data: void_ptr @optional; [[User data.]]
         }
      }
      @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
         }
         values {
            func: region_hook_func_type @nullable;
-            data: void * @optional;
+            data: void_ptr @optional;
         }
      }
      @property domain_part_text_translatable {
@@ -562,14 +562,14 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
         params {
            @in source: Evas.Object;
            @in type: Evas.Callback_Type;
-            @in event_info: void *;
+            @in event_info: void_ptr;
         }
         return: bool;
      }
      event_callback_add {
         params {
            @in func: Elm_Event_Cb;
-            @in data: const(void)* @optional;
+            @in data: const(void_ptr) @optional;
         }
      }
      access {
@@ -585,10 +585,10 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
         }
      }
      event_callback_del {
-         return: void *;
+         return: void_ptr;
         params {
            @in func: Elm_Event_Cb;
-            @in data: const(void)* @nullable;
+            @in data: const(void_ptr) @nullable;
         }
      }
      on_focus {
@@ -630,7 +630,7 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
         return: bool;
         params {
            @in type: Evas.Callback_Type;
-            @in event_info: void *;
+            @in event_info: void_ptr;
            @in event_flags: Efl.Event.Flags *;
         }
      }
@@ -639,7 +639,7 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
            @in emission: string;
            @in source: string;
            @in func: Edje.Signal_Cb;
-            @in data: void *;
+            @in data: void_ptr;
         }
      }
      focus_next_manager_is {
@@ -776,7 +776,7 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
         }
      }
      signal_callback_del {
-         return: void *;
+         return: void_ptr;
         params {
            @in emission: string;
            @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,
                     emission: string; [[The signal's name.]]
                     source: string; [[The signal's source.]]
                     func: Elm_Object_Item_Signal_Cb; [[The callback function to be executed when the signal is emitted.]]
-                     data: void *; [[A pointer to data to pass to the callback function.]]
+                     data: void_ptr; [[A pointer to data to pass to the callback function.]]
                }
           }
           signal_callback_del {
@@ -299,7 +299,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
                     source: string; [[The signal's source.]]
                     func: Elm_Object_Item_Signal_Cb; [[The callback function to be executed when the signal is emitted.]]
                }
-                return: void*; [[The data pointer of the signal callback or $NULL, on errors.]]
+                return: void_ptr; [[The data pointer of the signal callback or $NULL, on errors.]]
           }
           signal_emit {
                [[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,
                  See: elm_object_tooltip_content_cb_set() for more details.]]
                params {
                     func: Elm_Tooltip_Item_Content_Cb @nullable; [[the function used to create the tooltip contents.]]
-                     data: const (void) * @optional; [[what to provide to $func as callback data/context.]]
+                     data: const(void_ptr) @optional; [[what to provide to $func as callback data/context.]]
                     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.]]
                }
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 {
     [[Parameter passed in event callbacks holding extra event parameters]]
     object: Eo.Base; [[The object the event was called on.]]
     desc: const(Eo.Event.Description) *; [[The event description.]]
-     info: void *; [[Extra event information passed by the event caller.]]
+     info: void_ptr; [[Extra event information passed by the event caller.]]
 }
 type Eo.Event_Cb: __builtin_event_cb; [[An event callback prototype.
@@ -220,12 +220,12 @@ abstract Eo.Base ()
         }
         set {
            values {
-               data: const(void) *; [[the data to set]]
+               data: const(void_ptr); [[the data to set]]
            }
         }
         get {
            values {
-               data: void *; [[the data to set]]
+               data: void_ptr; [[the data to set]]
            }
         }
      }
@@ -306,7 +306,7 @@ abstract Eo.Base ()
            @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]]
            @in priority: Eo.Callback_Priority; [[The priority of the callback]]
            @in cb: Eo.Event_Cb; [[the callback to call]]
-            @in data: const(void)*; [[additional data to pass to the callback]]
+            @in data: const(void_ptr); [[additional data to pass to the callback]]
         }
      }
      event_callback_del {
@@ -315,7 +315,7 @@ abstract Eo.Base ()
         params {
            @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]]
            @in func: Eo.Event_Cb; [[the callback to delete]]
-            @in user_data: const(void)*; [[The data to compare]]
+            @in user_data: const(void_ptr); [[The data to compare]]
         }
      }
      event_callback_array_priority_add {
@@ -328,7 +328,7 @@ abstract Eo.Base ()
         params {
            @in array: const(Eo.Callback_Array_Item)*; [[an #Eo_Callback_Array_Item of events to listen to]]
            @in priority: Eo.Callback_Priority; [[The priority of the callback]]
-            @in data: const(void)*; [[additional data to pass to the callback]]
+            @in data: const(void_ptr); [[additional data to pass to the callback]]
         }
      }
      event_callback_array_del {
@@ -338,14 +338,14 @@ abstract Eo.Base ()
         return: bool; [[Return true when the callback has been successfully removed.]]
         params {
            @in array: const(Eo.Callback_Array_Item)*; [[an #Eo_Callback_Array_Item of events to listen to]]
-            @in user_data: const(void)*; [[The data to compare]]
+            @in user_data: const(void_ptr); [[The data to compare]]
         }
      }
      event_callback_call {
         [[Call the callbacks for an event of an object.]]
         params {
            @in desc: const(Eo.Event.Description)*; [[The description of the event to call]]
-            @in event_info: void *; [[Extra event info to pass to the callbacks]]
+            @in event_info: void_ptr; [[Extra event info to pass to the callbacks]]
         }
         return: bool; [[$true if one of the callbacks aborted the call,
                         $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)
             return: bool @warn_unused;
          }
          values {
-             buffer: void*; [[The external buffer, depends on its type.]]
+             buffer: void_ptr; [[The external buffer, depends on its type.]]
          }
      }
   }
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 @@
 struct Efl.Canvas.Surface.X11_Pixmap
 {
   [[The type used by @Efl.Canvas.Surface.native_buffer.]]
-   visual: void *; [[X11 Visual for this Pixmap.]]
+   visual: void_ptr; [[X11 Visual for this Pixmap.]]
   pixmap: ulong;  [[X11 Pixmap ID.]]
 }
@@ -15,7 +15,7 @@ class Efl.Canvas.Surface.X11 (Efl.Canvas.Surface)
         get {}
         set { return: bool; }
         values {
-            visual: void *; [[X11 Visual for this Pixmap.]]
+            visual: void_ptr; [[X11 Visual for this Pixmap.]]
            pixmap: ulong;  [[X11 Pixmap ID.]]
         }
      }
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)
         ]]
         params {
            @in  owner: Eo.Base; [[The parent object.]]
-            @out priv: void*; [[Pointer to the internal data of the object.]]
+            @out priv: void_ptr; [[Pointer to the internal data of the object.]]
         }
         return: own(Efl.Event.Pointer);
      }
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)
         }
         values {
            cb: Evas_Object_Box_Layout @nonull; [[The new layout function to set on $o.]]
-            data: const(void)*; [[Data pointer to be passed to $cb.]]
+            data: const(void_ptr); [[Data pointer to be passed to $cb.]]
            free_data: Eina_Free_Cb; [[Function to free $data, if need be.]]
         }
      }
@@ -128,7 +128,7 @@ class Evas.Box (Evas.Smart.Clipped)
           functions.]]
         params {
              priv: Evas_Object_Box_Data *;
-              data: void *;
+              data: void_ptr;
         }
      }
      layout_vertical {
@@ -139,7 +139,7 @@ class Evas.Box (Evas.Smart.Clipped)
           behaviour can be derived from that function's documentation.]]
         params {
              priv: Evas_Object_Box_Data *;
-              data: void *;
+              data: void_ptr;
         }
      }
      layout_homogeneous_max_size_horizontal {
@@ -185,7 +185,7 @@ class Evas.Box (Evas.Smart.Clipped)
           (respecting the max hint on the child's height).]]
         params {
              priv: Evas_Object_Box_Data *;
-              data: void *;
+              data: void_ptr;
         }
      }
@@ -205,7 +205,7 @@ class Evas.Box (Evas.Smart.Clipped)
           behaviour can be derived from that function's documentation.]]
         params {
              priv: Evas_Object_Box_Data *;
-              data: void *;
+              data: void_ptr;
         }
      }
      internal_option_free {
@@ -491,7 +491,7 @@ class Evas.Box (Evas.Smart.Clipped)
           (respecting the maximum size hint on the child's height).]]
         params {
            @in priv: Evas_Object_Box_Data *;
-            @in data: void *;
+            @in data: void_ptr;
         }
      }
      internal_option_new {
@@ -512,7 +512,7 @@ class Evas.Box (Evas.Smart.Clipped)
           documentation.]]
         params {
            @in priv: Evas_Object_Box_Data *;
-            @in data: void *;
+            @in data: void_ptr;
         }
      }
      internal_insert_after {
@@ -594,7 +594,7 @@ class Evas.Box (Evas.Smart.Clipped)
           same applies to the vertical axis.]]
         params {
            @in priv: Evas_Object_Box_Data *;
-            @in data: void *;
+            @in data: void_ptr;
         }
      }
      layout_homogeneous_vertical {
@@ -606,7 +606,7 @@ class Evas.Box (Evas.Smart.Clipped)
           of its behaviour can be derived from that function's documentation.]]
         params {
              priv: Evas_Object_Box_Data *;
-              data: void *;
+              data: void_ptr;
         }
      }
      layout_flow_horizontal {
@@ -645,7 +645,7 @@ class Evas.Box (Evas.Smart.Clipped)
           height required by a child object in the actual row.]]
         params {
              priv: Evas_Object_Box_Data *;
-              data: void *;
+              data: void_ptr;
         }
      }
      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,
            [[Returns the pointer attached by @.data_attach.set.]]
         }
         values {
-            data: void *; [[The attached pointer.]]
+            data: void_ptr; [[The attached pointer.]]
         }
      }
      @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)
            @in frame: int; [[The number of the key frame.]]
            @in attrib: Evas.Canvas3D.Vertex_Attrib; [[Vertex attribute ID.]]
            @in stride: int; [[Stride to go to the next vertex (in bytes).]]
-            @in data: const(void)*; [[Pointer to the vertex data buffer.]]
+            @in data: const(void_ptr); [[Pointer to the vertex data buffer.]]
         }
      }
@@ -39,7 +39,7 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
            @in frame: int; [[The number of the key frame.]]
            @in attrib: Evas.Canvas3D.Vertex_Attrib; [[Vertex attribute ID.]]
            @in stride: int; [[Stride to go to the next vertex (in bytes).]]
-            @in data: const(void)*; [[Pointer to the vertex data buffer.]]
+            @in data: const(void_ptr); [[Pointer to the vertex data buffer.]]
         }
      }
@@ -52,7 +52,7 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
           original buffer will be returned. Otherwise, the returned pointer
           can differ every time calling this function.
         ]]
-         return: void *; [[Starting address of the mapped vertex buffer.]]
+         return: void_ptr; [[Starting address of the mapped vertex buffer.]]
         params {
            @in frame: int; [[The number of the key frame.]]
            @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)
         params {
            @in format: Evas.Canvas3D.Index_Format; [[Vertex index data format.]]
            @in count: int; [[Vertex index count.]]
-            @in indices: const(void)*; [[Pointer to the index data.]]
+            @in indices: const(void_ptr); [[Pointer to the index data.]]
         }
      }
@@ -122,7 +122,7 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
         params {
            @in format: Evas.Canvas3D.Index_Format; [[Vertex index data format.]]
            @in count: int; [[Vertex index count.]]
-            @in indices: const(void)*; [[Pointer to the index data.]]
+            @in indices: const(void_ptr); [[Pointer to the index data.]]
         }
      }
@@ -155,7 +155,7 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Evas.Common_Interface, Efl.File)
           be returned, otherwise, the returned pointer may differ every
           time you call this function.
         ]]
-         return: void *; [[Pointer to the mapped buffer.]]
+         return: void_ptr; [[Pointer to the mapped buffer.]]
      }
      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)
         [[Pure virtual register samrt callback function.]]
         params {
           @in event: string; [[Event type.]]
-           @in data: const(void)*;  [[User data.]]
+           @in data: const(void_ptr);  [[User data.]]
         }
      }
      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)
            @in color_format: Evas_Colorspace; [[Color format of the texture.]]
            @in w: int; [[Width of the data.]]
            @in h: int; [[Height of the data.]]
-            @in data: const(void)*; [[Pointer to the data.]]
+            @in data: const(void_ptr); [[Pointer to the data.]]
         }
      }
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)
         ]]
         return: bool; [[Indicates success from the object render function.]]
         params {
-            filter: void*; [[Evas_Filter_Context]]
+            filter: void_ptr; [[Evas_Filter_Context]]
-            drawctx: void*;
+            drawctx: void_ptr;
            l: int;
            r: int;
            t: int;
@@ -54,7 +54,7 @@ mixin Evas.Filter (Efl.Gfx.Filter, Eo.Base)
            ]]
         }
         values {
-            buffer: void*;
+            buffer: void_ptr;
         }
      }
   }
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,
      @property smart_data {
         get {
            [[Retrieve user data stored on a given smart object.]]
-            return: void * @warn_unused; [[A pointer to data or $null.]]
+            return: void_ptr @warn_unused; [[A pointer to data or $null.]]
         }
      }
      @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)
              See also @.data.get.]]
         }
         values {
-            data: void *; [[A pointer to user data.]]
+            data: void_ptr; [[A pointer to user data.]]
         }
      }
      @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
         set { [[This Buffer will hold a reference to the evas image struct.]] }
         values {
            evas: Evas.Canvas; [[The current Evas.]]
-            image: void *; [[The engine-specific image struct.]]
+            image: void_ptr; [[The engine-specific image struct.]]
         }
      }
   }
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)
      method_multiple_args_1 {
         params {
            @inout promise1: promise<int>;
-            @in data: void*;
+            @in data: void_ptr;
         }
      }
      method_multiple_args_2 {
         params {
-            @in data: void*;
+            @in data: void_ptr;
            @inout promise1: promise<int>;
         }
      }
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)
      onecallback {
         params {
           @in cb: Ecore_Cb;
-           @in data: void*;
+           @in data: void_ptr;
         }
      }
      twocallback {
         params {
           @in cb: Ecore_Cb;
-           @in data: void*;
+           @in data: void_ptr;
           @in cb2: Ecore_Cb;
         }
      }
      test_global_callbacks @class {
         params {
           @in cb: Ecore_Cb;
-           @in data: void*;
+           @in data: void_ptr;
         }
      }
   }
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)
      required_ctor_b {
         params {
            @in cb: Ecore_Cb;
-            @in data: void*;
+            @in data: void_ptr;
         }
      }
      optional_ctor_a {
@@ -37,7 +37,7 @@ class Generic (Eo.Base)
      optional_ctor_b {
         params {
            @in cb: Ecore_Cb;
-            @in data: void*;
+            @in data: void_ptr;
         }
      }
      call_req_ctor_b_callback {
author	Daniel Kolesa <d.kolesa@osg.samsung.com>	2016-06-02 12:54:59 +0100
committer	Daniel Kolesa <d.kolesa@osg.samsung.com>	2016-06-02 13:00:26 +0100
commit	b1946ca5d611585572f1296088c57e4fd3c76279 (patch)
tree	a08cbd03656e2ff2d5a09fcac75ddd6081af80e6
parent	69ea4145c95a28c79c43de89079fdbbca628054b (diff)