eolian-mono: Renaming suffix for event and event args
Summary: suffix _Args to Args, Evt to Event Reviewers: lauromoura, felipealmeida Reviewed By: lauromoura Subscribers: Jaehyun_Cho, woohyun, segfaultxavi, cedric, felipealmeida, #reviewers, lauromoura, #committers Tags: #refactoring, PHID-PROJ-uhnmnvlvunw6jgoqdnd4, #efl_language_bindings Maniphest Tasks: T8164, T8163 Differential Revision: https://phab.enlightenment.org/D9692
This commit is contained in:
parent
5e1f2cd68c
commit
353524e1b8
|
@ -420,14 +420,12 @@ inline std::string klass_get_full_name(T const& clsname)
|
||||||
// Events
|
// Events
|
||||||
inline std::string managed_event_name(std::string const& name)
|
inline std::string managed_event_name(std::string const& name)
|
||||||
{
|
{
|
||||||
return utils::to_pascal_case(utils::split(name, "_,"), "") + "Evt";
|
return utils::to_pascal_case(utils::split(name, "_,"), "") + "Event";
|
||||||
}
|
}
|
||||||
|
|
||||||
inline std::string managed_event_args_short_name(attributes::event_def const& evt)
|
inline std::string managed_event_args_short_name(attributes::event_def const& evt)
|
||||||
{
|
{
|
||||||
std::string ret;
|
return klass_concrete_or_interface_name(evt.klass) + name_helpers::managed_event_name(evt.name) + "Args";
|
||||||
ret = klass_concrete_or_interface_name(evt.klass);
|
|
||||||
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)
|
||||||
|
|
|
@ -125,46 +125,46 @@ 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.IModelPropertiesChangedEvt_Args> PropertiesChangedEvt
|
public event EventHandler<Efl.IModelPropertiesChangedEventArgs> PropertiesChangedEvent
|
||||||
{
|
{
|
||||||
add {
|
add {
|
||||||
model.PropertiesChangedEvt += value;
|
model.PropertiesChangedEvent += value;
|
||||||
}
|
}
|
||||||
remove {
|
remove {
|
||||||
model.PropertiesChangedEvt -= value;
|
model.PropertiesChangedEvent -= value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <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.IModelChildAddedEvt_Args> ChildAddedEvt
|
public event EventHandler<Efl.IModelChildAddedEventArgs> ChildAddedEvent
|
||||||
{
|
{
|
||||||
add {
|
add {
|
||||||
model.ChildAddedEvt += value;
|
model.ChildAddedEvent += value;
|
||||||
}
|
}
|
||||||
remove {
|
remove {
|
||||||
model.ChildAddedEvt -= value;
|
model.ChildAddedEvent -= value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <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.IModelChildRemovedEvt_Args> ChildRemovedEvt
|
public event EventHandler<Efl.IModelChildRemovedEventArgs> ChildRemovedEvent
|
||||||
{
|
{
|
||||||
add {
|
add {
|
||||||
model.ChildRemovedEvt += value;
|
model.ChildRemovedEvent += value;
|
||||||
}
|
}
|
||||||
remove {
|
remove {
|
||||||
model.ChildRemovedEvt -= value;
|
model.ChildRemovedEvent -= value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Event triggered when the number of children changes.</summary>
|
/// <summary>Event triggered when the number of children changes.</summary>
|
||||||
public event EventHandler ChildrenCountChangedEvt
|
public event EventHandler ChildrenCountChangedEvent
|
||||||
{
|
{
|
||||||
add {
|
add {
|
||||||
model.ChildrenCountChangedEvt += value;
|
model.ChildrenCountChangedEvent += value;
|
||||||
}
|
}
|
||||||
remove {
|
remove {
|
||||||
model.ChildrenCountChangedEvt -= value;
|
model.ChildrenCountChangedEvent -= value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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, LoopArgumentsEvt_Args evt) =>
|
app.ArgumentsEvent += (object sender, LoopArgumentsEventArgs evt) =>
|
||||||
{
|
{
|
||||||
if (evt.arg.Initialization)
|
if (evt.arg.Initialization)
|
||||||
{
|
{
|
||||||
|
@ -152,15 +152,15 @@ public abstract class Application
|
||||||
|
|
||||||
OnArguments(evt.arg);
|
OnArguments(evt.arg);
|
||||||
};
|
};
|
||||||
app.PauseEvt += (object sender, EventArgs e) =>
|
app.PauseEvent += (object sender, EventArgs e) =>
|
||||||
{
|
{
|
||||||
OnPause();
|
OnPause();
|
||||||
};
|
};
|
||||||
app.ResumeEvt += (object sender, EventArgs e) =>
|
app.ResumeEvent += (object sender, EventArgs e) =>
|
||||||
{
|
{
|
||||||
OnResume();
|
OnResume();
|
||||||
};
|
};
|
||||||
app.TerminateEvt += (object sender, EventArgs e) =>
|
app.TerminateEvent += (object sender, EventArgs e) =>
|
||||||
{
|
{
|
||||||
OnTerminate();
|
OnTerminate();
|
||||||
};
|
};
|
||||||
|
|
|
@ -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.AlertPopupButtonClickedEvt_Args e) => {
|
popup.ButtonClickedEvent += (object sender, Efl.Ui.AlertPopupButtonClickedEventArgs e) => {
|
||||||
popup.SetParent(null);
|
popup.SetParent(null);
|
||||||
popup.Invalidate();
|
popup.Invalidate();
|
||||||
};
|
};
|
||||||
|
@ -99,7 +99,7 @@ public class Example
|
||||||
kms_box.DoPack(kms_input);
|
kms_box.DoPack(kms_input);
|
||||||
kms_box.DoPack(kms_button);
|
kms_box.DoPack(kms_button);
|
||||||
|
|
||||||
((Efl.Ui.Clickable)kms_button).ClickedEvt += (object sender, EventArgs e) => {
|
((Efl.Ui.Clickable)kms_button).ClickedEvent += (object sender, EventArgs e) => {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
string text = kms_input.GetText();
|
string text = kms_input.GetText();
|
||||||
|
@ -115,7 +115,7 @@ public class Example
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
((Efl.Ui.Clickable)miles_button).ClickedEvt += (object sender, EventArgs e) => {
|
((Efl.Ui.Clickable)miles_button).ClickedEvent += (object sender, EventArgs e) => {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
string text = miles_input.GetText();
|
string text = miles_input.GetText();
|
||||||
|
|
|
@ -99,7 +99,7 @@ class TestEolianError
|
||||||
// the managed code
|
// the managed code
|
||||||
var obj = new Dummy.TestObject();
|
var obj = new Dummy.TestObject();
|
||||||
Listener listener = new Listener();
|
Listener listener = new Listener();
|
||||||
obj.EvtWithIntEvt += listener.callback;
|
obj.EvtWithIntEvent += listener.callback;
|
||||||
|
|
||||||
Test.AssertRaises<Efl.EflException>(() => { obj.EmitEventWithInt(2); });
|
Test.AssertRaises<Efl.EflException>(() => { obj.EmitEventWithInt(2); });
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@ class TestEoEvents
|
||||||
loop.SetName("loop");
|
loop.SetName("loop");
|
||||||
TestEoEvents listener = new TestEoEvents();
|
TestEoEvents listener = new TestEoEvents();
|
||||||
listener.loop = loop;
|
listener.loop = loop;
|
||||||
loop.IdleEvt += listener.callback;
|
loop.IdleEvent += listener.callback;
|
||||||
|
|
||||||
Test.Assert(!listener.called);
|
Test.Assert(!listener.called);
|
||||||
Test.Assert(!listener.correct_sender);
|
Test.Assert(!listener.correct_sender);
|
||||||
|
@ -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.TestObjectEvtWithStringEvt_Args e) => {
|
obj.EvtWithStringEvent += (object sender, Dummy.TestObjectEvtWithStringEventArgs 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.TestObjectEvtWithIntEvt_Args e) => {
|
obj.EvtWithIntEvent += (object sender, Dummy.TestObjectEvtWithIntEventArgs 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.TestObjectEvtWithBoolEvt_Args e) => {
|
obj.EvtWithBoolEvent += (object sender, Dummy.TestObjectEvtWithBoolEventArgs 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.TestObjectEvtWithUintEvt_Args e) => {
|
obj.EvtWithUintEvent += (object sender, Dummy.TestObjectEvtWithUintEventArgs 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.TestObjectEvtWithFloatEvt_Args e) => {
|
obj.EvtWithFloatEvent += (object sender, Dummy.TestObjectEvtWithFloatEventArgs 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.TestObjectEvtWithDoubleEvt_Args e) => {
|
obj.EvtWithDoubleEvent += (object sender, Dummy.TestObjectEvtWithDoubleEventArgs 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.TestObjectEvtWithObjEvt_Args e) => {
|
obj.EvtWithObjEvent += (object sender, Dummy.TestObjectEvtWithObjEventArgs 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.TestObjectEvtWithErrorEvt_Args e) => {
|
obj.EvtWithErrorEvent += (object sender, Dummy.TestObjectEvtWithErrorEventArgs 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.TestObjectEvtWithStructEvt_Args e) => {
|
obj.EvtWithStructEvent += (object sender, Dummy.TestObjectEvtWithStructEventArgs 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.TestObjectEvtWithStructComplexEvt_Args e) => {
|
obj.EvtWithStructComplexEvent += (object sender, Dummy.TestObjectEvtWithStructComplexEventArgs 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.TestObjectEvtWithArrayEvt_Args e) => {
|
obj.EvtWithArrayEvent += (object sender, Dummy.TestObjectEvtWithArrayEventArgs e) => {
|
||||||
received = e.arg;
|
received = e.arg;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -222,16 +222,16 @@ class TestEventAddRemove
|
||||||
var obj = new Dummy.TestObject();
|
var obj = new Dummy.TestObject();
|
||||||
bool called = true;
|
bool called = true;
|
||||||
|
|
||||||
EventHandler<Dummy.TestObjectEvtWithIntEvt_Args> evtCb = (object sender, Dummy.TestObjectEvtWithIntEvt_Args e) => {
|
EventHandler<Dummy.TestObjectEvtWithIntEventArgs> evtCb = (object sender, Dummy.TestObjectEvtWithIntEventArgs e) => {
|
||||||
called = true;
|
called = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
obj.EvtWithIntEvt += evtCb;
|
obj.EvtWithIntEvent += evtCb;
|
||||||
obj.EmitEventWithInt(42);
|
obj.EmitEventWithInt(42);
|
||||||
Test.Assert(called);
|
Test.Assert(called);
|
||||||
|
|
||||||
called = false;
|
called = false;
|
||||||
obj.EvtWithIntEvt -= evtCb;
|
obj.EvtWithIntEvent -= evtCb;
|
||||||
obj.EmitEventWithInt(42);
|
obj.EmitEventWithInt(42);
|
||||||
Test.Assert(!called);
|
Test.Assert(!called);
|
||||||
}
|
}
|
||||||
|
@ -248,7 +248,7 @@ class TestInterfaceEvents
|
||||||
called = true;
|
called = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
obj.NonconflictedEvt += cb;
|
obj.NonconflictedEvent += cb;
|
||||||
obj.EmitNonconflicted();
|
obj.EmitNonconflicted();
|
||||||
Test.Assert(called);
|
Test.Assert(called);
|
||||||
}
|
}
|
||||||
|
@ -266,7 +266,7 @@ class TestEventNaming
|
||||||
test_called = true;
|
test_called = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
obj.EvtWithUnderEvt += cb;
|
obj.EvtWithUnderEvent += cb;
|
||||||
|
|
||||||
obj.EmitEventWithUnder();
|
obj.EmitEventWithUnder();
|
||||||
|
|
||||||
|
@ -279,12 +279,12 @@ class TestEventWithDeadWrappers
|
||||||
{
|
{
|
||||||
|
|
||||||
private static WeakReference AttachToManager(Dummy.EventManager manager,
|
private static WeakReference AttachToManager(Dummy.EventManager manager,
|
||||||
EventHandler<Dummy.TestObjectEvtWithIntEvt_Args> cb)
|
EventHandler<Dummy.TestObjectEvtWithIntEventArgs> cb)
|
||||||
{
|
{
|
||||||
var obj = new Dummy.TestObject();
|
var obj = new Dummy.TestObject();
|
||||||
manager.Emitter = obj;
|
manager.Emitter = obj;
|
||||||
|
|
||||||
obj.EvtWithIntEvt += cb;
|
obj.EvtWithIntEvent += cb;
|
||||||
return new WeakReference(obj);
|
return new WeakReference(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.TestObjectEvtWithIntEvt_Args> cb = (object sender, Dummy.TestObjectEvtWithIntEvt_Args args) => {
|
EventHandler<Dummy.TestObjectEvtWithIntEventArgs> cb = (object sender, Dummy.TestObjectEvtWithIntEventArgs 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));
|
||||||
|
|
|
@ -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.IPropertyBindPropertyBoundEvt_Args args) => {
|
factory.PropertyBoundEvent += (object sender, Efl.Ui.IPropertyBindPropertyBoundEventArgs args) => {
|
||||||
propertyBound = args.arg;
|
propertyBound = args.arg;
|
||||||
callbackCalled = true;
|
callbackCalled = true;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue