bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=97510fc5714e899f0681b79acb0cead7527bf42b
commit 97510fc5714e899f0681b79acb0cead7527bf42b Author: Yeongjong Lee <[email protected]> Date: Fri Aug 2 04:43:14 2019 +0000 efl_input_hold: replace hold property name with input_hold Sorry to touch stable eo classes. there is name conflict issue between class and property when binding language is generated from eo. for example in C#, compiler error occurs. ``` src/bindings/mono/efl_input_hold.eo.cs(166,17): error CS0542: `Efl.Input.Hold.Hold': member names cannot be the same as their enclosing type ``` This patch changes Efl.Input.Hold.GetHold/SetHold to Efl.Input.Hold.GetInputHold/SetInputHold and generates Efl.Input.Hold.InputHold property. Note that CAPI is not changed. ref T8093 Reviewed-by: Xavi Artigas <[email protected]> Reviewed-by: Mike Blumenkrantz <[email protected]> Reviewed-by: Lauro Neto <lauromauro_> Differential Revision: https://phab.enlightenment.org/D9484 --- src/bin/eolian_mono/eolian/mono/blacklist.hh | 3 +-- src/lib/evas/canvas/efl_input_hold.c | 4 ++-- src/lib/evas/canvas/efl_input_hold.eo | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/bin/eolian_mono/eolian/mono/blacklist.hh b/src/bin/eolian_mono/eolian/mono/blacklist.hh index 733592e239..5099013396 100644 --- a/src/bin/eolian_mono/eolian/mono/blacklist.hh +++ b/src/bin/eolian_mono/eolian/mono/blacklist.hh @@ -114,8 +114,7 @@ inline bool is_alias_blacklisted(attributes::alias_def const& alias) inline bool is_property_blacklisted(std::string const& name) { - return name == "Efl.Input.Hold.Hold" - || name == "Efl.IText.Text"; + return name == "Efl.IText.Text"; } template<typename Context> diff --git a/src/lib/evas/canvas/efl_input_hold.c b/src/lib/evas/canvas/efl_input_hold.c index 0713ca6e2a..c23f043ad1 100644 --- a/src/lib/evas/canvas/efl_input_hold.c +++ b/src/lib/evas/canvas/efl_input_hold.c @@ -13,13 +13,13 @@ #define MY_CLASS EFL_INPUT_HOLD_CLASS EOLIAN static void -_efl_input_hold_hold_set(Eo *obj EINA_UNUSED, Efl_Input_Hold_Data *pd, Eina_Bool val) +_efl_input_hold_input_hold_set(Eo *obj EINA_UNUSED, Efl_Input_Hold_Data *pd, Eina_Bool val) { pd->hold = !!val; } EOLIAN static Eina_Bool -_efl_input_hold_hold_get(const Eo *obj EINA_UNUSED, Efl_Input_Hold_Data *pd) +_efl_input_hold_input_hold_get(const Eo *obj EINA_UNUSED, Efl_Input_Hold_Data *pd) { return pd->hold; } diff --git a/src/lib/evas/canvas/efl_input_hold.eo b/src/lib/evas/canvas/efl_input_hold.eo index 9649d75cb6..9160f2d306 100644 --- a/src/lib/evas/canvas/efl_input_hold.eo +++ b/src/lib/evas/canvas/efl_input_hold.eo @@ -2,7 +2,7 @@ class Efl.Input.Hold extends Efl.Object implements Efl.Input.Event { [[Event data sent when inputs are put on hold or resumed.]] methods { - @property hold { + @property input_hold { [[Property to show if inputs are now on hold.]] values { val: bool; [[$true if inputs are on hold, $false otherwise]] --
