aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2018-11-30 22:50:18 -0300
committerLauro Moura <lauromoura@expertisesolutions.com.br>2018-11-30 22:50:18 -0300
commite9d0799cbf7a2808f8f6f7fc13896ff6c5666820 (patch)
tree4f2c12b56f839ac39e4a278826f0b31c1b507655
parentefl-mono: Fix event argument class naming. (diff)
downloadefl-devs/lauromoura/new_style_properties.tar.gz
efl_mono: EXPERIMENT Change interfaces to IFoodevs/lauromoura/new_style_properties
DO NOT MERGE
-rw-r--r--src/bin/eolian_mono/eolian/mono/blacklist.hh3
-rw-r--r--src/bin/eolian_mono/eolian/mono/name_helpers.hh2
-rw-r--r--src/tests/efl_mono/Eo.cs2
-rw-r--r--src/tests/efl_mono/Events.cs4
4 files changed, 6 insertions, 5 deletions
diff --git a/src/bin/eolian_mono/eolian/mono/blacklist.hh b/src/bin/eolian_mono/eolian/mono/blacklist.hh
index 646452e57c..79c678efce 100644
--- a/src/bin/eolian_mono/eolian/mono/blacklist.hh
+++ b/src/bin/eolian_mono/eolian/mono/blacklist.hh
@@ -82,7 +82,8 @@ inline bool is_property_blacklisted(attributes::property_def const& property)
auto name = name_helpers::klass_full_concrete_or_interface_name(property.klass) + "." + name_helpers::property_managed_name(property);
return name == "Efl.Input.Key.Key"
|| name == "Efl.Input.Hold.Hold"
- || name == "Efl.Text.Text";
+ // Still can uncomment line below as event changing to IText, it would conflict with Efl.Ui.Text.
+ || name == "Efl.IText.Text";
}
}
diff --git a/src/bin/eolian_mono/eolian/mono/name_helpers.hh b/src/bin/eolian_mono/eolian/mono/name_helpers.hh
index 3a0fc2440e..6c72c84da7 100644
--- a/src/bin/eolian_mono/eolian/mono/name_helpers.hh
+++ b/src/bin/eolian_mono/eolian/mono/name_helpers.hh
@@ -269,7 +269,7 @@ struct klass_interface_name_generator
template <typename T>
std::string operator()(T const& klass) const
{
- return utils::remove_all(klass.eolian_name, '_');
+ return "I" + utils::remove_all(klass.eolian_name, '_');
}
template <typename OutputIterator, typename Attr, typename Context>
diff --git a/src/tests/efl_mono/Eo.cs b/src/tests/efl_mono/Eo.cs
index 7d5df72457..a8325df729 100644
--- a/src/tests/efl_mono/Eo.cs
+++ b/src/tests/efl_mono/Eo.cs
@@ -339,7 +339,7 @@ class TestCsharpProperties
public static void test_iface_property()
{
int val = -33;
- Dummy.TestIface iface = new Dummy.TestObject();
+ Dummy.ITestIface iface = new Dummy.TestObject();
iface.IfaceProp = val;
Test.AssertEquals(val, iface.IfaceProp);
}
diff --git a/src/tests/efl_mono/Events.cs b/src/tests/efl_mono/Events.cs
index 7387c1e1b4..cdcefc0720 100644
--- a/src/tests/efl_mono/Events.cs
+++ b/src/tests/efl_mono/Events.cs
@@ -216,8 +216,8 @@ class TestInterfaceEvents
another_called = true;
};
- ((Dummy.TestIface)obj).ConflictedEvt += cb;
- ((Dummy.AnotherIface)obj).ConflictedEvt += another_cb;
+ ((Dummy.ITestIface)obj).ConflictedEvt += cb;
+ ((Dummy.IAnotherIface)obj).ConflictedEvt += another_cb;
obj.EmitTestConflicted();
Test.Assert(test_called);