savio pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=07c6cadee372c1229c5e0d84df8f8523de37982c
commit 07c6cadee372c1229c5e0d84df8f8523de37982c Author: Savio Sena <[email protected]> Date: Tue Aug 12 21:55:09 2014 -0300 eolian-cxx: Renamed event_*_callback_{add,call} to callback_*_{add,call}. --- src/examples/eolian_cxx/eolian_cxx_eo_events_01.cc | 2 +- src/lib/eolian_cxx/grammar/eo_class_events_generator.hh | 4 ++-- src/tests/eolian_cxx/eolian_cxx_test_callback.cc | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/examples/eolian_cxx/eolian_cxx_eo_events_01.cc b/src/examples/eolian_cxx/eolian_cxx_eo_events_01.cc index 7be091c..3cce90c 100644 --- a/src/examples/eolian_cxx/eolian_cxx_eo_events_01.cc +++ b/src/examples/eolian_cxx/eolian_cxx_eo_events_01.cc @@ -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; diff --git a/src/lib/eolian_cxx/grammar/eo_class_events_generator.hh b/src/lib/eolian_cxx/grammar/eo_class_events_generator.hh index d35fc46..fe9184d 100644 --- a/src/lib/eolian_cxx/grammar/eo_class_events_generator.hh +++ b/src/lib/eolian_cxx/grammar/eo_class_events_generator.hh @@ -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 diff --git a/src/tests/eolian_cxx/eolian_cxx_test_callback.cc b/src/tests/eolian_cxx/eolian_cxx_test_callback.cc index 05ee350..81b6ac5 100644 --- a/src/tests/eolian_cxx/eolian_cxx_test_callback.cc +++ b/src/tests/eolian_cxx/eolian_cxx_test_callback.cc @@ -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([&] { --
