From c9744596de007fc9ec900c31fb10f54f4897ec63 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 11 Jul 2014 14:40:14 +0100 Subject: [PATCH] eolian: builtin bool type, and change the eo files to use that --- src/lib/ecore/ecore_poll.eo | 2 +- src/lib/ecore_audio/ecore_audio.eo | 6 +- src/lib/ecore_audio/ecore_audio_in.eo | 4 +- src/lib/ecore_audio/ecore_audio_out.eo | 4 +- src/lib/edje/edje_object.eo | 118 +++++++++++------------ src/lib/eo/eo_base.eo | 2 +- src/lib/eolian/eo_lexer.c | 4 +- src/lib/eolian/eo_lexer.h | 6 +- src/lib/evas/canvas/evas_3d_light.eo | 4 +- src/lib/evas/canvas/evas_3d_material.eo | 2 +- src/lib/evas/canvas/evas_3d_mesh.eo | 4 +- src/lib/evas/canvas/evas_3d_node.eo | 6 +- src/lib/evas/canvas/evas_3d_object.eo | 2 +- src/lib/evas/canvas/evas_3d_scene.eo | 2 +- src/lib/evas/canvas/evas_3d_texture.eo | 2 +- src/lib/evas/canvas/evas_box.eo | 12 +-- src/lib/evas/canvas/evas_canvas.eo | 28 +++--- src/lib/evas/canvas/evas_grid.eo | 10 +- src/lib/evas/canvas/evas_image.eo | 30 +++--- src/lib/evas/canvas/evas_object.eo | 32 +++--- src/lib/evas/canvas/evas_object_smart.eo | 4 +- src/lib/evas/canvas/evas_out.eo | 2 +- src/lib/evas/canvas/evas_table.eo | 10 +- src/lib/evas/canvas/evas_text.eo | 2 +- src/lib/evas/canvas/evas_textblock.eo | 4 +- src/tests/eolian/data/class_simple.eo | 2 +- src/tests/eolian/data/consts.eo | 2 +- src/tests/eolian/data/object_impl.eo | 2 +- 28 files changed, 157 insertions(+), 151 deletions(-) diff --git a/src/lib/ecore/ecore_poll.eo b/src/lib/ecore/ecore_poll.eo index 266bd4e5d0..808eee9fe7 100644 --- a/src/lib/ecore/ecore_poll.eo +++ b/src/lib/ecore/ecore_poll.eo @@ -22,7 +22,7 @@ class Ecore.Poller (Eo.Base) This allows the changing of a poller's polling interval. It is useful when you want to alter a poll rate without deleting and re-creating a poller. */ legacy ecore_poller_poller_interval_set; - return Eina_Bool; + return bool; } get { /*@ diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo index fcc3289d50..2b268b7264 100644 --- a/src/lib/ecore_audio/ecore_audio.eo +++ b/src/lib/ecore_audio/ecore_audio.eo @@ -35,7 +35,7 @@ class Ecore_Audio (Eo.Base) @since 1.8 */ } values { - Eina_Bool paused; /*ret EINA_TRUE if object is paused, EINA_FALSE if not*/ + bool paused; /*ret EINA_TRUE if object is paused, EINA_FALSE if not*/ } } volume { @@ -64,7 +64,7 @@ class Ecore_Audio (Eo.Base) the libsndfile class accepts WAV, OGG, FLAC files as source. @since 1.8 */ - return Eina_Bool; /*EINA_TRUE if the source was set correctly (i.e. the file was opened), EINA_FALSE otherwise*/ + return bool; /*EINA_TRUE if the source was set correctly (i.e. the file was opened), EINA_FALSE otherwise*/ } get { /*@ @@ -85,7 +85,7 @@ class Ecore_Audio (Eo.Base) ECORE_AUDIO_FORMAT_AUTO @since 1.8 */ - return Eina_Bool; /*EINA_TRUE if the format was supported, EINA_FALSE otherwise*/ + return bool; /*EINA_TRUE if the format was supported, EINA_FALSE otherwise*/ } get { /*@ diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo index 71e774da1e..beaaa6da2a 100644 --- a/src/lib/ecore_audio/ecore_audio_in.eo +++ b/src/lib/ecore_audio/ecore_audio_in.eo @@ -69,7 +69,7 @@ class Ecore_Audio_In (Ecore_Audio) @since 1.8 */ } values { - Eina_Bool preloaded; /*EINA_TRUE if the input should be cached, EINA_FALSE otherwise*/ + bool preloaded; /*EINA_TRUE if the input should be cached, EINA_FALSE otherwise*/ } } looped { @@ -90,7 +90,7 @@ class Ecore_Audio_In (Ecore_Audio) @since 1.8 */ } values { - Eina_Bool looped; /*EINA_TRUE if the input should be looped, EINA_FALSE otherwise*/ + bool looped; /*EINA_TRUE if the input should be looped, EINA_FALSE otherwise*/ } } length { diff --git a/src/lib/ecore_audio/ecore_audio_out.eo b/src/lib/ecore_audio/ecore_audio_out.eo index f8621e4903..63087ce667 100644 --- a/src/lib/ecore_audio/ecore_audio_out.eo +++ b/src/lib/ecore_audio/ecore_audio_out.eo @@ -9,7 +9,7 @@ class Ecore_Audio_Out (Ecore_Audio) Attach an input to an output @since 1.8 */ - return Eina_Bool; /*EINA_TRUE if the input was attached, EINA_FALSE otherwise*/ + return bool; /*EINA_TRUE if the input was attached, EINA_FALSE otherwise*/ params { @in Eo *input; /*The input to attach to the output*/ } @@ -19,7 +19,7 @@ class Ecore_Audio_Out (Ecore_Audio) Detach an input from an output @since 1.8 */ - return Eina_Bool; /*EINA_TRUE if the input was detached, EINA_FALSE otherwise*/ + return bool; /*EINA_TRUE if the input was detached, EINA_FALSE otherwise*/ params { @in Eo *input; /*he input to detach to the output*/ } diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo index 972c979eb0..089d33b1b6 100644 --- a/src/lib/edje/edje_object.eo +++ b/src/lib/edje/edje_object.eo @@ -21,7 +21,7 @@ class Edje.Object (Evas.Smart_Clipped) @return @c true if does, @c false if it doesn't. */ } values { - Eina_Bool update; /*@ Whether or not update the size hints. */ + bool update; /*@ Whether or not update the size hints. */ } } mirrored { @@ -41,7 +41,7 @@ class Edje.Object (Evas.Smart_Clipped) @since 1.1.0 */ } values { - Eina_Bool rtl; /*@ new value of flag EINA_TRUE/EINA_FALSE */ + bool rtl; /*@ new value of flag EINA_TRUE/EINA_FALSE */ } } animation { @@ -68,7 +68,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_animation_set(). */ } values { - Eina_Bool on; /*@ The animation state. @c EINA_TRUE to starts or + bool on; /*@ The animation state. @c EINA_TRUE to starts or @c EINA_FALSE to stops. */ } } @@ -97,7 +97,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_play_set(). */ } values { - Eina_Bool play; /*@ Object state (@c EINA_TRUE to playing, + bool play; /*@ Object state (@c EINA_TRUE to playing, @c EINA_FALSE to paused). */ } } @@ -162,7 +162,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_add() @see edje_object_file_get() @see edje_object_mmap_set() */ - return Eina_Bool; + return bool; } get { /*@ @@ -203,7 +203,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_scale_get() @see edje_scale_get() for more details */ - return Eina_Bool; + return bool; } get { /*@ @@ -248,7 +248,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_file_get() @see edje_object_mmap_set() @since 1.8 */ - return Eina_Bool; + return bool; } values { const(Eina_File)* file; /*@ The Eina_File pointing to the EDJ file to load @p from */ @@ -298,7 +298,7 @@ class Edje.Object (Evas.Smart_Clipped) @return @c EINA_TRUE, on success or @c EINA_FALSE, on error This function sets the text class for the Edje. */ - return Eina_Bool; + return bool; } values { const(char)* text_class; /*@ The text class name */ @@ -314,7 +314,7 @@ class Edje.Object (Evas.Smart_Clipped) This is frequently used with the user cursor. @return True on success, false on error. */ - return Eina_Bool; + return bool; } values { const(char)* part; /*@ The part containing the object. */ @@ -346,7 +346,7 @@ class Edje.Object (Evas.Smart_Clipped) @return @c EINA_TRUE on success, @c EINA_FALSE otherwise @since 1.2 */ - return Eina_Bool; + return bool; } values { const(char)* part; /*@ The part name */ @@ -521,10 +521,10 @@ class Edje.Object (Evas.Smart_Clipped) Removes all object from the table indicated by part, except the internal ones set from the theme. */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ - @in Eina_Bool clear; /*@ If set, will delete subobjs on remove */ + @in bool clear; /*@ If set, will delete subobjs on remove */ } } part_external_param_type_get { @@ -553,7 +553,7 @@ class Edje.Object (Evas.Smart_Clipped) const; params { @in const(char)* part; /*@ The part name */ - @in Eina_Bool allow; /*@ EINA_TRUE to enable, EINA_FALSE otherwise */ + @in bool allow; /*@ EINA_TRUE to enable, EINA_FALSE otherwise */ } } part_state_get { @@ -604,7 +604,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_drag_step_get() */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in double dx; /*@ The x step amount */ @@ -621,7 +621,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_drag_step_set() */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part */ @out double dx; /*@ The x step increment pointer */ @@ -698,7 +698,7 @@ class Edje.Object (Evas.Smart_Clipped) @brief Advances the cursor to the next cursor position. @see evas_textblock_cursor_char_next */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ The edje cursor to advance */ @@ -747,7 +747,7 @@ class Edje.Object (Evas.Smart_Clipped) pointers' pointed variables be set to zero. */ const; - return Eina_Bool; + return bool; params { @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 @@ -783,7 +783,7 @@ class Edje.Object (Evas.Smart_Clipped) rectangles. */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in const(char)* item; /*@ The item name */ @@ -801,7 +801,7 @@ class Edje.Object (Evas.Smart_Clipped) Removes an object from the table indicated by part. */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in Evas_Object *child_obj; /*@ The object to pack in */ @@ -933,7 +933,7 @@ class Edje.Object (Evas.Smart_Clipped) @note On failure, this function will make all non-@c NULL geometry pointers' pointed variables be set to zero. */ - return Eina_Bool; + return bool; params { @out Evas_Coord x; /*@ A pointer to a variable where to store the parts region's x coordinate */ @@ -963,7 +963,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_drag_value_get() */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in double dx; /*@ The x value */ @@ -982,7 +982,7 @@ class Edje.Object (Evas.Smart_Clipped) Gets the drag location values. */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @out double dx; /*@ The X value pointer */ @@ -1091,7 +1091,7 @@ class Edje.Object (Evas.Smart_Clipped) Packs an object into the table indicated by part. */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in Evas_Object *child_obj; /*@ The object to pack in */ @@ -1138,7 +1138,7 @@ class Edje.Object (Evas.Smart_Clipped) Retrieves the size of the table in number of columns and rows. */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @out int cols; /*@ Pointer where to store number of columns (can be NULL) */ @@ -1198,9 +1198,9 @@ class Edje.Object (Evas.Smart_Clipped) @note Use @c EINA_TRUE on scenarios where you don't need the image data preloaded anymore. */ - return Eina_Bool; + return bool; params { - @in Eina_Bool cancel; /*@ @c EINA_FALSE will add it the preloading work queue, + @in bool cancel; /*@ @c EINA_FALSE will add it the preloading work queue, @c EINA_TRUE will remove it (if it was issued before). */ } } @@ -1212,7 +1212,7 @@ class Edje.Object (Evas.Smart_Clipped) params { @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 */ + @in bool enabled; /*@ If true, the input panel is appeared when entry is clicked or has a focus */ } } part_text_input_panel_enabled_get { @@ -1224,7 +1224,7 @@ class Edje.Object (Evas.Smart_Clipped) @since 1.1.0 */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ } @@ -1252,7 +1252,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_box_prepend() @see edje_object_part_box_insert_before() */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in Evas_Object *child; /*@ The object to insert */ @@ -1280,7 +1280,7 @@ class Edje.Object (Evas.Smart_Clipped) /*@ @brief Moves the cursor to the char below the current cursor position. */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ the edje cursor to work on */ @@ -1298,7 +1298,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_drag_page_get() */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in double dx; /*@ The x page step increment */ @@ -1314,7 +1314,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_drag_page_set() */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @out double dx; /*@ The dx page increment pointer */ @@ -1334,7 +1334,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_box_insert_before() @see edje_object_part_box_insert_at() */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in Evas_Object *child; /*@ The object to prepend */ @@ -1471,7 +1471,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_drag_size_get() */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in double dw; /*@ The drag width */ @@ -1487,7 +1487,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_drag_size_set() */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @out double dw; /*@ The drag width pointer */ @@ -1540,7 +1540,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_text_unescaped_get(). */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in const(char)* text_to_escape; /*@ The text string */ @@ -1647,7 +1647,7 @@ class Edje.Object (Evas.Smart_Clipped) params { @in const(char)* part; /*@ The part name */ - @in Eina_Bool disabled; /*@ The state */ + @in bool disabled; /*@ The state */ } } part_text_input_panel_return_key_disabled_get { @@ -1658,7 +1658,7 @@ class Edje.Object (Evas.Smart_Clipped) @since 1.2.0 */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ } @@ -1709,7 +1709,7 @@ class Edje.Object (Evas.Smart_Clipped) params { @in const(char)* part; /*@ The part name */ - @in Eina_Bool prediction; /*@ If true, the prediction feature is allowed. */ + @in bool prediction; /*@ If true, the prediction feature is allowed. */ } } part_text_prediction_allow_get { @@ -1720,7 +1720,7 @@ class Edje.Object (Evas.Smart_Clipped) @since 1.2.0 */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ } @@ -1922,7 +1922,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_box_prepend() @see edje_object_part_box_insert_at() */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in Evas_Object *child; /*@ The object to insert */ @@ -1951,7 +1951,7 @@ class Edje.Object (Evas.Smart_Clipped) @return @c EINA_TRUE if everything went fine, @c EINA_FALSE on errors. */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in const(Edje_External_Param)* param; /*@ the parameter details, including its name, type and @@ -1982,7 +1982,7 @@ class Edje.Object (Evas.Smart_Clipped) param member values are not set or valid. */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @out Edje_External_Param param; /*@ the parameter details. It is used as both input and @@ -2021,7 +2021,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_box_insert_before() @see edje_object_part_box_insert_at() */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in Evas_Object *child; /*@ The object to append */ @@ -2069,10 +2069,10 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_box_remove() @see edje_object_part_box_remove_at() */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ - @in Eina_Bool clear; /*@ Delete objects on removal */ + @in bool clear; /*@ Delete objects on removal */ } } part_drag_page { @@ -2088,7 +2088,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_drag_step() */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in double dx; /*@ The x step */ @@ -2101,7 +2101,7 @@ class Edje.Object (Evas.Smart_Clipped) @return @c EINA_TRUE on success, @c EINA_FALSE otherwise */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in const(char)* text; /*@ The text string */ @@ -2132,7 +2132,7 @@ class Edje.Object (Evas.Smart_Clipped) params { @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.) */ + @in bool ondemand; /*@ If true, the input panel will be shown in case of only Mouse up event. (Focus event will be ignored.) */ } } part_text_input_panel_show_on_demand_get { @@ -2143,7 +2143,7 @@ class Edje.Object (Evas.Smart_Clipped) @since 1.9.0 */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ } @@ -2173,7 +2173,7 @@ class Edje.Object (Evas.Smart_Clipped) @return EINA_TRUE if it's true, EINA_FALSE otherwise. */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ The cursor to adjust. */ @@ -2198,7 +2198,7 @@ class Edje.Object (Evas.Smart_Clipped) @note unlike Evas, Edje colors are @b not pre-multiplied. That is, half-transparent white is 255 255 255 128. */ - return Eina_Bool; + return bool; params { @in const(char)* color_class; @in int r; /*@ Object Red value */ @@ -2234,7 +2234,7 @@ class Edje.Object (Evas.Smart_Clipped) half-transparent white is 255 255 255 128. */ const; - return Eina_Bool; + return bool; params { @in const(char)* color_class; @out int r; /*@ Object Red value */ @@ -2262,7 +2262,7 @@ class Edje.Object (Evas.Smart_Clipped) @see edje_object_part_drag_page() */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in double dx; /*@ The x step */ @@ -2273,7 +2273,7 @@ class Edje.Object (Evas.Smart_Clipped) /*@ @brief Move the cursor to the char above the current cursor position. */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ the edje cursor to work on */ @@ -2374,7 +2374,7 @@ class Edje.Object (Evas.Smart_Clipped) given GUI element, depending on the @b theme applied to @p obj. */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part's name to check for existence in @p obj's group */ @@ -2406,7 +2406,7 @@ class Edje.Object (Evas.Smart_Clipped) @see evas_textblock_cursor_format_is_visible_get */ const; - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ The cursor to adjust. */ @@ -2432,7 +2432,7 @@ class Edje.Object (Evas.Smart_Clipped) @brief Moves the cursor to the previous char @see evas_textblock_cursor_char_prev */ - return Eina_Bool; + return bool; params { @in const(char)* part; /*@ The part name */ @in Edje_Cursor cur; /*@ the edje cursor to work on */ @@ -2485,7 +2485,7 @@ class Edje.Object (Evas.Smart_Clipped) For more details on EDC @c SWALLOW parts, see @ref edcref "syntax reference". */ - return Eina_Bool; + return bool; params { @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 e913a06adc..139e0fa71a 100644 --- a/src/lib/eo/eo_base.eo +++ b/src/lib/eo/eo_base.eo @@ -150,7 +150,7 @@ This function registers the object handle pointed by wref to obj so when obj is @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 */ + return bool; /* @c EINA_TRUE if one of the callbacks aborted the call, @c EINA_FALSE otherwise */ } event_callback_priority_add { /*@ Add a callback for an event with a specific priority. diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c index 28332fed08..6983a9ff20 100644 --- a/src/lib/eolian/eo_lexer.c +++ b/src/lib/eolian/eo_lexer.c @@ -60,6 +60,8 @@ static const char * const ctypes[] = "float", "double", "long double", + "Eina_Bool", + "void" }; @@ -478,7 +480,7 @@ eo_lexer_keyword_str_get(int kw) Eina_Bool eo_lexer_is_type_keyword(int kw) { - return (kw >= KW_char && kw <= KW_ullong); + return (kw >= KW_char && kw <= KW_void); } const char * diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h index 7ada2bfb50..e569a816d2 100644 --- a/src/lib/eolian/eo_lexer.h +++ b/src/lib/eolian/eo_lexer.h @@ -32,7 +32,11 @@ enum Tokens \ KW(float), KW(double), KW(ldouble), \ \ - KW(void) + KW(bool), \ + \ + KW(void), \ + \ + KW(true), KW(false), KW(null) #define KW(x) KW_##x #define KWAT(x) KW_at_##x diff --git a/src/lib/evas/canvas/evas_3d_light.eo b/src/lib/evas/canvas/evas_3d_light.eo index 9d7bb4b26e..6ad9930e9f 100644 --- a/src/lib/evas/canvas/evas_3d_light.eo +++ b/src/lib/evas/canvas/evas_3d_light.eo @@ -30,7 +30,7 @@ class Evas_3D_Light (Evas_3D_Object, Evas.Common_Interface) */ } values { - Eina_Bool directional; /*@ Whether the light is directional (@c EINA_TRUE), or not (@c EINA_FALSE).*/ + bool directional; /*@ Whether the light is directional (@c EINA_TRUE), or not (@c EINA_FALSE).*/ } } @@ -114,7 +114,7 @@ class Evas_3D_Light (Evas_3D_Object, Evas.Common_Interface) */ } values { - Eina_Bool enable; /*@ Whether to enable attenuation (@c EINA_TRUE), or not (@c EINA_FALSE)..*/ + bool enable; /*@ Whether to enable attenuation (@c EINA_TRUE), or not (@c EINA_FALSE)..*/ } } } diff --git a/src/lib/evas/canvas/evas_3d_material.eo b/src/lib/evas/canvas/evas_3d_material.eo index 9b6872087d..98e2a3a813 100644 --- a/src/lib/evas/canvas/evas_3d_material.eo +++ b/src/lib/evas/canvas/evas_3d_material.eo @@ -81,7 +81,7 @@ class Evas_3D_Material (Evas_3D_Object, Evas.Common_Interface) Evas_3D_Material_Attrib attrib; /*@ Material attribute ID. */ } values { - Eina_Bool enable; /*@ Whether to enable the attribute (@c EINA_TRUE), or not (@c EINA_FALSE). */ + bool enable; /*@ Whether to enable the attribute (@c EINA_TRUE), or not (@c EINA_FALSE). */ } } diff --git a/src/lib/evas/canvas/evas_3d_mesh.eo b/src/lib/evas/canvas/evas_3d_mesh.eo index c65cb34950..9cfa9acd7d 100644 --- a/src/lib/evas/canvas/evas_3d_mesh.eo +++ b/src/lib/evas/canvas/evas_3d_mesh.eo @@ -340,7 +340,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface) @ingroup Evas_3D_Mesh */ params { - @in Eina_Bool enabled; /*@ The red component of the fog color.*/ + @in bool enabled; /*@ The red component of the fog color.*/ } } fog_enable_get { @@ -348,7 +348,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface) Get fog effect status for the given mesh. @ingroup Evas_3D_Mesh */ - return Eina_Bool; + return bool; params { } } diff --git a/src/lib/evas/canvas/evas_3d_node.eo b/src/lib/evas/canvas/evas_3d_node.eo index 0c47e4261a..e161062273 100644 --- a/src/lib/evas/canvas/evas_3d_node.eo +++ b/src/lib/evas/canvas/evas_3d_node.eo @@ -406,7 +406,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface) */ } values { - Eina_Bool inherit; /*@ Whether to inherit parent position*/ + bool inherit; /*@ Whether to inherit parent position*/ } } @@ -439,7 +439,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface) */ } values { - Eina_Bool inherit; /*@ Whether to inherit parent orientation*/ + bool inherit; /*@ Whether to inherit parent orientation*/ } } @@ -471,7 +471,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface) */ } values { - Eina_Bool inherit; /*@ Whether to inherit parent scale*/ + bool inherit; /*@ Whether to inherit parent scale*/ } } diff --git a/src/lib/evas/canvas/evas_3d_object.eo b/src/lib/evas/canvas/evas_3d_object.eo index e77d3f1d5f..1ad0834e2a 100644 --- a/src/lib/evas/canvas/evas_3d_object.eo +++ b/src/lib/evas/canvas/evas_3d_object.eo @@ -34,7 +34,7 @@ class Evas_3D_Object (Eo.Base, Evas.Common_Interface) Returns the status of a particular state of the object. */ const; - return Eina_Bool; + return bool; params { @in Evas_3D_State state; /*@ State whose status is being asked */ } diff --git a/src/lib/evas/canvas/evas_3d_scene.eo b/src/lib/evas/canvas/evas_3d_scene.eo index cea8e5ed7f..8aa5c97d7b 100644 --- a/src/lib/evas/canvas/evas_3d_scene.eo +++ b/src/lib/evas/canvas/evas_3d_scene.eo @@ -78,7 +78,7 @@ class Evas_3D_Scene (Evas_3D_Object, Evas.Common_Interface) @ingroup Evas_3D_Scene */ const; - return Eina_Bool ; + return bool ; params { @in Evas_Real x; /*@ X coordinate of the picking position. */ @in Evas_Real y; /*@ Y coordinate of the picking position. */ diff --git a/src/lib/evas/canvas/evas_3d_texture.eo b/src/lib/evas/canvas/evas_3d_texture.eo index 85d56cd3a2..227dfd0628 100644 --- a/src/lib/evas/canvas/evas_3d_texture.eo +++ b/src/lib/evas/canvas/evas_3d_texture.eo @@ -28,7 +28,7 @@ class Evas_3D_Texture (Evas_3D_Object, Evas.Common_Interface) */ } values { - Eina_Bool visible; /*@ @c EINA_TRUE for visible, @c EINA_FALSE for invisible.*/ + bool visible; /*@ @c EINA_TRUE for visible, @c EINA_FALSE for invisible.*/ } } } diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo index d0a1e3107c..2467fbe00a 100644 --- a/src/lib/evas/canvas/evas_box.eo +++ b/src/lib/evas/canvas/evas_box.eo @@ -261,9 +261,9 @@ class Evas.Box (Evas.Smart_Clipped) each of @p o's child objects, in sequence. If, and only if, all those calls succeed, so does this one. */ - return Eina_Bool; + return bool; params { - @in Eina_Bool clear; /*@ if true, it will delete just removed children. */ + @in bool clear; /*@ if true, it will delete just removed children. */ } } iterator_new { @@ -390,7 +390,7 @@ class Evas.Box (Evas.Smart_Clipped) evas_object_box_option_property_set(). See its documentation for more details. */ - return Eina_Bool; + return bool; params { @in Evas_Object_Box_Option *opt @nonull; /*@ The box option structure bound to the child box element to set a property on */ @@ -427,7 +427,7 @@ class Evas.Box (Evas.Smart_Clipped) @note This call will trigger the box's _Evas_Object_Box_Api.remove_at smart function. */ - return Eina_Bool; + return bool; params { @in uint pos; /*@ The numeric position (starting from @c 0) of the child object to be removed */ @@ -445,7 +445,7 @@ class Evas.Box (Evas.Smart_Clipped) more details. */ const; - return Eina_Bool; + return bool; params { @in Evas_Object_Box_Option *opt @nonull; /*@ The box option structure bound to the child box element to get a property from */ @@ -638,7 +638,7 @@ class Evas.Box (Evas.Smart_Clipped) @note This call will trigger the box's _Evas_Object_Box_Api.remove smart function. */ - return Eina_Bool; + return bool; params { @in Evas_Object *child @nonull; /*@ The handle to the child object to be removed */ } diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo index f593602a85..1f2e63017f 100644 --- a/src/lib/evas/canvas/evas_canvas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo @@ -245,7 +245,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface) @return @c EINA_TRUE if no error occurred, @c EINA_FALSE otherwise. @ingroup Evas_Output_Method */ - return Eina_Bool; + return bool; } get { /*@ @@ -408,7 +408,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface) @return @c EINA_TRUE if it got the focus, @c EINA_FALSE otherwise. @ingroup Evas_Canvas */ - return Eina_Bool; + return bool; } } pointer_output_xy { @@ -464,7 +464,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface) if (evas_pointer_inside_get(evas)) printf("Mouse is in!\n"); else printf("Mouse is out!\n"); @endcode */ - return Eina_Bool @warn_unused; + return bool @warn_unused; } } image_max_size { @@ -479,7 +479,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface) a limit, just a much higher one. @since 1.1 */ - return Eina_Bool; + return bool; } values { int maxw; /*@ Pointer to hold the return value in pixels of the maximum width */ @@ -803,9 +803,9 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface) params { @in Evas_Coord x; /*@ The horizontal coordinate of the position */ @in Evas_Coord y; /*@ The vertical coordinate of the position */ - @in Eina_Bool include_pass_events_objects; /*@ Boolean flag to include or not + @in bool include_pass_events_objects; /*@ Boolean flag to include or not objects which pass events in this calculation */ - @in Eina_Bool include_hidden_objects; /*@ Boolean flag to include or not hidden + @in bool include_hidden_objects; /*@ Boolean flag to include or not hidden objects in this calculation */ } } @@ -865,7 +865,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface) @ingroup Evas_Canvas @since 1.8 */ - return Eina_Bool; + return bool; } focus_out { /*@ @@ -1004,7 +1004,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface) @ingroup Evas_Font_Group */ const; - return Eina_Bool @warn_unused; + return bool @warn_unused; params { @in Evas_Font_Hinting_Flags hinting; /*@ The hinting to use, one of #EVAS_FONT_HINTING_NONE, */ } @@ -1031,9 +1031,9 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface) params { @in Evas_Coord x; /*@ The horizontal coordinate of the position */ @in Evas_Coord y; /*@ The vertical coordinate of the position */ - @in Eina_Bool include_pass_events_objects; /*@ Boolean flag to include or not + @in bool include_pass_events_objects; /*@ Boolean flag to include or not objects which pass events in this calculation */ - @in Eina_Bool include_hidden_objects; /*@ Boolean flag to include or not hidden + @in bool include_hidden_objects; /*@ Boolean flag to include or not hidden objects in this calculation */ } } @@ -1123,8 +1123,8 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface) @in Evas_Coord y; @in Evas_Coord w; @in Evas_Coord h; - @in Eina_Bool include_pass_events_objects; - @in Eina_Bool include_hidden_objects; + @in bool include_pass_events_objects; + @in bool include_hidden_objects; } } object_name_find { @@ -1559,9 +1559,9 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface) rectangular region */ @in Evas_Coord w; /*@ The width of the rectangular region */ @in Evas_Coord h; /*@ The height of the rectangular region */ - @in Eina_Bool include_pass_events_objects; /*@ Boolean flag to include or not + @in bool include_pass_events_objects; /*@ Boolean flag to include or not objects which pass events in this calculation */ - @in Eina_Bool include_hidden_objects; /*@ Boolean flag to include or not hidden + @in bool include_hidden_objects; /*@ Boolean flag to include or not hidden objects in this calculation */ } } diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo index 8bcd65af67..50478cd48c 100644 --- a/src/lib/evas/canvas/evas_grid.eo +++ b/src/lib/evas/canvas/evas_grid.eo @@ -21,7 +21,7 @@ class Evas.Grid (Evas.Smart_Clipped) @since 1.1 */ } values { - Eina_Bool mirrored; /*@ the mirrored mode to set */ + bool mirrored; /*@ the mirrored mode to set */ } } size { @@ -75,7 +75,7 @@ class Evas.Grid (Evas.Smart_Clipped) @since 1.1 */ params { - @in Eina_Bool clear; /*@ if true, it will delete just removed children. */ + @in bool clear; /*@ if true, it will delete just removed children. */ } } iterator_new { @@ -108,7 +108,7 @@ class Evas.Grid (Evas.Smart_Clipped) @return 1 on success, 0 on failure. @since 1.1 */ - return Eina_Bool; + return bool; params { @in Evas_Object *child @nonull; } @@ -123,7 +123,7 @@ class Evas.Grid (Evas.Smart_Clipped) @since 1.1 */ const; - return Eina_Bool; + return bool; params { @in Evas_Object *child; /*@ The grid child to query for coordinates */ @out int x; /*@ The pointer to where the x coordinate will be returned */ @@ -139,7 +139,7 @@ class Evas.Grid (Evas.Smart_Clipped) @return 1 on success, 0 on failure. @since 1.1 */ - return Eina_Bool; + return bool; params { @in Evas_Object *child @nonull; /*@ The child object to add. */ @in int x; /*@ The virtual x coordinate of the child */ diff --git a/src/lib/evas/canvas/evas_image.eo b/src/lib/evas/canvas/evas_image.eo index 2671e9ea19..be51fbf9b1 100644 --- a/src/lib/evas/canvas/evas_image.eo +++ b/src/lib/evas/canvas/evas_image.eo @@ -49,7 +49,7 @@ class Evas.Image (Evas.Object) @since 1.8 */ } values { - Eina_Bool source_clip; /*@ whether @p obj is clipped by the source clipper. + bool source_clip; /*@ whether @p obj is clipped by the source clipper. (@c EINA_TRUE) or not (@c EINA_FALSE) */ } } @@ -76,7 +76,7 @@ class Evas.Image (Evas.Object) @see evas_object_image_source_get() @see evas_object_image_source_unset() @see evas_object_image_source_visible_set() */ - return Eina_Bool; + return bool; } get { /*@ @@ -116,7 +116,7 @@ class Evas.Image (Evas.Object) @see evas_object_image_filled_set() for more information */ } values { - Eina_Bool filled; /*@ @c EINA_TRUE, to make the fill property follow + bool filled; /*@ @c EINA_TRUE, to make the fill property follow object size or @c EINA_FALSE, otherwise. */ } } @@ -210,7 +210,7 @@ class Evas.Image (Evas.Object) See @ref evas_object_image_alpha_set() for more details. */ } values { - Eina_Bool alpha; /*@ Whether to use alpha channel (@c EINA_TRUE) data + bool alpha; /*@ Whether to use alpha channel (@c EINA_TRUE) data or not (@c EINA_FALSE). */ } } @@ -321,7 +321,7 @@ class Evas.Image (Evas.Object) See @ref evas_object_image_smooth_scale_set() for more details. */ } values { - Eina_Bool smooth_scale; /*@ Whether to use smooth scale or not. */ + bool smooth_scale; /*@ Whether to use smooth scale or not. */ } } border_scale { @@ -365,7 +365,7 @@ class Evas.Image (Evas.Object) @return Whether the image is dirty. */ } values { - Eina_Bool dirty; /*@ Whether the image is dirty. */ + bool dirty; /*@ Whether the image is dirty. */ } } video_surface { @@ -415,7 +415,7 @@ class Evas.Image (Evas.Object) @since 1.1 */ } values { - Eina_Bool enable; /*@ @c EINA_TRUE means that it should honor the orientation information */ + bool enable; /*@ @c EINA_TRUE means that it should honor the orientation information */ } } fill_spread { @@ -570,7 +570,7 @@ class Evas.Image (Evas.Object) @since 1.8 */ } values { - Eina_Bool visible; /*@ @c EINA_TRUE is source object to be shown, @c EINA_FALSE + bool visible; /*@ @c EINA_TRUE is source object to be shown, @c EINA_FALSE otherwise. */ } } @@ -728,7 +728,7 @@ class Evas.Image (Evas.Object) @since 1.8 */ } values { - Eina_Bool source; /*@ whether @p obj is to pass events (@c EINA_TRUE) or not + bool source; /*@ whether @p obj is to pass events (@c EINA_TRUE) or not (@c EINA_FALSE) */ } } @@ -847,7 +847,7 @@ class Evas.Image (Evas.Object) @since 1.2 This function returns the state of the region support of given image */ - return Eina_Bool @warn_unused; + return bool @warn_unused; } } load_error { @@ -944,7 +944,7 @@ class Evas.Image (Evas.Object) @see evas_object_image_animated_frame_duration_get() @see evas_object_image_animated_frame_set() @since 1.1 */ - return Eina_Bool; + return bool; } } animated_loop_type { @@ -1070,7 +1070,7 @@ class Evas.Image (Evas.Object) filter_padding { get { /*@ Get the value of the extra padding set when a filter is used. */ - return Eina_Bool; /*@ Returns false if the filter is invalid and padding is 0 */ + return bool; /*@ Returns false if the filter is invalid and padding is 0 */ legacy null; } values { @@ -1140,7 +1140,7 @@ class Evas.Image (Evas.Object) "quality=100 compress=9" */ const; - return Eina_Bool; + return bool; params { @in const(char)* file @nonull; /*@ The filename to be used to save the image (extension obligatory). */ @@ -1197,7 +1197,7 @@ class Evas.Image (Evas.Object) const; return void * @warn_unused; params { - @in Eina_Bool for_writing; /*@ Whether the data being retrieved will be + @in bool for_writing; /*@ Whether the data being retrieved will be modified (@c EINA_TRUE) or not (@c EINA_FALSE). */ } } @@ -1231,7 +1231,7 @@ class Evas.Image (Evas.Object) This function imports pixels from a given source to a given canvas image. */ - return Eina_Bool; + return bool; params { @in Evas_Pixel_Import_Source *pixels @nonull; /*@ The pixel's source to be imported. */ } diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo index d67d1750c4..8d95a89049 100644 --- a/src/lib/evas/canvas/evas_object.eo +++ b/src/lib/evas/canvas/evas_object.eo @@ -84,7 +84,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) legacy evas_object_visible_get; } values { - Eina_Bool v; /*@ @c EINA_TRUE if to make the object visible, @c EINA_FALSE otherwise */ + bool v; /*@ @c EINA_TRUE if to make the object visible, @c EINA_FALSE otherwise */ } } type { @@ -247,7 +247,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @since 1.1 */ } values { - Eina_Bool freeze; /*@ pass whether @p obj is to freeze events (@c EINA_TRUE) or not + bool freeze; /*@ pass whether @p obj is to freeze events (@c EINA_TRUE) or not (@c EINA_FALSE) */ } } @@ -574,7 +574,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @see evas_object_freeze_events_get() */ } values { - Eina_Bool repeat; /*@ whether @p obj is to repeat events (@c EINA_TRUE) or not + bool repeat; /*@ whether @p obj is to repeat events (@c EINA_TRUE) or not (@c EINA_FALSE) */ } } @@ -726,7 +726,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @ingroup Evas_Object_Group_Extras */ } values { - Eina_Bool is_static_clip; /*@ @c EINA_TRUE if it's to be used as a static + bool is_static_clip; /*@ @c EINA_TRUE if it's to be used as a static clipper, @c EINA_FALSE otherwise. */ } } @@ -790,7 +790,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @see evas_object_key_ungrab */ } values { - Eina_Bool focus; /*@ @c EINA_TRUE, to set it as focused or @c EINA_FALSE, + bool focus; /*@ @c EINA_TRUE, to set it as focused or @c EINA_FALSE, to take away the focus from it. */ } } @@ -802,7 +802,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) /*@ @since 1.2 */ } values { - Eina_Bool is_frame; /*@ in */ + bool is_frame; /*@ in */ } } map_enable { @@ -829,7 +829,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @return the map enabled state */ } values { - Eina_Bool enabled; /*@ enabled state */ + bool enabled; /*@ enabled state */ } } precise_is_inside { @@ -869,7 +869,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @ingroup Evas_Object_Group_Extras */ } values { - Eina_Bool precise; /*@ Whether to use precise point collision detection or + bool precise; /*@ Whether to use precise point collision detection or not. The default value is false. */ } } @@ -971,7 +971,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @see evas_object_freeze_events_get() */ } values { - Eina_Bool propagate; /*@ whether to propagate events (@c EINA_TRUE) or not + bool propagate; /*@ whether to propagate events (@c EINA_TRUE) or not (@c EINA_FALSE) */ } } @@ -1012,7 +1012,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @see evas_object_freeze_events_get() */ } values { - Eina_Bool pass; /*@ whether @p obj is to pass events (@c EINA_TRUE) or not + bool pass; /*@ whether @p obj is to pass events (@c EINA_TRUE) or not (@c EINA_FALSE) */ } } @@ -1044,7 +1044,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @ingroup Evas_Object_Group_Extras */ } values { - Eina_Bool anti_alias; /*@ 1 if the object is to be anti_aliased, 0 otherwise. */ + bool anti_alias; /*@ 1 if the object is to be anti_aliased, 0 otherwise. */ } } color { @@ -1243,7 +1243,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @since 1.8 */ const; - return Eina_Bool @warn_unused; + return bool @warn_unused; } key_grab { /*@ @@ -1286,14 +1286,14 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @see evas_focus_get @see evas_key_modifier_add */ - return Eina_Bool @warn_unused; + return bool @warn_unused; params { @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 to trigger the event. */ - @in Eina_Bool exclusive; /*@ request that the @p obj is the only object + @in bool exclusive; /*@ request that the @p obj is the only object receiving the @p keyname events. */ } } @@ -1391,7 +1391,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @ingroup Evas_Smart_Object_Group */ const; - return Eina_Bool @warn_unused; + return bool @warn_unused; params { @in const(char)* type @nonull; /*@ The @b name (type) of the smart class to check for */ } @@ -1504,7 +1504,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface) @ingroup Evas_Smart_Object_Group */ const; - return Eina_Bool @warn_unused; + return bool @warn_unused; params { @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 b33c8600e6..c95264ade0 100644 --- a/src/lib/evas/canvas/evas_object_smart.eo +++ b/src/lib/evas/canvas/evas_object_smart.eo @@ -45,7 +45,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface) @ingroup Evas_Smart_Object_Group */ } values { - Eina_Bool value; /*@ whether one wants to set (@c EINA_TRUE) or to unset + bool value; /*@ whether one wants to set (@c EINA_TRUE) or to unset (@c EINA_FALSE) the flag. */ } } @@ -157,7 +157,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface) @ingroup Evas_Smart_Object_Group */ - return Eina_Bool; + return bool; params { @in const(Evas_Smart_Cb_Description)* descriptions; /*@ @c NULL terminated array with #Evas_Smart_Cb_Description descriptions. Array elements won't be diff --git a/src/lib/evas/canvas/evas_out.eo b/src/lib/evas/canvas/evas_out.eo index a8fad0496a..de9e23f165 100644 --- a/src/lib/evas/canvas/evas_out.eo +++ b/src/lib/evas/canvas/evas_out.eo @@ -20,7 +20,7 @@ class Evas.Out (Eo.Base) engine_info { set { /*@ Sets the engine specific output parameters for a given output. */ - return Eina_Bool; + return bool; } get { /*@ Gets the engine specific output parameters for a given output. */ diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo index 883ef4a086..69e1f3b51b 100644 --- a/src/lib/evas/canvas/evas_table.eo +++ b/src/lib/evas/canvas/evas_table.eo @@ -103,7 +103,7 @@ class Evas.Table (Evas.Smart_Clipped) @see evas_object_table_mirrored_set() */ } values { - Eina_Bool mirrored; /*@ the mirrored mode to set */ + bool mirrored; /*@ the mirrored mode to set */ } } col_row_size { @@ -155,7 +155,7 @@ class Evas.Table (Evas.Smart_Clipped) Faster way to remove all child objects from a table object. */ params { - @in Eina_Bool clear; /*@ if true, it will delete just removed children. */ + @in bool clear; /*@ if true, it will delete just removed children. */ } } accessor_new { @@ -192,7 +192,7 @@ class Evas.Table (Evas.Smart_Clipped) @since 1.1 */ const; - return Eina_Bool; + return bool; params { @in Evas_Object *child; /*@ The child object to add. */ @out ushort col; /*@ pointer to store relative-horizontal position to place child. */ @@ -213,7 +213,7 @@ class Evas.Table (Evas.Smart_Clipped) @return 1 on success, 0 on failure. */ - return Eina_Bool; + return bool; params { @in Evas_Object *child @nonull; /*@ The child object to add. */ @in ushort col; /*@ relative-horizontal position to place child. */ @@ -232,7 +232,7 @@ class Evas.Table (Evas.Smart_Clipped) @return 1 on success, 0 on failure. */ - return Eina_Bool; + return bool; params { @in Evas_Object *child @nonull; } diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo index 372bbeb9ca..5cacda2313 100644 --- a/src/lib/evas/canvas/evas_text.eo +++ b/src/lib/evas/canvas/evas_text.eo @@ -428,7 +428,7 @@ class Evas.Text (Evas.Object) @return @c EINA_FALSE on success, @c EINA_TRUE on error. */ const; - return Eina_Bool; + return bool; params { @in int pos; /*@ The character position to request co-ordinates for. */ @out Evas_Coord cx; /*@ A pointer to an @c Evas_Coord to store the X value in (can be NULL). */ diff --git a/src/lib/evas/canvas/evas_textblock.eo b/src/lib/evas/canvas/evas_textblock.eo index e3cc3d3f65..ba3d282100 100644 --- a/src/lib/evas/canvas/evas_textblock.eo +++ b/src/lib/evas/canvas/evas_textblock.eo @@ -98,7 +98,7 @@ class Evas.Textblock (Evas.Object) @since 1.1 */ } values { - Eina_Bool mode; /*@ @c EINA_TRUE for legacy mode, @c EINA_FALSE otherwise. */ + bool mode; /*@ @c EINA_TRUE for legacy mode, @c EINA_FALSE otherwise. */ } } style { @@ -211,7 +211,7 @@ class Evas.Textblock (Evas.Object) @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. */ const; - return Eina_Bool; + return bool; params { @in int line; /*@ the line number. */ @out Evas_Coord cx; /*@ x coord of the line. */ diff --git a/src/tests/eolian/data/class_simple.eo b/src/tests/eolian/data/class_simple.eo index 3485177251..9375eb7922 100644 --- a/src/tests/eolian/data/class_simple.eo +++ b/src/tests/eolian/data/class_simple.eo @@ -8,7 +8,7 @@ class Simple { set { /*@ comment a.set */ - return Eina_Bool (EINA_TRUE); /*@ comment for property set return */ + return bool (EINA_TRUE); /*@ comment for property set return */ } get { } diff --git a/src/tests/eolian/data/consts.eo b/src/tests/eolian/data/consts.eo index 690e811519..76fefc8672 100644 --- a/src/tests/eolian/data/consts.eo +++ b/src/tests/eolian/data/consts.eo @@ -2,7 +2,7 @@ class Const { properties { a { set { - return Eina_Bool (EINA_TRUE); /*@ comment for property set return */ + return bool (EINA_TRUE); /*@ comment for property set return */ } get { buffer: const; diff --git a/src/tests/eolian/data/object_impl.eo b/src/tests/eolian/data/object_impl.eo index 10c4e36415..bd3d3f63a4 100644 --- a/src/tests/eolian/data/object_impl.eo +++ b/src/tests/eolian/data/object_impl.eo @@ -12,7 +12,7 @@ class Object (Base) { properties { a { set { - return Eina_Bool(EINA_FALSE); + return bool(EINA_FALSE); value: const; } get {