From 8221e9dd45f60367fe4d482aa06965ff9a542d48 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 26 Jun 2014 10:52:17 +0100 Subject: [PATCH] eolian: modify all eo files according to the new type syntax --- src/lib/ecore/ecore_animator.eo | 4 +- src/lib/ecore/ecore_idle_enterer.eo | 4 +- src/lib/ecore/ecore_idle_exiter.eo | 2 +- src/lib/ecore/ecore_idler.eo | 2 +- src/lib/ecore/ecore_job.eo | 2 +- src/lib/ecore/ecore_poll.eo | 2 +- src/lib/ecore/ecore_timer.eo | 4 +- src/lib/ecore_audio/ecore_audio.eo | 4 +- src/lib/edje/edje.eo | 280 +++++++++++------------ src/lib/eo/eo_base.eo | 30 +-- src/lib/evas/canvas/evas.eo | 100 ++++---- src/lib/evas/canvas/evas_3d_camera.eo | 2 +- src/lib/evas/canvas/evas_3d_mesh.eo | 16 +- src/lib/evas/canvas/evas_3d_node.eo | 4 +- src/lib/evas/canvas/evas_3d_texture.eo | 6 +- src/lib/evas/canvas/evas_box.eo | 14 +- src/lib/evas/canvas/evas_image.eo | 18 +- src/lib/evas/canvas/evas_object.eo | 18 +- src/lib/evas/canvas/evas_object_smart.eo | 12 +- src/lib/evas/canvas/evas_text.eo | 12 +- src/lib/evas/canvas/evas_textblock.eo | 20 +- src/lib/evas/canvas/evas_textgrid.eo | 6 +- src/tests/eolian/data/object_impl.eo | 4 +- 23 files changed, 283 insertions(+), 283 deletions(-) diff --git a/src/lib/ecore/ecore_animator.eo b/src/lib/ecore/ecore_animator.eo index 98cc07718e..a50600b044 100644 --- a/src/lib/ecore/ecore_animator.eo +++ b/src/lib/ecore/ecore_animator.eo @@ -7,14 +7,14 @@ class Ecore_Animator (Eo_Base) params { @in double runtime; @in Ecore_Timeline_Cb func; - @in const void *data; + @in const(void)* data; } } constructor { /*@ Contructor. */ params { @in Ecore_Task_Cb func; - @in const void *data; + @in const(void)* data; } } } diff --git a/src/lib/ecore/ecore_idle_enterer.eo b/src/lib/ecore/ecore_idle_enterer.eo index f015a19b08..80ea36dc1b 100644 --- a/src/lib/ecore/ecore_idle_enterer.eo +++ b/src/lib/ecore/ecore_idle_enterer.eo @@ -6,14 +6,14 @@ class Ecore_Idle_Enterer (Eo_Base) /*@ Contructor. Will insert the handler at the beginning of the list. */ params { @in Ecore_Task_Cb func; - @in const void *data; + @in const(void)* data; } } after_constructor { /*@ Contructor. Will insert the handler at the end of the list. */ params { @in Ecore_Task_Cb func; - @in const void *data; + @in const(void)* data; } } } diff --git a/src/lib/ecore/ecore_idle_exiter.eo b/src/lib/ecore/ecore_idle_exiter.eo index cac3ccb784..b463b7ea14 100644 --- a/src/lib/ecore/ecore_idle_exiter.eo +++ b/src/lib/ecore/ecore_idle_exiter.eo @@ -6,7 +6,7 @@ class Ecore_Idle_Exiter (Eo_Base) /*@ Contructor. */ params { @in Ecore_Task_Cb func; - @in const void *data; + @in const(void)* data; } } } diff --git a/src/lib/ecore/ecore_idler.eo b/src/lib/ecore/ecore_idler.eo index b9a7769ce1..87f85a27d1 100644 --- a/src/lib/ecore/ecore_idler.eo +++ b/src/lib/ecore/ecore_idler.eo @@ -6,7 +6,7 @@ class Ecore_Idler (Eo_Base) /*@ Contructor. */ params { @in Ecore_Task_Cb func; - @in const void *data; + @in const(void)* data; } } } diff --git a/src/lib/ecore/ecore_job.eo b/src/lib/ecore/ecore_job.eo index 85cc169e3b..cf4a120513 100644 --- a/src/lib/ecore/ecore_job.eo +++ b/src/lib/ecore/ecore_job.eo @@ -6,7 +6,7 @@ class Ecore_Job (Eo_Base) /*@ Contructor. */ params { @in Ecore_Cb func; - @in const void *data; + @in const(void)* data; } } } diff --git a/src/lib/ecore/ecore_poll.eo b/src/lib/ecore/ecore_poll.eo index 577f91072b..003a0c0bea 100644 --- a/src/lib/ecore/ecore_poll.eo +++ b/src/lib/ecore/ecore_poll.eo @@ -8,7 +8,7 @@ class Ecore_Poller (Eo_Base) @in Ecore_Poller_Type type; @in int interval; @in Ecore_Task_Cb func; - @in const void *data; + @in const(void)* data; } } } diff --git a/src/lib/ecore/ecore_timer.eo b/src/lib/ecore/ecore_timer.eo index 31039dc41e..f55880aeb1 100644 --- a/src/lib/ecore/ecore_timer.eo +++ b/src/lib/ecore/ecore_timer.eo @@ -14,7 +14,7 @@ class Ecore_Timer (Eo_Base) params { @in double in; /*@ The time, in seconds, from now when to go off */ @in Ecore_Task_Cb func; /*@ The callback function to call when the timer goes off */ - @in const void *data; /*@ A pointer to pass to the callback function as its data pointer */ + @in const(void)* data; /*@ A pointer to pass to the callback function as its data pointer */ } } constructor { @@ -22,7 +22,7 @@ class Ecore_Timer (Eo_Base) params { @in double in; /*@ The time, in seconds, from when the main loop woke up, to go off */ @in Ecore_Task_Cb func; /*@ The callback function to call when the timer goes off */ - @in const void *data; /*@ A pointer to pass to the callback function as its data pointer */ + @in const(void)* data; /*@ A pointer to pass to the callback function as its data pointer */ } } } diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo index 6480a270f5..3c00e9f0e9 100644 --- a/src/lib/ecore_audio/ecore_audio.eo +++ b/src/lib/ecore_audio/ecore_audio.eo @@ -18,7 +18,7 @@ class Ecore_Audio (Eo_Base) @since 1.8 */ } values { - const char *name; + const(char)* name; } } paused { @@ -73,7 +73,7 @@ class Ecore_Audio (Eo_Base) @since 1.8 */ } values { - const char *source; /*The source to set to (i.e. file, URL, device)*/ + const(char)* source; /*The source to set to (i.e. file, URL, device)*/ } } format { diff --git a/src/lib/edje/edje.eo b/src/lib/edje/edje.eo index efa56ba94b..438785dcf2 100644 --- a/src/lib/edje/edje.eo +++ b/src/lib/edje/edje.eo @@ -180,8 +180,8 @@ class Edje (Evas_Smart_Clipped) interested in: they'll be ignored by the function. */ } values { - const char *file; /*@ The path to the EDJ file to load @p from */ - const char *group; /*@ The name of the group, in @p file, which implements an + const(char)* file; /*@ The path to the EDJ file to load @p from */ + const(char)* group; /*@ The name of the group, in @p file, which implements an Edje object */ } } @@ -251,8 +251,8 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; } values { - const Eina_File *file; /*@ The Eina_File pointing to the EDJ file to load @p from */ - const char *group; /*@ The name of the group, in @p file, which implements an + const(Eina_File)* file; /*@ The Eina_File pointing to the EDJ file to load @p from */ + const(char)* group; /*@ The name of the group, in @p file, which implements an Edje object */ } } @@ -275,7 +275,7 @@ class Edje (Evas_Smart_Clipped) @see evas_textblock_cursor_paragraph_first */ } values { - const char *part; /*@ The part name */ + const(char)* part; /*@ The part name */ Edje_Cursor cur; /*@ the edje cursor to work on */ } } @@ -286,7 +286,7 @@ class Edje (Evas_Smart_Clipped) @see evas_textblock_cursor_line_char_last */ } values { - const char *part; /*@ The part name */ + const(char)* part; /*@ The part name */ Edje_Cursor cur; /*@ the edje cursor to work on */ } } @@ -301,8 +301,8 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; } values { - const char *text_class; /*@ The text class name */ - const char *font; /*@ Font name */ + const(char)* text_class; /*@ The text class name */ + const(char)* font; /*@ Font name */ Evas_Font_Size size; /*@ Font Size */ } } @@ -317,7 +317,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; } values { - const char *part; /*@ The part containing the object. */ + const(char)* part; /*@ The part containing the object. */ Edje_Cursor cur; /*@ The cursor to adjust. */ Evas_Coord x; /*@ X Coordinate. */ Evas_Coord y; /*@ Y Coordinate. */ @@ -330,7 +330,7 @@ class Edje (Evas_Smart_Clipped) @see evas_textblock_cursor_paragraph_last */ } values { - const char *part; /*@ The part name */ + const(char)* part; /*@ The part name */ Edje_Cursor cur; /*@ the edje cursor to work on */ } } @@ -349,8 +349,8 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; } values { - const char *part; /*@ The part name */ - const char *text; /*@ The text string */ + const(char)* part; /*@ The part name */ + const(char)* text; /*@ The text string */ } } item_provider { @@ -373,7 +373,7 @@ class Edje (Evas_Smart_Clipped) @see evas_textblock_cursor_line_char_first */ } values { - const char *part; /*@ The part name */ + const(char)* part; /*@ The part name */ Edje_Cursor cur; /*@ the edje cursor to work on */ } } @@ -523,7 +523,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Eina_Bool clear; /*@ If set, will delete subobjs on remove */ } } @@ -537,8 +537,8 @@ class Edje (Evas_Smart_Clipped) const; return Edje_External_Param_Type; params { - @in const char *part; /*@ The part name */ - @out const char param; /*@ the parameter name to use. */ + @in const(char)* part; /*@ The part name */ + @out const(char) param; /*@ the parameter name to use. */ } } part_text_select_allow_set { @@ -552,7 +552,7 @@ class Edje (Evas_Smart_Clipped) const; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Eina_Bool allow; /*@ EINA_TRUE to enable, EINA_FALSE otherwise */ } } @@ -565,9 +565,9 @@ class Edje (Evas_Smart_Clipped) "" for other states */ const; - return const char *; + return const(char)*; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @out double val_ret; } } @@ -587,7 +587,7 @@ class Edje (Evas_Smart_Clipped) return void *; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Markup_Filter_Cb func; /*@ The function callback to remove */ @in void *data; /*@ The data passed to the callback function */ } @@ -606,7 +606,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in double dx; /*@ The x step amount */ @in double dy; /*@ The y step amount */ } @@ -623,7 +623,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part */ + @in const(char)* part; /*@ The part */ @out double dx; /*@ The x step increment pointer */ @out double dy; /*@ The y step increment pointer */ } @@ -641,7 +641,7 @@ class Edje (Evas_Smart_Clipped) const; return void *; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_select_begin { @@ -650,7 +650,7 @@ class Edje (Evas_Smart_Clipped) const; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_style_user_peek { @@ -664,9 +664,9 @@ class Edje (Evas_Smart_Clipped) @since 1.2.0 */ const; - return const char *; + return const(char)*; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } signal_callback_del { @@ -687,8 +687,8 @@ class Edje (Evas_Smart_Clipped) legacy null; return void *; params { - @in const char *emission; /*@ The emission string. */ - @in const char *source; /*@ The source string. */ + @in const(char)* emission; /*@ The emission string. */ + @in const(char)* source; /*@ The source string. */ @in Edje_Signal_Cb func; /*@ The callback function. */ @in void *data; /*@ The callback function. */ } @@ -700,7 +700,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ The edje cursor to advance */ } } @@ -713,8 +713,8 @@ class Edje (Evas_Smart_Clipped) @since 1.2.0 */ params { - @in const char *part; /*@ The part name */ - @in const char *style; /*@ The style to set (textblock conventions). */ + @in const(char)* part; /*@ The part name */ + @in const(char)* style; /*@ The style to set (textblock conventions). */ } } part_text_append { @@ -727,8 +727,8 @@ class Edje (Evas_Smart_Clipped) @since 1.1 */ params { - @in const char *part; /*@ The part name */ - @in const char *text; /*@ The text string */ + @in const(char)* part; /*@ The part name */ + @in const(char)* text; /*@ The text string */ } } part_geometry_get { @@ -749,7 +749,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The Edje part's name */ + @in const(char)* part; /*@ The Edje part's name */ @out Evas_Coord x; /*@ A pointer to a variable where to store the part's x coordinate */ @out Evas_Coord y; /*@ A pointer to a variable where to store the part's y @@ -770,7 +770,7 @@ class Edje (Evas_Smart_Clipped) const; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_item_geometry_get { @@ -785,8 +785,8 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part name */ - @in const char *item; /*@ The item name */ + @in const(char)* part; /*@ The part name */ + @in const(char)* item; /*@ The item name */ @out Evas_Coord cx; /*@ Item x return (relative to entry part) */ @out Evas_Coord cy; /*@ Item y return (relative to entry part) */ @out Evas_Coord cw; /*@ Item width return */ @@ -803,7 +803,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Evas_Object *child_obj; /*@ The object to pack in */ } } @@ -813,7 +813,7 @@ class Edje (Evas_Smart_Clipped) const; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } text_insert_filter_callback_del_full { @@ -831,7 +831,7 @@ class Edje (Evas_Smart_Clipped) return void *; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Text_Filter_Cb func; /*@ The function callback to remove */ @in void *data; /*@ The data passed to the callback function */ } @@ -843,7 +843,7 @@ class Edje (Evas_Smart_Clipped) @since 1.2.0 */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_input_panel_imdata_set { @@ -857,8 +857,8 @@ class Edje (Evas_Smart_Clipped) @since 1.2.0 */ params { - @in const char *part; /*@ The part name */ - @in const void *data; /*@ The specific data to be set to the input panel. */ + @in const(char)* part; /*@ The part name */ + @in const(void)* data; /*@ The specific data to be set to the input panel. */ @in int len; /*@ the length of data, in bytes, to send to the input panel */ } } @@ -870,7 +870,7 @@ class Edje (Evas_Smart_Clipped) const; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in void *data; /*@ The specific data to be got from the input panel */ @in int *len; /*@ The length of data */ } @@ -883,8 +883,8 @@ class Edje (Evas_Smart_Clipped) cursor position. */ params { - @in const char *part; /*@ The part name */ - @in const char *text; /*@ The text string */ + @in const(char)* part; /*@ The part name */ + @in const(char)* text; /*@ The text string */ } } part_box_remove_at { @@ -901,7 +901,7 @@ class Edje (Evas_Smart_Clipped) return Evas_Object *; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in unsigned int pos; /*@ The position index of the object (starts counting from 0) */ } } @@ -910,7 +910,7 @@ class Edje (Evas_Smart_Clipped) @brief Copy the cursor to another cursor. */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Cursor src; /*@ the cursor to copy from */ @in Edje_Cursor dst; /*@ the cursor to copy to */ } @@ -965,7 +965,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in double dx; /*@ The x value */ @in double dy; /*@ The y value */ } @@ -984,7 +984,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @out double dx; /*@ The X value pointer */ @out double dy; /*@ The Y value pointer */ } @@ -1004,7 +1004,7 @@ class Edje (Evas_Smart_Clipped) @since 1.1.0 */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ The cursor to move */ @in int pos; /*@ the position of the cursor */ } @@ -1019,7 +1019,7 @@ class Edje (Evas_Smart_Clipped) const; return int; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ The cursor to get the position */ } } @@ -1048,7 +1048,7 @@ class Edje (Evas_Smart_Clipped) const; return char *; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ The cursor to use */ } } @@ -1064,7 +1064,7 @@ class Edje (Evas_Smart_Clipped) @since 1.1 */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Input_Panel_Layout layout; /*@ layout type */ } } @@ -1080,7 +1080,7 @@ class Edje (Evas_Smart_Clipped) const; return Edje_Input_Panel_Layout; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_table_pack { @@ -1093,7 +1093,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Evas_Object *child_obj; /*@ The object to pack in */ @in unsigned short col; /*@ The column to place it in */ @in unsigned short row; /*@ The row to place it in */ @@ -1110,7 +1110,7 @@ class Edje (Evas_Smart_Clipped) @since 1.2.0 */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Input_Panel_Lang lang; /*@ the language to be set to the input panel. */ } } @@ -1126,7 +1126,7 @@ class Edje (Evas_Smart_Clipped) const; return Edje_Input_Panel_Lang; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_table_col_row_size_get { @@ -1140,7 +1140,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @out int cols; /*@ Pointer where to store number of columns (can be NULL) */ @out int rows; /*@ Pointer where to store number of rows (can be NULL) */ } @@ -1166,7 +1166,7 @@ class Edje (Evas_Smart_Clipped) const; return Evas_Object *; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_external_content_get { @@ -1179,8 +1179,8 @@ class Edje (Evas_Smart_Clipped) const; return Evas_Object *; params { - @in const char *part; /*@ The name of the part holding the EXTERNAL */ - @out const char content; /*@ A string identifying which content from the EXTERNAL to get */ + @in const(char)* part; /*@ The name of the part holding the EXTERNAL */ + @out const(char) content; /*@ A string identifying which content from the EXTERNAL to get */ } } preload { @@ -1211,7 +1211,7 @@ class Edje (Evas_Smart_Clipped) @since 1.1.0 */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Eina_Bool enabled; /*@ If true, the input panel is appeared when entry is clicked or has a focus */ } } @@ -1226,7 +1226,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_select_extend { @@ -1235,7 +1235,7 @@ class Edje (Evas_Smart_Clipped) const; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_box_insert_at { @@ -1254,7 +1254,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Evas_Object *child; /*@ The object to insert */ @in unsigned int pos; /*@ The position where to insert child */ } @@ -1270,10 +1270,10 @@ class Edje (Evas_Smart_Clipped) rectangles. */ const; - return const Eina_List *; + return const(Eina_List)*; params { - @in const char *part; /*@ The part name */ - @in const char *anchor; /*@ The anchor name */ + @in const(char)* part; /*@ The part name */ + @in const(char)* anchor; /*@ The anchor name */ } } part_text_cursor_down { @@ -1282,7 +1282,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ the edje cursor to work on */ } } @@ -1300,7 +1300,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in double dx; /*@ The x page step increment */ @in double dy; /*@ The y page step increment */ } @@ -1316,7 +1316,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @out double dx; /*@ The dx page increment pointer */ @out double dy; /*@ The dy page increment pointer */ } @@ -1336,7 +1336,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Evas_Object *child; /*@ The object to prepend */ } } @@ -1366,8 +1366,8 @@ class Edje (Evas_Smart_Clipped) @see edje_object_signal_callback_add() for more on Edje signals. */ params { - @in const char *emission; /*@ The signal's "emission" string */ - @in const char *source; /*@ The signal's "source" string */ + @in const(char)* emission; /*@ The signal's "emission" string */ + @in const(char)* source; /*@ The signal's "source" string */ } } part_text_input_panel_layout_variation_set { @@ -1382,7 +1382,7 @@ class Edje (Evas_Smart_Clipped) @since 1.8 */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in int variation; /*@ layout variation type */ } } @@ -1398,7 +1398,7 @@ class Edje (Evas_Smart_Clipped) const; return int; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } message_send { @@ -1433,7 +1433,7 @@ class Edje (Evas_Smart_Clipped) const; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_object_get { @@ -1455,9 +1455,9 @@ class Edje (Evas_Smart_Clipped) example), though. */ const; - return const Evas_Object *; + return const(Evas_Object)*; params { - @in const char *part; /*@ The Edje part's name */ + @in const(char)* part; /*@ The Edje part's name */ } } part_drag_size_set { @@ -1473,7 +1473,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in double dw; /*@ The drag width */ @in double dh; /*@ The drag height */ } @@ -1489,7 +1489,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @out double dw; /*@ The drag width pointer */ @out double dh; /*@ The drag height pointer */ } @@ -1508,7 +1508,7 @@ class Edje (Evas_Smart_Clipped) return void *; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Text_Filter_Cb func; /*@ The function callback to remove */ } } @@ -1528,7 +1528,7 @@ class Edje (Evas_Smart_Clipped) const; return Edje_Drag_Dir; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_unescaped_set { @@ -1542,8 +1542,8 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ - @in const char *text_to_escape; /*@ The text string */ + @in const(char)* part; /*@ The part name */ + @in const(char)* text_to_escape; /*@ The text string */ } } part_text_unescaped_get { @@ -1563,7 +1563,7 @@ class Edje (Evas_Smart_Clipped) const; return char *; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } signal_callback_add { @@ -1621,8 +1621,8 @@ class Edje (Evas_Smart_Clipped) @see edje_object_signal_callback_del_full() */ params { - @in const char *emission; /*@ The signal's "emission" string */ - @in const char *source; /*@ The signal's "source" string */ + @in const(char)* emission; /*@ The signal's "emission" string */ + @in const(char)* source; /*@ The signal's "source" string */ @in Edje_Signal_Cb func; /*@ The callback function to be executed when the signal is emitted. */ @in void *data; /*@ A pointer to data to pass in to @p func. */ @@ -1636,7 +1636,7 @@ class Edje (Evas_Smart_Clipped) const; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_input_panel_return_key_disabled_set { @@ -1646,7 +1646,7 @@ class Edje (Evas_Smart_Clipped) @since 1.2.0 */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Eina_Bool disabled; /*@ The state */ } } @@ -1660,7 +1660,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_autocapital_type_set { @@ -1670,7 +1670,7 @@ class Edje (Evas_Smart_Clipped) @since 1.1.0 */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Text_Autocapital_Type autocapital_type; /*@ The type of autocapitalization */ } } @@ -1684,7 +1684,7 @@ class Edje (Evas_Smart_Clipped) const; return Edje_Text_Autocapital_Type; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_unswallow { @@ -1708,7 +1708,7 @@ class Edje (Evas_Smart_Clipped) @since 1.2.0 */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Eina_Bool prediction; /*@ If true, the prediction feature is allowed. */ } } @@ -1722,7 +1722,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } data_get { @@ -1761,9 +1761,9 @@ class Edje (Evas_Smart_Clipped) @see edje_object_file_set() */ const; - return const char *; + return const(char)*; params { - @in const char *key; /*@ The data field's key string */ + @in const(char)* key; /*@ The data field's key string */ } } text_markup_filter_callback_add { @@ -1795,7 +1795,7 @@ class Edje (Evas_Smart_Clipped) @since 1.2.0 */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Markup_Filter_Cb func; /*@ The callback function that will act as markup filter */ @in void *data; /*@ User provided data to pass to the filter function */ } @@ -1822,7 +1822,7 @@ class Edje (Evas_Smart_Clipped) return Evas_Object *; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Evas_Object *child; /*@ The object to remove */ } } @@ -1850,7 +1850,7 @@ class Edje (Evas_Smart_Clipped) const; return Evas_Object *; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_imf_context_reset { @@ -1863,7 +1863,7 @@ class Edje (Evas_Smart_Clipped) const; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_input_panel_return_key_type_set { @@ -1875,7 +1875,7 @@ class Edje (Evas_Smart_Clipped) @since 1.2.0 */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Input_Panel_Return_Key_Type return_key_type; /*@ The type of "return" key on the input panel */ } } @@ -1891,7 +1891,7 @@ class Edje (Evas_Smart_Clipped) const; return Edje_Input_Panel_Return_Key_Type; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_table_child_get { @@ -1903,7 +1903,7 @@ class Edje (Evas_Smart_Clipped) const; return Evas_Object *; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in unsigned int col; /*@ The column of the child to get */ @in unsigned int row; /*@ The row of the child to get */ } @@ -1924,9 +1924,9 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Evas_Object *child; /*@ The object to insert */ - @in const Evas_Object *reference; /*@ The object to be used as reference */ + @in const(Evas_Object)* reference; /*@ The object to be used as reference */ } } part_external_param_set { @@ -1953,8 +1953,8 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ - @in const Edje_External_Param *param; /*@ the parameter details, including its name, type and + @in const(char)* part; /*@ The part name */ + @in const(Edje_External_Param)* param; /*@ the parameter details, including its name, type and actual value. This pointer should be valid, and the parameter must exist in #Edje_External_Type.parameters_info, with the exact type, @@ -1984,7 +1984,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @out Edje_External_Param param; /*@ the parameter details. It is used as both input and output variable. This pointer should be valid, and the parameter must exist in @@ -2023,7 +2023,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Evas_Object *child; /*@ The object to append */ } } @@ -2071,7 +2071,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Eina_Bool clear; /*@ Delete objects on removal */ } } @@ -2090,7 +2090,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in double dx; /*@ The x step */ @in double dy; /*@ The y step */ } @@ -2103,8 +2103,8 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ - @in const char *text; /*@ The text string */ + @in const(char)* part; /*@ The part name */ + @in const(char)* text; /*@ The text string */ } } part_text_get { @@ -2118,9 +2118,9 @@ class Edje (Evas_Smart_Clipped) @see edje_object_part_text_set(). */ const; - return const char *; + return const(char)*; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_input_panel_show_on_demand_set { @@ -2131,7 +2131,7 @@ class Edje (Evas_Smart_Clipped) @since 1.9.0 */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Eina_Bool ondemand; /*@ If true, the input panel will be shown in case of only Mouse up event. (Focus event will be ignored.) */ } } @@ -2145,7 +2145,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_selection_get { @@ -2160,9 +2160,9 @@ class Edje (Evas_Smart_Clipped) @see edje_object_part_text_select_none() */ const; - return const char *; + return const(char)*; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_text_cursor_is_format_get { @@ -2175,7 +2175,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ The cursor to adjust. */ } } @@ -2200,7 +2200,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *color_class; + @in const(char)* color_class; @in int r; /*@ Object Red value */ @in int g; /*@ Object Green value */ @in int b; /*@ Object Blue value */ @@ -2236,7 +2236,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *color_class; + @in const(char)* color_class; @out int r; /*@ Object Red value */ @out int g; /*@ Object Green value */ @out int b; /*@ Object Blue value */ @@ -2264,7 +2264,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in double dx; /*@ The x step */ @in double dy; /*@ The y step */ } @@ -2275,7 +2275,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ the edje cursor to work on */ } } @@ -2286,7 +2286,7 @@ class Edje (Evas_Smart_Clipped) const; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @out Evas_Coord x; /*@ Cursor X position */ @out Evas_Coord y; /*@ Cursor Y position */ @out Evas_Coord w; /*@ Cursor width */ @@ -2302,9 +2302,9 @@ class Edje (Evas_Smart_Clipped) This function returns a list of char anchor names. */ const; - return const Eina_List *; + return const(Eina_List)*; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } text_insert_filter_callback_add { @@ -2340,7 +2340,7 @@ class Edje (Evas_Smart_Clipped) @see edje_object_text_markup_filter_callback_add */ params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Text_Filter_Cb func; /*@ The callback function that will act as filter */ @in void *data; /*@ User provided data to pass to the filter function */ } @@ -2356,7 +2356,7 @@ class Edje (Evas_Smart_Clipped) const; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_exists { @@ -2376,7 +2376,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part's name to check for existence in @p obj's + @in const(char)* part; /*@ The part's name to check for existence in @p obj's group */ } } @@ -2395,7 +2395,7 @@ class Edje (Evas_Smart_Clipped) return void *; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Markup_Filter_Cb func; /*@ The function callback to remove */ } } @@ -2408,7 +2408,7 @@ class Edje (Evas_Smart_Clipped) const; return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ The cursor to adjust. */ } } @@ -2423,8 +2423,8 @@ class Edje (Evas_Smart_Clipped) const; params { - @in const char *part; /*@ The part name */ - @in const char *text; /*@ The text string */ + @in const(char)* part; /*@ The part name */ + @in const(char)* text; /*@ The text string */ } } part_text_cursor_prev { @@ -2434,7 +2434,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ the edje cursor to work on */ } } @@ -2447,9 +2447,9 @@ class Edje (Evas_Smart_Clipped) This function returns a list of char item names. */ const; - return const Eina_List *; + return const(Eina_List)*; params { - @in const char *part; /*@ The part name */ + @in const(char)* part; /*@ The part name */ } } part_swallow { @@ -2487,7 +2487,7 @@ class Edje (Evas_Smart_Clipped) return Eina_Bool; params { - @in const char *part; /*@ The swallow part's name */ + @in const(char)* part; /*@ The swallow part's name */ @in Evas_Object *obj_swallow; /*@ The object to occupy that part */ } } diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo index 88b7e538a4..a7849a1789 100644 --- a/src/lib/eo/eo_base.eo +++ b/src/lib/eo/eo_base.eo @@ -45,7 +45,7 @@ Return event freeze count. */ event_callback_forwarder_del { /*@ Remove an event callback forwarder for an event and an object. */ params { - @in const Eo_Event_Description* desc; /*@ The description of the event to listen to */ + @in const(Eo_Event_Description)* desc; /*@ The description of the event to listen to */ @in Eo* new_obj; /*@ The object to emit events from */ } } @@ -64,8 +64,8 @@ Prevents event callbacks from being called for the object. */ event_callback_array_del { /*@ Del a callback array with a specific data associated to it for an event. */ params { - @in const Eo_Callback_Array_Item* array; /*@ an #Eo_Callback_Array_Item of events to listen to */ - @in const void* user_data; /*@ The data to compare */ + @in const(Eo_Callback_Array_Item)* array; /*@ an #Eo_Callback_Array_Item of events to listen to */ + @in const(void)* user_data; /*@ The data to compare */ } } wref_del { @@ -85,24 +85,24 @@ Should not be used with #eo_do. Only use it with #eo_do_super. */ key_data_set { /*@ Set generic data to object. */ params { - @in const char* key; /*@ the key associated with the data */ - @in const void* data; /*@ the data to set */ + @in const(char)* key; /*@ the key associated with the data */ + @in const(void)* data; /*@ the data to set */ @in eo_key_data_free_func free_func; /*@ the func to free data with (NULL means */ } } key_data_get { /*@ Get generic data from object. */ params { - @in const char* key; /*@ the key associated with the data */ + @in const(char)* key; /*@ the key associated with the data */ } return void *; /* the data for the key */ } event_callback_del { /*@ Del a callback with a specific data associated to it for an event. */ params { - @in const Eo_Event_Description* desc; /*@ The description of the event to listen to */ + @in const(Eo_Event_Description)* desc; /*@ The description of the event to listen to */ @in Eo_Event_Cb func; /*@ the callback to delete */ - @in const void* user_data; /*@ The data to compare */ + @in const(void)* user_data; /*@ The data to compare */ } } event_global_thaw { @@ -112,16 +112,16 @@ Lets event callbacks be called for the object. */ key_data_del { /*@ Del generic data from object. */ params { - @in const char* key; /*@ the key associated with the data */ + @in const(char)* key; /*@ the key associated with the data */ } } event_callback_array_priority_add { /*@ Add a callback array for an event with a specific priority. callbacks of the same priority are called in reverse order of creation. */ params { - @in const Eo_Callback_Array_Item* array; /*@ an #Eo_Callback_Array_Item of events to listen to */ + @in const(Eo_Callback_Array_Item)* array; /*@ an #Eo_Callback_Array_Item of events to listen to */ @in Eo_Callback_Priority priority; /*@ The priority of the callback */ - @in const void* data; /*@ additional data to pass to the callback */ + @in const(void)* data; /*@ additional data to pass to the callback */ } } wref_add { @@ -140,14 +140,14 @@ This function registers the object handle pointed by wref to obj so when obj is event_callback_forwarder_add { /*@ Add an event callback forwarder for an event and an object. */ params { - @in const Eo_Event_Description* desc; /*@ The description of the event to listen to */ + @in const(Eo_Event_Description)* desc; /*@ The description of the event to listen to */ @in Eo* new_obj; /*@ The object to emit events from */ } } event_callback_call { /*@ Call the callbacks for an event of an object. */ params { - @in const Eo_Event_Description *desc; /*@ The description of the event to call */ + @in const(Eo_Event_Description)* desc; /*@ The description of the event to call */ @in void *event_info; /*@ Extra event info to pass to the callbacks */ } return Eina_Bool; /* @c EINA_TRUE if one of the callbacks aborted the call, @c EINA_FALSE otherwise */ @@ -156,10 +156,10 @@ This function registers the object handle pointed by wref to obj so when obj is /*@ Add a callback for an event with a specific priority. callbacks of the same priority are called in reverse order of creation. */ params { - @in const Eo_Event_Description* desc; /*@ The description of the event to listen to */ + @in const(Eo_Event_Description)* desc; /*@ The description of the event to listen to */ @in Eo_Callback_Priority priority; /*@ The priority of the callback */ @in Eo_Event_Cb cb; /*@ the callback to call */ - @in const void* data; /*@ additional data to pass to the callback */ + @in const(void)* data; /*@ additional data to pass to the callback */ } } children_iterator_new { diff --git a/src/lib/evas/canvas/evas.eo b/src/lib/evas/canvas/evas.eo index 85a64961b0..224e9f8741 100644 --- a/src/lib/evas/canvas/evas.eo +++ b/src/lib/evas/canvas/evas.eo @@ -343,7 +343,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @return An .Evas_Lock handle to query Evas' keys subsystem with evas_key_lock_is_set(), or @c NULL on error. */ - return const Evas_Lock * @warn_unused; + return const(Evas_Lock)* @warn_unused; } } pointer_canvas_xy { @@ -523,7 +523,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @return An .Evas_Modifier handle to query Evas' keys subsystem with evas_key_modifier_is_set(), or @c NULL on error. */ - return const Evas_Modifier * @warn_unused; + return const(Evas_Modifier)* @warn_unused; } } pointer_button_down_mask { @@ -598,7 +598,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @in int direction; /*@ The wheel mouse direction. */ @in int z; /*@ How much mouse wheel was scrolled up or down. */ @in unsigned int timestamp; /*@ The timestamp of the mouse up event. */ - @in const void *data; /*@ The data for canvas. */ + @in const(void)* data; /*@ The data for canvas. */ } } key_lock_on { @@ -615,7 +615,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @see evas_key_lock_off */ params { - @in const char *keyname @nonull; /*@ The name of the lock to enable. */ + @in const(char)* keyname @nonull; /*@ The name of the lock to enable. */ } } event_feed_key_down { @@ -627,12 +627,12 @@ class Evas (Eo_Base, Evas_Common_Interface) callback function. */ params { - @in const char *keyname; /*@ Name of the key */ - @in const char *key; /*@ The key pressed. */ - @in const char *string; /*@ A String */ - @in const char *compose; /*@ The compose string */ + @in const(char)* keyname; /*@ Name of the key */ + @in const(char)* key; /*@ The key pressed. */ + @in const(char)* string; /*@ A String */ + @in const(char)* compose; /*@ The compose string */ @in unsigned int timestamp; /*@ Timestamp of the mouse up event */ - @in const void *data; /*@ Data for canvas. */ + @in const(void)* data; /*@ Data for canvas. */ } } key_modifier_mask_get { @@ -659,7 +659,7 @@ class Evas (Eo_Base, Evas_Common_Interface) const; return Evas_Modifier_Mask @warn_unused; params { - @in const char *keyname @nonull; /*@ The name of the modifier key to create the mask for. */ + @in const(char)* keyname @nonull; /*@ The name of the modifier key to create the mask for. */ } } key_modifier_add { @@ -689,7 +689,7 @@ class Evas (Eo_Base, Evas_Common_Interface) "Control", "Alt", "Meta", "Hyper", "Super". */ params { - @in const char *keyname @nonull; /*@ The name of the modifier key to add to the list of + @in const(char)* keyname @nonull; /*@ The name of the modifier key to add to the list of Evas modifiers. */ } } @@ -704,7 +704,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @see evas_key_modifier_is_set */ params { - @in const char *keyname @nonull; /*@ The name of the modifier to disable. */ + @in const(char)* keyname @nonull; /*@ The name of the modifier to disable. */ } } event_feed_hold { @@ -716,7 +716,7 @@ class Evas (Eo_Base, Evas_Common_Interface) params { @in int hold; /*@ The hold. */ @in unsigned int timestamp; /*@ The timestamp of the mouse up event. */ - @in const void *data; /*@ The data for canvas. */ + @in const(void)* data; /*@ The data for canvas. */ } } event_feed_mouse_move { @@ -731,7 +731,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @in int x; /*@ The horizontal position of the mouse pointer. */ @in int y; /*@ The vertical position of the mouse pointer. */ @in unsigned int timestamp; /*@ The timestamp of the mouse up event. */ - @in const void *data; /*@ The data for canvas. */ + @in const(void)* data; /*@ The data for canvas. */ } } event_feed_key_up { @@ -743,12 +743,12 @@ class Evas (Eo_Base, Evas_Common_Interface) callback function. */ params { - @in const char *keyname; /*@ Name of the key */ - @in const char *key; /*@ The key released. */ - @in const char *string; /*@ string */ - @in const char *compose; /*@ compose */ + @in const(char)* keyname; /*@ Name of the key */ + @in const(char)* key; /*@ The key released. */ + @in const(char)* string; /*@ string */ + @in const(char)* compose; /*@ compose */ @in unsigned int timestamp; /*@ Timestamp of the mouse up event */ - @in const void *data; /*@ Data for canvas. */ + @in const(void)* data; /*@ Data for canvas. */ } } event_feed_mouse_out { @@ -761,7 +761,7 @@ class Evas (Eo_Base, Evas_Common_Interface) params { @in unsigned int timestamp; /*@ Timestamp of the mouse up event. */ - @in const void *data; /*@ The data for canvas. */ + @in const(void)* data; /*@ The data for canvas. */ } } event_input_multi_move { @@ -778,7 +778,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @in double fx; @in double fy; @in unsigned int timestamp; - @in const void *data; + @in const(void)* data; } } objects_at_xy_get { @@ -824,7 +824,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @in double fy; @in Evas_Button_Flags flags; @in unsigned int timestamp; - @in const void *data; + @in const(void)* data; } } event_feed_multi_down { @@ -842,7 +842,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @in double fy; @in Evas_Button_Flags flags; @in unsigned int timestamp; - @in const void *data; + @in const(void)* data; } } render_async { @@ -892,7 +892,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @in int y; /*@ The vertical position of the mouse pointer relative to the 0,0 of the window/surface. */ @in unsigned int timestamp; /*@ The timestamp of the mouse move event. */ - @in const void *data; /*@ The data for canvas. */ + @in const(void)* data; /*@ The data for canvas. */ } } norender { @@ -948,7 +948,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @in double fy; @in Evas_Button_Flags flags; @in unsigned int timestamp; - @in const void *data; + @in const(void)* data; } } nochange_pop { @@ -975,7 +975,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @see evas_key_lock_on */ params { - @in const char *keyname @nonull; /*@ The name of the lock to disable. */ + @in const(char)* keyname @nonull; /*@ The name of the lock to disable. */ } } nochange_push { @@ -1051,7 +1051,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @see evas_key_modifier_is_set */ params { - @in const char *keyname @nonull; /*@ The name of the modifier to enable. */ + @in const(char)* keyname @nonull; /*@ The name of the modifier to enable. */ } } event_feed_mouse_up { @@ -1066,7 +1066,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @in int b; /*@ The button number. */ @in Evas_Button_Flags flags; /*@ evas button flags. */ @in unsigned int timestamp; /*@ The timestamp of the mouse up event. */ - @in const void *data; /*@ The data for canvas. */ + @in const(void)* data; /*@ The data for canvas. */ } } event_feed_mouse_down { @@ -1081,7 +1081,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @in int b; /*@ The button number. */ @in Evas_Button_Flags flags; /*@ The evas button flags. */ @in unsigned int timestamp; /*@ The timestamp of the mouse down event. */ - @in const void *data; /*@ The data for canvas. */ + @in const(void)* data; /*@ The data for canvas. */ } } event_refeed_event { @@ -1143,7 +1143,7 @@ class Evas (Eo_Base, Evas_Common_Interface) const; return Evas_Object * @warn_unused; params { - @in const char *name; /*@ The given name. */ + @in const(char)* name; /*@ The given name. */ } } font_path_append { @@ -1152,7 +1152,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @ingroup Evas_Font_Path_Group */ params { - @in const char *path @nonull; /*@ The new font path. */ + @in const(char)* path @nonull; /*@ The new font path. */ } } touch_point_list_nth_id_get { @@ -1243,7 +1243,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @see evas_key_lock_off */ params { - @in const char *keyname @nonull; /*@ The name of the key to remove from the locks list. */ + @in const(char)* keyname @nonull; /*@ The name of the key to remove from the locks list. */ } } damage_rectangle_add { @@ -1274,7 +1274,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @ingroup Evas_Font_Path_Group */ const; - return const Eina_List * @warn_unused; + return const(Eina_List)* @warn_unused; } image_cache_reload { /*@ @@ -1324,7 +1324,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @in double fx; @in double fy; @in unsigned int timestamp; - @in const void *data; + @in const(void)* data; } } render_updates { @@ -1404,7 +1404,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @see evas_key_modifier_is_set */ params { - @in const char *keyname @nonull; /*@ The name of the key to remove from the modifiers list. */ + @in const(char)* keyname @nonull; /*@ The name of the key to remove from the modifiers list. */ } } touch_point_list_nth_state_get { @@ -1529,7 +1529,7 @@ class Evas (Eo_Base, Evas_Common_Interface) params { @in unsigned int timestamp; /*@ The timestamp of the mouse up event. */ - @in const void *data; /*@ The data for canvas. */ + @in const(void)* data; /*@ The data for canvas. */ } } object_top_in_rectangle_get { @@ -1587,7 +1587,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @in double fy; @in Evas_Button_Flags flags; @in unsigned int timestamp; - @in const void *data; + @in const(void)* data; } } font_path_prepend { @@ -1596,7 +1596,7 @@ class Evas (Eo_Base, Evas_Common_Interface) @ingroup Evas_Font_Path_Group */ params { - @in const char *path @nonull; /*@ The new font path. */ + @in const(char)* path @nonull; /*@ The new font path. */ } } obscured_clear { @@ -1631,7 +1631,7 @@ class Evas (Eo_Base, Evas_Common_Interface) params { @in unsigned int timestamp; /*@ The timestamp of the mouse up event. */ - @in const void *data; /*@ The data for canvas. */ + @in const(void)* data; /*@ The data for canvas. */ } } coord_screen_x_to_world { @@ -1689,7 +1689,7 @@ class Evas (Eo_Base, Evas_Common_Interface) "Num_Lock", "Scroll_Lock". */ params { - @in const char *keyname @nonull; /*@ The name of the key to add to the locks list. */ + @in const(char)* keyname @nonull; /*@ The name of the key to add to the locks list. */ } } render_idle_flush { @@ -1741,12 +1741,12 @@ class Evas (Eo_Base, Evas_Common_Interface) @since 1.10 */ params { - @in const char *keyname; /*@ Name of the key */ - @in const char *key; /*@ The key pressed. */ - @in const char *string; /*@ A String */ - @in const char *compose; /*@ The compose string */ + @in const(char)* keyname; /*@ Name of the key */ + @in const(char)* key; /*@ The key pressed. */ + @in const(char)* string; /*@ A String */ + @in const(char)* compose; /*@ The compose string */ @in unsigned int timestamp; /*@ Timestamp of the mouse up event */ - @in const void *data; /*@ Data for canvas. */ + @in const(void)* data; /*@ Data for canvas. */ @in unsigned int keycode; /*@ Key scan code numeric value for canvas. */ } } @@ -1761,12 +1761,12 @@ class Evas (Eo_Base, Evas_Common_Interface) @since 1.10 */ params { - @in const char *keyname; /*@ Name of the key */ - @in const char *key; /*@ The key released. */ - @in const char *string; /*@ string */ - @in const char *compose; /*@ compose */ + @in const(char)* keyname; /*@ Name of the key */ + @in const(char)* key; /*@ The key released. */ + @in const(char)* string; /*@ string */ + @in const(char)* compose; /*@ compose */ @in unsigned int timestamp; /*@ Timestamp of the mouse up event */ - @in const void *data; /*@ Data for canvas. */ + @in const(void)* data; /*@ Data for canvas. */ @in unsigned int keycode; /*@ Key scan code numeric value for canvas. */ } } diff --git a/src/lib/evas/canvas/evas_3d_camera.eo b/src/lib/evas/canvas/evas_3d_camera.eo index 1f010500aa..ad3db0e75c 100644 --- a/src/lib/evas/canvas/evas_3d_camera.eo +++ b/src/lib/evas/canvas/evas_3d_camera.eo @@ -19,7 +19,7 @@ class Evas_3D_Camera (Evas_3D_Object, Evas_Common_Interface) @ingroup Evas_3D_Camera */ params { - @in const Evas_Real *matrix; /*@ Projection Matrix */ + @in const(Evas_Real)* matrix; /*@ Projection Matrix */ } } diff --git a/src/lib/evas/canvas/evas_3d_mesh.eo b/src/lib/evas/canvas/evas_3d_mesh.eo index 7dd57bfa1d..c459c74bc4 100644 --- a/src/lib/evas/canvas/evas_3d_mesh.eo +++ b/src/lib/evas/canvas/evas_3d_mesh.eo @@ -15,8 +15,8 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas_Common_Interface) */ params { @in Evas_3D_Mesh_File_Type type; /*@ The type of the mesh file. */ - @in const char *file; /*@ Path to the mesh file. */ - @in const char *key; /*@ Key in the mesh file. */ + @in const(char)* file; /*@ Path to the mesh file. */ + @in const(char)* key; /*@ Key in the mesh file. */ } } @@ -31,8 +31,8 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas_Common_Interface) */ params { @in Evas_3D_Mesh_File_Type type; /*@ The type of the mesh file. */ - @in const char *file; /*@ Path to the mesh file. */ - @in const char *key; /*@ Key in the mesh file. */ + @in const(char)* file; /*@ Path to the mesh file. */ + @in const(char)* key; /*@ Key in the mesh file. */ } } @@ -57,7 +57,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas_Common_Interface) @in int frame; /*@ The number of the key frame. */ @in Evas_3D_Vertex_Attrib attrib; /*@ Vertex attribute ID. */ @in int stride; /*@ Stride to go to the next vertex (in bytes). */ - @in const void *data; /*@ Pointer to the vertex data buffer. */ + @in const(void)* data; /*@ Pointer to the vertex data buffer. */ } } @@ -79,7 +79,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas_Common_Interface) @in int frame; /*@ The number of the key frame. */ @in Evas_3D_Vertex_Attrib attrib; /*@ Vertex attribute ID. */ @in int stride; /*@ Stride to go to the next vertex (in bytes). */ - @in const void *data; /*@ Pointer to the vertex data buffer. */ + @in const(void)* data; /*@ Pointer to the vertex data buffer. */ } } @@ -160,7 +160,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas_Common_Interface) params { @in Evas_3D_Index_Format format; /*@ Vertex index data format. */ @in int count; /*@ Vertex index count. */ - @in const void *indices; /*@ Pointer to the index data. */ + @in const(void)* indices; /*@ Pointer to the index data. */ } } @@ -180,7 +180,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas_Common_Interface) params { @in Evas_3D_Index_Format format; /*@ Vertex index data format. */ @in int count; /*@ Vertex index count. */ - @in const void *indices; /*@ Pointer to the index data. */ + @in const(void)* indices; /*@ Pointer to the index data. */ } } diff --git a/src/lib/evas/canvas/evas_3d_node.eo b/src/lib/evas/canvas/evas_3d_node.eo index 7ec7e6809e..a02186bd9a 100644 --- a/src/lib/evas/canvas/evas_3d_node.eo +++ b/src/lib/evas/canvas/evas_3d_node.eo @@ -79,7 +79,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas_Common_Interface) @ingroup Evas_3D_Node */ const; - return const Eina_List * ; + return const(Eina_List)*; } position_set { @@ -327,7 +327,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas_Common_Interface) @ingroup Evas_3D_Node */ const; - return const Eina_List *; + return const(Eina_List)*; } bounding_box_get{ diff --git a/src/lib/evas/canvas/evas_3d_texture.eo b/src/lib/evas/canvas/evas_3d_texture.eo index 756007d0fe..7b82722d4b 100644 --- a/src/lib/evas/canvas/evas_3d_texture.eo +++ b/src/lib/evas/canvas/evas_3d_texture.eo @@ -47,7 +47,7 @@ class Evas_3D_Texture (Evas_3D_Object, Evas_Common_Interface) @in Evas_3D_Pixel_Format pixel_format; /*@ Pixel format of the data. */ @in int w; /*@ Width of the data. */ @in int h; /*@ Height of the data. */ - @in const void *data; /*@ Pointer to the data. */ + @in const(void)* data; /*@ Pointer to the data. */ } } @@ -62,8 +62,8 @@ class Evas_3D_Texture (Evas_3D_Object, Evas_Common_Interface) return void ; params { - @in const char *file; /*@ Path to the image file. */ - @in const char *key; /*@ Key in the image file. */ + @in const(char)* file; /*@ Path to the image file. */ + @in const(char)* key; /*@ Key in the image file. */ } } diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo index 2017915f89..33054214ab 100644 --- a/src/lib/evas/canvas/evas_box.eo +++ b/src/lib/evas/canvas/evas_box.eo @@ -78,7 +78,7 @@ class Evas_Box (Evas_Smart_Clipped) } values { Evas_Object_Box_Layout cb @nonull; /*@ The new layout function to set on @p o. */ - const void *data; /*@ Data pointer to be passed to @p cb. */ + const(void)* data; /*@ Data pointer to be passed to @p cb. */ Eina_Free_Cb free_data; /*@ Function to free @p data, if need be. */ } } @@ -247,7 +247,7 @@ class Evas_Box (Evas_Smart_Clipped) return Evas_Object_Box_Option *; params { @in Evas_Object *child @nonull; /*@ A child Evas object to be made a member of @p o */ - @in const Evas_Object *reference @nonull; /*@ The child object to place this new one after */ + @in const(Evas_Object)* reference @nonull; /*@ The child object to place this new one after */ } } remove_all { @@ -332,7 +332,7 @@ class Evas_Box (Evas_Smart_Clipped) const; return int @warn_unused; params { - @in const char *name @nonull; /*@ The name string of the option being searched, for + @in const(char)* name @nonull; /*@ The name string of the option being searched, for its ID */ } } @@ -487,7 +487,7 @@ class Evas_Box (Evas_Smart_Clipped) return Evas_Object_Box_Option *; params { @in Evas_Object *child @nonull; /*@ A child Evas object to be made a member of @p o */ - @in const Evas_Object *reference @nonull; /*@ The child object to place this new one before */ + @in const(Evas_Object)* reference @nonull; /*@ The child object to place this new one before */ } } option_property_name_get { @@ -505,7 +505,7 @@ class Evas_Box (Evas_Smart_Clipped) box, which is originally set to @c NULL. */ const; - return const char * @warn_unused; + return const(char)* @warn_unused; params { @in int property; /*@ The numerical identifier of the option being searched, for its name */ @@ -517,7 +517,7 @@ class Evas_Box (Evas_Smart_Clipped) return Evas_Object_Box_Option *; params { @in Evas_Object *child; - @in const Evas_Object *reference; + @in const(Evas_Object)* reference; } } layout_homogeneous_horizontal { @@ -586,7 +586,7 @@ class Evas_Box (Evas_Smart_Clipped) return Evas_Object_Box_Option *; params { @in Evas_Object *child; - @in const Evas_Object *reference; + @in const(Evas_Object)* reference; } } insert_at { diff --git a/src/lib/evas/canvas/evas_image.eo b/src/lib/evas/canvas/evas_image.eo index a3513e28a9..032cdc518d 100644 --- a/src/lib/evas/canvas/evas_image.eo +++ b/src/lib/evas/canvas/evas_image.eo @@ -474,8 +474,8 @@ class Evas_Image (Evas_Object) interested in: they'll be ignored by the function. */ } values { - const char *file; /*@ The image file path. */ - const char *key; /*@ The image key in @p file (if its an Eet one), or @c + const(char)* file; /*@ The image file path. */ + const(char)* key; /*@ The image key in @p file (if its an Eet one), or @c NULL, otherwise. */ } } @@ -788,8 +788,8 @@ class Evas_Image (Evas_Object) @since 1.10 */ } values { - const Eina_File *f; /*@ The mmaped file */ - const char *key; /*@ The image key in @p file (if its an Eet one), or @c + const(Eina_File)* f; /*@ The mmaped file */ + const(char)* key; /*@ The image key in @p file (if its an Eet one), or @c NULL, otherwise. */ } } @@ -1042,7 +1042,7 @@ class Evas_Image (Evas_Object) legacy null; } values { - const char* program; /*@ The program code, as defined + const(char)* program; /*@ The program code, as defined by the @ref evasfiltersref "Evas filters script language". Pass NULL to remove the former program and switch back to the standard text effect @@ -1063,7 +1063,7 @@ class Evas_Image (Evas_Object) legacy null; } values { - const char* name; /*@ Object name as used in the program code */ + const(char)* name; /*@ Object name as used in the program code */ Eo* eobj; /*@ Eo object to use through proxy rendering */ } } @@ -1142,11 +1142,11 @@ class Evas_Image (Evas_Object) const; return Eina_Bool; params { - @in const char *file @nonull; /*@ The filename to be used to save the image (extension + @in const(char)* file @nonull; /*@ The filename to be used to save the image (extension obligatory). */ - @in const char *key; /*@ The image key in the file (if an Eet one), or @c NULL, + @in const(char)* key; /*@ The image key in the file (if an Eet one), or @c NULL, otherwise. */ - @in const char *flags; /*@ String containing the flags to be used (@c NULL for + @in const(char)* flags; /*@ String containing the flags to be used (@c NULL for none). */ } } diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo index 95bf564808..8cdeb24c49 100644 --- a/src/lib/evas/canvas/evas_object.eo +++ b/src/lib/evas/canvas/evas_object.eo @@ -121,7 +121,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface) See the full @ref Example_Evas_Object_Manipulation "example". */ } values { - const char *type; /*@ in */ + const(char)* type; /*@ in */ } } size_hint_min { @@ -312,7 +312,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface) @see evas_object_map_set() */ } values { - const Evas_Map *map; /*@ new map to use */ + const(Evas_Map)* map; /*@ new map to use */ } } size_hint_aspect { @@ -664,7 +664,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface) See the full @ref Example_Evas_Events "example". */ } values { - const char *name; /*@ The given name. */ + const(char)* name; /*@ The given name. */ } } scale { @@ -1180,7 +1180,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface) evas_object_show(obj_tmp); } @endcode */ - return const Eina_List * @warn_unused; + return const(Eina_List)* @warn_unused; } } smart_parent { @@ -1288,7 +1288,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface) return Eina_Bool @warn_unused; params { - @in const char *keyname @nonull; /*@ the key to request events for. */ + @in const(char)* keyname @nonull; /*@ the key to request events for. */ @in Evas_Modifier_Mask modifiers; /*@ a mask of modifiers that must be present to trigger the event. */ @in Evas_Modifier_Mask not_modifiers; /*@ a mask of modifiers that must @b not be present @@ -1393,7 +1393,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface) const; return Eina_Bool @warn_unused; params { - @in const char *type @nonull; /*@ The @b name (type) of the smart class to check for */ + @in const(char)* type @nonull; /*@ The @b name (type) of the smart class to check for */ } } name_child_find { @@ -1416,7 +1416,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface) const; return Evas_Object * @warn_unused; params { - @in const char *name; /*@ The given name. */ + @in const(char)* name; /*@ The given name. */ @in int recurse; /*@ Set to the number of child levels to recurse (0 == don't recurse, 1 == only look at the children of @p obj or their immediate children, but no further etc.). */ } } @@ -1440,7 +1440,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface) @see evas_focus_get */ params { - @in const char *keyname @nonull; /*@ the key the grab is set for. */ + @in const(char)* keyname @nonull; /*@ the key the grab is set for. */ @in Evas_Modifier_Mask modifiers; /*@ a mask of modifiers that must be present to trigger the event. */ @in Evas_Modifier_Mask not_modifiers; /*@ a mask of modifiers that must not not be @@ -1506,7 +1506,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface) const; return Eina_Bool @warn_unused; params { - @in const char *type @nonull; /*@ The type (name string) to check for. Must be the name */ + @in const(char)* type @nonull; /*@ The type (name string) to check for. Must be the name */ } } } diff --git a/src/lib/evas/canvas/evas_object_smart.eo b/src/lib/evas/canvas/evas_object_smart.eo index 3d60891093..2bab743567 100644 --- a/src/lib/evas/canvas/evas_object_smart.eo +++ b/src/lib/evas/canvas/evas_object_smart.eo @@ -159,7 +159,7 @@ class Evas_Object_Smart (Evas_Object, Evas_Signal_Interface) return Eina_Bool; params { - @in const Evas_Smart_Cb_Description *descriptions; /*@ @c NULL terminated array with + @in const(Evas_Smart_Cb_Description)* descriptions; /*@ @c NULL terminated array with #Evas_Smart_Cb_Description descriptions. Array elements won't be modified at run time, but references to them and their contents will be made, so this array should be kept alive during the whole @@ -190,12 +190,12 @@ class Evas_Object_Smart (Evas_Object, Evas_Signal_Interface) const; params { - @out const Evas_Smart_Cb_Description **class_descriptions; /*@ Where to store class callbacks + @out const(Evas_Smart_Cb_Description)** class_descriptions; /*@ Where to store class callbacks descriptions array, if any is known. If no descriptions are known, @c NULL is returned */ @out unsigned int class_count; /*@ Returns how many class callbacks descriptions are known. */ - @out const Evas_Smart_Cb_Description **instance_descriptions; /*@ Where to store instance callbacks + @out const(Evas_Smart_Cb_Description)** instance_descriptions; /*@ Where to store instance callbacks descriptions array, if any is known. If no descriptions are known, @c NULL is returned. */ @out unsigned int instance_count; /*@ Returns how many instance callbacks @@ -228,14 +228,14 @@ class Evas_Object_Smart (Evas_Object, Evas_Signal_Interface) const; params { - @in const char *name @nonull; /*@ name of desired callback, must @b not be @c NULL. The + @in const(char)* name @nonull; /*@ name of desired callback, must @b not be @c NULL. The search have a special case for @a name being the same pointer as registered with Evas_Smart_Cb_Description, one can use it to avoid excessive use of strcmp(). */ - @out const Evas_Smart_Cb_Description *class_description; /*@ pointer to return class description or + @out const(Evas_Smart_Cb_Description)* class_description; /*@ pointer to return class description or @c NULL if not found. If parameter is @c NULL, no search will be done on class descriptions. */ - @out const Evas_Smart_Cb_Description *instance_description; /*@ pointer to return instance description */ + @out const(Evas_Smart_Cb_Description)* instance_description; /*@ pointer to return instance description */ } } hide { diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo index 4356ae8421..bb31f1a7ca 100644 --- a/src/lib/evas/canvas/evas_text.eo +++ b/src/lib/evas/canvas/evas_text.eo @@ -24,7 +24,7 @@ class Evas_Text (Evas_Object) @see evas_object_text_font_get() for more details */ } values { - const char* font_source; /*@ The font file's path. */ + const(char)* font_source; /*@ The font file's path. */ } } shadow_color { @@ -113,7 +113,7 @@ class Evas_Text (Evas_Object) @since 1.1 */ } values { - const char* delim; /*@ A null terminated string of delimiters, e.g ",|". */ + const(char)* delim; /*@ A null terminated string of delimiters, e.g ",|". */ } } outline_color { @@ -165,7 +165,7 @@ class Evas_Text (Evas_Object) @see evas_object_text_text_set() */ } values { - const char* text; /*@ Text string to display on it. */ + const(char)* text; /*@ Text string to display on it. */ } } glow2_color { @@ -222,7 +222,7 @@ class Evas_Text (Evas_Object) @see evas_object_text_font_set() */ } values { - const char* font; /*@ The font family name or filename. */ + const(char)* font; /*@ The font family name or filename. */ Evas_Font_Size size; /*@ The font size, in points. */ } } @@ -312,7 +312,7 @@ class Evas_Text (Evas_Object) legacy null; } values { - const char* program; /*@ The program code, as defined + const(char)* program; /*@ The program code, as defined by the @ref evasfiltersref "Evas filters script language". Pass NULL to remove the former program and switch back to the standard text effect */ @@ -332,7 +332,7 @@ class Evas_Text (Evas_Object) legacy null; } values { - const char* name; /*@ Object name as used in the program code */ + const(char)* name; /*@ Object name as used in the program code */ Eo* eobj; /*@ Eo object to use through proxy rendering */ } } diff --git a/src/lib/evas/canvas/evas_textblock.eo b/src/lib/evas/canvas/evas_textblock.eo index e464512f9c..b7882985b5 100644 --- a/src/lib/evas/canvas/evas_textblock.eo +++ b/src/lib/evas/canvas/evas_textblock.eo @@ -19,7 +19,7 @@ class Evas_Textblock (Evas_Object) @return the markup text of the object. */ } values { - const char *text; /*@ the markup text to use. */ + const(char)* text; /*@ the markup text to use. */ } } valign { @@ -69,7 +69,7 @@ class Evas_Textblock (Evas_Object) @since 1.1 */ } values { - const char* delim; /*@ A null terminated string of delimiters, e.g ",|". */ + const(char)* delim; /*@ A null terminated string of delimiters, e.g ",|". */ } } replace_char { @@ -78,7 +78,7 @@ class Evas_Textblock (Evas_Object) @brief Set the "replacement character" to use for the given textblock object. */ } values { - const char *ch; /*@ The charset name. */ + const(char)* ch; /*@ The charset name. */ } } legacy_newline { @@ -113,7 +113,7 @@ class Evas_Textblock (Evas_Object) @return the style of the object. */ } values { - const Evas_Textblock_Style *ts; /*@ the style to set. */ + const(Evas_Textblock_Style)* ts; /*@ the style to set. */ } } node_format_first { @@ -122,7 +122,7 @@ class Evas_Textblock (Evas_Object) legacy evas_textblock_node_format_first_get; } values { - const Evas_Object_Textblock_Node_Format *format; + const(Evas_Object_Textblock_Node_Format)* format; } } size_formatted { @@ -156,7 +156,7 @@ class Evas_Textblock (Evas_Object) legacy evas_textblock_node_format_last_get; } values { - const Evas_Object_Textblock_Node_Format *format; + const(Evas_Object_Textblock_Node_Format)* format; } } cursor { @@ -227,7 +227,7 @@ class Evas_Textblock (Evas_Object) @return Replacement character or @c NULL. */ - return const char *; + return const(char)*; } style_user_pop { /*@ @@ -254,9 +254,9 @@ class Evas_Textblock (Evas_Object) /*@ No description supplied by the EAPI. */ const; legacy evas_textblock_node_format_list_get; - return const Eina_List *; + return const(Eina_List)*; params { - @in const char *anchor; + @in const(char)* anchor; } } style_user_peek { @@ -268,7 +268,7 @@ class Evas_Textblock (Evas_Object) @since 1.2 */ const; - return const Evas_Textblock_Style *; + return const(Evas_Textblock_Style)*; } node_format_remove_pair { /*@ Remove a format node and its match. */ diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo index f2ca8e4685..d436400a84 100644 --- a/src/lib/evas/canvas/evas_textgrid.eo +++ b/src/lib/evas/canvas/evas_textgrid.eo @@ -37,7 +37,7 @@ class Evas_Textgrid (Evas_Object) @since 1.7 */ } values { - const char *font_source; /*@ The font file's path. */ + const(char)* font_source; /*@ The font file's path. */ } } supported_font_styles { @@ -90,7 +90,7 @@ class Evas_Textgrid (Evas_Object) @since 1.7 */ } values { - const char *font_name; /*@ The font (family) name. */ + const(char)* font_name; /*@ The font (family) name. */ Evas_Font_Size font_size; /*@ The font size, in points. */ } } @@ -195,7 +195,7 @@ class Evas_Textgrid (Evas_Object) params { @in int y; /*@ The row index of the grid. */ - @in const Evas_Textgrid_Cell *row; /*@ The string as a sequence of #Evas_Textgrid_Cell. */ + @in const(Evas_Textgrid_Cell)* row; /*@ The string as a sequence of #Evas_Textgrid_Cell. */ } } cellrow_get { diff --git a/src/tests/eolian/data/object_impl.eo b/src/tests/eolian/data/object_impl.eo index 2bedbfd866..13c294b1bf 100644 --- a/src/tests/eolian/data/object_impl.eo +++ b/src/tests/eolian/data/object_impl.eo @@ -18,7 +18,7 @@ class Object (Base) { get { } keys { - const char *part; + const(char)* part; } values { @own Eina_List * value; @@ -49,7 +49,7 @@ class Object (Base) { /*@ comment foo */ params { @in int a; - @in const char *b; + @in const(char)* b; } const; }