summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorYeongjong Lee <yj34.lee@samsung.com>2019-08-05 08:48:04 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-08-05 08:51:22 -0400
commitf2b1f312a97a6ef3f909109161db25d1d3b3f1d5 (patch)
tree36eba72e96c33ce9091c94d558c85b71388d8580 /src/bin
parentfb023ee6d2c7859446960512433bd633c77a420a (diff)
efl_input_key: replace key property name with key_sym
Summary: 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_key.eo.cs(272,26): error CS0542: `Efl.Input.Key.Key': member names cannot be the same as their enclosing type ``` This patch changes Efl.Input.Key.GetKey/SetKey method to Efl.Input.Key.GetKeySym/SetKeySym and generates Efl.Input.Key.KeySym property. Note that CAPI is not changed. ref T8093 Test Plan: meson setup -Dbindings=mono,cxx -Dmono-beta=true Reviewers: lauromoura, woohyun, zmike, segfaultxavi Reviewed By: segfaultxavi Subscribers: bu5hm4n, cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T8093 Differential Revision: https://phab.enlightenment.org/D9483 zmike note: this class was not released at the point of this patch, the class was only recently marked as stable
Diffstat (limited to '')
-rw-r--r--src/bin/elementary/test_events.c2
-rw-r--r--src/bin/eolian_mono/eolian/mono/blacklist.hh13
2 files changed, 3 insertions, 12 deletions
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 4b36bf4..e1438db 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -56,7 +56,7 @@ _key_down(void *data, const Efl_Event *ev)
56 // 2. ecore_evas -> evas -> focused obj (elm_win) -> here 56 // 2. ecore_evas -> evas -> focused obj (elm_win) -> here
57 57
58 sprintf(str, "key=%s keyname=%s string=%s compose=%s", 58 sprintf(str, "key=%s keyname=%s string=%s compose=%s",
59 efl_input_key_get(ev->info), 59 efl_input_key_sym_get(ev->info),
60 efl_input_key_name_get(ev->info), 60 efl_input_key_name_get(ev->info),
61 efl_input_key_string_get(ev->info), 61 efl_input_key_string_get(ev->info),
62 efl_input_key_compose_string_get(ev->info)); 62 efl_input_key_compose_string_get(ev->info));
diff --git a/src/bin/eolian_mono/eolian/mono/blacklist.hh b/src/bin/eolian_mono/eolian/mono/blacklist.hh
index 02cda67..733592e 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)
114 114
115inline bool is_property_blacklisted(std::string const& name) 115inline bool is_property_blacklisted(std::string const& name)
116{ 116{
117 return name == "Efl.Input.Key.Key" 117 return name == "Efl.Input.Hold.Hold"
118 || name == "Efl.Input.Hold.Hold"
119 || name == "Efl.IText.Text"; 118 || name == "Efl.IText.Text";
120} 119}
121 120
@@ -135,17 +134,9 @@ inline bool is_property_blacklisted(attributes::property_def const& property, Co
135 134
136template<typename Context> 135template<typename Context>
137inline bool is_property_blacklisted(attributes::property_def const& property, 136inline bool is_property_blacklisted(attributes::property_def const& property,
138 attributes::klass_def const& implementing_class, 137 EINA_UNUSED attributes::klass_def const& implementing_class,
139 Context const& context) 138 Context const& context)
140{ 139{
141 std::string property_name = name_helpers::property_managed_name(property);
142 std::string klass_name = name_helpers::klass_concrete_or_interface_name(implementing_class);
143
144 // This property wrapper is invalidated as it would clash with the implementing
145 // class constructor. CS
146 if (property_name == klass_name)
147 return true;
148
149 return is_property_blacklisted(property, context); 140 return is_property_blacklisted(property, context);
150} 141}
151 142