From b4705ea968de21f25434357cff7683673a4cf8ef Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Wed, 1 Nov 2017 12:10:05 +0100 Subject: [PATCH] elementary: use @cref where possible --- src/lib/efl/interfaces/efl_gfx_buffer.eo | 8 ++++---- src/lib/elementary/efl_access.eo | 2 +- src/lib/elementary/efl_ui_win.eo | 2 +- src/lib/elementary/elm_calendar.eo | 4 ++-- src/lib/elementary/elm_gengrid.eo | 10 +++++----- src/lib/elementary/elm_gengrid_item.eo | 4 ++-- src/lib/elementary/elm_genlist.eo | 10 +++++----- src/lib/elementary/elm_genlist_item.eo | 4 ++-- .../elementary/elm_interface_atspi_widget_action.eo | 2 +- src/lib/elementary/elm_map.eo | 2 +- src/lib/elementary/elm_slideshow.eo | 4 ++-- src/lib/elementary/elm_widget.eo | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/lib/efl/interfaces/efl_gfx_buffer.eo b/src/lib/efl/interfaces/efl_gfx_buffer.eo index a4967fc39e..917b4438ba 100644 --- a/src/lib/efl/interfaces/efl_gfx_buffer.eo +++ b/src/lib/efl/interfaces/efl_gfx_buffer.eo @@ -95,7 +95,7 @@ interface Efl.Gfx.Buffer () image object to be updated (redrawn) at the next rendering cycle. ]] params { - @in region: const(ptr(Eina.Rect)) @optional; [[The updated region.]] + @cref region: Eina.Rect @optional; [[The updated region.]] } } @@ -131,7 +131,7 @@ interface Efl.Gfx.Buffer () params { @in mode: Efl.Gfx.Buffer.Access_Mode; [[Specifies whether to map for read-only, write-only or read-write access (OR combination of flags).]] - @in region: const(ptr(Eina.Rect)) @optional; [[The region to map.]] + @cref region: Eina.Rect @optional; [[The region to map.]] @in cspace: Efl.Gfx.Colorspace @optional; [[Requested colorspace. If different from the internal cspace, map should try to convert the data into a new buffer. argb8888 by default.]] @@ -174,7 +174,7 @@ interface Efl.Gfx.Buffer () $slice should not be the return value of @.buffer_managed_get. ]] params { - @in slice: ptr(const(Eina.Slice)) @nullable; [[If $null, allocates an empty buffer]] + @cref slice: Eina.Slice @nullable; [[If $null, allocates an empty buffer]] @in size: Eina.Size2D; [[The size in pixels.]] @in stride: int @optional; [[If 0, automatically guessed from the $width.]] @in cspace: Efl.Gfx.Colorspace @optional; [[argb8888 by default.]] @@ -199,7 +199,7 @@ interface Efl.Gfx.Buffer () internally. ]] params { - @in slice: ptr(const(Eina.Slice)) @nullable; [[If $null, detaches the previous buffer.]] + @cref slice: Eina.Slice @nullable; [[If $null, detaches the previous buffer.]] @in size: Eina.Size2D; [[The size in pixels.]] @in stride: int @optional; [[If 0, automatically guessed from the $width.]] @in cspace: Efl.Gfx.Colorspace @optional; [[argb8888 by default.]] diff --git a/src/lib/elementary/efl_access.eo b/src/lib/elementary/efl_access.eo index 17181f7ff6..01a1b4abe2 100644 --- a/src/lib/elementary/efl_access.eo +++ b/src/lib/elementary/efl_access.eo @@ -356,7 +356,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object) [[Emit event]] params { @in accessible: Efl.Access; [[Accessibility object.]] - @in event: ptr(const(Efl.Event.Description)); [[Accessibility event type.]] + @cref event: Efl.Event.Description; [[Accessibility event type.]] @in event_info: void_ptr; [[Accessibility event details.]] } } diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index b7b7213e26..818ea53e58 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -228,6 +228,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, ]] legacy: elm_win_wm_rotation_available_rotations_set; values { + /* FIXME: array */ rotations: ptr(const(int)); [[The array of rotation value.]] count: uint; [[The size of the rotations array.]] } @@ -843,7 +844,6 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, Efl.Gfx.Size.Hint.hint_base { get; set; } Efl.Gfx.Size.Hint.hint_step { get; set; } Efl.Gfx.Size.Hint.hint_aspect { set; } - Efl.Gfx.Size.Hint.hint_weight { set; } Efl.Gfx.Size.Hint.hint_max { set; } Efl.Text.text { get; set; } Efl.Canvas.pointer_position { get; } diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo index 556d78ab3d..d08765d312 100644 --- a/src/lib/elementary/elm_calendar.eo +++ b/src/lib/elementary/elm_calendar.eo @@ -252,7 +252,7 @@ class Elm.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface.Atspi ]] } values { - min: const(ptr(Efl.Time)); [[A tm struct to point to minimum date.]] + @cref min: Efl.Time; [[A tm struct to point to minimum date.]] } } @property date_max { @@ -280,7 +280,7 @@ class Elm.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface.Atspi ]] } values { - max: const(ptr(Efl.Time)); [[A tm struct to point to maximum date.]] + @cref max: Efl.Time; [[A tm struct to point to maximum date.]] } } selected_time_set { diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo index 6be46b33d9..efa0e954e3 100644 --- a/src/lib/elementary/elm_gengrid.eo +++ b/src/lib/elementary/elm_gengrid.eo @@ -377,7 +377,7 @@ class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll ]] return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]] params { - @in itc: ptr(const(Elm.Gengrid.Item.Class)); [[The item class for the item.]] + @cref itc: Elm.Gengrid.Item.Class; [[The item class for the item.]] @in data: const(void_ptr); [[The item data.]] @in relative: Elm.Widget.Item; [[The item to place this new one before.]] @in func: Evas_Smart_Cb @optional; [[Convenience function called @@ -403,7 +403,7 @@ class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll ]] return: Elm.Widget.Item; [[A handle to the item added or $null on error.]] params { - @in itc: ptr(const(Elm.Gengrid.Item.Class)); [[The item class for the item.]] + @cref itc: Elm.Gengrid.Item.Class; [[The item class for the item.]] @in data: const(void_ptr); [[The item data.]] @in relative: Elm.Widget.Item; [[The item to place this new one after.]] @in func: Evas_Smart_Cb @optional; [[Convenience function called @@ -451,7 +451,7 @@ class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll ]] return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]] params { - @in itc: ptr(const(Elm.Gengrid.Item.Class)); [[The item class for the item.]] + @cref itc: Elm.Gengrid.Item.Class; [[The item class for the item.]] @in data: const(void_ptr); [[The item data.]] @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]] @@ -465,7 +465,7 @@ class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll ]] return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]] params { - @in itc: ptr(const(Elm.Gengrid.Item.Class)); [[The item class for the item.]] + @cref itc: Elm.Gengrid.Item.Class; [[The item class for the item.]] @in data: const(void_ptr); [[The item data.]] @in func: Evas_Smart_Cb @optional; [[Convenience function called when the item is selected.]] @@ -490,7 +490,7 @@ class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll ]] return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]] params { - @in itc: ptr(const(Elm.Gengrid.Item.Class)); [[The item class for the item.]] + @cref itc: Elm.Gengrid.Item.Class; [[The item class for the item.]] @in data: const(void_ptr); [[The item data.]] @in comp: Eina_Compare_Cb; [[User defined comparison function that defines the sort order based diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo index 6bdaad694a..3f0e73663c 100644 --- a/src/lib/elementary/elm_gengrid_item.eo +++ b/src/lib/elementary/elm_gengrid_item.eo @@ -80,7 +80,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item, Efl.Ui.Focus.Object) the function pointers and item_style.]] } values { - itc: ptr(const(Elm.Gengrid.Item.Class)); [[Gengrid Item class for the given item]] + @cref itc: Elm.Gengrid.Item.Class; [[Gengrid Item class for the given item]] } } @property index { @@ -219,7 +219,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item, Efl.Ui.Focus.Object) displayed. After changing the item class, elm_gengrid_item_update() is called on the item $it.]] params { - @in itc: ptr(const(Elm.Gengrid.Item.Class)); [[The gengrid item class describing the function pointers and the item style.]] + @cref itc: Elm.Gengrid.Item.Class; [[The gengrid item class describing the function pointers and the item style.]] } } all_contents_unset{ diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo index 3a6969e6f3..52cb44908c 100644 --- a/src/lib/elementary/elm_genlist.eo +++ b/src/lib/elementary/elm_genlist.eo @@ -346,7 +346,7 @@ class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, ]] return: Elm.Widget.Item; [[Handle to inserted item]] params { - @in itc: ptr(const(Elm.Genlist.Item.Class)); [[The item class for the item.]] + @cref itc: Elm.Genlist.Item.Class; [[The item class for the item.]] @in data: const(void_ptr); [[The item data.]] @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]] @in before_it: Elm.Widget.Item; [[The item to place this new one before.]] @@ -374,7 +374,7 @@ class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, ]] return: Elm.Widget.Item; [[Handle to inserted item]] params { - @in itc: ptr(const(Elm.Genlist.Item.Class)); [[The item class for the item.]] + @cref itc: Elm.Genlist.Item.Class; [[The item class for the item.]] @in data: const(void_ptr); [[The item data.]] @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]] @in after_it: Elm.Widget.Item; [[The item to place this new one after.]] @@ -454,7 +454,7 @@ class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, ]] return: Elm.Widget.Item; [[Handle to prepended item]] params { - @in itc: ptr(const(Elm.Genlist.Item.Class)); [[The item class for the item.]] + @cref itc: Elm.Genlist.Item.Class; [[The item class for the item.]] @in data: const(void_ptr); [[The item data.]] @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]] @in type: Elm.Genlist.Item.Type; [[Item type.]] @@ -476,7 +476,7 @@ class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, ]] return: Elm.Widget.Item; [[Handle to appended item]] params { - @in itc: ptr(const(Elm.Genlist.Item.Class)); [[The item class for the item.]] + @cref itc: Elm.Genlist.Item.Class; [[The item class for the item.]] @in data: const(void_ptr); [[The item data.]] @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]] @in type: Elm.Genlist.Item.Type; [[Item type.]] @@ -493,7 +493,7 @@ class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, ]] return: Elm.Widget.Item; [[Handle to inserted item]] params { - @in itc: ptr(const(Elm.Genlist.Item.Class)); [[The item class for the item.]] + @cref itc: Elm.Genlist.Item.Class; [[The item class for the item.]] @in data: const(void_ptr); [[The item data.]] @in parent: Elm.Widget.Item @nullable; [[The parent item, or $null if none.]] @in type: Elm.Genlist.Item.Type; [[Item type.]] diff --git a/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo index 28a5beaead..87bc3bcff8 100644 --- a/src/lib/elementary/elm_genlist_item.eo +++ b/src/lib/elementary/elm_genlist_item.eo @@ -172,7 +172,7 @@ class Elm.Genlist.Item(Elm.Widget.Item) ]] } values { - itc: ptr(const(Elm.Genlist.Item.Class)); [[Genlist Item class for the given item.]] + @cref itc: Elm.Genlist.Item.Class; [[Genlist Item class for the given item.]] } } @property index { @@ -399,7 +399,7 @@ class Elm.Genlist.Item(Elm.Widget.Item) @.update is called on the item $it. ]] params { - @in itc: ptr(const(Elm.Genlist.Item.Class)); [[The item class for the item.]] + @cref itc: Elm.Genlist.Item.Class; [[The item class for the item.]] } } decorate_mode_set { diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.eo b/src/lib/elementary/elm_interface_atspi_widget_action.eo index 9d0ce3458b..568ce5ac41 100644 --- a/src/lib/elementary/elm_interface_atspi_widget_action.eo +++ b/src/lib/elementary/elm_interface_atspi_widget_action.eo @@ -11,7 +11,7 @@ mixin Elm.Interface.Atspi_Widget_Action (Efl.Access.Action) get @pure_virtual { } values { - actions: ptr(const(Elm_Atspi_Action)); [[NULL-terminated array of Elm_Atspi_Action]] + @cref actions: Elm_Atspi_Action; [[NULL-terminated array of Elm_Atspi_Action]] } } } diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo index 05c0a109c2..7f5376ad85 100644 --- a/src/lib/elementary/elm_map.eo +++ b/src/lib/elementary/elm_map.eo @@ -566,7 +566,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable, ]] return: ptr(Elm_Map_Overlay); [[The created overlay or $null upon failure.]] params { - @in route: ptr(const(Elm_Map_Route)); [[The route object to make a overlay.]] + @cref route: Elm_Map_Route; [[The route object to make a overlay.]] } } overlay_scale_add { diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo index e6c9950e16..7842be06b7 100644 --- a/src/lib/elementary/elm_slideshow.eo +++ b/src/lib/elementary/elm_slideshow.eo @@ -276,7 +276,7 @@ class Elm.Slideshow (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action) ]] return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]] params { - @in itc: ptr(const(Elm_Slideshow_Item_Class)); [[The item class for the item.]] + @cref itc: Elm_Slideshow_Item_Class; [[The item class for the item.]] @in data: const(void_ptr); [[The item's data.]] } } @@ -294,7 +294,7 @@ class Elm.Slideshow (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action) return: Elm.Widget.Item; [[Returns The slideshow item handle, on success, or $null on errors.]] params { - @in itc: ptr(const(Elm_Slideshow_Item_Class)); [[The item class for the item.]] + @cref itc: Elm_Slideshow_Item_Class; [[The item class for the item.]] @in data: const(void_ptr); [[The item's data.]] @in func: Eina_Compare_Cb; [[The comparing function to be used to sort the slideshow items by #Elm_Slideshow_Item_Class item handles.]] diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 33c74cc8d0..bbff97af77 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -108,7 +108,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access, makes sure other widgets will not also process this input event. ]] params { - @in eo_event: const(ptr(Efl.Event)); + @cref eo_event: Efl.Event; [[EO event struct with an Efl.Input.Event as info.]] @in source: Efl.Canvas.Object; [[Source object where the event originated. Often same as this.]]