timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eolian-cxx: Renamed event_*_callback_{add,call} to callback_*_{add,call}.

This commit is contained in:
Savio Sena 2014-08-12 21:55:09 -03:00
parent 37d20553bd
commit 07c6cadee3
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/examples/eolian_cxx/eolian_cxx_eo_events_01.cc
View File

@ -76,7 +76,7 @@ example_complex_types()
bg.visibility_set(true);
efl::eo::signal_connection conn =
bg.event_mouse_down_callback_add
bg.callback_mouse_down_add
([] (efl::evas::object obj EINA_UNUSED, Eo_Event_Description const& desc EINA_UNUSED, void* info EINA_UNUSED)
{
std::cout << "evas::box::mouse_down" << std::endl;

4
src/lib/eolian_cxx/grammar/eo_class_events_generator.hh
View File

@ -44,7 +44,7 @@ operator<<(std::ostream& out, event_callback_add const& x)
{
out << tab(1) << "template <typename F>" << endl
<< tab(1) << "::efl::eo::signal_connection" << endl
<< tab(1) << "event_" << x._event.name << "_callback_add(F && callback_," << endl
<< tab(1) << "callback_" << x._event.name << "_add(F && callback_," << endl
<< tab(11) << "::efl::eo::callback_priority priority_ =" << endl
<< tab(11) << "::efl::eo::callback_priorities::default_)" << endl
<< tab(1) << "{" << endl
@ -77,7 +77,7 @@ operator<<(std::ostream& out, event_callback_call const& x)
{
out << tab(1) << "template <typename T>" << endl
<< tab(1) << "void" << endl
<< tab(1) << "event_" << x._event.name << "_callback_call(T* info)" << endl
<< tab(1) << "callback_" << x._event.name << "_call(T* info)" << endl
<< tab(1) << "{" << endl
<< tab(2) << "eo_do(" << add_cast_to_t(x._add_cast_to_t) << "_eo_ptr(), eo_event_callback_call" << endl
<< tab(4) << "(" << x._event.eo_name << ", info));" << endl

12
src/tests/eolian_cxx/eolian_cxx_test_callback.cc
View File

@ -49,8 +49,8 @@ START_TEST(eolian_cxx_test_callback_event_add)
bool called1 = false, called2 = false;
c.event_call_on_add_callback_add(std::bind([&called1] { called1 = true; }));
c.event_call_on_add_callback_add(std::bind([&called2] { called2 = true; }));
c.callback_call_on_add_add(std::bind([&called1] { called1 = true; }));
c.callback_call_on_add_add(std::bind([&called2] { called2 = true; }));
fail_if(!called1);
fail_if(!called2);
@ -65,7 +65,7 @@ START_TEST(eolian_cxx_test_callback_event_del)
int called1 = 0, called2 = 0, called3 = 0, called4 = 0;
efl::eo::signal_connection s1 = c.event_call_on_add_callback_add
efl::eo::signal_connection s1 = c.callback_call_on_add_add
(std::bind([&]
{
std::cerr << "called1 " << called1 << " called2 " << called2 << " called3 " << called3
@ -75,7 +75,7 @@ START_TEST(eolian_cxx_test_callback_event_del)
));
++called1;
}));
efl::eo::signal_connection s2 = c.event_call_on_add_callback_add
efl::eo::signal_connection s2 = c.callback_call_on_add_add
(std::bind([&]
{
std::cerr << "called1 " << called1 << " called2 " << called2 << " called3 " << called3
@ -89,7 +89,7 @@ START_TEST(eolian_cxx_test_callback_event_del)
s1.disconnect();
c.event_call_on_add_callback_add
c.callback_call_on_add_add
(
std::bind([&]
{
@ -103,7 +103,7 @@ START_TEST(eolian_cxx_test_callback_event_del)
s2.disconnect();
c.event_call_on_add_callback_add
c.callback_call_on_add_add
(
std::bind([&]
{