Revert "eolian_mono: remove underscore of Evt_Args"

This reverts commit ac99e2ac94.

This patch is reverted because D9692 covers this patch.
This commit is contained in:
Jaehyun Cho 2019-09-02 21:41:20 +09:00
parent b7bab9aa8e
commit 595a0c0b2f
6 changed files with 21 additions and 21 deletions

View File

@ -427,7 +427,7 @@ inline std::string managed_event_args_short_name(attributes::event_def const& ev
{ {
std::string ret; std::string ret;
ret = klass_concrete_or_interface_name(evt.klass); 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) inline std::string managed_event_args_name(attributes::event_def evt)

View File

@ -125,7 +125,7 @@ public class GenericModel<T> : Efl.Object, Efl.IModel, IDisposable
} }
/// <summary>Event triggered when properties on the wrapped model changes.</summary> /// <summary>Event triggered when properties on the wrapped model changes.</summary>
public event EventHandler<Efl.IModelPropertiesChangedEvtArgs> PropertiesChangedEvt public event EventHandler<Efl.IModelPropertiesChangedEvt_Args> PropertiesChangedEvt
{ {
add { add {
model.PropertiesChangedEvt += value; 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> /// <summary>Event triggered when a child is added from the wrapped model.</summary>
public event EventHandler<Efl.IModelChildAddedEvtArgs> ChildAddedEvt public event EventHandler<Efl.IModelChildAddedEvt_Args> ChildAddedEvt
{ {
add { add {
model.ChildAddedEvt += value; 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> /// <summary>Event triggered when a child is removed from the wrapped model.</summary>
public event EventHandler<Efl.IModelChildRemovedEvtArgs> ChildRemovedEvt public event EventHandler<Efl.IModelChildRemovedEvt_Args> ChildRemovedEvt
{ {
add { add {
model.ChildRemovedEvt += value; model.ChildRemovedEvt += value;

View File

@ -135,7 +135,7 @@ public abstract class Application
#if EFL_BETA #if EFL_BETA
app.SetCommandArray(command_line); app.SetCommandArray(command_line);
#endif #endif
app.ArgumentsEvt += (object sender, LoopArgumentsEvtArgs evt) => app.ArgumentsEvt += (object sender, LoopArgumentsEvt_Args evt) =>
{ {
if (evt.arg.Initialization) if (evt.arg.Initialization)
{ {

View File

@ -23,7 +23,7 @@ public class Example
popup.SetVisible(true); popup.SetVisible(true);
popup.SetButton(Efl.Ui.AlertPopupButton.Positive, "Ok", null); popup.SetButton(Efl.Ui.AlertPopupButton.Positive, "Ok", null);
popup.SetSize(new Eina.Size2D(150, 30)); popup.SetSize(new Eina.Size2D(150, 30));
popup.ButtonClickedEvt += (object sender, Efl.Ui.AlertPopupButtonClickedEvtArgs e) => { popup.ButtonClickedEvt += (object sender, Efl.Ui.AlertPopupButtonClickedEvt_Args e) => {
popup.SetParent(null); popup.SetParent(null);
popup.Invalidate(); popup.Invalidate();
}; };

View File

@ -46,7 +46,7 @@ class TestEoEvents
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
string received_string = null; string received_string = null;
obj.EvtWithStringEvt += (object sender, Dummy.TestObjectEvtWithStringEvtArgs e) => { obj.EvtWithStringEvt += (object sender, Dummy.TestObjectEvtWithStringEvt_Args e) => {
received_string = e.arg; received_string = e.arg;
}; };
@ -60,7 +60,7 @@ class TestEoEvents
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
int received_int= 0; int received_int= 0;
obj.EvtWithIntEvt += (object sender, Dummy.TestObjectEvtWithIntEvtArgs e) => { obj.EvtWithIntEvt += (object sender, Dummy.TestObjectEvtWithIntEvt_Args e) => {
received_int = e.arg; received_int = e.arg;
}; };
@ -74,7 +74,7 @@ class TestEoEvents
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
bool received_bool = false; bool received_bool = false;
obj.EvtWithBoolEvt += (object sender, Dummy.TestObjectEvtWithBoolEvtArgs e) => { obj.EvtWithBoolEvt += (object sender, Dummy.TestObjectEvtWithBoolEvt_Args e) => {
received_bool = e.arg; received_bool = e.arg;
}; };
@ -91,7 +91,7 @@ class TestEoEvents
{ {
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
uint received_uint = 0; uint received_uint = 0;
obj.EvtWithUintEvt += (object sender, Dummy.TestObjectEvtWithUintEvtArgs e) => { obj.EvtWithUintEvt += (object sender, Dummy.TestObjectEvtWithUintEvt_Args e) => {
received_uint = e.arg; received_uint = e.arg;
}; };
@ -104,7 +104,7 @@ class TestEoEvents
{ {
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
float received_float = 0; float received_float = 0;
obj.EvtWithFloatEvt += (object sender, Dummy.TestObjectEvtWithFloatEvtArgs e) => { obj.EvtWithFloatEvt += (object sender, Dummy.TestObjectEvtWithFloatEvt_Args e) => {
received_float = e.arg; received_float = e.arg;
}; };
@ -118,7 +118,7 @@ class TestEoEvents
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
double received_double = 0; double received_double = 0;
double reference = float.MaxValue + 42; double reference = float.MaxValue + 42;
obj.EvtWithDoubleEvt += (object sender, Dummy.TestObjectEvtWithDoubleEvtArgs e) => { obj.EvtWithDoubleEvt += (object sender, Dummy.TestObjectEvtWithDoubleEvt_Args e) => {
received_double = e.arg; received_double = e.arg;
}; };
@ -132,7 +132,7 @@ class TestEoEvents
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
Dummy.TestObject received_obj = null; Dummy.TestObject received_obj = null;
obj.EvtWithObjEvt += (object sender, Dummy.TestObjectEvtWithObjEvtArgs e) => { obj.EvtWithObjEvt += (object sender, Dummy.TestObjectEvtWithObjEvt_Args e) => {
received_obj = e.arg; received_obj = e.arg;
}; };
@ -148,7 +148,7 @@ class TestEoEvents
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
Eina.Error received_error = 0; Eina.Error received_error = 0;
obj.EvtWithErrorEvt += (object sender, Dummy.TestObjectEvtWithErrorEvtArgs e) => { obj.EvtWithErrorEvt += (object sender, Dummy.TestObjectEvtWithErrorEvt_Args e) => {
received_error = e.arg; received_error = e.arg;
}; };
@ -164,7 +164,7 @@ class TestEoEvents
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
Dummy.StructSimple received_struct = default(Dummy.StructSimple); Dummy.StructSimple received_struct = default(Dummy.StructSimple);
obj.EvtWithStructEvt += (object sender, Dummy.TestObjectEvtWithStructEvtArgs e) => { obj.EvtWithStructEvt += (object sender, Dummy.TestObjectEvtWithStructEvt_Args e) => {
received_struct = e.arg; received_struct = e.arg;
}; };
@ -181,7 +181,7 @@ class TestEoEvents
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
Dummy.StructComplex received_struct = default(Dummy.StructComplex); Dummy.StructComplex received_struct = default(Dummy.StructComplex);
obj.EvtWithStructComplexEvt += (object sender, Dummy.TestObjectEvtWithStructComplexEvtArgs e) => { obj.EvtWithStructComplexEvt += (object sender, Dummy.TestObjectEvtWithStructComplexEvt_Args e) => {
received_struct = e.arg; received_struct = e.arg;
}; };
@ -202,7 +202,7 @@ class TestEoEvents
sent.Append("Def"); sent.Append("Def");
sent.Append("Ghi"); sent.Append("Ghi");
obj.EvtWithArrayEvt += (object sender, Dummy.TestObjectEvtWithArrayEvtArgs e) => { obj.EvtWithArrayEvt += (object sender, Dummy.TestObjectEvtWithArrayEvt_Args e) => {
received = e.arg; received = e.arg;
}; };
@ -222,7 +222,7 @@ class TestEventAddRemove
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
bool called = true; bool called = true;
EventHandler<Dummy.TestObjectEvtWithIntEvtArgs> evtCb = (object sender, Dummy.TestObjectEvtWithIntEvtArgs e) => { EventHandler<Dummy.TestObjectEvtWithIntEvt_Args> evtCb = (object sender, Dummy.TestObjectEvtWithIntEvt_Args e) => {
called = true; called = true;
}; };
@ -279,7 +279,7 @@ class TestEventWithDeadWrappers
{ {
private static WeakReference AttachToManager(Dummy.EventManager manager, private static WeakReference AttachToManager(Dummy.EventManager manager,
EventHandler<Dummy.TestObjectEvtWithIntEvtArgs> cb) EventHandler<Dummy.TestObjectEvtWithIntEvt_Args> cb)
{ {
var obj = new Dummy.TestObject(); var obj = new Dummy.TestObject();
manager.Emitter = obj; manager.Emitter = obj;
@ -298,7 +298,7 @@ class TestEventWithDeadWrappers
int received = -1; int received = -1;
// attach to evt with int // attach to evt with int
EventHandler<Dummy.TestObjectEvtWithIntEvtArgs> cb = (object sender, Dummy.TestObjectEvtWithIntEvtArgs args) => { EventHandler<Dummy.TestObjectEvtWithIntEvt_Args> cb = (object sender, Dummy.TestObjectEvtWithIntEvt_Args args) => {
callbackCalled = true; callbackCalled = true;
received = args.arg; received = args.arg;
Test.Assert(Object.ReferenceEquals(sender, wref.Target)); Test.Assert(Object.ReferenceEquals(sender, wref.Target));

View File

@ -66,7 +66,7 @@ public class TestModel {
string propertyBound = null; string propertyBound = null;
bool callbackCalled = false; bool callbackCalled = false;
var factory = new Efl.Ui.ItemFactory<Efl.Ui.Button>(); var factory = new Efl.Ui.ItemFactory<Efl.Ui.Button>();
factory.PropertyBoundEvt += (object sender, Efl.Ui.IPropertyBindPropertyBoundEvtArgs args) => { factory.PropertyBoundEvt += (object sender, Efl.Ui.IPropertyBindPropertyBoundEvt_Args args) => {
propertyBound = args.arg; propertyBound = args.arg;
callbackCalled = true; callbackCalled = true;
}; };