jaehyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ac99e2ac9410d5b2ef6225fa1aaaf9ffcd6578fb
commit ac99e2ac9410d5b2ef6225fa1aaaf9ffcd6578fb
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date: Mon Sep 2 21:14:44 2019 +0900
eolian_mono: remove underscore of Evt_Args
Since C# does not use underscore in type name, the underscore of
Evt_Args is removed.
---
src/bin/eolian_mono/eolian/mono/name_helpers.hh | 2 +-
src/bindings/mono/efl_mono/GenericModel.cs | 6 ++---
.../mono/efl_mono/efl_csharp_application.cs | 2 +-
src/examples/elementary/efl_ui_unit_converter.cs | 2 +-
src/tests/efl_mono/Events.cs | 28 +++++++++++-----------
src/tests/efl_mono/Model.cs | 2 +-
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/name_helpers.hh
b/src/bin/eolian_mono/eolian/mono/name_helpers.hh
index d6064b2d56..c41470f144 100644
--- a/src/bin/eolian_mono/eolian/mono/name_helpers.hh
+++ b/src/bin/eolian_mono/eolian/mono/name_helpers.hh
@@ -427,7 +427,7 @@ inline std::string
managed_event_args_short_name(attributes::event_def const& ev
{
std::string ret;
ret = klass_concrete_or_interface_name(evt.klass);
- return ret + name_helpers::managed_event_name(evt.name) + "_Args";
+ return ret + name_helpers::managed_event_name(evt.name) + "Args";
}
inline std::string managed_event_args_name(attributes::event_def evt)
diff --git a/src/bindings/mono/efl_mono/GenericModel.cs
b/src/bindings/mono/efl_mono/GenericModel.cs
index 1bfa91e53d..be44846918 100644
--- a/src/bindings/mono/efl_mono/GenericModel.cs
+++ b/src/bindings/mono/efl_mono/GenericModel.cs
@@ -125,7 +125,7 @@ public class GenericModel<T> : Efl.Object, Efl.IModel,
IDisposable
}
/// <summary>Event triggered when properties on the wrapped model
changes.</summary>
- public event EventHandler<Efl.IModelPropertiesChangedEvt_Args>
PropertiesChangedEvt
+ public event EventHandler<Efl.IModelPropertiesChangedEvtArgs>
PropertiesChangedEvt
{
add {
model.PropertiesChangedEvt += value;
@@ -136,7 +136,7 @@ public class GenericModel<T> : Efl.Object, Efl.IModel,
IDisposable
}
/// <summary>Event triggered when a child is added from the wrapped
model.</summary>
- public event EventHandler<Efl.IModelChildAddedEvt_Args> ChildAddedEvt
+ public event EventHandler<Efl.IModelChildAddedEvtArgs> ChildAddedEvt
{
add {
model.ChildAddedEvt += value;
@@ -147,7 +147,7 @@ public class GenericModel<T> : Efl.Object, Efl.IModel,
IDisposable
}
/// <summary>Event triggered when a child is removed from the wrapped
model.</summary>
- public event EventHandler<Efl.IModelChildRemovedEvt_Args> ChildRemovedEvt
+ public event EventHandler<Efl.IModelChildRemovedEvtArgs> ChildRemovedEvt
{
add {
model.ChildRemovedEvt += value;
diff --git a/src/bindings/mono/efl_mono/efl_csharp_application.cs
b/src/bindings/mono/efl_mono/efl_csharp_application.cs
index 4e3a2522cc..d8cdbfc6ba 100644
--- a/src/bindings/mono/efl_mono/efl_csharp_application.cs
+++ b/src/bindings/mono/efl_mono/efl_csharp_application.cs
@@ -135,7 +135,7 @@ public abstract class Application
#if EFL_BETA
app.SetCommandArray(command_line);
#endif
- app.ArgumentsEvt += (object sender, LoopArgumentsEvt_Args evt) =>
+ app.ArgumentsEvt += (object sender, LoopArgumentsEvtArgs evt) =>
{
if (evt.arg.Initialization)
{
diff --git a/src/examples/elementary/efl_ui_unit_converter.cs
b/src/examples/elementary/efl_ui_unit_converter.cs
index 3460af3f5f..88c0be499f 100644
--- a/src/examples/elementary/efl_ui_unit_converter.cs
+++ b/src/examples/elementary/efl_ui_unit_converter.cs
@@ -23,7 +23,7 @@ public class Example
popup.SetVisible(true);
popup.SetButton(Efl.Ui.AlertPopupButton.Positive, "Ok", null);
popup.SetSize(new Eina.Size2D(150, 30));
- popup.ButtonClickedEvt += (object sender,
Efl.Ui.AlertPopupButtonClickedEvt_Args e) => {
+ popup.ButtonClickedEvt += (object sender,
Efl.Ui.AlertPopupButtonClickedEvtArgs e) => {
popup.SetParent(null);
popup.Invalidate();
};
diff --git a/src/tests/efl_mono/Events.cs b/src/tests/efl_mono/Events.cs
index b664e2bbbd..b22feb4cb0 100644
--- a/src/tests/efl_mono/Events.cs
+++ b/src/tests/efl_mono/Events.cs
@@ -46,7 +46,7 @@ class TestEoEvents
var obj = new Dummy.TestObject();
string received_string = null;
- obj.EvtWithStringEvt += (object sender,
Dummy.TestObjectEvtWithStringEvt_Args e) => {
+ obj.EvtWithStringEvt += (object sender,
Dummy.TestObjectEvtWithStringEvtArgs e) => {
received_string = e.arg;
};
@@ -60,7 +60,7 @@ class TestEoEvents
var obj = new Dummy.TestObject();
int received_int= 0;
- obj.EvtWithIntEvt += (object sender,
Dummy.TestObjectEvtWithIntEvt_Args e) => {
+ obj.EvtWithIntEvt += (object sender, Dummy.TestObjectEvtWithIntEvtArgs
e) => {
received_int = e.arg;
};
@@ -74,7 +74,7 @@ class TestEoEvents
var obj = new Dummy.TestObject();
bool received_bool = false;
- obj.EvtWithBoolEvt += (object sender,
Dummy.TestObjectEvtWithBoolEvt_Args e) => {
+ obj.EvtWithBoolEvt += (object sender,
Dummy.TestObjectEvtWithBoolEvtArgs e) => {
received_bool = e.arg;
};
@@ -91,7 +91,7 @@ class TestEoEvents
{
var obj = new Dummy.TestObject();
uint received_uint = 0;
- obj.EvtWithUintEvt += (object sender,
Dummy.TestObjectEvtWithUintEvt_Args e) => {
+ obj.EvtWithUintEvt += (object sender,
Dummy.TestObjectEvtWithUintEvtArgs e) => {
received_uint = e.arg;
};
@@ -104,7 +104,7 @@ class TestEoEvents
{
var obj = new Dummy.TestObject();
float received_float = 0;
- obj.EvtWithFloatEvt += (object sender,
Dummy.TestObjectEvtWithFloatEvt_Args e) => {
+ obj.EvtWithFloatEvt += (object sender,
Dummy.TestObjectEvtWithFloatEvtArgs e) => {
received_float = e.arg;
};
@@ -118,7 +118,7 @@ class TestEoEvents
var obj = new Dummy.TestObject();
double received_double = 0;
double reference = float.MaxValue + 42;
- obj.EvtWithDoubleEvt += (object sender,
Dummy.TestObjectEvtWithDoubleEvt_Args e) => {
+ obj.EvtWithDoubleEvt += (object sender,
Dummy.TestObjectEvtWithDoubleEvtArgs e) => {
received_double = e.arg;
};
@@ -132,7 +132,7 @@ class TestEoEvents
var obj = new Dummy.TestObject();
Dummy.TestObject received_obj = null;
- obj.EvtWithObjEvt += (object sender,
Dummy.TestObjectEvtWithObjEvt_Args e) => {
+ obj.EvtWithObjEvt += (object sender, Dummy.TestObjectEvtWithObjEvtArgs
e) => {
received_obj = e.arg;
};
@@ -148,7 +148,7 @@ class TestEoEvents
var obj = new Dummy.TestObject();
Eina.Error received_error = 0;
- obj.EvtWithErrorEvt += (object sender,
Dummy.TestObjectEvtWithErrorEvt_Args e) => {
+ obj.EvtWithErrorEvt += (object sender,
Dummy.TestObjectEvtWithErrorEvtArgs e) => {
received_error = e.arg;
};
@@ -164,7 +164,7 @@ class TestEoEvents
var obj = new Dummy.TestObject();
Dummy.StructSimple received_struct = default(Dummy.StructSimple);
- obj.EvtWithStructEvt += (object sender,
Dummy.TestObjectEvtWithStructEvt_Args e) => {
+ obj.EvtWithStructEvt += (object sender,
Dummy.TestObjectEvtWithStructEvtArgs e) => {
received_struct = e.arg;
};
@@ -181,7 +181,7 @@ class TestEoEvents
var obj = new Dummy.TestObject();
Dummy.StructComplex received_struct = default(Dummy.StructComplex);
- obj.EvtWithStructComplexEvt += (object sender,
Dummy.TestObjectEvtWithStructComplexEvt_Args e) => {
+ obj.EvtWithStructComplexEvt += (object sender,
Dummy.TestObjectEvtWithStructComplexEvtArgs e) => {
received_struct = e.arg;
};
@@ -202,7 +202,7 @@ class TestEoEvents
sent.Append("Def");
sent.Append("Ghi");
- obj.EvtWithArrayEvt += (object sender,
Dummy.TestObjectEvtWithArrayEvt_Args e) => {
+ obj.EvtWithArrayEvt += (object sender,
Dummy.TestObjectEvtWithArrayEvtArgs e) => {
received = e.arg;
};
@@ -222,7 +222,7 @@ class TestEventAddRemove
var obj = new Dummy.TestObject();
bool called = true;
- EventHandler<Dummy.TestObjectEvtWithIntEvt_Args> evtCb = (object
sender, Dummy.TestObjectEvtWithIntEvt_Args e) => {
+ EventHandler<Dummy.TestObjectEvtWithIntEvtArgs> evtCb = (object
sender, Dummy.TestObjectEvtWithIntEvtArgs e) => {
called = true;
};
@@ -279,7 +279,7 @@ class TestEventWithDeadWrappers
{
private static WeakReference AttachToManager(Dummy.EventManager manager,
-
EventHandler<Dummy.TestObjectEvtWithIntEvt_Args> cb)
+
EventHandler<Dummy.TestObjectEvtWithIntEvtArgs> cb)
{
var obj = new Dummy.TestObject();
manager.Emitter = obj;
@@ -298,7 +298,7 @@ class TestEventWithDeadWrappers
int received = -1;
// attach to evt with int
- EventHandler<Dummy.TestObjectEvtWithIntEvt_Args> cb = (object sender,
Dummy.TestObjectEvtWithIntEvt_Args args) => {
+ EventHandler<Dummy.TestObjectEvtWithIntEvtArgs> cb = (object sender,
Dummy.TestObjectEvtWithIntEvtArgs args) => {
callbackCalled = true;
received = args.arg;
Test.Assert(Object.ReferenceEquals(sender, wref.Target));
diff --git a/src/tests/efl_mono/Model.cs b/src/tests/efl_mono/Model.cs
index a43d9da51c..8493d5c0af 100644
--- a/src/tests/efl_mono/Model.cs
+++ b/src/tests/efl_mono/Model.cs
@@ -66,7 +66,7 @@ public class TestModel {
string propertyBound = null;
bool callbackCalled = false;
var factory = new Efl.Ui.ItemFactory<Efl.Ui.Button>();
- factory.PropertyBoundEvt += (object sender,
Efl.Ui.IPropertyBindPropertyBoundEvt_Args args) => {
+ factory.PropertyBoundEvt += (object sender,
Efl.Ui.IPropertyBindPropertyBoundEvtArgs args) => {
propertyBound = args.arg;
callbackCalled = true;
};
--
