summaryrefslogtreecommitdiff
path: root/src/bindings/cxx/eo_cxx/eo_event.hh
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-08-11 16:24:15 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-08-11 16:24:15 -0300
commitf4a90dcde25452c95c3d1ac3cac9c904ceb25eba (patch)
tree470c9dd42e09ebe4264ae6ffd3c7f001be611f13 /src/bindings/cxx/eo_cxx/eo_event.hh
parentf0400e604c0eabd055d6edfb3268d9c99ca72f6d (diff)
eolian-cxx: Fix compilation break from changes in Eo nomenclature
Rename of classes and function calls in generated code and C++ headers
Diffstat (limited to 'src/bindings/cxx/eo_cxx/eo_event.hh')
-rw-r--r--src/bindings/cxx/eo_cxx/eo_event.hh18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/bindings/cxx/eo_cxx/eo_event.hh b/src/bindings/cxx/eo_cxx/eo_event.hh
index a66a043d66..8f49b00a40 100644
--- a/src/bindings/cxx/eo_cxx/eo_event.hh
+++ b/src/bindings/cxx/eo_cxx/eo_event.hh
@@ -16,7 +16,7 @@
16 16
17namespace efl { namespace eolian { 17namespace efl { namespace eolian {
18 18
19typedef ::Eo_Callback_Priority callback_priority; 19 typedef ::Efl_Callback_Priority callback_priority;
20namespace callback_priorities 20namespace callback_priorities
21{ 21{
22static const callback_priority before = -100; 22static const callback_priority before = -100;
@@ -74,7 +74,7 @@ private:
74template <typename F> 74template <typename F>
75struct _event_deleter 75struct _event_deleter
76{ 76{
77 _event_deleter(F* data, Eo* eo, ::Eo_Event_Cb cb, Eo_Event_Description const* description) 77 _event_deleter(F* data, Eo* eo, ::Efl_Event_Cb cb, Efl_Event_Description const* description)
78 : _data(data), _eo( ::eo_ref(eo)), _cb(cb), _description(description) 78 : _data(data), _eo( ::eo_ref(eo)), _cb(cb), _description(description)
79 { 79 {
80 } 80 }
@@ -97,7 +97,7 @@ struct _event_deleter
97 97
98 void operator()() const 98 void operator()() const
99 { 99 {
100 ::eo_event_callback_del(_eo, _description, _cb, _data); 100 ::efl_event_callback_del(_eo, _description, _cb, _data);
101 ::ecore_main_loop_thread_safe_call_async(&_deleter_call, _data); 101 ::ecore_main_loop_thread_safe_call_async(&_deleter_call, _data);
102 } 102 }
103 103
@@ -109,12 +109,12 @@ private:
109 109
110 F* _data; 110 F* _data;
111 Eo* _eo; 111 Eo* _eo;
112 ::Eo_Event_Cb _cb; 112 ::Efl_Event_Cb _cb;
113 Eo_Event_Description const* _description; 113 Efl_Event_Description const* _description;
114}; 114};
115 115
116template <typename F> 116template <typename F>
117signal_connection make_signal_connection(std::unique_ptr<F>& data, Eo* eo, ::Eo_Event_Cb cb, Eo_Event_Description const* description) 117signal_connection make_signal_connection(std::unique_ptr<F>& data, Eo* eo, ::Efl_Event_Cb cb, Efl_Event_Description const* description)
118{ 118{
119 signal_connection c(_event_deleter<F>(data.get(), eo, cb, description)); 119 signal_connection c(_event_deleter<F>(data.get(), eo, cb, description));
120 data.release(); 120 data.release();
@@ -152,14 +152,14 @@ signal_connection event_add(Event event, Object object, F&& function)
152 typedef typename std::remove_reference<F>::type function_type; 152 typedef typename std::remove_reference<F>::type function_type;
153 std::unique_ptr<function_type> f(new function_type(std::forward<F>(function))); 153 std::unique_ptr<function_type> f(new function_type(std::forward<F>(function)));
154 154
155 ::eo_event_callback_priority_add 155 ::efl_event_callback_priority_add
156 (object._eo_ptr(), event.description(), 0 156 (object._eo_ptr(), event.description(), 0
157 , static_cast<Eo_Event_Cb> 157 , static_cast<Efl_Event_Cb>
158 (&_detail::event_callback<Object, typename Event::parameter_type, function_type>) 158 (&_detail::event_callback<Object, typename Event::parameter_type, function_type>)
159 , f.get()); 159 , f.get());
160 return make_signal_connection 160 return make_signal_connection
161 (f, object._eo_ptr() 161 (f, object._eo_ptr()
162 , static_cast<Eo_Event_Cb> 162 , static_cast<Efl_Event_Cb>
163 (&_detail::event_callback<Object, typename Event::parameter_type, function_type>) 163 (&_detail::event_callback<Object, typename Event::parameter_type, function_type>)
164 , event.description()); 164 , event.description());
165} 165}