From 9e3707f0b41e09d6171a26631bdb77dc84889e52 Mon Sep 17 00:00:00 2001 From: Lauro Moura Date: Thu, 7 Feb 2019 18:02:21 +0100 Subject: [PATCH] efl: Change non required constructors to @optional. Summary: These constructors aren't checked for in the finalize step of the initialization and may be given the @optional tag. For C# this means they can be ommitted from the constructor call. This also adds `Efl.Ui.View.model` as a constructor of `Efl.Composite_Model` as the finalizer checks for it. Fixes T7673 Test Plan: make check Reviewers: segfaultxavi, zmike, bu5hm4n, cedric, felipealmeida Reviewed By: segfaultxavi, cedric Tags: #efl, #do_not_merge Maniphest Tasks: T7673 Differential Revision: https://phab.enlightenment.org/D7855 --- src/lib/ecore/efl_composite_model.eo | 3 ++- src/lib/ecore/efl_view_model.eo | 2 +- src/lib/elementary/efl_ui_widget.eo | 2 +- src/lib/elementary/efl_ui_widget_factory.eo | 4 ++-- src/lib/elementary/efl_ui_win.eo | 6 +++--- src/lib/elementary/elm_glview.eo | 2 +- src/lib/elementary/elm_view_form.eo | 2 +- src/lib/elementary/elm_view_list.eo | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/lib/ecore/efl_composite_model.eo b/src/lib/ecore/efl_composite_model.eo index 58cc3c3e2c..b1b3cc7ef5 100644 --- a/src/lib/ecore/efl_composite_model.eo +++ b/src/lib/ecore/efl_composite_model.eo @@ -31,6 +31,7 @@ class Efl.Composite_Model extends Efl.Loop_Model implements Efl.Ui.View Efl.Model.child_del; } constructors { - .index; + .index @optional; + Efl.Ui.View.model; } } diff --git a/src/lib/ecore/efl_view_model.eo b/src/lib/ecore/efl_view_model.eo index d362e88021..349a5a4e77 100644 --- a/src/lib/ecore/efl_view_model.eo +++ b/src/lib/ecore/efl_view_model.eo @@ -99,6 +99,6 @@ class Efl.View_Model extends Efl.Composite_Model Efl.Model.property { set; get; } } constructors { - Efl.View_Model.children_bind; + Efl.View_Model.children_bind @optional; } } diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo index 98d357d472..a66458c1d2 100644 --- a/src/lib/elementary/efl_ui_widget.eo +++ b/src/lib/elementary/efl_ui_widget.eo @@ -595,7 +595,7 @@ abstract Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Object, Efl.Part.part_get; [[Returns @Efl.Ui.Widget_Part.]] } constructors { - .style; + .style @optional; } events { moved: Efl.Object; [[Called when widget moved]] diff --git a/src/lib/elementary/efl_ui_widget_factory.eo b/src/lib/elementary/efl_ui_widget_factory.eo index 3652010735..63eb3c28db 100644 --- a/src/lib/elementary/efl_ui_widget_factory.eo +++ b/src/lib/elementary/efl_ui_widget_factory.eo @@ -23,6 +23,6 @@ class Efl.Ui.Widget_Factory extends Efl.Loop_Consumer implements Efl.Ui.Factory Efl.Ui.Model.Connect.connect; } constructors { - .item_class; + .item_class @optional; } -} \ No newline at end of file +} diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 148eaeb805..fc2d52fd52 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -872,9 +872,9 @@ class Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.W Efl.Part.part_get; } constructors { - .win_name; - .win_type; - .accel_preference; + .win_name @optional; + .win_type @optional; + .accel_preference @optional; } events { delete,request: void; [[Called when the window receives a delete request]] diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo index faa03f2691..73b8bf83c2 100644 --- a/src/lib/elementary/elm_glview.eo +++ b/src/lib/elementary/elm_glview.eo @@ -229,6 +229,6 @@ class Elm.Glview extends Efl.Ui.Widget implements Efl.Gfx.View, Efl.Ui.Legacy ]] } constructors { - .version_constructor; + .version_constructor @optional; } } diff --git a/src/lib/elementary/elm_view_form.eo b/src/lib/elementary/elm_view_form.eo index a6bf4cc6df..ce32cecce8 100644 --- a/src/lib/elementary/elm_view_form.eo +++ b/src/lib/elementary/elm_view_form.eo @@ -26,6 +26,6 @@ class Elm.View.Form extends Efl.Object Efl.Object.destructor; } constructors { - .model_set; + .model_set @optional; } } diff --git a/src/lib/elementary/elm_view_list.eo b/src/lib/elementary/elm_view_list.eo index 7a8e777b4d..932b5863f6 100644 --- a/src/lib/elementary/elm_view_list.eo +++ b/src/lib/elementary/elm_view_list.eo @@ -60,6 +60,6 @@ class Elm.View.List extends Efl.Object Efl.Object.destructor; } constructors { - .genlist_set; + .genlist_set @optional; } }