From d2b76219078d84a2974dc73402ae1c28a167a66c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 29 Mar 2016 11:56:06 +0900 Subject: [PATCH] elm: make content_get/set a property This doesn't change the C code. --- src/lib/elementary/elm_button.eo | 2 +- src/lib/elementary/elm_check.eo | 2 +- src/lib/elementary/elm_container.eo | 26 +++++++++----------- src/lib/elementary/elm_ctxpopup.eo | 4 +-- src/lib/elementary/elm_dayselector.eo | 2 +- src/lib/elementary/elm_entry.eo | 2 +- src/lib/elementary/elm_fileselector_entry.eo | 4 +-- src/lib/elementary/elm_flip.eo | 4 +-- src/lib/elementary/elm_hover.eo | 4 +-- src/lib/elementary/elm_layout.eo | 4 +-- src/lib/elementary/elm_mapbuf.eo | 4 +-- src/lib/elementary/elm_naviframe.eo | 4 +-- src/lib/elementary/elm_notify.eo | 4 +-- src/lib/elementary/elm_panel.eo | 4 +-- src/lib/elementary/elm_player.eo | 2 +- src/lib/elementary/elm_popup.eo | 4 +-- src/lib/elementary/elm_progressbar.eo | 2 +- src/lib/elementary/elm_scroller.eo | 4 +-- 18 files changed, 40 insertions(+), 42 deletions(-) diff --git a/src/lib/elementary/elm_button.eo b/src/lib/elementary/elm_button.eo index f1b1164e3b..2c536396c8 100644 --- a/src/lib/elementary/elm_button.eo +++ b/src/lib/elementary/elm_button.eo @@ -93,7 +93,7 @@ class Elm.Button (Elm.Layout, Evas.Clickable_Interface, Elm.Widget.theme_apply; Elm.Widget.sub_object_del; Elm.Widget.event; - Elm.Container.content_set; + Elm.Container.content.set; Elm.Layout.text_aliases.get; Elm.Layout.content_aliases.get; Elm.Layout.sizing_eval; diff --git a/src/lib/elementary/elm_check.eo b/src/lib/elementary/elm_check.eo index 452ab93b9b..47a32ec9dd 100644 --- a/src/lib/elementary/elm_check.eo +++ b/src/lib/elementary/elm_check.eo @@ -46,7 +46,7 @@ class Elm.Check (Elm.Layout, Elm.Interface_Atspi_Widget_Action) Elm.Widget.theme_apply; Elm.Widget.sub_object_del; Elm.Widget.event; - Elm.Container.content_set; + Elm.Container.content.set; Elm.Layout.text_aliases.get; Elm.Layout.content_aliases.get; Elm.Layout.sizing_eval; diff --git a/src/lib/elementary/elm_container.eo b/src/lib/elementary/elm_container.eo index 82463a0d73..94c0d37cae 100644 --- a/src/lib/elementary/elm_container.eo +++ b/src/lib/elementary/elm_container.eo @@ -12,20 +12,18 @@ class Elm.Container (Elm.Widget) ret: free(own(list *), eina_list_free); [[list]] } } - content_set { - [[Swallow the given object into the given part of the container.]] - params { - @in name: const(char)*; [[the part in which to swallow the object]] - @in content: Evas.Object *; [[the object to swallow.]] + @property content { + [[Swallowed sub-object contained in this object.]] + set { + return: bool; } - return: bool; - } - content_get { - [[Get the object swallowed in the given part of the container.]] - params { - @in name: const(char)* @nullable; [[the part in which the object is swallowed.]] + get {} + keys { + name: const(char)*; [[the part in which to swallow the object]] + } + values { + content: Evas.Object*; [[the object to swallow.]] } - return: Evas.Object *; } content_unset { [[Unswallow the object in the given part of the container and return it.]] @@ -36,9 +34,9 @@ class Elm.Container (Elm.Widget) } } implements { - @virtual .content_set; @virtual .content_unset; - @virtual .content_get; + @virtual .content.get; + @virtual .content.set; @virtual .content_swallow_list.get; } diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo index 0e4da984a7..7bc2f3a9b5 100644 --- a/src/lib/elementary/elm_ctxpopup.eo +++ b/src/lib/elementary/elm_ctxpopup.eo @@ -227,8 +227,8 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface_Atspi_Widget_Action) Elm.Widget.translate; Elm.Widget.theme_apply; Elm.Widget.event; - Elm.Container.content_get; - Elm.Container.content_set; + Elm.Container.content.get; + Elm.Container.content.set; Elm.Container.content_unset; Elm.Layout.sub_object_add_enable; Elm.Layout.sizing_eval; diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo index dfae8cbabc..2bb045c853 100644 --- a/src/lib/elementary/elm_dayselector.eo +++ b/src/lib/elementary/elm_dayselector.eo @@ -154,7 +154,7 @@ class Elm.Dayselector (Elm.Layout) Elm.Widget.focus_direction_manager_is; Elm.Widget.translate; Elm.Container.content_unset; - Elm.Container.content_set; + Elm.Container.content.set; Elm.Layout.sizing_eval; } events { diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index 166c6c75b9..35e71c769a 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -934,7 +934,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface, Elm.Widget.sub_object_del; Elm.Widget.focus_next_manager_is; Elm.Container.content_unset; - Elm.Container.content_set; + Elm.Container.content.set; Elm.Layout.theme_enable; Elm.Layout.sizing_eval; Elm.Layout.text.get; diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo index eab4f4b916..4585de21dd 100644 --- a/src/lib/elementary/elm_fileselector_entry.eo +++ b/src/lib/elementary/elm_fileselector_entry.eo @@ -90,9 +90,9 @@ class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface_Fileselector, Elm.Widget.focus_next; Elm.Widget.disable; Elm.Widget.focus_direction_manager_is; - Elm.Container.content_get; + Elm.Container.content.get; Elm.Container.content_unset; - Elm.Container.content_set; + Elm.Container.content.set; Elm.Layout.text.set; Elm.Layout.text.get; Elm.Layout.sizing_eval; diff --git a/src/lib/elementary/elm_flip.eo b/src/lib/elementary/elm_flip.eo index 77819bd383..39c6d0f0d8 100644 --- a/src/lib/elementary/elm_flip.eo +++ b/src/lib/elementary/elm_flip.eo @@ -238,8 +238,8 @@ class Elm.Flip (Elm.Container) Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; Elm.Widget.sub_object_del; - Elm.Container.content_get; - Elm.Container.content_set; + Elm.Container.content.get; + Elm.Container.content.set; Elm.Container.content_unset; } events { diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo index f5b05bce5e..bf6071ae44 100644 --- a/src/lib/elementary/elm_hover.eo +++ b/src/lib/elementary/elm_hover.eo @@ -70,8 +70,8 @@ class Elm.Hover (Elm.Layout, Evas.Clickable_Interface, Elm.Interface_Atspi_Widge Elm.Widget.focus_direction_manager_is; Elm.Widget.focus_next_manager_is; Elm.Widget.sub_object_del; - Elm.Container.content_get; - Elm.Container.content_set; + Elm.Container.content.get; + Elm.Container.content.set; Elm.Container.content_unset; Elm.Layout.sizing_eval; Elm.Layout.content_aliases.get; diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo index 50f4e88656..5d2f89db04 100644 --- a/src/lib/elementary/elm_layout.eo +++ b/src/lib/elementary/elm_layout.eo @@ -487,8 +487,8 @@ class Elm.Layout (Elm.Container, Efl.File) Elm.Widget.disable; Elm.Widget.sub_object_del; Elm.Widget.on_focus; - Elm.Container.content_get; - Elm.Container.content_set; + Elm.Container.content.get; + Elm.Container.content.set; Elm.Container.content_unset; Elm.Container.content_swallow_list.get; } diff --git a/src/lib/elementary/elm_mapbuf.eo b/src/lib/elementary/elm_mapbuf.eo index bea3a9a6a5..fcd048d4e2 100644 --- a/src/lib/elementary/elm_mapbuf.eo +++ b/src/lib/elementary/elm_mapbuf.eo @@ -136,8 +136,8 @@ class Elm.Mapbuf (Elm.Container) Evas.Object_Smart.resize; Elm.Widget.theme_apply; Elm.Widget.sub_object_del; - Elm.Container.content_get; - Elm.Container.content_set; + Elm.Container.content.get; + Elm.Container.content.set; Elm.Container.content_unset; } diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo index 84d3dcc275..fd11ed513c 100644 --- a/src/lib/elementary/elm_naviframe.eo +++ b/src/lib/elementary/elm_naviframe.eo @@ -151,8 +151,8 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface_Atspi_Widget_Action) Elm.Widget.translate; Elm.Widget.theme_apply; Elm.Widget.event; - Elm.Container.content_get; - Elm.Container.content_set; + Elm.Container.content.get; + Elm.Container.content.set; Elm.Container.content_unset; Elm.Layout.text.set; Elm.Layout.text.get; diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo index f7426d8b28..0782bda8af 100644 --- a/src/lib/elementary/elm_notify.eo +++ b/src/lib/elementary/elm_notify.eo @@ -92,8 +92,8 @@ class Elm.Notify (Elm.Container) Elm.Widget.sub_object_del; Elm.Widget.part_text.set; Elm.Widget.part_text.get; - Elm.Container.content_get; - Elm.Container.content_set; + Elm.Container.content.get; + Elm.Container.content.set; Elm.Container.content_unset; } events { diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo index e6c64a2a65..79afea564d 100644 --- a/src/lib/elementary/elm_panel.eo +++ b/src/lib/elementary/elm_panel.eo @@ -79,9 +79,9 @@ class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable, Elm.Widget.access; Elm.Widget.event; Elm.Widget.on_focus_region; - Elm.Container.content_get; + Elm.Container.content.get; Elm.Container.content_unset; - Elm.Container.content_set; + Elm.Container.content.set; Elm.Layout.sizing_eval; Elm.Interface_Atspi_Widget_Action.elm_actions.get; } diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo index be14828737..10faef1d2a 100644 --- a/src/lib/elementary/elm_player.eo +++ b/src/lib/elementary/elm_player.eo @@ -8,7 +8,7 @@ class Elm.Player (Elm.Layout, Elm.Interface_Atspi_Widget_Action) Evas.Object_Smart.del; Elm.Widget.theme_apply; Elm.Widget.event; - Elm.Container.content_set; + Elm.Container.content.set; Elm.Layout.sizing_eval; Elm.Interface_Atspi_Widget_Action.elm_actions.get; } diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index ec89df8cad..e93bb9a15b 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo @@ -177,8 +177,8 @@ class Elm.Popup (Elm.Layout, Elm.Interface_Atspi_Widget_Action) Elm.Widget.translate; Elm.Widget.sub_object_del; Elm.Widget.event; - Elm.Container.content_get; - Elm.Container.content_set; + Elm.Container.content.get; + Elm.Container.content.set; Elm.Container.content_unset; Elm.Layout.text.set; Elm.Layout.text.get; diff --git a/src/lib/elementary/elm_progressbar.eo b/src/lib/elementary/elm_progressbar.eo index 95c4a5519c..1b73deb8f0 100644 --- a/src/lib/elementary/elm_progressbar.eo +++ b/src/lib/elementary/elm_progressbar.eo @@ -162,7 +162,7 @@ class Elm.Progressbar (Elm.Layout) Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; Elm.Widget.sub_object_del; - Elm.Container.content_set; + Elm.Container.content.set; Elm.Layout.text_aliases.get; Elm.Layout.content_aliases.get; Elm.Layout.sizing_eval; diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo index fc53ddee23..8a0a53570f 100644 --- a/src/lib/elementary/elm_scroller.eo +++ b/src/lib/elementary/elm_scroller.eo @@ -106,8 +106,8 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable, Elm.Widget.focus_direction; Elm.Widget.sub_object_del; Elm.Widget.event; - Elm.Container.content_get; - Elm.Container.content_set; + Elm.Container.content.get; + Elm.Container.content.set; Elm.Container.content_unset; Elm.Layout.sizing_eval; Elm.Interface_Scrollable.page_size.set;