regenerate native/evas

1 files changed, 563 insertions, 560 deletions

diff --git a/lib/efl/native/evas.rb b/lib/efl/native/evas.rb
index e4dba53..5043889 100644
--- a/lib/efl/native/evas.rb
+++ b/lib/efl/native/evas.rb
@@ -2,6 +2,7 @@
 # -*- coding: UTF-8 -*-
 #
 require 'efl/native'
+require 'efl/native/eina_list'
 #
 module Efl
     #
@@ -199,51 +200,51 @@ module Efl
         #
         # CALLBACKS
         # typedef void (*Evas_Video_Cb) (void *data, Evas_Object *obj, const Evas_Video_Surface *surface);
-        callback :evas_video_cb, [ :pointer, :pointer, :pointer ], :void
+        callback :evas_video_cb, [ :pointer, :evas_object, :evas_video_surface ], :void
         # typedef void (*Evas_Video_Coord_Cb) (void *data, Evas_Object *obj, const Evas_Video_Surface *surface, Evas_Coord a, Evas_Coord b);
-        callback :evas_video_coord_cb, [ :pointer, :pointer, :pointer, :int, :int ], :void
+        callback :evas_video_coord_cb, [ :pointer, :evas_object, :evas_video_surface, :int, :int ], :void
         # typedef void (*Evas_Smart_Cb) (void *data, Evas_Object *obj, void *event_info);
-        callback :evas_smart_cb, [ :pointer, :pointer, :pointer ], :void
+        callback :evas_smart_cb, [ :pointer, :evas_object, :pointer ], :void
         # typedef void (*Evas_Event_Cb) (void *data, Evas *e, void *event_info);
-        callback :evas_event_cb, [ :pointer, :pointer, :pointer ], :void
+        callback :evas_event_cb, [ :pointer, :evas, :pointer ], :void
         # typedef Eina_Bool (*Evas_Object_Event_Post_Cb) (void *data, Evas *e);
-        callback :evas_object_event_post_cb, [ :pointer, :pointer ], :eina_bool
+        callback :evas_object_event_post_cb, [ :pointer, :evas ], :bool
         # typedef void (*Evas_Object_Event_Cb) (void *data, Evas *e, Evas_Object *obj, void *event_info);
-        callback :evas_object_event_cb, [ :pointer, :pointer, :pointer, :pointer ], :void
+        callback :evas_object_event_cb, [ :pointer, :evas, :evas_object, :pointer ], :void
         # typedef void (*Evas_Async_Events_Put_Cb) (void *target, Evas_Callback_Type type, void *event_info);
         callback :evas_async_events_put_cb, [ :pointer, :evas_callback_type, :pointer ], :void
         # typedef void (*Evas_Object_Intercept_Show_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_show_cb, [ :pointer, :pointer ], :void
+        callback :evas_object_intercept_show_cb, [ :pointer, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Hide_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_hide_cb, [ :pointer, :pointer ], :void
+        callback :evas_object_intercept_hide_cb, [ :pointer, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Move_Cb) (void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        callback :evas_object_intercept_move_cb, [ :pointer, :pointer, :int, :int ], :void
+        callback :evas_object_intercept_move_cb, [ :pointer, :evas_object, :int, :int ], :void
         # typedef void (*Evas_Object_Intercept_Resize_Cb) (void *data, Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        callback :evas_object_intercept_resize_cb, [ :pointer, :pointer, :int, :int ], :void
+        callback :evas_object_intercept_resize_cb, [ :pointer, :evas_object, :int, :int ], :void
         # typedef void (*Evas_Object_Intercept_Raise_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_raise_cb, [ :pointer, :pointer ], :void
+        callback :evas_object_intercept_raise_cb, [ :pointer, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Lower_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_lower_cb, [ :pointer, :pointer ], :void
+        callback :evas_object_intercept_lower_cb, [ :pointer, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Stack_Above_Cb) (void *data, Evas_Object *obj, Evas_Object *above);
-        callback :evas_object_intercept_stack_above_cb, [ :pointer, :pointer, :pointer ], :void
+        callback :evas_object_intercept_stack_above_cb, [ :pointer, :evas_object, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Stack_Below_Cb) (void *data, Evas_Object *obj, Evas_Object *above);
-        callback :evas_object_intercept_stack_below_cb, [ :pointer, :pointer, :pointer ], :void
+        callback :evas_object_intercept_stack_below_cb, [ :pointer, :evas_object, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Layer_Set_Cb) (void *data, Evas_Object *obj, int l);
-        callback :evas_object_intercept_layer_set_cb, [ :pointer, :pointer, :int ], :void
+        callback :evas_object_intercept_layer_set_cb, [ :pointer, :evas_object, :int ], :void
         # typedef void (*Evas_Object_Intercept_Color_Set_Cb) (void *data, Evas_Object *obj, int r, int g, int b, int a);
-        callback :evas_object_intercept_color_set_cb, [ :pointer, :pointer, :int, :int, :int, :int ], :void
+        callback :evas_object_intercept_color_set_cb, [ :pointer, :evas_object, :int, :int, :int, :int ], :void
         # typedef void (*Evas_Object_Intercept_Clip_Set_Cb) (void *data, Evas_Object *obj, Evas_Object *clip);
-        callback :evas_object_intercept_clip_set_cb, [ :pointer, :pointer, :pointer ], :void
+        callback :evas_object_intercept_clip_set_cb, [ :pointer, :evas_object, :evas_object ], :void
         # typedef void (*Evas_Object_Intercept_Clip_Unset_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_clip_unset_cb, [ :pointer, :pointer ], :void
+        callback :evas_object_intercept_clip_unset_cb, [ :pointer, :evas_object ], :void
         # typedef void (*Evas_Object_Image_Pixels_Get_Cb) (void *data, Evas_Object *o);
-        callback :evas_object_image_pixels_get_cb, [ :pointer, :pointer ], :void
+        callback :evas_object_image_pixels_get_cb, [ :pointer, :evas_object ], :void
         # typedef void (*Evas_Object_Box_Layout) (Evas_Object *o, Evas_Object_Box_Data *priv, void *user_data);
-        callback :evas_object_box_layout_cb, [ :pointer, :pointer, :pointer ], :void
+        callback :evas_object_box_layout_cb, [ :evas_object, :evas_object_box_data, :pointer ], :void
         #
         # VARIABLES
         # EAPI extern Evas_Version *evas_version;
-        attach_variable :evas_version, :pointer
+        attach_variable :evas_version, :evas_version
         #
         # FUNCTIONS
         fcts = [
@@ -258,654 +259,654 @@ module Efl
         # EAPI int evas_async_events_process (void);
         [ :evas_async_events_process, [  ], :int ],
         # EAPI Eina_Bool evas_async_events_put (const void *target, Evas_Callback_Type type, void *event_info, Evas_Async_Events_Put_Cb func);
-        [ :evas_async_events_put, [ :pointer, :evas_callback_type, :pointer, :evas_async_events_put_cb ], :eina_bool ],
+        [ :evas_async_events_put, [ :pointer, :evas_callback_type, :pointer, :evas_async_events_put_cb ], :bool ],
         # EAPI Evas *evas_new (void);
-        [ :evas_new, [  ], :pointer ],
+        [ :evas_new, [  ], :evas ],
         # EAPI void evas_free (Evas *e);
-        [ :evas_free, [ :pointer ], :void ],
+        [ :evas_free, [ :evas ], :void ],
         # EAPI void evas_focus_in (Evas *e);
-        [ :evas_focus_in, [ :pointer ], :void ],
+        [ :evas_focus_in, [ :evas ], :void ],
         # EAPI void evas_focus_out (Evas *e);
-        [ :evas_focus_out, [ :pointer ], :void ],
+        [ :evas_focus_out, [ :evas ], :void ],
         # EAPI Eina_Bool evas_focus_state_get (const Evas *e);
-        [ :evas_focus_state_get, [ :pointer ], :eina_bool ],
+        [ :evas_focus_state_get, [ :evas ], :bool ],
         # EAPI void evas_nochange_push (Evas *e);
-        [ :evas_nochange_push, [ :pointer ], :void ],
+        [ :evas_nochange_push, [ :evas ], :void ],
         # EAPI void evas_nochange_pop (Evas *e);
-        [ :evas_nochange_pop, [ :pointer ], :void ],
+        [ :evas_nochange_pop, [ :evas ], :void ],
         # EAPI void evas_data_attach_set (Evas *e, void *data);
-        [ :evas_data_attach_set, [ :pointer, :pointer ], :void ],
+        [ :evas_data_attach_set, [ :evas, :pointer ], :void ],
         # EAPI void *evas_data_attach_get (const Evas *e);
-        [ :evas_data_attach_get, [ :pointer ], :pointer ],
+        [ :evas_data_attach_get, [ :evas ], :pointer ],
         # EAPI void evas_damage_rectangle_add (Evas *e, int x, int y, int w, int h);
-        [ :evas_damage_rectangle_add, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_damage_rectangle_add, [ :evas, :int, :int, :int, :int ], :void ],
         # EAPI void evas_obscured_rectangle_add (Evas *e, int x, int y, int w, int h);
-        [ :evas_obscured_rectangle_add, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_obscured_rectangle_add, [ :evas, :int, :int, :int, :int ], :void ],
         # EAPI void evas_obscured_clear (Evas *e);
-        [ :evas_obscured_clear, [ :pointer ], :void ],
+        [ :evas_obscured_clear, [ :evas ], :void ],
         # EAPI Eina_List *evas_render_updates (Evas *e);
-        [ :evas_render_updates, [ :pointer ], :pointer ],
+        [ :evas_render_updates, [ :evas ], :eina_list ],
         # EAPI void evas_render_updates_free (Eina_List *updates);
-        [ :evas_render_updates_free, [ :pointer ], :void ],
+        [ :evas_render_updates_free, [ :eina_list ], :void ],
         # EAPI void evas_render (Evas *e);
-        [ :evas_render, [ :pointer ], :void ],
+        [ :evas_render, [ :evas ], :void ],
         # EAPI void evas_norender (Evas *e);
-        [ :evas_norender, [ :pointer ], :void ],
+        [ :evas_norender, [ :evas ], :void ],
         # EAPI void evas_render_idle_flush (Evas *e);
-        [ :evas_render_idle_flush, [ :pointer ], :void ],
+        [ :evas_render_idle_flush, [ :evas ], :void ],
         # EAPI void evas_render_dump (Evas *e);
-        [ :evas_render_dump, [ :pointer ], :void ],
+        [ :evas_render_dump, [ :evas ], :void ],
         # EAPI int evas_render_method_lookup (const char *name);
         [ :evas_render_method_lookup, [ :string ], :int ],
         # EAPI Eina_List *evas_render_method_list (void);
-        [ :evas_render_method_list, [  ], :pointer ],
+        [ :evas_render_method_list, [  ], :eina_list ],
         # EAPI void evas_render_method_list_free (Eina_List *list);
-        [ :evas_render_method_list_free, [ :pointer ], :void ],
+        [ :evas_render_method_list_free, [ :eina_list ], :void ],
         # EAPI void evas_output_method_set (Evas *e, int render_method);
-        [ :evas_output_method_set, [ :pointer, :int ], :void ],
+        [ :evas_output_method_set, [ :evas, :int ], :void ],
         # EAPI int evas_output_method_get (const Evas *e);
-        [ :evas_output_method_get, [ :pointer ], :int ],
+        [ :evas_output_method_get, [ :evas ], :int ],
         # EAPI Evas_Engine_Info *evas_engine_info_get (const Evas *e);
-        [ :evas_engine_info_get, [ :pointer ], :pointer ],
+        [ :evas_engine_info_get, [ :evas ], :evas_engine_info ],
         # EAPI Eina_Bool evas_engine_info_set (Evas *e, Evas_Engine_Info *info);
-        [ :evas_engine_info_set, [ :pointer, :pointer ], :eina_bool ],
+        [ :evas_engine_info_set, [ :evas, :evas_engine_info ], :bool ],
         # EAPI void evas_output_size_set (Evas *e, int w, int h);
-        [ :evas_output_size_set, [ :pointer, :int, :int ], :void ],
+        [ :evas_output_size_set, [ :evas, :int, :int ], :void ],
         # EAPI void evas_output_size_get (const Evas *e, int *w, int *h);
-        [ :evas_output_size_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_output_size_get, [ :evas, :pointer, :pointer ], :void ],
         # EAPI void evas_output_viewport_set (Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :evas_output_viewport_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_output_viewport_set, [ :evas, :int, :int, :int, :int ], :void ],
         # EAPI void evas_output_viewport_get (const Evas *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_output_viewport_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_output_viewport_get, [ :evas, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_output_framespace_set (Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :evas_output_framespace_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_output_framespace_set, [ :evas, :int, :int, :int, :int ], :void ],
         # EAPI void evas_output_framespace_get (const Evas *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_output_framespace_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_output_framespace_get, [ :evas, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_Coord evas_coord_screen_x_to_world (const Evas *e, int x);
-        [ :evas_coord_screen_x_to_world, [ :pointer, :int ], :int ],
+        [ :evas_coord_screen_x_to_world, [ :evas, :int ], :int ],
         # EAPI Evas_Coord evas_coord_screen_y_to_world (const Evas *e, int y);
-        [ :evas_coord_screen_y_to_world, [ :pointer, :int ], :int ],
+        [ :evas_coord_screen_y_to_world, [ :evas, :int ], :int ],
         # EAPI int evas_coord_world_x_to_screen (const Evas *e, Evas_Coord x);
-        [ :evas_coord_world_x_to_screen, [ :pointer, :int ], :int ],
+        [ :evas_coord_world_x_to_screen, [ :evas, :int ], :int ],
         # EAPI int evas_coord_world_y_to_screen (const Evas *e, Evas_Coord y);
-        [ :evas_coord_world_y_to_screen, [ :pointer, :int ], :int ],
+        [ :evas_coord_world_y_to_screen, [ :evas, :int ], :int ],
         # EAPI void evas_pointer_output_xy_get (const Evas *e, int *x, int *y);
-        [ :evas_pointer_output_xy_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_pointer_output_xy_get, [ :evas, :pointer, :pointer ], :void ],
         # EAPI void evas_pointer_canvas_xy_get (const Evas *e, Evas_Coord *x, Evas_Coord *y);
-        [ :evas_pointer_canvas_xy_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_pointer_canvas_xy_get, [ :evas, :pointer, :pointer ], :void ],
         # EAPI int evas_pointer_button_down_mask_get (const Evas *e);
-        [ :evas_pointer_button_down_mask_get, [ :pointer ], :int ],
+        [ :evas_pointer_button_down_mask_get, [ :evas ], :int ],
         # EAPI Eina_Bool evas_pointer_inside_get (const Evas *e);
-        [ :evas_pointer_inside_get, [ :pointer ], :eina_bool ],
+        [ :evas_pointer_inside_get, [ :evas ], :bool ],
         # EAPI void evas_sync(Evas *e);
-        [ :evas_sync, [ :pointer ], :void ],
+        [ :evas_sync, [ :evas ], :void ],
         # EAPI void evas_event_callback_add (Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data);
-        [ :evas_event_callback_add, [ :pointer, :evas_callback_type, :evas_event_cb, :pointer ], :void ],
+        [ :evas_event_callback_add, [ :evas, :evas_callback_type, :evas_event_cb, :pointer ], :void ],
         # EAPI void evas_event_callback_priority_add(Evas *e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data);
-        [ :evas_event_callback_priority_add, [ :pointer, :evas_callback_type, :short, :evas_event_cb, :pointer ], :void ],
+        [ :evas_event_callback_priority_add, [ :evas, :evas_callback_type, :short, :evas_event_cb, :pointer ], :void ],
         # EAPI void *evas_event_callback_del (Evas *e, Evas_Callback_Type type, Evas_Event_Cb func);
-        [ :evas_event_callback_del, [ :pointer, :evas_callback_type, :evas_event_cb ], :pointer ],
+        [ :evas_event_callback_del, [ :evas, :evas_callback_type, :evas_event_cb ], :pointer ],
         # EAPI void *evas_event_callback_del_full (Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data);
-        [ :evas_event_callback_del_full, [ :pointer, :evas_callback_type, :evas_event_cb, :pointer ], :pointer ],
+        [ :evas_event_callback_del_full, [ :evas, :evas_callback_type, :evas_event_cb, :pointer ], :pointer ],
         # EAPI void evas_post_event_callback_push (Evas *e, Evas_Object_Event_Post_Cb func, const void *data);
-        [ :evas_post_event_callback_push, [ :pointer, :evas_object_event_post_cb, :pointer ], :void ],
+        [ :evas_post_event_callback_push, [ :evas, :evas_object_event_post_cb, :pointer ], :void ],
         # EAPI void evas_post_event_callback_remove (Evas *e, Evas_Object_Event_Post_Cb func);
-        [ :evas_post_event_callback_remove, [ :pointer, :evas_object_event_post_cb ], :void ],
+        [ :evas_post_event_callback_remove, [ :evas, :evas_object_event_post_cb ], :void ],
         # EAPI void evas_post_event_callback_remove_full (Evas *e, Evas_Object_Event_Post_Cb func, const void *data);
-        [ :evas_post_event_callback_remove_full, [ :pointer, :evas_object_event_post_cb, :pointer ], :void ],
+        [ :evas_post_event_callback_remove_full, [ :evas, :evas_object_event_post_cb, :pointer ], :void ],
         # EAPI void evas_event_default_flags_set (Evas *e, Evas_Event_Flags flags);
-        [ :evas_event_default_flags_set, [ :pointer, :evas_event_flags ], :void ],
+        [ :evas_event_default_flags_set, [ :evas, :evas_event_flags ], :void ],
         # EAPI Evas_Event_Flags evas_event_default_flags_get (const Evas *e);
-        [ :evas_event_default_flags_get, [ :pointer ], :evas_event_flags ],
+        [ :evas_event_default_flags_get, [ :evas ], :evas_event_flags ],
         # EAPI void evas_event_freeze (Evas *e);
-        [ :evas_event_freeze, [ :pointer ], :void ],
+        [ :evas_event_freeze, [ :evas ], :void ],
         # EAPI void evas_event_thaw (Evas *e);
-        [ :evas_event_thaw, [ :pointer ], :void ],
+        [ :evas_event_thaw, [ :evas ], :void ],
         # EAPI int evas_event_freeze_get (const Evas *e);
-        [ :evas_event_freeze_get, [ :pointer ], :int ],
+        [ :evas_event_freeze_get, [ :evas ], :int ],
         # EAPI void evas_event_thaw_eval (Evas *e);
-        [ :evas_event_thaw_eval, [ :pointer ], :void ],
+        [ :evas_event_thaw_eval, [ :evas ], :void ],
         # EAPI int evas_event_down_count_get (const Evas *e);
-        [ :evas_event_down_count_get, [ :pointer ], :int ],
+        [ :evas_event_down_count_get, [ :evas ], :int ],
         # EAPI void evas_event_feed_mouse_down (Evas *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_down, [ :pointer, :int, :evas_button_flags, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_down, [ :evas, :int, :evas_button_flags, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_up (Evas *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_up, [ :pointer, :int, :evas_button_flags, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_up, [ :evas, :int, :evas_button_flags, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_move (Evas *e, int x, int y, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_move, [ :pointer, :int, :int, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_move, [ :evas, :int, :int, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_in (Evas *e, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_in, [ :pointer, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_in, [ :evas, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_out (Evas *e, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_out, [ :pointer, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_out, [ :evas, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_multi_down (Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_multi_down, [ :pointer, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double,
-            :evas_button_flags, :uint, :pointer ], :void ],
+        [ :evas_event_feed_multi_down, [ :evas, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :evas_button_flags,
+            :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_multi_up (Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_multi_up, [ :pointer, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :evas_button_flags,
+        [ :evas_event_feed_multi_up, [ :evas, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :evas_button_flags,
             :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_multi_move (Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_multi_move, [ :pointer, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :uint, :pointer ],
+        [ :evas_event_feed_multi_move, [ :evas, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :uint, :pointer ],
             :void ],
         # EAPI void evas_event_feed_mouse_cancel (Evas *e, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_cancel, [ :pointer, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_cancel, [ :evas, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_wheel (Evas *e, int direction, int z, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_wheel, [ :pointer, :int, :int, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_wheel, [ :evas, :int, :int, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_key_down (Evas *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_key_down, [ :pointer, :string, :string, :string, :string, :uint, :pointer ], :void ],
+        [ :evas_event_feed_key_down, [ :evas, :string, :string, :string, :string, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_key_up (Evas *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_key_up, [ :pointer, :string, :string, :string, :string, :uint, :pointer ], :void ],
+        [ :evas_event_feed_key_up, [ :evas, :string, :string, :string, :string, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_hold (Evas *e, int hold, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_hold, [ :pointer, :int, :uint, :pointer ], :void ],
+        [ :evas_event_feed_hold, [ :evas, :int, :uint, :pointer ], :void ],
         # EAPI void evas_event_refeed_event (Evas *e, void *event_copy, Evas_Callback_Type event_type);
-        [ :evas_event_refeed_event, [ :pointer, :pointer, :evas_callback_type ], :void ],
+        [ :evas_event_refeed_event, [ :evas, :pointer, :evas_callback_type ], :void ],
         # EAPI void evas_image_cache_flush (Evas *e);
-        [ :evas_image_cache_flush, [ :pointer ], :void ],
+        [ :evas_image_cache_flush, [ :evas ], :void ],
         # EAPI void evas_image_cache_reload (Evas *e);
-        [ :evas_image_cache_reload, [ :pointer ], :void ],
+        [ :evas_image_cache_reload, [ :evas ], :void ],
         # EAPI void evas_image_cache_set (Evas *e, int size);
-        [ :evas_image_cache_set, [ :pointer, :int ], :void ],
+        [ :evas_image_cache_set, [ :evas, :int ], :void ],
         # EAPI int evas_image_cache_get (const Evas *e);
-        [ :evas_image_cache_get, [ :pointer ], :int ],
+        [ :evas_image_cache_get, [ :evas ], :int ],
         # EAPI Eina_Bool evas_image_max_size_get (const Evas *e, int *maxw, int *maxh);
-        [ :evas_image_max_size_get, [ :pointer, :pointer, :pointer ], :eina_bool ],
+        [ :evas_image_max_size_get, [ :evas, :pointer, :pointer ], :bool ],
         # EAPI void evas_font_hinting_set (Evas *e, Evas_Font_Hinting_Flags hinting);
-        [ :evas_font_hinting_set, [ :pointer, :evas_font_hinting_flags ], :void ],
+        [ :evas_font_hinting_set, [ :evas, :evas_font_hinting_flags ], :void ],
         # EAPI Evas_Font_Hinting_Flags evas_font_hinting_get (const Evas *e);
-        [ :evas_font_hinting_get, [ :pointer ], :evas_font_hinting_flags ],
+        [ :evas_font_hinting_get, [ :evas ], :evas_font_hinting_flags ],
         # EAPI Eina_Bool evas_font_hinting_can_hint (const Evas *e, Evas_Font_Hinting_Flags hinting);
-        [ :evas_font_hinting_can_hint, [ :pointer, :evas_font_hinting_flags ], :eina_bool ],
+        [ :evas_font_hinting_can_hint, [ :evas, :evas_font_hinting_flags ], :bool ],
         # EAPI void evas_font_cache_flush (Evas *e);
-        [ :evas_font_cache_flush, [ :pointer ], :void ],
+        [ :evas_font_cache_flush, [ :evas ], :void ],
         # EAPI void evas_font_cache_set (Evas *e, int size);
-        [ :evas_font_cache_set, [ :pointer, :int ], :void ],
+        [ :evas_font_cache_set, [ :evas, :int ], :void ],
         # EAPI int evas_font_cache_get (const Evas *e);
-        [ :evas_font_cache_get, [ :pointer ], :int ],
+        [ :evas_font_cache_get, [ :evas ], :int ],
         # EAPI Eina_List *evas_font_available_list (const Evas *e);
-        [ :evas_font_available_list, [ :pointer ], :pointer ],
+        [ :evas_font_available_list, [ :evas ], :eina_list ],
         # EAPI void evas_font_available_list_free(Evas *e, Eina_List *available);
-        [ :evas_font_available_list_free, [ :pointer, :pointer ], :void ],
+        [ :evas_font_available_list_free, [ :evas, :eina_list ], :void ],
         # EAPI void evas_font_path_clear (Evas *e);
-        [ :evas_font_path_clear, [ :pointer ], :void ],
+        [ :evas_font_path_clear, [ :evas ], :void ],
         # EAPI void evas_font_path_append (Evas *e, const char *path);
-        [ :evas_font_path_append, [ :pointer, :string ], :void ],
+        [ :evas_font_path_append, [ :evas, :string ], :void ],
         # EAPI void evas_font_path_prepend (Evas *e, const char *path);
-        [ :evas_font_path_prepend, [ :pointer, :string ], :void ],
+        [ :evas_font_path_prepend, [ :evas, :string ], :void ],
         # EAPI const Eina_List *evas_font_path_list (const Evas *e);
-        [ :evas_font_path_list, [ :pointer ], :pointer ],
+        [ :evas_font_path_list, [ :evas ], :eina_list ],
         # EAPI void evas_object_clip_set (Evas_Object *obj, Evas_Object *clip);
-        [ :evas_object_clip_set, [ :pointer, :pointer ], :void ],
+        [ :evas_object_clip_set, [ :evas_object, :evas_object ], :void ],
         # EAPI Evas_Object *evas_object_clip_get (const Evas_Object *obj);
-        [ :evas_object_clip_get, [ :pointer ], :pointer ],
+        [ :evas_object_clip_get, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_clip_unset (Evas_Object *obj);
-        [ :evas_object_clip_unset, [ :pointer ], :void ],
+        [ :evas_object_clip_unset, [ :evas_object ], :void ],
         # EAPI const Eina_List *evas_object_clipees_get (const Evas_Object *obj);
-        [ :evas_object_clipees_get, [ :pointer ], :pointer ],
+        [ :evas_object_clipees_get, [ :evas_object ], :eina_list ],
         # EAPI void evas_object_focus_set (Evas_Object *obj, Eina_Bool focus);
-        [ :evas_object_focus_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_focus_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_focus_get (const Evas_Object *obj);
-        [ :evas_object_focus_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_focus_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_layer_set (Evas_Object *obj, short l);
-        [ :evas_object_layer_set, [ :pointer, :short ], :void ],
+        [ :evas_object_layer_set, [ :evas_object, :short ], :void ],
         # EAPI short evas_object_layer_get (const Evas_Object *obj);
-        [ :evas_object_layer_get, [ :pointer ], :short ],
+        [ :evas_object_layer_get, [ :evas_object ], :short ],
         # EAPI void evas_object_name_set (Evas_Object *obj, const char *name);
-        [ :evas_object_name_set, [ :pointer, :string ], :void ],
+        [ :evas_object_name_set, [ :evas_object, :string ], :void ],
         # EAPI const char *evas_object_name_get (const Evas_Object *obj);
-        [ :evas_object_name_get, [ :pointer ], :string ],
+        [ :evas_object_name_get, [ :evas_object ], :string ],
         # EAPI void evas_object_ref (Evas_Object *obj);
-        [ :evas_object_ref, [ :pointer ], :void ],
+        [ :evas_object_ref, [ :evas_object ], :void ],
         # EAPI void evas_object_unref (Evas_Object *obj);
-        [ :evas_object_unref, [ :pointer ], :void ],
+        [ :evas_object_unref, [ :evas_object ], :void ],
         # EAPI void evas_object_del (Evas_Object *obj);
-        [ :evas_object_del, [ :pointer ], :void ],
+        [ :evas_object_del, [ :evas_object ], :void ],
         # EAPI void evas_object_move (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        [ :evas_object_move, [ :pointer, :int, :int ], :void ],
+        [ :evas_object_move, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_resize (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_resize, [ :pointer, :int, :int ], :void ],
+        [ :evas_object_resize, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_geometry_get (const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_geometry_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_geometry_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_show (Evas_Object *obj);
-        [ :evas_object_show, [ :pointer ], :void ],
+        [ :evas_object_show, [ :evas_object ], :void ],
         # EAPI void evas_object_hide (Evas_Object *obj);
-        [ :evas_object_hide, [ :pointer ], :void ],
+        [ :evas_object_hide, [ :evas_object ], :void ],
         # EAPI Eina_Bool evas_object_visible_get (const Evas_Object *obj);
-        [ :evas_object_visible_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_visible_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_color_set (Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_object_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_color_get (const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas *evas_object_evas_get (const Evas_Object *obj);
-        [ :evas_object_evas_get, [ :pointer ], :pointer ],
+        [ :evas_object_evas_get, [ :evas_object ], :evas ],
         # EAPI const char *evas_object_type_get (const Evas_Object *obj);
-        [ :evas_object_type_get, [ :pointer ], :string ],
+        [ :evas_object_type_get, [ :evas_object ], :string ],
         # EAPI void evas_object_raise (Evas_Object *obj);
-        [ :evas_object_raise, [ :pointer ], :void ],
+        [ :evas_object_raise, [ :evas_object ], :void ],
         # EAPI void evas_object_lower (Evas_Object *obj);
-        [ :evas_object_lower, [ :pointer ], :void ],
+        [ :evas_object_lower, [ :evas_object ], :void ],
         # EAPI void evas_object_stack_above (Evas_Object *obj, Evas_Object *above);
-        [ :evas_object_stack_above, [ :pointer, :pointer ], :void ],
+        [ :evas_object_stack_above, [ :evas_object, :evas_object ], :void ],
         # EAPI void evas_object_stack_below (Evas_Object *obj, Evas_Object *below);
-        [ :evas_object_stack_below, [ :pointer, :pointer ], :void ],
+        [ :evas_object_stack_below, [ :evas_object, :evas_object ], :void ],
         # EAPI Evas_Object *evas_object_above_get (const Evas_Object *obj);
-        [ :evas_object_above_get, [ :pointer ], :pointer ],
+        [ :evas_object_above_get, [ :evas_object ], :evas_object ],
         # EAPI Evas_Object *evas_object_below_get (const Evas_Object *obj);
-        [ :evas_object_below_get, [ :pointer ], :pointer ],
+        [ :evas_object_below_get, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_event_callback_add (Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data);
-        [ :evas_object_event_callback_add, [ :pointer, :evas_callback_type, :evas_object_event_cb, :pointer ], :void ],
+        [ :evas_object_event_callback_add, [ :evas_object, :evas_callback_type, :evas_object_event_cb, :pointer ], :void ],
         # EAPI void evas_object_event_callback_priority_add(Evas_Object *obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data);
-        [ :evas_object_event_callback_priority_add, [ :pointer, :evas_callback_type, :short, :evas_object_event_cb, :pointer ], :void ],
+        [ :evas_object_event_callback_priority_add, [ :evas_object, :evas_callback_type, :short, :evas_object_event_cb, :pointer ], :void ],
         # EAPI void *evas_object_event_callback_del (Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func);
-        [ :evas_object_event_callback_del, [ :pointer, :evas_callback_type, :evas_object_event_cb ], :pointer ],
+        [ :evas_object_event_callback_del, [ :evas_object, :evas_callback_type, :evas_object_event_cb ], :pointer ],
         # EAPI void *evas_object_event_callback_del_full(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data);
-        [ :evas_object_event_callback_del_full, [ :pointer, :evas_callback_type, :evas_object_event_cb, :pointer ], :pointer ],
+        [ :evas_object_event_callback_del_full, [ :evas_object, :evas_callback_type, :evas_object_event_cb, :pointer ], :pointer ],
         # EAPI void evas_object_pass_events_set (Evas_Object *obj, Eina_Bool pass);
-        [ :evas_object_pass_events_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_pass_events_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_pass_events_get (const Evas_Object *obj);
-        [ :evas_object_pass_events_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_pass_events_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_repeat_events_set (Evas_Object *obj, Eina_Bool repeat);
-        [ :evas_object_repeat_events_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_repeat_events_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_repeat_events_get (const Evas_Object *obj);
-        [ :evas_object_repeat_events_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_repeat_events_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_propagate_events_set (Evas_Object *obj, Eina_Bool prop);
-        [ :evas_object_propagate_events_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_propagate_events_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_propagate_events_get (const Evas_Object *obj);
-        [ :evas_object_propagate_events_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_propagate_events_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_freeze_events_set(Evas_Object *obj, Eina_Bool freeze);
-        [ :evas_object_freeze_events_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_freeze_events_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_freeze_events_get(const Evas_Object *obj);
-        [ :evas_object_freeze_events_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_freeze_events_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_map_enable_set (Evas_Object *obj, Eina_Bool enabled);
-        [ :evas_object_map_enable_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_map_enable_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_map_enable_get (const Evas_Object *obj);
-        [ :evas_object_map_enable_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_map_enable_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_map_source_set (Evas_Object *obj, Evas_Object *src);
-        [ :evas_object_map_source_set, [ :pointer, :pointer ], :void ],
+        [ :evas_object_map_source_set, [ :evas_object, :evas_object ], :void ],
         # EAPI Evas_Object *evas_object_map_source_get (const Evas_Object *obj);
-        [ :evas_object_map_source_get, [ :pointer ], :pointer ],
+        [ :evas_object_map_source_get, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_map_set (Evas_Object *obj, const Evas_Map *map);
-        [ :evas_object_map_set, [ :pointer, :pointer ], :void ],
+        [ :evas_object_map_set, [ :evas_object, :evas_map ], :void ],
         # EAPI const Evas_Map *evas_object_map_get (const Evas_Object *obj);
-        [ :evas_object_map_get, [ :pointer ], :pointer ],
+        [ :evas_object_map_get, [ :evas_object ], :evas_map ],
         # EAPI void evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *obj, Evas_Coord z);
-        [ :evas_map_util_points_populate_from_object_full, [ :pointer, :pointer, :int ], :void ],
+        [ :evas_map_util_points_populate_from_object_full, [ :evas_map, :evas_object, :int ], :void ],
         # EAPI void evas_map_util_points_populate_from_object (Evas_Map *m, const Evas_Object *obj);
-        [ :evas_map_util_points_populate_from_object, [ :pointer, :pointer ], :void ],
+        [ :evas_map_util_points_populate_from_object, [ :evas_map, :evas_object ], :void ],
         # EAPI void evas_map_util_points_populate_from_geometry (Evas_Map *m, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Evas_Coord z);
-        [ :evas_map_util_points_populate_from_geometry, [ :pointer, :int, :int, :int, :int, :int ], :void ],
+        [ :evas_map_util_points_populate_from_geometry, [ :evas_map, :int, :int, :int, :int, :int ], :void ],
         # EAPI void evas_map_util_points_color_set (Evas_Map *m, int r, int g, int b, int a);
-        [ :evas_map_util_points_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_map_util_points_color_set, [ :evas_map, :int, :int, :int, :int ], :void ],
         # EAPI void evas_map_util_rotate (Evas_Map *m, double degrees, Evas_Coord cx, Evas_Coord cy);
-        [ :evas_map_util_rotate, [ :pointer, :double, :int, :int ], :void ],
+        [ :evas_map_util_rotate, [ :evas_map, :double, :int, :int ], :void ],
         # EAPI void evas_map_util_zoom (Evas_Map *m, double zoomx, double zoomy, Evas_Coord cx, Evas_Coord cy);
-        [ :evas_map_util_zoom, [ :pointer, :double, :double, :int, :int ], :void ],
+        [ :evas_map_util_zoom, [ :evas_map, :double, :double, :int, :int ], :void ],
         # EAPI void evas_map_util_3d_rotate (Evas_Map *m, double dx, double dy, double dz, Evas_Coord cx, Evas_Coord cy, Evas_Coord cz);
-        [ :evas_map_util_3d_rotate, [ :pointer, :double, :double, :double, :int, :int, :int ], :void ],
+        [ :evas_map_util_3d_rotate, [ :evas_map, :double, :double, :double, :int, :int, :int ], :void ],
         # EAPI void evas_map_util_3d_lighting (Evas_Map *m, Evas_Coord lx, Evas_Coord ly, Evas_Coord lz, int lr, int lg, int lb, int ar, int ag, int ab);
-        [ :evas_map_util_3d_lighting, [ :pointer, :int, :int, :int, :int, :int, :int, :int, :int, :int ], :void ],
+        [ :evas_map_util_3d_lighting, [ :evas_map, :int, :int, :int, :int, :int, :int, :int, :int, :int ], :void ],
         # EAPI void evas_map_util_3d_perspective (Evas_Map *m, Evas_Coord px, Evas_Coord py, Evas_Coord z0, Evas_Coord foc);
-        [ :evas_map_util_3d_perspective, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_map_util_3d_perspective, [ :evas_map, :int, :int, :int, :int ], :void ],
         # EAPI Eina_Bool evas_map_util_clockwise_get (Evas_Map *m);
-        [ :evas_map_util_clockwise_get, [ :pointer ], :eina_bool ],
+        [ :evas_map_util_clockwise_get, [ :evas_map ], :bool ],
         # EAPI Evas_Map *evas_map_new (int count);
-        [ :evas_map_new, [ :int ], :pointer ],
+        [ :evas_map_new, [ :int ], :evas_map ],
         # EAPI void evas_map_smooth_set (Evas_Map *m, Eina_Bool enabled);
-        [ :evas_map_smooth_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_map_smooth_set, [ :evas_map, :bool ], :void ],
         # EAPI Eina_Bool evas_map_smooth_get (const Evas_Map *m);
-        [ :evas_map_smooth_get, [ :pointer ], :eina_bool ],
+        [ :evas_map_smooth_get, [ :evas_map ], :bool ],
         # EAPI void evas_map_alpha_set (Evas_Map *m, Eina_Bool enabled);
-        [ :evas_map_alpha_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_map_alpha_set, [ :evas_map, :bool ], :void ],
         # EAPI Eina_Bool evas_map_alpha_get (const Evas_Map *m);
-        [ :evas_map_alpha_get, [ :pointer ], :eina_bool ],
+        [ :evas_map_alpha_get, [ :evas_map ], :bool ],
         # EAPI Evas_Map *evas_map_dup (const Evas_Map *m);
-        [ :evas_map_dup, [ :pointer ], :pointer ],
+        [ :evas_map_dup, [ :evas_map ], :evas_map ],
         # EAPI void evas_map_free (Evas_Map *m);
-        [ :evas_map_free, [ :pointer ], :void ],
+        [ :evas_map_free, [ :evas_map ], :void ],
         # EAPI int evas_map_count_get (const Evas_Map *m);
-        [ :evas_map_count_get, [ :pointer ], :int ],
+        [ :evas_map_count_get, [ :evas_map ], :int ],
         # EAPI void evas_map_point_coord_set (Evas_Map *m, int idx, Evas_Coord x, Evas_Coord y, Evas_Coord z);
-        [ :evas_map_point_coord_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_map_point_coord_set, [ :evas_map, :int, :int, :int, :int ], :void ],
         # EAPI void evas_map_point_coord_get (const Evas_Map *m, int idx, Evas_Coord *x, Evas_Coord *y, Evas_Coord *z);
-        [ :evas_map_point_coord_get, [ :pointer, :int, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_map_point_coord_get, [ :evas_map, :int, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_map_point_image_uv_set (Evas_Map *m, int idx, double u, double v);
-        [ :evas_map_point_image_uv_set, [ :pointer, :int, :double, :double ], :void ],
+        [ :evas_map_point_image_uv_set, [ :evas_map, :int, :double, :double ], :void ],
         # EAPI void evas_map_point_image_uv_get (const Evas_Map *m, int idx, double *u, double *v);
-        [ :evas_map_point_image_uv_get, [ :pointer, :int, :pointer, :pointer ], :void ],
+        [ :evas_map_point_image_uv_get, [ :evas_map, :int, :pointer, :pointer ], :void ],
         # EAPI void evas_map_point_color_set (Evas_Map *m, int idx, int r, int g, int b, int a);
-        [ :evas_map_point_color_set, [ :pointer, :int, :int, :int, :int, :int ], :void ],
+        [ :evas_map_point_color_set, [ :evas_map, :int, :int, :int, :int, :int ], :void ],
         # EAPI void evas_map_point_color_get (const Evas_Map *m, int idx, int *r, int *g, int *b, int *a);
-        [ :evas_map_point_color_get, [ :pointer, :int, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_map_point_color_get, [ :evas_map, :int, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_min_get (const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_size_hint_min_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_min_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_min_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_size_hint_min_set, [ :pointer, :int, :int ], :void ],
+        [ :evas_object_size_hint_min_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_size_hint_max_get (const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_size_hint_max_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_max_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_max_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_size_hint_max_set, [ :pointer, :int, :int ], :void ],
+        [ :evas_object_size_hint_max_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_size_hint_request_get (const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_size_hint_request_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_request_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_request_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_size_hint_request_set, [ :pointer, :int, :int ], :void ],
+        [ :evas_object_size_hint_request_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_size_hint_aspect_get (const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_size_hint_aspect_get, [ :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_aspect_get, [ :evas_object, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_aspect_set (Evas_Object *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_size_hint_aspect_set, [ :pointer, :evas_aspect_control, :int, :int ], :void ],
+        [ :evas_object_size_hint_aspect_set, [ :evas_object, :evas_aspect_control, :int, :int ], :void ],
         # EAPI void evas_object_size_hint_align_get (const Evas_Object *obj, double *x, double *y);
-        [ :evas_object_size_hint_align_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_align_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_align_set (Evas_Object *obj, double x, double y);
-        [ :evas_object_size_hint_align_set, [ :pointer, :double, :double ], :void ],
+        [ :evas_object_size_hint_align_set, [ :evas_object, :double, :double ], :void ],
         # EAPI void evas_object_size_hint_weight_get (const Evas_Object *obj, double *x, double *y);
-        [ :evas_object_size_hint_weight_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_weight_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_weight_set (Evas_Object *obj, double x, double y);
-        [ :evas_object_size_hint_weight_set, [ :pointer, :double, :double ], :void ],
+        [ :evas_object_size_hint_weight_set, [ :evas_object, :double, :double ], :void ],
         # EAPI void evas_object_size_hint_padding_get (const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b);
-        [ :evas_object_size_hint_padding_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_padding_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_padding_set (Evas_Object *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b);
-        [ :evas_object_size_hint_padding_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_object_size_hint_padding_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_data_set (Evas_Object *obj, const char *key, const void *data);
-        [ :evas_object_data_set, [ :pointer, :string, :pointer ], :void ],
+        [ :evas_object_data_set, [ :evas_object, :string, :pointer ], :void ],
         # EAPI void *evas_object_data_get (const Evas_Object *obj, const char *key);
-        [ :evas_object_data_get, [ :pointer, :string ], :pointer ],
+        [ :evas_object_data_get, [ :evas_object, :string ], :pointer ],
         # EAPI void *evas_object_data_del (Evas_Object *obj, const char *key);
-        [ :evas_object_data_del, [ :pointer, :string ], :pointer ],
+        [ :evas_object_data_del, [ :evas_object, :string ], :pointer ],
         # EAPI void evas_object_pointer_mode_set (Evas_Object *obj, Evas_Object_Pointer_Mode setting);
-        [ :evas_object_pointer_mode_set, [ :pointer, :evas_object_pointer_mode ], :void ],
+        [ :evas_object_pointer_mode_set, [ :evas_object, :evas_object_pointer_mode ], :void ],
         # EAPI Evas_Object_Pointer_Mode evas_object_pointer_mode_get (const Evas_Object *obj);
-        [ :evas_object_pointer_mode_get, [ :pointer ], :evas_object_pointer_mode ],
+        [ :evas_object_pointer_mode_get, [ :evas_object ], :evas_object_pointer_mode ],
         # EAPI void evas_object_anti_alias_set (Evas_Object *obj, Eina_Bool antialias);
-        [ :evas_object_anti_alias_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_anti_alias_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_anti_alias_get (const Evas_Object *obj);
-        [ :evas_object_anti_alias_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_anti_alias_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_scale_set (Evas_Object *obj, double scale);
-        [ :evas_object_scale_set, [ :pointer, :double ], :void ],
+        [ :evas_object_scale_set, [ :evas_object, :double ], :void ],
         # EAPI double evas_object_scale_get (const Evas_Object *obj);
-        [ :evas_object_scale_get, [ :pointer ], :double ],
+        [ :evas_object_scale_get, [ :evas_object ], :double ],
         # EAPI void evas_object_render_op_set (Evas_Object *obj, Evas_Render_Op op);
-        [ :evas_object_render_op_set, [ :pointer, :evas_render_op ], :void ],
+        [ :evas_object_render_op_set, [ :evas_object, :evas_render_op ], :void ],
         # EAPI Evas_Render_Op evas_object_render_op_get (const Evas_Object *obj);
-        [ :evas_object_render_op_get, [ :pointer ], :evas_render_op ],
+        [ :evas_object_render_op_get, [ :evas_object ], :evas_render_op ],
         # EAPI void evas_object_precise_is_inside_set(Evas_Object *obj, Eina_Bool precise);
-        [ :evas_object_precise_is_inside_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_precise_is_inside_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_precise_is_inside_get(const Evas_Object *obj);
-        [ :evas_object_precise_is_inside_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_precise_is_inside_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_static_clip_set (Evas_Object *obj, Eina_Bool is_static_clip);
-        [ :evas_object_static_clip_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_static_clip_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_static_clip_get (const Evas_Object *obj);
-        [ :evas_object_static_clip_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_static_clip_get, [ :evas_object ], :bool ],
         # EAPI Evas_Object *evas_focus_get (const Evas *e);
-        [ :evas_focus_get, [ :pointer ], :pointer ],
+        [ :evas_focus_get, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_name_find (const Evas *e, const char *name);
-        [ :evas_object_name_find, [ :pointer, :string ], :pointer ],
+        [ :evas_object_name_find, [ :evas, :string ], :evas_object ],
         # EAPI Evas_Object *evas_object_name_child_find (const Evas_Object *obj, const char *name, int recurse);
-        [ :evas_object_name_child_find, [ :pointer, :string, :int ], :pointer ],
+        [ :evas_object_name_child_find, [ :evas_object, :string, :int ], :evas_object ],
         # EAPI Evas_Object *evas_object_top_at_xy_get (const Evas *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
-        [ :evas_object_top_at_xy_get, [ :pointer, :int, :int, :eina_bool, :eina_bool ], :pointer ],
+        [ :evas_object_top_at_xy_get, [ :evas, :int, :int, :bool, :bool ], :evas_object ],
         # EAPI Evas_Object *evas_object_top_at_pointer_get (const Evas *e);
-        [ :evas_object_top_at_pointer_get, [ :pointer ], :pointer ],
+        [ :evas_object_top_at_pointer_get, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_top_in_rectangle_get (const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
-        [ :evas_object_top_in_rectangle_get, [ :pointer, :int, :int, :int, :int, :eina_bool, :eina_bool ], :pointer ],
+        [ :evas_object_top_in_rectangle_get, [ :evas, :int, :int, :int, :int, :bool, :bool ], :evas_object ],
         # EAPI Eina_List *evas_objects_at_xy_get (const Evas *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
-        [ :evas_objects_at_xy_get, [ :pointer, :int, :int, :eina_bool, :eina_bool ], :pointer ],
+        [ :evas_objects_at_xy_get, [ :evas, :int, :int, :bool, :bool ], :eina_list ],
         # EAPI Eina_List *evas_objects_in_rectangle_get (const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
-        [ :evas_objects_in_rectangle_get, [ :pointer, :int, :int, :int, :int, :eina_bool, :eina_bool ], :pointer ],
+        [ :evas_objects_in_rectangle_get, [ :evas, :int, :int, :int, :int, :bool, :bool ], :eina_list ],
         # EAPI Evas_Object *evas_object_bottom_get (const Evas *e);
-        [ :evas_object_bottom_get, [ :pointer ], :pointer ],
+        [ :evas_object_bottom_get, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_top_get (const Evas *e);
-        [ :evas_object_top_get, [ :pointer ], :pointer ],
+        [ :evas_object_top_get, [ :evas ], :evas_object ],
         # EAPI void evas_object_intercept_show_callback_add (Evas_Object *obj, Evas_Object_Intercept_Show_Cb func, const void *data);
-        [ :evas_object_intercept_show_callback_add, [ :pointer, :evas_object_intercept_show_cb, :pointer ], :void ],
+        [ :evas_object_intercept_show_callback_add, [ :evas_object, :evas_object_intercept_show_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_show_callback_del (Evas_Object *obj, Evas_Object_Intercept_Show_Cb func);
-        [ :evas_object_intercept_show_callback_del, [ :pointer, :evas_object_intercept_show_cb ], :pointer ],
+        [ :evas_object_intercept_show_callback_del, [ :evas_object, :evas_object_intercept_show_cb ], :pointer ],
         # EAPI void evas_object_intercept_hide_callback_add (Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func, const void *data);
-        [ :evas_object_intercept_hide_callback_add, [ :pointer, :evas_object_intercept_hide_cb, :pointer ], :void ],
+        [ :evas_object_intercept_hide_callback_add, [ :evas_object, :evas_object_intercept_hide_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_hide_callback_del (Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func);
-        [ :evas_object_intercept_hide_callback_del, [ :pointer, :evas_object_intercept_hide_cb ], :pointer ],
+        [ :evas_object_intercept_hide_callback_del, [ :evas_object, :evas_object_intercept_hide_cb ], :pointer ],
         # EAPI void evas_object_intercept_move_callback_add (Evas_Object *obj, Evas_Object_Intercept_Move_Cb func, const void *data);
-        [ :evas_object_intercept_move_callback_add, [ :pointer, :evas_object_intercept_move_cb, :pointer ], :void ],
+        [ :evas_object_intercept_move_callback_add, [ :evas_object, :evas_object_intercept_move_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_move_callback_del (Evas_Object *obj, Evas_Object_Intercept_Move_Cb func);
-        [ :evas_object_intercept_move_callback_del, [ :pointer, :evas_object_intercept_move_cb ], :pointer ],
+        [ :evas_object_intercept_move_callback_del, [ :evas_object, :evas_object_intercept_move_cb ], :pointer ],
         # EAPI void evas_object_intercept_resize_callback_add (Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func, const void *data);
-        [ :evas_object_intercept_resize_callback_add, [ :pointer, :evas_object_intercept_resize_cb, :pointer ], :void ],
+        [ :evas_object_intercept_resize_callback_add, [ :evas_object, :evas_object_intercept_resize_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_resize_callback_del (Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func);
-        [ :evas_object_intercept_resize_callback_del, [ :pointer, :evas_object_intercept_resize_cb ], :pointer ],
+        [ :evas_object_intercept_resize_callback_del, [ :evas_object, :evas_object_intercept_resize_cb ], :pointer ],
         # EAPI void evas_object_intercept_raise_callback_add (Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func, const void *data);
-        [ :evas_object_intercept_raise_callback_add, [ :pointer, :evas_object_intercept_raise_cb, :pointer ], :void ],
+        [ :evas_object_intercept_raise_callback_add, [ :evas_object, :evas_object_intercept_raise_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_raise_callback_del (Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func);
-        [ :evas_object_intercept_raise_callback_del, [ :pointer, :evas_object_intercept_raise_cb ], :pointer ],
+        [ :evas_object_intercept_raise_callback_del, [ :evas_object, :evas_object_intercept_raise_cb ], :pointer ],
         # EAPI void evas_object_intercept_lower_callback_add (Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func, const void *data);
-        [ :evas_object_intercept_lower_callback_add, [ :pointer, :evas_object_intercept_lower_cb, :pointer ], :void ],
+        [ :evas_object_intercept_lower_callback_add, [ :evas_object, :evas_object_intercept_lower_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_lower_callback_del (Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func);
-        [ :evas_object_intercept_lower_callback_del, [ :pointer, :evas_object_intercept_lower_cb ], :pointer ],
+        [ :evas_object_intercept_lower_callback_del, [ :evas_object, :evas_object_intercept_lower_cb ], :pointer ],
         # EAPI void evas_object_intercept_stack_above_callback_add (Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func, const void *data);
-        [ :evas_object_intercept_stack_above_callback_add, [ :pointer, :evas_object_intercept_stack_above_cb, :pointer ], :void ],
+        [ :evas_object_intercept_stack_above_callback_add, [ :evas_object, :evas_object_intercept_stack_above_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_stack_above_callback_del (Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func);
-        [ :evas_object_intercept_stack_above_callback_del, [ :pointer, :evas_object_intercept_stack_above_cb ], :pointer ],
+        [ :evas_object_intercept_stack_above_callback_del, [ :evas_object, :evas_object_intercept_stack_above_cb ], :pointer ],
         # EAPI void evas_object_intercept_stack_below_callback_add (Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func, const void *data);
-        [ :evas_object_intercept_stack_below_callback_add, [ :pointer, :evas_object_intercept_stack_below_cb, :pointer ], :void ],
+        [ :evas_object_intercept_stack_below_callback_add, [ :evas_object, :evas_object_intercept_stack_below_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_stack_below_callback_del (Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func);
-        [ :evas_object_intercept_stack_below_callback_del, [ :pointer, :evas_object_intercept_stack_below_cb ], :pointer ],
+        [ :evas_object_intercept_stack_below_callback_del, [ :evas_object, :evas_object_intercept_stack_below_cb ], :pointer ],
         # EAPI void evas_object_intercept_layer_set_callback_add (Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func, const void *data);
-        [ :evas_object_intercept_layer_set_callback_add, [ :pointer, :evas_object_intercept_layer_set_cb, :pointer ], :void ],
+        [ :evas_object_intercept_layer_set_callback_add, [ :evas_object, :evas_object_intercept_layer_set_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_layer_set_callback_del (Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func);
-        [ :evas_object_intercept_layer_set_callback_del, [ :pointer, :evas_object_intercept_layer_set_cb ], :pointer ],
+        [ :evas_object_intercept_layer_set_callback_del, [ :evas_object, :evas_object_intercept_layer_set_cb ], :pointer ],
         # EAPI void evas_object_intercept_color_set_callback_add (Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func, const void *data);
-        [ :evas_object_intercept_color_set_callback_add, [ :pointer, :evas_object_intercept_color_set_cb, :pointer ], :void ],
+        [ :evas_object_intercept_color_set_callback_add, [ :evas_object, :evas_object_intercept_color_set_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_color_set_callback_del (Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func);
-        [ :evas_object_intercept_color_set_callback_del, [ :pointer, :evas_object_intercept_color_set_cb ], :pointer ],
+        [ :evas_object_intercept_color_set_callback_del, [ :evas_object, :evas_object_intercept_color_set_cb ], :pointer ],
         # EAPI void evas_object_intercept_clip_set_callback_add (Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func, const void *data);
-        [ :evas_object_intercept_clip_set_callback_add, [ :pointer, :evas_object_intercept_clip_set_cb, :pointer ], :void ],
+        [ :evas_object_intercept_clip_set_callback_add, [ :evas_object, :evas_object_intercept_clip_set_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_clip_set_callback_del (Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func);
-        [ :evas_object_intercept_clip_set_callback_del, [ :pointer, :evas_object_intercept_clip_set_cb ], :pointer ],
+        [ :evas_object_intercept_clip_set_callback_del, [ :evas_object, :evas_object_intercept_clip_set_cb ], :pointer ],
         # EAPI void evas_object_intercept_clip_unset_callback_add (Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func, const void *data);
-        [ :evas_object_intercept_clip_unset_callback_add, [ :pointer, :evas_object_intercept_clip_unset_cb, :pointer ], :void ],
+        [ :evas_object_intercept_clip_unset_callback_add, [ :evas_object, :evas_object_intercept_clip_unset_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_clip_unset_callback_del (Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func);
-        [ :evas_object_intercept_clip_unset_callback_del, [ :pointer, :evas_object_intercept_clip_unset_cb ], :pointer ],
+        [ :evas_object_intercept_clip_unset_callback_del, [ :evas_object, :evas_object_intercept_clip_unset_cb ], :pointer ],
         # EAPI Evas_Object *evas_object_rectangle_add (Evas *e);
-        [ :evas_object_rectangle_add, [ :pointer ], :pointer ],
+        [ :evas_object_rectangle_add, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_image_add (Evas *e);
-        [ :evas_object_image_add, [ :pointer ], :pointer ],
+        [ :evas_object_image_add, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_image_filled_add (Evas *e);
-        [ :evas_object_image_filled_add, [ :pointer ], :pointer ],
+        [ :evas_object_image_filled_add, [ :evas ], :evas_object ],
         # EAPI void evas_object_image_memfile_set (Evas_Object *obj, void *data, int size, char *format, char *key);
-        [ :evas_object_image_memfile_set, [ :pointer, :pointer, :int, :string, :string ], :void ],
+        [ :evas_object_image_memfile_set, [ :evas_object, :pointer, :int, :string, :string ], :void ],
         # EAPI void evas_object_image_file_set (Evas_Object *obj, const char *file, const char *key);
-        [ :evas_object_image_file_set, [ :pointer, :string, :string ], :void ],
+        [ :evas_object_image_file_set, [ :evas_object, :string, :string ], :void ],
         # EAPI void evas_object_image_file_get (const Evas_Object *obj, const char **file, const char **key);
-        [ :evas_object_image_file_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_image_file_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_border_set (Evas_Object *obj, int l, int r, int t, int b);
-        [ :evas_object_image_border_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_object_image_border_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_image_border_get (const Evas_Object *obj, int *l, int *r, int *t, int *b);
-        [ :evas_object_image_border_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_image_border_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_border_center_fill_set (Evas_Object *obj, Evas_Border_Fill_Mode fill);
-        [ :evas_object_image_border_center_fill_set, [ :pointer, :evas_border_fill_mode ], :void ],
+        [ :evas_object_image_border_center_fill_set, [ :evas_object, :evas_border_fill_mode ], :void ],
         # EAPI Evas_Border_Fill_Mode evas_object_image_border_center_fill_get (const Evas_Object *obj);
-        [ :evas_object_image_border_center_fill_get, [ :pointer ], :evas_border_fill_mode ],
+        [ :evas_object_image_border_center_fill_get, [ :evas_object ], :evas_border_fill_mode ],
         # EAPI void evas_object_image_filled_set (Evas_Object *obj, Eina_Bool setting);
-        [ :evas_object_image_filled_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_image_filled_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_filled_get (const Evas_Object *obj);
-        [ :evas_object_image_filled_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_image_filled_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_image_border_scale_set (Evas_Object *obj, double scale);
-        [ :evas_object_image_border_scale_set, [ :pointer, :double ], :void ],
+        [ :evas_object_image_border_scale_set, [ :evas_object, :double ], :void ],
         # EAPI double evas_object_image_border_scale_get (const Evas_Object *obj);
-        [ :evas_object_image_border_scale_get, [ :pointer ], :double ],
+        [ :evas_object_image_border_scale_get, [ :evas_object ], :double ],
         # EAPI void evas_object_image_fill_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_image_fill_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_object_image_fill_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_image_fill_get (const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_image_fill_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_image_fill_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_fill_spread_set (Evas_Object *obj, Evas_Fill_Spread spread);
-        [ :evas_object_image_fill_spread_set, [ :pointer, :evas_fill_spread ], :void ],
+        [ :evas_object_image_fill_spread_set, [ :evas_object, :evas_fill_spread ], :void ],
         # EAPI Evas_Fill_Spread evas_object_image_fill_spread_get (const Evas_Object *obj);
-        [ :evas_object_image_fill_spread_get, [ :pointer ], :evas_fill_spread ],
+        [ :evas_object_image_fill_spread_get, [ :evas_object ], :evas_fill_spread ],
         # EAPI void evas_object_image_size_set (Evas_Object *obj, int w, int h);
-        [ :evas_object_image_size_set, [ :pointer, :int, :int ], :void ],
+        [ :evas_object_image_size_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_image_size_get (const Evas_Object *obj, int *w, int *h);
-        [ :evas_object_image_size_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_image_size_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI int evas_object_image_stride_get (const Evas_Object *obj);
-        [ :evas_object_image_stride_get, [ :pointer ], :int ],
+        [ :evas_object_image_stride_get, [ :evas_object ], :int ],
         # EAPI Evas_Load_Error evas_object_image_load_error_get (const Evas_Object *obj);
-        [ :evas_object_image_load_error_get, [ :pointer ], :evas_load_error ],
+        [ :evas_object_image_load_error_get, [ :evas_object ], :evas_load_error ],
         # EAPI void evas_object_image_data_set (Evas_Object *obj, void *data);
-        [ :evas_object_image_data_set, [ :pointer, :pointer ], :void ],
+        [ :evas_object_image_data_set, [ :evas_object, :pointer ], :void ],
         # EAPI void *evas_object_image_data_get (const Evas_Object *obj, Eina_Bool for_writing);
-        [ :evas_object_image_data_get, [ :pointer, :eina_bool ], :pointer ],
+        [ :evas_object_image_data_get, [ :evas_object, :bool ], :pointer ],
         # EAPI void *evas_object_image_data_convert (Evas_Object *obj, Evas_Colorspace to_cspace);
-        [ :evas_object_image_data_convert, [ :pointer, :evas_colorspace ], :pointer ],
+        [ :evas_object_image_data_convert, [ :evas_object, :evas_colorspace ], :pointer ],
         # EAPI void evas_object_image_data_copy_set (Evas_Object *obj, void *data);
-        [ :evas_object_image_data_copy_set, [ :pointer, :pointer ], :void ],
+        [ :evas_object_image_data_copy_set, [ :evas_object, :pointer ], :void ],
         # EAPI void evas_object_image_data_update_add (Evas_Object *obj, int x, int y, int w, int h);
-        [ :evas_object_image_data_update_add, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_object_image_data_update_add, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_image_alpha_set (Evas_Object *obj, Eina_Bool has_alpha);
-        [ :evas_object_image_alpha_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_image_alpha_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_alpha_get (const Evas_Object *obj);
-        [ :evas_object_image_alpha_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_image_alpha_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_image_smooth_scale_set (Evas_Object *obj, Eina_Bool smooth_scale);
-        [ :evas_object_image_smooth_scale_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_image_smooth_scale_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_smooth_scale_get (const Evas_Object *obj);
-        [ :evas_object_image_smooth_scale_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_image_smooth_scale_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_image_preload (Evas_Object *obj, Eina_Bool cancel);
-        [ :evas_object_image_preload, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_image_preload, [ :evas_object, :bool ], :void ],
         # EAPI void evas_object_image_reload (Evas_Object *obj);
-        [ :evas_object_image_reload, [ :pointer ], :void ],
+        [ :evas_object_image_reload, [ :evas_object ], :void ],
         # EAPI Eina_Bool evas_object_image_save (const Evas_Object *obj, const char *file, const char *key, const char *flags);
-        [ :evas_object_image_save, [ :pointer, :string, :string, :string ], :eina_bool ],
+        [ :evas_object_image_save, [ :evas_object, :string, :string, :string ], :bool ],
         # EAPI Eina_Bool evas_object_image_pixels_import (Evas_Object *obj, Evas_Pixel_Import_Source *pixels);
-        [ :evas_object_image_pixels_import, [ :pointer, :pointer ], :eina_bool ],
+        [ :evas_object_image_pixels_import, [ :evas_object, :evas_pixel_import_source ], :bool ],
         # EAPI void evas_object_image_pixels_get_callback_set(Evas_Object *obj, Evas_Object_Image_Pixels_Get_Cb func, void *data);
-        [ :evas_object_image_pixels_get_callback_set, [ :pointer, :evas_object_image_pixels_get_cb, :pointer ], :void ],
+        [ :evas_object_image_pixels_get_callback_set, [ :evas_object, :evas_object_image_pixels_get_cb, :pointer ], :void ],
         # EAPI void evas_object_image_pixels_dirty_set (Evas_Object *obj, Eina_Bool dirty);
-        [ :evas_object_image_pixels_dirty_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_image_pixels_dirty_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_pixels_dirty_get (const Evas_Object *obj);
-        [ :evas_object_image_pixels_dirty_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_image_pixels_dirty_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_image_load_dpi_set (Evas_Object *obj, double dpi);
-        [ :evas_object_image_load_dpi_set, [ :pointer, :double ], :void ],
+        [ :evas_object_image_load_dpi_set, [ :evas_object, :double ], :void ],
         # EAPI double evas_object_image_load_dpi_get (const Evas_Object *obj);
-        [ :evas_object_image_load_dpi_get, [ :pointer ], :double ],
+        [ :evas_object_image_load_dpi_get, [ :evas_object ], :double ],
         # EAPI void evas_object_image_load_size_set (Evas_Object *obj, int w, int h);
-        [ :evas_object_image_load_size_set, [ :pointer, :int, :int ], :void ],
+        [ :evas_object_image_load_size_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_image_load_size_get (const Evas_Object *obj, int *w, int *h);
-        [ :evas_object_image_load_size_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_image_load_size_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_load_scale_down_set (Evas_Object *obj, int scale_down);
-        [ :evas_object_image_load_scale_down_set, [ :pointer, :int ], :void ],
+        [ :evas_object_image_load_scale_down_set, [ :evas_object, :int ], :void ],
         # EAPI int evas_object_image_load_scale_down_get (const Evas_Object *obj);
-        [ :evas_object_image_load_scale_down_get, [ :pointer ], :int ],
+        [ :evas_object_image_load_scale_down_get, [ :evas_object ], :int ],
         # EAPI void evas_object_image_load_region_set (Evas_Object *obj, int x, int y, int w, int h);
-        [ :evas_object_image_load_region_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_object_image_load_region_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_image_load_region_get (const Evas_Object *obj, int *x, int *y, int *w, int *h);
-        [ :evas_object_image_load_region_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_image_load_region_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_load_orientation_set (Evas_Object *obj, Eina_Bool enable);
-        [ :evas_object_image_load_orientation_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_image_load_orientation_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_load_orientation_get (const Evas_Object *obj);
-        [ :evas_object_image_load_orientation_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_image_load_orientation_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_image_colorspace_set (Evas_Object *obj, Evas_Colorspace cspace);
-        [ :evas_object_image_colorspace_set, [ :pointer, :evas_colorspace ], :void ],
+        [ :evas_object_image_colorspace_set, [ :evas_object, :evas_colorspace ], :void ],
         # EAPI Evas_Colorspace evas_object_image_colorspace_get (const Evas_Object *obj);
-        [ :evas_object_image_colorspace_get, [ :pointer ], :evas_colorspace ],
+        [ :evas_object_image_colorspace_get, [ :evas_object ], :evas_colorspace ],
         # EAPI Eina_Bool evas_object_image_region_support_get (const Evas_Object *obj);
-        [ :evas_object_image_region_support_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_image_region_support_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_image_native_surface_set (Evas_Object *obj, Evas_Native_Surface *surf);
-        [ :evas_object_image_native_surface_set, [ :pointer, :pointer ], :void ],
+        [ :evas_object_image_native_surface_set, [ :evas_object, :evas_native_surface ], :void ],
         # EAPI Evas_Native_Surface *evas_object_image_native_surface_get (const Evas_Object *obj);
-        [ :evas_object_image_native_surface_get, [ :pointer ], :pointer ],
+        [ :evas_object_image_native_surface_get, [ :evas_object ], :evas_native_surface ],
         # EAPI void evas_object_image_video_surface_set (Evas_Object *obj, Evas_Video_Surface *surf);
-        [ :evas_object_image_video_surface_set, [ :pointer, :pointer ], :void ],
+        [ :evas_object_image_video_surface_set, [ :evas_object, :evas_video_surface ], :void ],
         # EAPI const Evas_Video_Surface *evas_object_image_video_surface_get (const Evas_Object *obj);
-        [ :evas_object_image_video_surface_get, [ :pointer ], :pointer ],
+        [ :evas_object_image_video_surface_get, [ :evas_object ], :evas_video_surface ],
         # EAPI void evas_object_image_scale_hint_set (Evas_Object *obj, Evas_Image_Scale_Hint hint);
-        [ :evas_object_image_scale_hint_set, [ :pointer, :evas_image_scale_hint ], :void ],
+        [ :evas_object_image_scale_hint_set, [ :evas_object, :evas_image_scale_hint ], :void ],
         # EAPI Evas_Image_Scale_Hint evas_object_image_scale_hint_get (const Evas_Object *obj);
-        [ :evas_object_image_scale_hint_get, [ :pointer ], :evas_image_scale_hint ],
+        [ :evas_object_image_scale_hint_get, [ :evas_object ], :evas_image_scale_hint ],
         # EAPI void evas_object_image_content_hint_set (Evas_Object *obj, Evas_Image_Content_Hint hint);
-        [ :evas_object_image_content_hint_set, [ :pointer, :evas_image_content_hint ], :void ],
+        [ :evas_object_image_content_hint_set, [ :evas_object, :evas_image_content_hint ], :void ],
         # EAPI Evas_Image_Content_Hint evas_object_image_content_hint_get (const Evas_Object *obj);
-        [ :evas_object_image_content_hint_get, [ :pointer ], :evas_image_content_hint ],
+        [ :evas_object_image_content_hint_get, [ :evas_object ], :evas_image_content_hint ],
         # EAPI void evas_object_image_alpha_mask_set (Evas_Object *obj, Eina_Bool ismask);
-        [ :evas_object_image_alpha_mask_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_image_alpha_mask_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_source_set (Evas_Object *obj, Evas_Object *src);
-        [ :evas_object_image_source_set, [ :pointer, :pointer ], :eina_bool ],
+        [ :evas_object_image_source_set, [ :evas_object, :evas_object ], :bool ],
         # EAPI Evas_Object *evas_object_image_source_get (Evas_Object *obj);
-        [ :evas_object_image_source_get, [ :pointer ], :pointer ],
+        [ :evas_object_image_source_get, [ :evas_object ], :evas_object ],
         # EAPI Eina_Bool evas_object_image_source_unset (Evas_Object *obj);
-        [ :evas_object_image_source_unset, [ :pointer ], :eina_bool ],
+        [ :evas_object_image_source_unset, [ :evas_object ], :bool ],
         # EAPI Eina_Bool evas_object_image_extension_can_load_get(const char *file);
-        [ :evas_object_image_extension_can_load_get, [ :string ], :eina_bool ],
+        [ :evas_object_image_extension_can_load_get, [ :string ], :bool ],
         # EAPI Eina_Bool evas_object_image_extension_can_load_fast_get(const char *file);
-        [ :evas_object_image_extension_can_load_fast_get, [ :string ], :eina_bool ],
+        [ :evas_object_image_extension_can_load_fast_get, [ :string ], :bool ],
         # EAPI Eina_Bool evas_object_image_animated_get(const Evas_Object *obj);
-        [ :evas_object_image_animated_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_image_animated_get, [ :evas_object ], :bool ],
         # EAPI int evas_object_image_animated_frame_count_get(const Evas_Object *obj);
-        [ :evas_object_image_animated_frame_count_get, [ :pointer ], :int ],
+        [ :evas_object_image_animated_frame_count_get, [ :evas_object ], :int ],
         # EAPI Evas_Image_Animated_Loop_Hint evas_object_image_animated_loop_type_get(const Evas_Object *obj);
-        [ :evas_object_image_animated_loop_type_get, [ :pointer ], :evas_image_animated_loop_hint ],
+        [ :evas_object_image_animated_loop_type_get, [ :evas_object ], :evas_image_animated_loop_hint ],
         # EAPI int evas_object_image_animated_loop_count_get(const Evas_Object *obj);
-        [ :evas_object_image_animated_loop_count_get, [ :pointer ], :int ],
+        [ :evas_object_image_animated_loop_count_get, [ :evas_object ], :int ],
         # EAPI double evas_object_image_animated_frame_duration_get(const Evas_Object *obj, int start_frame, int fram_num);
-        [ :evas_object_image_animated_frame_duration_get, [ :pointer, :int, :int ], :double ],
+        [ :evas_object_image_animated_frame_duration_get, [ :evas_object, :int, :int ], :double ],
         # EAPI void evas_object_image_animated_frame_set(Evas_Object *obj, int frame_num);
-        [ :evas_object_image_animated_frame_set, [ :pointer, :int ], :void ],
+        [ :evas_object_image_animated_frame_set, [ :evas_object, :int ], :void ],
         # EAPI Evas_Object *evas_object_text_add (Evas *e);
-        [ :evas_object_text_add, [ :pointer ], :pointer ],
+        [ :evas_object_text_add, [ :evas ], :evas_object ],
         # EAPI void evas_object_text_font_source_set (Evas_Object *obj, const char *font);
-        [ :evas_object_text_font_source_set, [ :pointer, :string ], :void ],
+        [ :evas_object_text_font_source_set, [ :evas_object, :string ], :void ],
         # EAPI const char *evas_object_text_font_source_get (const Evas_Object *obj);
-        [ :evas_object_text_font_source_get, [ :pointer ], :string ],
+        [ :evas_object_text_font_source_get, [ :evas_object ], :string ],
         # EAPI void evas_object_text_font_set (Evas_Object *obj, const char *font, Evas_Font_Size size);
-        [ :evas_object_text_font_set, [ :pointer, :string, :int ], :void ],
+        [ :evas_object_text_font_set, [ :evas_object, :string, :int ], :void ],
         # EAPI void evas_object_text_font_get (const Evas_Object *obj, const char **font, Evas_Font_Size *size);
-        [ :evas_object_text_font_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_text_font_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_text_set (Evas_Object *obj, const char *text);
-        [ :evas_object_text_text_set, [ :pointer, :string ], :void ],
+        [ :evas_object_text_text_set, [ :evas_object, :string ], :void ],
         # EAPI const char *evas_object_text_text_get (const Evas_Object *obj);
-        [ :evas_object_text_text_get, [ :pointer ], :string ],
+        [ :evas_object_text_text_get, [ :evas_object ], :string ],
         # EAPI void evas_object_text_bidi_delimiters_set(Evas_Object *obj, const char *delim);
-        [ :evas_object_text_bidi_delimiters_set, [ :pointer, :string ], :void ],
+        [ :evas_object_text_bidi_delimiters_set, [ :evas_object, :string ], :void ],
         # EAPI const char *evas_object_text_bidi_delimiters_get(const Evas_Object *obj);
-        [ :evas_object_text_bidi_delimiters_get, [ :pointer ], :string ],
+        [ :evas_object_text_bidi_delimiters_get, [ :evas_object ], :string ],
         # EAPI Evas_Coord evas_object_text_ascent_get (const Evas_Object *obj);
-        [ :evas_object_text_ascent_get, [ :pointer ], :int ],
+        [ :evas_object_text_ascent_get, [ :evas_object ], :int ],
         # EAPI Evas_Coord evas_object_text_descent_get (const Evas_Object *obj);
-        [ :evas_object_text_descent_get, [ :pointer ], :int ],
+        [ :evas_object_text_descent_get, [ :evas_object ], :int ],
         # EAPI Evas_Coord evas_object_text_max_ascent_get (const Evas_Object *obj);
-        [ :evas_object_text_max_ascent_get, [ :pointer ], :int ],
+        [ :evas_object_text_max_ascent_get, [ :evas_object ], :int ],
         # EAPI Evas_Coord evas_object_text_max_descent_get (const Evas_Object *obj);
-        [ :evas_object_text_max_descent_get, [ :pointer ], :int ],
+        [ :evas_object_text_max_descent_get, [ :evas_object ], :int ],
         # EAPI Evas_Coord evas_object_text_horiz_advance_get(const Evas_Object *obj);
-        [ :evas_object_text_horiz_advance_get, [ :pointer ], :int ],
+        [ :evas_object_text_horiz_advance_get, [ :evas_object ], :int ],
         # EAPI Evas_Coord evas_object_text_vert_advance_get (const Evas_Object *obj);
-        [ :evas_object_text_vert_advance_get, [ :pointer ], :int ],
+        [ :evas_object_text_vert_advance_get, [ :evas_object ], :int ],
         # EAPI Evas_Coord evas_object_text_inset_get (const Evas_Object *obj);
-        [ :evas_object_text_inset_get, [ :pointer ], :int ],
+        [ :evas_object_text_inset_get, [ :evas_object ], :int ],
         # EAPI Eina_Bool evas_object_text_char_pos_get (const Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_object_text_char_pos_get, [ :pointer, :int, :pointer, :pointer, :pointer, :pointer ], :eina_bool ],
+        [ :evas_object_text_char_pos_get, [ :evas_object, :int, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI int evas_object_text_char_coords_get (const Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_object_text_char_coords_get, [ :pointer, :int, :int, :pointer, :pointer, :pointer, :pointer ], :int ],
+        [ :evas_object_text_char_coords_get, [ :evas_object, :int, :int, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI int evas_object_text_last_up_to_pos (const Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        [ :evas_object_text_last_up_to_pos, [ :pointer, :int, :int ], :int ],
+        [ :evas_object_text_last_up_to_pos, [ :evas_object, :int, :int ], :int ],
         # EAPI Evas_Text_Style_Type evas_object_text_style_get (const Evas_Object *obj);
-        [ :evas_object_text_style_get, [ :pointer ], :evas_text_style_type ],
+        [ :evas_object_text_style_get, [ :evas_object ], :evas_text_style_type ],
         # EAPI void evas_object_text_style_set (Evas_Object *obj, Evas_Text_Style_Type type);
-        [ :evas_object_text_style_set, [ :pointer, :evas_text_style_type ], :void ],
+        [ :evas_object_text_style_set, [ :evas_object, :evas_text_style_type ], :void ],
         # EAPI void evas_object_text_shadow_color_set (Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_text_shadow_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_object_text_shadow_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_text_shadow_color_get (const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_text_shadow_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_text_shadow_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_glow_color_set (Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_text_glow_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_object_text_glow_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_text_glow_color_get (const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_text_glow_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_text_glow_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_glow2_color_set (Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_text_glow2_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_object_text_glow2_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_text_glow2_color_get (const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_text_glow2_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_text_glow2_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_outline_color_set(Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_text_outline_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_object_text_outline_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_text_outline_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_text_outline_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_text_outline_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_style_pad_get (const Evas_Object *obj, int *l, int *r, int *t, int *b);
-        [ :evas_object_text_style_pad_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_text_style_pad_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_BiDi_Direction evas_object_text_direction_get (const Evas_Object *obj);
-        [ :evas_object_text_direction_get, [ :pointer ], :evas_bidi_direction ],
+        [ :evas_object_text_direction_get, [ :evas_object ], :evas_bidi_direction ],
         # EAPI Evas_Object *evas_object_textblock_add(Evas *e);
-        [ :evas_object_textblock_add, [ :pointer ], :pointer ],
+        [ :evas_object_textblock_add, [ :evas ], :evas_object ],
         # EAPI const char *evas_textblock_escape_string_get(const char *escape);
         [ :evas_textblock_escape_string_get, [ :string ], :string ],
         # EAPI const char *evas_textblock_string_escape_get(const char *string, int *len_ret);
@@ -913,401 +914,403 @@ module Efl
         # EAPI const char *evas_textblock_escape_string_range_get(const char *escape_start, const char *escape_end);
         [ :evas_textblock_escape_string_range_get, [ :string, :string ], :string ],
         # EAPI char *evas_textblock_text_markup_to_utf8(const Evas_Object *obj, const char *text);
-        [ :evas_textblock_text_markup_to_utf8, [ :pointer, :string ], :string ],
+        [ :evas_textblock_text_markup_to_utf8, [ :evas_object, :string ], :string ],
         # EAPI char *evas_textblock_text_utf8_to_markup(const Evas_Object *obj, const char *text);
-        [ :evas_textblock_text_utf8_to_markup, [ :pointer, :string ], :string ],
+        [ :evas_textblock_text_utf8_to_markup, [ :evas_object, :string ], :string ],
         # EAPI Evas_Textblock_Style *evas_textblock_style_new(void);
-        [ :evas_textblock_style_new, [  ], :pointer ],
+        [ :evas_textblock_style_new, [  ], :evas_textblock_style ],
         # EAPI void evas_textblock_style_free(Evas_Textblock_Style *ts);
-        [ :evas_textblock_style_free, [ :pointer ], :void ],
+        [ :evas_textblock_style_free, [ :evas_textblock_style ], :void ],
         # EAPI void evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text);
-        [ :evas_textblock_style_set, [ :pointer, :string ], :void ],
+        [ :evas_textblock_style_set, [ :evas_textblock_style, :string ], :void ],
         # EAPI const char *evas_textblock_style_get(const Evas_Textblock_Style *ts);
-        [ :evas_textblock_style_get, [ :pointer ], :string ],
+        [ :evas_textblock_style_get, [ :evas_textblock_style ], :string ],
         # EAPI void evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts);
-        [ :evas_object_textblock_style_set, [ :pointer, :pointer ], :void ],
+        [ :evas_object_textblock_style_set, [ :evas_object, :evas_textblock_style ], :void ],
         # EAPI const Evas_Textblock_Style *evas_object_textblock_style_get(const Evas_Object *obj);
-        [ :evas_object_textblock_style_get, [ :pointer ], :pointer ],
+        [ :evas_object_textblock_style_get, [ :evas_object ], :evas_textblock_style ],
         # EAPI void evas_object_textblock_style_user_set(Evas_Object *obj, Evas_Textblock_Style *ts);
-        [ :evas_object_textblock_style_user_set, [ :pointer, :pointer ], :void ],
+        [ :evas_object_textblock_style_user_set, [ :evas_object, :evas_textblock_style ], :void ],
         # EAPI const Evas_Textblock_Style *evas_object_textblock_style_user_get(const Evas_Object *obj);
-        [ :evas_object_textblock_style_user_get, [ :pointer ], :pointer ],
+        [ :evas_object_textblock_style_user_get, [ :evas_object ], :evas_textblock_style ],
         # EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch);
-        [ :evas_object_textblock_replace_char_set, [ :pointer, :string ], :void ],
+        [ :evas_object_textblock_replace_char_set, [ :evas_object, :string ], :void ],
         # EAPI const char *evas_object_textblock_replace_char_get(Evas_Object *obj);
-        [ :evas_object_textblock_replace_char_get, [ :pointer ], :string ],
+        [ :evas_object_textblock_replace_char_get, [ :evas_object ], :string ],
         # EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align);
-        [ :evas_object_textblock_valign_set, [ :pointer, :double ], :void ],
+        [ :evas_object_textblock_valign_set, [ :evas_object, :double ], :void ],
         # EAPI double evas_object_textblock_valign_get(const Evas_Object *obj);
-        [ :evas_object_textblock_valign_get, [ :pointer ], :double ],
+        [ :evas_object_textblock_valign_get, [ :evas_object ], :double ],
         # EAPI void evas_object_textblock_bidi_delimiters_set(Evas_Object *obj, const char *delim);
-        [ :evas_object_textblock_bidi_delimiters_set, [ :pointer, :string ], :void ],
+        [ :evas_object_textblock_bidi_delimiters_set, [ :evas_object, :string ], :void ],
         # EAPI const char *evas_object_textblock_bidi_delimiters_get(const Evas_Object *obj);
-        [ :evas_object_textblock_bidi_delimiters_get, [ :pointer ], :string ],
+        [ :evas_object_textblock_bidi_delimiters_get, [ :evas_object ], :string ],
         # EAPI void evas_object_textblock_legacy_newline_set(Evas_Object *obj, Eina_Bool mode);
-        [ :evas_object_textblock_legacy_newline_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_textblock_legacy_newline_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Evas_Object *obj);
-        [ :evas_object_textblock_legacy_newline_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_textblock_legacy_newline_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text);
-        [ :evas_object_textblock_text_markup_set, [ :pointer, :string ], :void ],
+        [ :evas_object_textblock_text_markup_set, [ :evas_object, :string ], :void ],
         # EAPI void evas_object_textblock_text_markup_prepend(Evas_Textblock_Cursor *cur, const char *text);
-        [ :evas_object_textblock_text_markup_prepend, [ :pointer, :string ], :void ],
+        [ :evas_object_textblock_text_markup_prepend, [ :evas_textblock_cursor, :string ], :void ],
         # EAPI const char *evas_object_textblock_text_markup_get(const Evas_Object *obj);
-        [ :evas_object_textblock_text_markup_get, [ :pointer ], :string ],
+        [ :evas_object_textblock_text_markup_get, [ :evas_object ], :string ],
         # EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_get(const Evas_Object *obj);
-        [ :evas_object_textblock_cursor_get, [ :pointer ], :pointer ],
+        [ :evas_object_textblock_cursor_get, [ :evas_object ], :evas_textblock_cursor ],
         # EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_new(const Evas_Object *obj);
-        [ :evas_object_textblock_cursor_new, [ :pointer ], :pointer ],
+        [ :evas_object_textblock_cursor_new, [ :evas_object ], :evas_textblock_cursor ],
         # EAPI void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_free, [ :pointer ], :void ],
+        [ :evas_textblock_cursor_free, [ :evas_textblock_cursor ], :void ],
         # EAPI void evas_textblock_cursor_paragraph_first(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_first, [ :pointer ], :void ],
+        [ :evas_textblock_cursor_paragraph_first, [ :evas_textblock_cursor ], :void ],
         # EAPI void evas_textblock_cursor_paragraph_last(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_last, [ :pointer ], :void ],
+        [ :evas_textblock_cursor_paragraph_last, [ :evas_textblock_cursor ], :void ],
         # EAPI Eina_Bool evas_textblock_cursor_paragraph_next(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_next, [ :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_paragraph_next, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_paragraph_prev(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_prev, [ :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_paragraph_prev, [ :evas_textblock_cursor ], :bool ],
         # EAPI const Eina_List *evas_textblock_node_format_list_get(const Evas_Object *obj, const char *anchor);
-        [ :evas_textblock_node_format_list_get, [ :pointer, :string ], :pointer ],
+        [ :evas_textblock_node_format_list_get, [ :evas_object, :string ], :eina_list ],
         # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_first_get(const Evas_Object *obj);
-        [ :evas_textblock_node_format_first_get, [ :pointer ], :pointer ],
+        [ :evas_textblock_node_format_first_get, [ :evas_object ], :evas_object_textblock_node_format ],
         # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_last_get(const Evas_Object *obj);
-        [ :evas_textblock_node_format_last_get, [ :pointer ], :pointer ],
+        [ :evas_textblock_node_format_last_get, [ :evas_object ], :evas_object_textblock_node_format ],
         # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_next_get(const Evas_Object_Textblock_Node_Format *n);
-        [ :evas_textblock_node_format_next_get, [ :pointer ], :pointer ],
+        [ :evas_textblock_node_format_next_get, [ :evas_object_textblock_node_format ], :evas_object_textblock_node_format ],
         # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_prev_get(const Evas_Object_Textblock_Node_Format *n);
-        [ :evas_textblock_node_format_prev_get, [ :pointer ], :pointer ],
+        [ :evas_textblock_node_format_prev_get, [ :evas_object_textblock_node_format ], :evas_object_textblock_node_format ],
         # EAPI void evas_textblock_node_format_remove_pair(Evas_Object *obj, Evas_Object_Textblock_Node_Format *n);
-        [ :evas_textblock_node_format_remove_pair, [ :pointer, :pointer ], :void ],
+        [ :evas_textblock_node_format_remove_pair, [ :evas_object, :evas_object_textblock_node_format ], :void ],
         # EAPI void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n);
-        [ :evas_textblock_cursor_set_at_format, [ :pointer, :pointer ], :void ],
+        [ :evas_textblock_cursor_set_at_format, [ :evas_textblock_cursor, :evas_object_textblock_node_format ], :void ],
         # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_format_get, [ :pointer ], :pointer ],
+        [ :evas_textblock_cursor_format_get, [ :evas_textblock_cursor ], :evas_object_textblock_node_format ],
         # EAPI const char *evas_textblock_node_format_text_get(const Evas_Object_Textblock_Node_Format *fnode);
-        [ :evas_textblock_node_format_text_get, [ :pointer ], :string ],
+        [ :evas_textblock_node_format_text_get, [ :evas_object_textblock_node_format ], :string ],
         # EAPI void evas_textblock_cursor_at_format_set(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *fmt);
-        [ :evas_textblock_cursor_at_format_set, [ :pointer, :pointer ], :void ],
+        [ :evas_textblock_cursor_at_format_set, [ :evas_textblock_cursor, :evas_object_textblock_node_format ], :void ],
         # EAPI Eina_Bool evas_textblock_cursor_format_is_visible_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_format_is_visible_get, [ :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_format_is_visible_get, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_format_next(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_format_next, [ :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_format_next, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_format_prev, [ :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_format_prev, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_is_format, [ :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_is_format, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_char_next, [ :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_char_next, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_char_prev, [ :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_char_prev, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_word_start(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_word_start, [ :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_word_start, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_word_end(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_word_end, [ :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_word_end, [ :evas_textblock_cursor ], :bool ],
         # EAPI void evas_textblock_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_char_first, [ :pointer ], :void ],
+        [ :evas_textblock_cursor_paragraph_char_first, [ :evas_textblock_cursor ], :void ],
         # EAPI void evas_textblock_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_char_last, [ :pointer ], :void ],
+        [ :evas_textblock_cursor_paragraph_char_last, [ :evas_textblock_cursor ], :void ],
         # EAPI void evas_textblock_cursor_line_char_first(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_line_char_first, [ :pointer ], :void ],
+        [ :evas_textblock_cursor_line_char_first, [ :evas_textblock_cursor ], :void ],
         # EAPI void evas_textblock_cursor_line_char_last(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_line_char_last, [ :pointer ], :void ],
+        [ :evas_textblock_cursor_line_char_last, [ :evas_textblock_cursor ], :void ],
         # EAPI int evas_textblock_cursor_pos_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_pos_get, [ :pointer ], :int ],
+        [ :evas_textblock_cursor_pos_get, [ :evas_textblock_cursor ], :int ],
         # EAPI void evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos);
-        [ :evas_textblock_cursor_pos_set, [ :pointer, :int ], :void ],
+        [ :evas_textblock_cursor_pos_set, [ :evas_textblock_cursor, :int ], :void ],
         # EAPI Eina_Bool evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line);
-        [ :evas_textblock_cursor_line_set, [ :pointer, :int ], :eina_bool ],
+        [ :evas_textblock_cursor_line_set, [ :evas_textblock_cursor, :int ], :bool ],
         # EAPI int evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
-        [ :evas_textblock_cursor_compare, [ :pointer, :pointer ], :int ],
+        [ :evas_textblock_cursor_compare, [ :evas_textblock_cursor, :evas_textblock_cursor ], :int ],
         # EAPI void evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest);
-        [ :evas_textblock_cursor_copy, [ :pointer, :pointer ], :void ],
+        [ :evas_textblock_cursor_copy, [ :evas_textblock_cursor, :evas_textblock_cursor ], :void ],
         # EAPI int evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text);
-        [ :evas_textblock_cursor_text_append, [ :pointer, :string ], :int ],
+        [ :evas_textblock_cursor_text_append, [ :evas_textblock_cursor, :string ], :int ],
         # EAPI int evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text);
-        [ :evas_textblock_cursor_text_prepend, [ :pointer, :string ], :int ],
+        [ :evas_textblock_cursor_text_prepend, [ :evas_textblock_cursor, :string ], :int ],
         # EAPI Eina_Bool evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format);
-        [ :evas_textblock_cursor_format_append, [ :pointer, :string ], :eina_bool ],
+        [ :evas_textblock_cursor_format_append, [ :evas_textblock_cursor, :string ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format);
-        [ :evas_textblock_cursor_format_prepend, [ :pointer, :string ], :eina_bool ],
+        [ :evas_textblock_cursor_format_prepend, [ :evas_textblock_cursor, :string ], :bool ],
         # EAPI void evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_char_delete, [ :pointer ], :void ],
+        [ :evas_textblock_cursor_char_delete, [ :evas_textblock_cursor ], :void ],
         # EAPI void evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2);
-        [ :evas_textblock_cursor_range_delete, [ :pointer, :pointer ], :void ],
+        [ :evas_textblock_cursor_range_delete, [ :evas_textblock_cursor, :evas_textblock_cursor ], :void ],
         # EAPI const char *evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_text_get, [ :pointer ], :string ],
+        [ :evas_textblock_cursor_paragraph_text_get, [ :evas_textblock_cursor ], :string ],
         # EAPI int evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_text_length_get, [ :pointer ], :int ],
+        [ :evas_textblock_cursor_paragraph_text_length_get, [ :evas_textblock_cursor ], :int ],
         # EAPI Eina_Bool evas_textblock_cursor_visible_range_get(Evas_Textblock_Cursor *start, Evas_Textblock_Cursor *end);
-        [ :evas_textblock_cursor_visible_range_get, [ :pointer, :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_visible_range_get, [ :evas_textblock_cursor, :evas_textblock_cursor ], :bool ],
         # EAPI Eina_List * evas_textblock_cursor_range_formats_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
-        [ :evas_textblock_cursor_range_formats_get, [ :pointer, :pointer ], :pointer ],
+        [ :evas_textblock_cursor_range_formats_get, [ :evas_textblock_cursor, :evas_textblock_cursor ], :eina_list ],
         # EAPI char *evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format);
-        [ :evas_textblock_cursor_range_text_get, [ :pointer, :pointer, :evas_textblock_text_type ], :string ],
+        [ :evas_textblock_cursor_range_text_get, [ :evas_textblock_cursor, :evas_textblock_cursor, :evas_textblock_text_type ], :string ],
         # EAPI char *evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_content_get, [ :pointer ], :string ],
+        [ :evas_textblock_cursor_content_get, [ :evas_textblock_cursor ], :string ],
         # EAPI int evas_textblock_cursor_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype);
-        [ :evas_textblock_cursor_geometry_get, [ :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :evas_textblock_cursor_type ], :int ],
+        [ :evas_textblock_cursor_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer, :pointer, :evas_textblock_cursor_type
+            ], :int ],
         # EAPI int evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_textblock_cursor_char_geometry_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :int ],
+        [ :evas_textblock_cursor_char_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI int evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cpen_x, Evas_Coord *cy, Evas_Coord *cadv, Evas_Coord *ch);
-        [ :evas_textblock_cursor_pen_geometry_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :int ],
+        [ :evas_textblock_cursor_pen_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI int evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_textblock_cursor_line_geometry_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :int ],
+        [ :evas_textblock_cursor_line_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y);
-        [ :evas_textblock_cursor_char_coord_set, [ :pointer, :int, :int ], :eina_bool ],
+        [ :evas_textblock_cursor_char_coord_set, [ :evas_textblock_cursor, :int, :int ], :bool ],
         # EAPI int evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y);
-        [ :evas_textblock_cursor_line_coord_set, [ :pointer, :int ], :int ],
+        [ :evas_textblock_cursor_line_coord_set, [ :evas_textblock_cursor, :int ], :int ],
         # EAPI Eina_List *evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
-        [ :evas_textblock_cursor_range_geometry_get, [ :pointer, :pointer ], :pointer ],
+        [ :evas_textblock_cursor_range_geometry_get, [ :evas_textblock_cursor, :evas_textblock_cursor ], :eina_list ],
         # EAPI Eina_Bool evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_textblock_cursor_format_item_geometry_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_format_item_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_eol_get, [ :pointer ], :eina_bool ],
+        [ :evas_textblock_cursor_eol_get, [ :evas_textblock_cursor ], :bool ],
         # EAPI Eina_Bool evas_object_textblock_line_number_geometry_get(const Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_object_textblock_line_number_geometry_get, [ :pointer, :int, :pointer, :pointer, :pointer, :pointer ], :eina_bool ],
+        [ :evas_object_textblock_line_number_geometry_get, [ :evas_object, :int, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI void evas_object_textblock_clear(Evas_Object *obj);
-        [ :evas_object_textblock_clear, [ :pointer ], :void ],
+        [ :evas_object_textblock_clear, [ :evas_object ], :void ],
         # EAPI void evas_object_textblock_size_formatted_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_textblock_size_formatted_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_textblock_size_formatted_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_textblock_size_native_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_textblock_size_native_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_textblock_size_native_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_textblock_style_insets_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b);
-        [ :evas_object_textblock_style_insets_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_textblock_style_insets_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_Object *evas_object_line_add (Evas *e);
-        [ :evas_object_line_add, [ :pointer ], :pointer ],
+        [ :evas_object_line_add, [ :evas ], :evas_object ],
         # EAPI void evas_object_line_xy_set (Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2);
-        [ :evas_object_line_xy_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        [ :evas_object_line_xy_set, [ :evas_object, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_line_xy_get (const Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2);
-        [ :evas_object_line_xy_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_line_xy_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_Object *evas_object_polygon_add (Evas *e);
-        [ :evas_object_polygon_add, [ :pointer ], :pointer ],
+        [ :evas_object_polygon_add, [ :evas ], :evas_object ],
         # EAPI void evas_object_polygon_point_add (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        [ :evas_object_polygon_point_add, [ :pointer, :int, :int ], :void ],
+        [ :evas_object_polygon_point_add, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_polygon_points_clear (Evas_Object *obj);
-        [ :evas_object_polygon_points_clear, [ :pointer ], :void ],
+        [ :evas_object_polygon_points_clear, [ :evas_object ], :void ],
         # EAPI void evas_object_is_frame_object_set(Evas_Object *obj, Eina_Bool is_frame);
-        [ :evas_object_is_frame_object_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_is_frame_object_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_is_frame_object_get(Evas_Object *obj);
-        [ :evas_object_is_frame_object_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_is_frame_object_get, [ :evas_object ], :bool ],
         # EAPI void evas_smart_free (Evas_Smart *s);
-        [ :evas_smart_free, [ :pointer ], :void ],
+        [ :evas_smart_free, [ :evas_smart ], :void ],
         # EAPI Evas_Smart *evas_smart_class_new (const Evas_Smart_Class *sc);
-        [ :evas_smart_class_new, [ :pointer ], :pointer ],
+        [ :evas_smart_class_new, [ :evas_smart_class ], :evas_smart ],
         # EAPI const Evas_Smart_Class *evas_smart_class_get (const Evas_Smart *s);
-        [ :evas_smart_class_get, [ :pointer ], :pointer ],
+        [ :evas_smart_class_get, [ :evas_smart ], :evas_smart_class ],
         # EAPI void *evas_smart_data_get (const Evas_Smart *s);
-        [ :evas_smart_data_get, [ :pointer ], :pointer ],
+        [ :evas_smart_data_get, [ :evas_smart ], :pointer ],
         # EAPI const Evas_Smart_Cb_Description **evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count);
-        [ :evas_smart_callbacks_descriptions_get, [ :pointer, :pointer ], :pointer ],
+        [ :evas_smart_callbacks_descriptions_get, [ :evas_smart, :pointer ], :evas_smart_cb_description ],
         # EAPI const Evas_Smart_Cb_Description *evas_smart_callback_description_find(const Evas_Smart *s, const char *name);
-        [ :evas_smart_callback_description_find, [ :pointer, :string ], :pointer ],
+        [ :evas_smart_callback_description_find, [ :evas_smart, :string ], :evas_smart_cb_description ],
         # EAPI Eina_Bool evas_smart_class_inherit_full (Evas_Smart_Class *sc, const Evas_Smart_Class *parent_sc, unsigned int parent_sc_size);
-        [ :evas_smart_class_inherit_full, [ :pointer, :pointer, :uint ], :eina_bool ],
+        [ :evas_smart_class_inherit_full, [ :evas_smart_class, :evas_smart_class, :uint ], :bool ],
         # EAPI int evas_smart_usage_get(const Evas_Smart *s);
-        [ :evas_smart_usage_get, [ :pointer ], :int ],
+        [ :evas_smart_usage_get, [ :evas_smart ], :int ],
         # EAPI Evas_Object *evas_object_smart_add (Evas *e, Evas_Smart *s);
-        [ :evas_object_smart_add, [ :pointer, :pointer ], :pointer ],
+        [ :evas_object_smart_add, [ :evas, :evas_smart ], :evas_object ],
         # EAPI void evas_object_smart_member_add (Evas_Object *obj, Evas_Object *smart_obj);
-        [ :evas_object_smart_member_add, [ :pointer, :pointer ], :void ],
+        [ :evas_object_smart_member_add, [ :evas_object, :evas_object ], :void ],
         # EAPI void evas_object_smart_member_del (Evas_Object *obj);
-        [ :evas_object_smart_member_del, [ :pointer ], :void ],
+        [ :evas_object_smart_member_del, [ :evas_object ], :void ],
         # EAPI Eina_List *evas_object_smart_members_get (const Evas_Object *obj);
-        [ :evas_object_smart_members_get, [ :pointer ], :pointer ],
+        [ :evas_object_smart_members_get, [ :evas_object ], :eina_list ],
         # EAPI Evas_Object *evas_object_smart_parent_get (const Evas_Object *obj);
-        [ :evas_object_smart_parent_get, [ :pointer ], :pointer ],
+        [ :evas_object_smart_parent_get, [ :evas_object ], :evas_object ],
         # EAPI Eina_Bool evas_object_smart_type_check (const Evas_Object *obj, const char *type);
-        [ :evas_object_smart_type_check, [ :pointer, :string ], :eina_bool ],
+        [ :evas_object_smart_type_check, [ :evas_object, :string ], :bool ],
         # EAPI Eina_Bool evas_object_smart_type_check_ptr (const Evas_Object *obj, const char *type);
-        [ :evas_object_smart_type_check_ptr, [ :pointer, :string ], :eina_bool ],
+        [ :evas_object_smart_type_check_ptr, [ :evas_object, :string ], :bool ],
         # EAPI Evas_Smart *evas_object_smart_smart_get (const Evas_Object *obj);
-        [ :evas_object_smart_smart_get, [ :pointer ], :pointer ],
+        [ :evas_object_smart_smart_get, [ :evas_object ], :evas_smart ],
         # EAPI void *evas_object_smart_data_get (const Evas_Object *obj);
-        [ :evas_object_smart_data_get, [ :pointer ], :pointer ],
+        [ :evas_object_smart_data_get, [ :evas_object ], :pointer ],
         # EAPI void evas_object_smart_data_set (Evas_Object *obj, void *data);
-        [ :evas_object_smart_data_set, [ :pointer, :pointer ], :void ],
+        [ :evas_object_smart_data_set, [ :evas_object, :pointer ], :void ],
         # EAPI void evas_object_smart_callback_add (Evas_Object *obj, const char *event, Evas_Smart_Cb func, const void *data);
-        [ :evas_object_smart_callback_add, [ :pointer, :string, :evas_smart_cb, :pointer ], :void ],
+        [ :evas_object_smart_callback_add, [ :evas_object, :string, :evas_smart_cb, :pointer ], :void ],
         # EAPI void evas_object_smart_callback_priority_add(Evas_Object *obj, const char *event, Evas_Callback_Priority priority, Evas_Smart_Cb func, const void *data);
-        [ :evas_object_smart_callback_priority_add, [ :pointer, :string, :short, :evas_smart_cb, :pointer ], :void ],
+        [ :evas_object_smart_callback_priority_add, [ :evas_object, :string, :short, :evas_smart_cb, :pointer ], :void ],
         # EAPI void *evas_object_smart_callback_del (Evas_Object *obj, const char *event, Evas_Smart_Cb func);
-        [ :evas_object_smart_callback_del, [ :pointer, :string, :evas_smart_cb ], :pointer ],
+        [ :evas_object_smart_callback_del, [ :evas_object, :string, :evas_smart_cb ], :pointer ],
         # EAPI void *evas_object_smart_callback_del_full(Evas_Object *obj, const char *event, Evas_Smart_Cb func, const void *data);
-        [ :evas_object_smart_callback_del_full, [ :pointer, :string, :evas_smart_cb, :pointer ], :pointer ],
+        [ :evas_object_smart_callback_del_full, [ :evas_object, :string, :evas_smart_cb, :pointer ], :pointer ],
         # EAPI void evas_object_smart_callback_call (Evas_Object *obj, const char *event, void *event_info);
-        [ :evas_object_smart_callback_call, [ :pointer, :string, :pointer ], :void ],
+        [ :evas_object_smart_callback_call, [ :evas_object, :string, :pointer ], :void ],
         # EAPI Eina_Bool evas_object_smart_callbacks_descriptions_set(Evas_Object *obj, const Evas_Smart_Cb_Description *descriptions);
-        [ :evas_object_smart_callbacks_descriptions_set, [ :pointer, :pointer ], :eina_bool ],
+        [ :evas_object_smart_callbacks_descriptions_set, [ :evas_object, :evas_smart_cb_description ], :bool ],
         # EAPI void evas_object_smart_callbacks_descriptions_get(const Evas_Object *obj, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count);
-        [ :evas_object_smart_callbacks_descriptions_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_smart_callbacks_descriptions_get, [ :evas_object, :evas_smart_cb_description, :pointer, :evas_smart_cb_description, :pointer ],
+            :void ],
         # EAPI void evas_object_smart_callback_description_find(const Evas_Object *obj, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description);
-        [ :evas_object_smart_callback_description_find, [ :pointer, :string, :pointer, :pointer ], :void ],
+        [ :evas_object_smart_callback_description_find, [ :evas_object, :string, :evas_smart_cb_description, :evas_smart_cb_description ], :void ],
         # EAPI void evas_object_smart_changed (Evas_Object *obj);
-        [ :evas_object_smart_changed, [ :pointer ], :void ],
+        [ :evas_object_smart_changed, [ :evas_object ], :void ],
         # EAPI void evas_object_smart_need_recalculate_set(Evas_Object *obj, Eina_Bool value);
-        [ :evas_object_smart_need_recalculate_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_smart_need_recalculate_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_smart_need_recalculate_get(const Evas_Object *obj);
-        [ :evas_object_smart_need_recalculate_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_smart_need_recalculate_get, [ :evas_object ], :bool ],
         # EAPI void evas_object_smart_calculate (Evas_Object *obj);
-        [ :evas_object_smart_calculate, [ :pointer ], :void ],
+        [ :evas_object_smart_calculate, [ :evas_object ], :void ],
         # EAPI void evas_smart_objects_calculate (Evas *e);
-        [ :evas_smart_objects_calculate, [ :pointer ], :void ],
+        [ :evas_smart_objects_calculate, [ :evas ], :void ],
         # EAPI int evas_smart_objects_calculate_count_get (const Evas *e);
-        [ :evas_smart_objects_calculate_count_get, [ :pointer ], :int ],
+        [ :evas_smart_objects_calculate_count_get, [ :evas ], :int ],
         # EAPI void evas_object_smart_move_children_relative(Evas_Object *obj, Evas_Coord dx, Evas_Coord dy);
-        [ :evas_object_smart_move_children_relative, [ :pointer, :int, :int ], :void ],
+        [ :evas_object_smart_move_children_relative, [ :evas_object, :int, :int ], :void ],
         # EAPI Evas_Object *evas_object_smart_clipped_clipper_get (Evas_Object *obj);
-        [ :evas_object_smart_clipped_clipper_get, [ :pointer ], :pointer ],
+        [ :evas_object_smart_clipped_clipper_get, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_smart_clipped_smart_set (Evas_Smart_Class *sc);
-        [ :evas_object_smart_clipped_smart_set, [ :pointer ], :void ],
+        [ :evas_object_smart_clipped_smart_set, [ :evas_smart_class ], :void ],
         # EAPI const Evas_Smart_Class *evas_object_smart_clipped_class_get (void);
-        [ :evas_object_smart_clipped_class_get, [  ], :pointer ],
+        [ :evas_object_smart_clipped_class_get, [  ], :evas_smart_class ],
         # EAPI void evas_object_box_smart_set (Evas_Object_Box_Api *api);
-        [ :evas_object_box_smart_set, [ :pointer ], :void ],
+        [ :evas_object_box_smart_set, [ :evas_object_box_api ], :void ],
         # EAPI const Evas_Object_Box_Api *evas_object_box_smart_class_get (void);
-        [ :evas_object_box_smart_class_get, [  ], :pointer ],
+        [ :evas_object_box_smart_class_get, [  ], :evas_object_box_api ],
         # EAPI void evas_object_box_layout_set (Evas_Object *o, Evas_Object_Box_Layout cb, const void *data, void (*free_data)(void *data));
         # FIXME
         # EAPI Evas_Object *evas_object_box_add (Evas *evas);
-        [ :evas_object_box_add, [ :pointer ], :pointer ],
+        [ :evas_object_box_add, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_box_add_to (Evas_Object *parent);
-        [ :evas_object_box_add_to, [ :pointer ], :pointer ],
+        [ :evas_object_box_add_to, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_box_layout_horizontal (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_horizontal, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_box_layout_horizontal, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_vertical (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_vertical, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_box_layout_vertical, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_homogeneous_vertical (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_homogeneous_vertical, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_box_layout_homogeneous_vertical, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_homogeneous_horizontal (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_homogeneous_horizontal, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_box_layout_homogeneous_horizontal, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_homogeneous_max_size_horizontal(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_homogeneous_max_size_horizontal, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_box_layout_homogeneous_max_size_horizontal, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_homogeneous_max_size_vertical (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_homogeneous_max_size_vertical, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_box_layout_homogeneous_max_size_vertical, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_flow_horizontal (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_flow_horizontal, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_box_layout_flow_horizontal, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_flow_vertical (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_flow_vertical, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_box_layout_flow_vertical, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_stack (Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_stack, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_box_layout_stack, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_align_set (Evas_Object *o, double horizontal, double vertical);
-        [ :evas_object_box_align_set, [ :pointer, :double, :double ], :void ],
+        [ :evas_object_box_align_set, [ :evas_object, :double, :double ], :void ],
         # EAPI void evas_object_box_align_get (const Evas_Object *o, double *horizontal, double *vertical);
-        [ :evas_object_box_align_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_box_align_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_box_padding_set (Evas_Object *o, Evas_Coord horizontal, Evas_Coord vertical);
-        [ :evas_object_box_padding_set, [ :pointer, :int, :int ], :void ],
+        [ :evas_object_box_padding_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_box_padding_get (const Evas_Object *o, Evas_Coord *horizontal, Evas_Coord *vertical);
-        [ :evas_object_box_padding_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_box_padding_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI Evas_Object_Box_Option *evas_object_box_append (Evas_Object *o, Evas_Object *child);
-        [ :evas_object_box_append, [ :pointer, :pointer ], :pointer ],
+        [ :evas_object_box_append, [ :evas_object, :evas_object ], :evas_object_box_option ],
         # EAPI Evas_Object_Box_Option *evas_object_box_prepend (Evas_Object *o, Evas_Object *child);
-        [ :evas_object_box_prepend, [ :pointer, :pointer ], :pointer ],
+        [ :evas_object_box_prepend, [ :evas_object, :evas_object ], :evas_object_box_option ],
         # EAPI Evas_Object_Box_Option *evas_object_box_insert_before (Evas_Object *o, Evas_Object *child, const Evas_Object *reference);
-        [ :evas_object_box_insert_before, [ :pointer, :pointer, :pointer ], :pointer ],
+        [ :evas_object_box_insert_before, [ :evas_object, :evas_object, :evas_object ], :evas_object_box_option ],
         # EAPI Evas_Object_Box_Option *evas_object_box_insert_after (Evas_Object *o, Evas_Object *child, const Evas_Object *referente);
-        [ :evas_object_box_insert_after, [ :pointer, :pointer, :pointer ], :pointer ],
+        [ :evas_object_box_insert_after, [ :evas_object, :evas_object, :evas_object ], :evas_object_box_option ],
         # EAPI Evas_Object_Box_Option *evas_object_box_insert_at (Evas_Object *o, Evas_Object *child, unsigned int pos);
-        [ :evas_object_box_insert_at, [ :pointer, :pointer, :uint ], :pointer ],
+        [ :evas_object_box_insert_at, [ :evas_object, :evas_object, :uint ], :evas_object_box_option ],
         # EAPI Eina_Bool evas_object_box_remove (Evas_Object *o, Evas_Object *child);
-        [ :evas_object_box_remove, [ :pointer, :pointer ], :eina_bool ],
+        [ :evas_object_box_remove, [ :evas_object, :evas_object ], :bool ],
         # EAPI Eina_Bool evas_object_box_remove_at (Evas_Object *o, unsigned int pos);
-        [ :evas_object_box_remove_at, [ :pointer, :uint ], :eina_bool ],
+        [ :evas_object_box_remove_at, [ :evas_object, :uint ], :bool ],
         # EAPI Eina_Bool evas_object_box_remove_all (Evas_Object *o, Eina_Bool clear);
-        [ :evas_object_box_remove_all, [ :pointer, :eina_bool ], :eina_bool ],
+        [ :evas_object_box_remove_all, [ :evas_object, :bool ], :bool ],
         # EAPI Eina_Iterator *evas_object_box_iterator_new (const Evas_Object *o);
-        [ :evas_object_box_iterator_new, [ :pointer ], :pointer ],
+        [ :evas_object_box_iterator_new, [ :evas_object ], :pointer ],
         # EAPI Eina_Accessor *evas_object_box_accessor_new (const Evas_Object *o);
-        [ :evas_object_box_accessor_new, [ :pointer ], :pointer ],
+        [ :evas_object_box_accessor_new, [ :evas_object ], :pointer ],
         # EAPI Eina_List *evas_object_box_children_get (const Evas_Object *o);
-        [ :evas_object_box_children_get, [ :pointer ], :pointer ],
+        [ :evas_object_box_children_get, [ :evas_object ], :eina_list ],
         # EAPI const char *evas_object_box_option_property_name_get (Evas_Object *o, int property);
-        [ :evas_object_box_option_property_name_get, [ :pointer, :int ], :string ],
+        [ :evas_object_box_option_property_name_get, [ :evas_object, :int ], :string ],
         # EAPI int evas_object_box_option_property_id_get (Evas_Object *o, const char *name);
-        [ :evas_object_box_option_property_id_get, [ :pointer, :string ], :int ],
+        [ :evas_object_box_option_property_id_get, [ :evas_object, :string ], :int ],
         # EAPI Eina_Bool evas_object_box_option_property_set (Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...);
-        [ :evas_object_box_option_property_set, [ :pointer, :pointer, :int, :varargs ], :eina_bool ],
+        [ :evas_object_box_option_property_set, [ :evas_object, :evas_object_box_option, :int, :varargs ], :bool ],
         # EAPI Eina_Bool evas_object_box_option_property_vset (Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args);
-        [ :evas_object_box_option_property_vset, [ :pointer, :pointer, :int, :pointer ], :eina_bool ],
+        [ :evas_object_box_option_property_vset, [ :evas_object, :evas_object_box_option, :int, :pointer ], :bool ],
         # EAPI Eina_Bool evas_object_box_option_property_get (Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...);
-        [ :evas_object_box_option_property_get, [ :pointer, :pointer, :int, :varargs ], :eina_bool ],
+        [ :evas_object_box_option_property_get, [ :evas_object, :evas_object_box_option, :int, :varargs ], :bool ],
         # EAPI Eina_Bool evas_object_box_option_property_vget (Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args);
-        [ :evas_object_box_option_property_vget, [ :pointer, :pointer, :int, :pointer ], :eina_bool ],
+        [ :evas_object_box_option_property_vget, [ :evas_object, :evas_object_box_option, :int, :pointer ], :bool ],
         # EAPI Evas_Object *evas_object_table_add (Evas *evas);
-        [ :evas_object_table_add, [ :pointer ], :pointer ],
+        [ :evas_object_table_add, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_table_add_to (Evas_Object *parent);
-        [ :evas_object_table_add_to, [ :pointer ], :pointer ],
+        [ :evas_object_table_add_to, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_table_homogeneous_set (Evas_Object *o, Evas_Object_Table_Homogeneous_Mode homogeneous);
-        [ :evas_object_table_homogeneous_set, [ :pointer, :evas_object_table_homogeneous_mode ], :void ],
+        [ :evas_object_table_homogeneous_set, [ :evas_object, :evas_object_table_homogeneous_mode ], :void ],
         # EAPI Evas_Object_Table_Homogeneous_Mode evas_object_table_homogeneous_get (const Evas_Object *o);
-        [ :evas_object_table_homogeneous_get, [ :pointer ], :evas_object_table_homogeneous_mode ],
+        [ :evas_object_table_homogeneous_get, [ :evas_object ], :evas_object_table_homogeneous_mode ],
         # EAPI void evas_object_table_padding_set (Evas_Object *o, Evas_Coord horizontal, Evas_Coord vertical);
-        [ :evas_object_table_padding_set, [ :pointer, :int, :int ], :void ],
+        [ :evas_object_table_padding_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_table_padding_get (const Evas_Object *o, Evas_Coord *horizontal, Evas_Coord *vertical);
-        [ :evas_object_table_padding_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_table_padding_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_table_align_set (Evas_Object *o, double horizontal, double vertical);
-        [ :evas_object_table_align_set, [ :pointer, :double, :double ], :void ],
+        [ :evas_object_table_align_set, [ :evas_object, :double, :double ], :void ],
         # EAPI void evas_object_table_align_get (const Evas_Object *o, double *horizontal, double *vertical);
-        [ :evas_object_table_align_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_table_align_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_table_mirrored_set (Evas_Object *o, Eina_Bool mirrored);
-        [ :evas_object_table_mirrored_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_table_mirrored_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_table_mirrored_get (const Evas_Object *o);
-        [ :evas_object_table_mirrored_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_table_mirrored_get, [ :evas_object ], :bool ],
         # EAPI Eina_Bool evas_object_table_pack_get(Evas_Object *o, Evas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan);
-        [ :evas_object_table_pack_get, [ :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :eina_bool ],
+        [ :evas_object_table_pack_get, [ :evas_object, :evas_object, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool evas_object_table_pack (Evas_Object *o, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
-        [ :evas_object_table_pack, [ :pointer, :pointer, :ushort, :ushort, :ushort, :ushort ], :eina_bool ],
+        [ :evas_object_table_pack, [ :evas_object, :evas_object, :ushort, :ushort, :ushort, :ushort ], :bool ],
         # EAPI Eina_Bool evas_object_table_unpack (Evas_Object *o, Evas_Object *child);
-        [ :evas_object_table_unpack, [ :pointer, :pointer ], :eina_bool ],
+        [ :evas_object_table_unpack, [ :evas_object, :evas_object ], :bool ],
         # EAPI void evas_object_table_clear (Evas_Object *o, Eina_Bool clear);
-        [ :evas_object_table_clear, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_table_clear, [ :evas_object, :bool ], :void ],
         # EAPI void evas_object_table_col_row_size_get(const Evas_Object *o, int *cols, int *rows);
-        [ :evas_object_table_col_row_size_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_table_col_row_size_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI Eina_Iterator *evas_object_table_iterator_new (const Evas_Object *o);
-        [ :evas_object_table_iterator_new, [ :pointer ], :pointer ],
+        [ :evas_object_table_iterator_new, [ :evas_object ], :pointer ],
         # EAPI Eina_Accessor *evas_object_table_accessor_new (const Evas_Object *o);
-        [ :evas_object_table_accessor_new, [ :pointer ], :pointer ],
+        [ :evas_object_table_accessor_new, [ :evas_object ], :pointer ],
         # EAPI Eina_List *evas_object_table_children_get (const Evas_Object *o);
-        [ :evas_object_table_children_get, [ :pointer ], :pointer ],
+        [ :evas_object_table_children_get, [ :evas_object ], :eina_list ],
         # EAPI Evas_Object *evas_object_table_child_get (const Evas_Object *o, unsigned short col, unsigned short row);
-        [ :evas_object_table_child_get, [ :pointer, :ushort, :ushort ], :pointer ],
+        [ :evas_object_table_child_get, [ :evas_object, :ushort, :ushort ], :evas_object ],
         # EAPI Evas_Object *evas_object_grid_add (Evas *evas);
-        [ :evas_object_grid_add, [ :pointer ], :pointer ],
+        [ :evas_object_grid_add, [ :evas ], :evas_object ],
         # EAPI Evas_Object *evas_object_grid_add_to (Evas_Object *parent);
-        [ :evas_object_grid_add_to, [ :pointer ], :pointer ],
+        [ :evas_object_grid_add_to, [ :evas_object ], :evas_object ],
         # EAPI void evas_object_grid_size_set (Evas_Object *o, int w, int h);
-        [ :evas_object_grid_size_set, [ :pointer, :int, :int ], :void ],
+        [ :evas_object_grid_size_set, [ :evas_object, :int, :int ], :void ],
         # EAPI void evas_object_grid_size_get (const Evas_Object *o, int *w, int *h);
-        [ :evas_object_grid_size_get, [ :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_grid_size_get, [ :evas_object, :pointer, :pointer ], :void ],
         # EAPI void evas_object_grid_mirrored_set (Evas_Object *o, Eina_Bool mirrored);
-        [ :evas_object_grid_mirrored_set, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_grid_mirrored_set, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_grid_mirrored_get (const Evas_Object *o);
-        [ :evas_object_grid_mirrored_get, [ :pointer ], :eina_bool ],
+        [ :evas_object_grid_mirrored_get, [ :evas_object ], :bool ],
         # EAPI Eina_Bool evas_object_grid_pack (Evas_Object *o, Evas_Object *child, int x, int y, int w, int h);
-        [ :evas_object_grid_pack, [ :pointer, :pointer, :int, :int, :int, :int ], :eina_bool ],
+        [ :evas_object_grid_pack, [ :evas_object, :evas_object, :int, :int, :int, :int ], :bool ],
         # EAPI Eina_Bool evas_object_grid_unpack (Evas_Object *o, Evas_Object *child);
-        [ :evas_object_grid_unpack, [ :pointer, :pointer ], :eina_bool ],
+        [ :evas_object_grid_unpack, [ :evas_object, :evas_object ], :bool ],
         # EAPI void evas_object_grid_clear (Evas_Object *o, Eina_Bool clear);
-        [ :evas_object_grid_clear, [ :pointer, :eina_bool ], :void ],
+        [ :evas_object_grid_clear, [ :evas_object, :bool ], :void ],
         # EAPI Eina_Bool evas_object_grid_pack_get (Evas_Object *o, Evas_Object *child, int *x, int *y, int *w, int *h);
-        [ :evas_object_grid_pack_get, [ :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :eina_bool ],
+        [ :evas_object_grid_pack_get, [ :evas_object, :evas_object, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI Eina_Iterator *evas_object_grid_iterator_new (const Evas_Object *o);
-        [ :evas_object_grid_iterator_new, [ :pointer ], :pointer ],
+        [ :evas_object_grid_iterator_new, [ :evas_object ], :pointer ],
         # EAPI Eina_Accessor *evas_object_grid_accessor_new (const Evas_Object *o);
-        [ :evas_object_grid_accessor_new, [ :pointer ], :pointer ],
+        [ :evas_object_grid_accessor_new, [ :evas_object ], :pointer ],
         # EAPI Eina_List *evas_object_grid_children_get (const Evas_Object *o);
-        [ :evas_object_grid_children_get, [ :pointer ], :pointer ],
+        [ :evas_object_grid_children_get, [ :evas_object ], :eina_list ],
         # EAPI Eina_Bool evas_cserve_want_get (void);
-        [ :evas_cserve_want_get, [  ], :eina_bool ],
+        [ :evas_cserve_want_get, [  ], :bool ],
         # EAPI Eina_Bool evas_cserve_connected_get (void);
-        [ :evas_cserve_connected_get, [  ], :eina_bool ],
+        [ :evas_cserve_connected_get, [  ], :bool ],
         # EAPI Eina_Bool evas_cserve_stats_get (Evas_Cserve_Stats *stats);
-        [ :evas_cserve_stats_get, [ :pointer ], :eina_bool ],
+        [ :evas_cserve_stats_get, [ :evas_cserve_stats ], :bool ],
         # EAPI void evas_cserve_image_cache_contents_clean (Evas_Cserve_Image_Cache *cache);
-        [ :evas_cserve_image_cache_contents_clean, [ :pointer ], :void ],
+        [ :evas_cserve_image_cache_contents_clean, [ :evas_cserve_image_cache ], :void ],
         # EAPI Eina_Bool evas_cserve_config_get (Evas_Cserve_Config *config);
-        [ :evas_cserve_config_get, [ :pointer ], :eina_bool ],
+        [ :evas_cserve_config_get, [ :evas_cserve_config ], :bool ],
         # EAPI Eina_Bool evas_cserve_config_set (const Evas_Cserve_Config *config);
-        [ :evas_cserve_config_set, [ :pointer ], :eina_bool ],
+        [ :evas_cserve_config_set, [ :evas_cserve_config ], :bool ],
         # EAPI void evas_cserve_disconnect (void);
         [ :evas_cserve_disconnect, [  ], :void ],
         # EAPI const char *evas_load_error_str (Evas_Load_Error error);
@@ -1331,43 +1334,43 @@ module Efl
         # EAPI int evas_string_char_len_get (const char *str);
         [ :evas_string_char_len_get, [ :string ], :int ],
         # EAPI const Evas_Modifier *evas_key_modifier_get (const Evas *e);
-        [ :evas_key_modifier_get, [ :pointer ], :pointer ],
+        [ :evas_key_modifier_get, [ :evas ], :evas_modifier ],
         # EAPI const Evas_Lock *evas_key_lock_get (const Evas *e);
-        [ :evas_key_lock_get, [ :pointer ], :pointer ],
+        [ :evas_key_lock_get, [ :evas ], :evas_lock ],
         # EAPI Eina_Bool evas_key_modifier_is_set (const Evas_Modifier *m, const char *keyname);
-        [ :evas_key_modifier_is_set, [ :pointer, :string ], :eina_bool ],
+        [ :evas_key_modifier_is_set, [ :evas_modifier, :string ], :bool ],
         # EAPI Eina_Bool evas_key_lock_is_set (const Evas_Lock *l, const char *keyname);
-        [ :evas_key_lock_is_set, [ :pointer, :string ], :eina_bool ],
+        [ :evas_key_lock_is_set, [ :evas_lock, :string ], :bool ],
         # EAPI void evas_key_modifier_add (Evas *e, const char *keyname);
-        [ :evas_key_modifier_add, [ :pointer, :string ], :void ],
+        [ :evas_key_modifier_add, [ :evas, :string ], :void ],
         # EAPI void evas_key_modifier_del (Evas *e, const char *keyname);
-        [ :evas_key_modifier_del, [ :pointer, :string ], :void ],
+        [ :evas_key_modifier_del, [ :evas, :string ], :void ],
         # EAPI void evas_key_lock_add (Evas *e, const char *keyname);
-        [ :evas_key_lock_add, [ :pointer, :string ], :void ],
+        [ :evas_key_lock_add, [ :evas, :string ], :void ],
         # EAPI void evas_key_lock_del (Evas *e, const char *keyname);
-        [ :evas_key_lock_del, [ :pointer, :string ], :void ],
+        [ :evas_key_lock_del, [ :evas, :string ], :void ],
         # EAPI void evas_key_modifier_on (Evas *e, const char *keyname);
-        [ :evas_key_modifier_on, [ :pointer, :string ], :void ],
+        [ :evas_key_modifier_on, [ :evas, :string ], :void ],
         # EAPI void evas_key_modifier_off (Evas *e, const char *keyname);
-        [ :evas_key_modifier_off, [ :pointer, :string ], :void ],
+        [ :evas_key_modifier_off, [ :evas, :string ], :void ],
         # EAPI void evas_key_lock_on (Evas *e, const char *keyname);
-        [ :evas_key_lock_on, [ :pointer, :string ], :void ],
+        [ :evas_key_lock_on, [ :evas, :string ], :void ],
         # EAPI void evas_key_lock_off (Evas *e, const char *keyname);
-        [ :evas_key_lock_off, [ :pointer, :string ], :void ],
+        [ :evas_key_lock_off, [ :evas, :string ], :void ],
         # EAPI Evas_Modifier_Mask evas_key_modifier_mask_get (const Evas *e, const char *keyname);
-        [ :evas_key_modifier_mask_get, [ :pointer, :string ], :ulong_long ],
+        [ :evas_key_modifier_mask_get, [ :evas, :string ], :ulong_long ],
         # EAPI Eina_Bool evas_object_key_grab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive);
-        [ :evas_object_key_grab, [ :pointer, :string, :ulong_long, :ulong_long, :eina_bool ], :eina_bool ],
+        [ :evas_object_key_grab, [ :evas_object, :string, :ulong_long, :ulong_long, :bool ], :bool ],
         # EAPI void evas_object_key_ungrab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers);
-        [ :evas_object_key_ungrab, [ :pointer, :string, :ulong_long, :ulong_long ], :void ],
+        [ :evas_object_key_ungrab, [ :evas_object, :string, :ulong_long, :ulong_long ], :void ],
         # EAPI unsigned int evas_touch_point_list_count(Evas *e);
-        [ :evas_touch_point_list_count, [ :pointer ], :uint ],
+        [ :evas_touch_point_list_count, [ :evas ], :uint ],
         # EAPI void evas_touch_point_list_nth_xy_get(Evas *e, unsigned int n, Evas_Coord *x, Evas_Coord *y);
-        [ :evas_touch_point_list_nth_xy_get, [ :pointer, :uint, :pointer, :pointer ], :void ],
+        [ :evas_touch_point_list_nth_xy_get, [ :evas, :uint, :pointer, :pointer ], :void ],
         # EAPI int evas_touch_point_list_nth_id_get(Evas *e, unsigned int n);
-        [ :evas_touch_point_list_nth_id_get, [ :pointer, :uint ], :int ],
+        [ :evas_touch_point_list_nth_id_get, [ :evas, :uint ], :int ],
         # EAPI Evas_Touch_Point_State evas_touch_point_list_nth_state_get(Evas *e, unsigned int n);
-        [ :evas_touch_point_list_nth_state_get, [ :pointer, :uint ], :evas_touch_point_state ],
+        [ :evas_touch_point_list_nth_state_get, [ :evas, :uint ], :evas_touch_point_state ],
         ]
         #
         attach_fcts fcts