From f8a6568d5c246a0d6fbd5436f4b143eb77806d8c Mon Sep 17 00:00:00 2001 From: Felipe Magno de Almeida Date: Mon, 15 Aug 2016 15:14:53 -0300 Subject: [PATCH] eolian-cxx: Fix compilation break with Eo rename to EFL --- src/bindings/cxx/eina_cxx/eina_accessor.hh | 2 +- .../cxx/eina_cxx/eina_clone_allocators.hh | 4 +- src/bindings/cxx/eo_cxx/eo_cxx_interop.hh | 12 ++--- src/bindings/cxx/eo_cxx/eo_event.hh | 12 ++--- src/bindings/cxx/eo_cxx/eo_ops.hh | 16 +++---- src/tests/eina_cxx/eina_cxx_test_accessor.cc | 16 +++---- src/tests/eina_cxx/eina_cxx_test_ptrarray.cc | 48 +++++++++---------- src/tests/eina_cxx/eina_cxx_test_ptrlist.cc | 44 ++++++++--------- 8 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/bindings/cxx/eina_cxx/eina_accessor.hh b/src/bindings/cxx/eina_cxx/eina_accessor.hh index 33046a3f7f..58c0b98adc 100644 --- a/src/bindings/cxx/eina_cxx/eina_accessor.hh +++ b/src/bindings/cxx/eina_cxx/eina_accessor.hh @@ -359,7 +359,7 @@ struct accessor(p))); + return mapped_type(::efl_ref(static_cast(p))); } using _base_type::native_handle; diff --git a/src/bindings/cxx/eina_cxx/eina_clone_allocators.hh b/src/bindings/cxx/eina_cxx/eina_clone_allocators.hh index 3af9336fc5..15e97adcfc 100644 --- a/src/bindings/cxx/eina_cxx/eina_clone_allocators.hh +++ b/src/bindings/cxx/eina_cxx/eina_clone_allocators.hh @@ -68,12 +68,12 @@ struct eo_clone_allocator { static Eo* allocate_clone(Eo const& v) { - return ::eo_ref(&v); + return ::efl_ref(&v); } static void deallocate_clone(Eo const* p) { - ::eo_unref(const_cast(p)); + ::efl_unref(const_cast(p)); } }; diff --git a/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh index 0d0aad8979..597ef3b703 100644 --- a/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh +++ b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh @@ -333,7 +333,7 @@ template Eo* convert_to_c_impl(T v, tag , typename std::enable_if::value>::type* = 0) { - return ::eo_ref(v._eo_ptr()); + return ::efl_ref(v._eo_ptr()); } template Eo const* convert_to_c_impl(T v, tag @@ -556,7 +556,7 @@ struct is_container> : std::true_type {}; template T convert_to_event(void* value, typename std::enable_if< eo::is_eolian_object::value>::type* = 0) { - return T{::eo_ref(static_cast(value))}; + return T{::efl_ref(static_cast(value))}; } template T convert_to_event(void* value, typename std::enable_if< is_container::value @@ -748,15 +748,15 @@ struct is_callable() ())> : std::true_type {}; inline void do_eo_add(Eo*& object, efl::eo::concrete const& parent , Efl_Class const* klass) { - object = ::_eo_add_internal_start(__FILE__, __LINE__, klass, parent._eo_ptr(), EINA_TRUE, EINA_FALSE); - object = ::_eo_add_end(object, EINA_FALSE, EINA_FALSE); + object = ::_efl_add_internal_start(__FILE__, __LINE__, klass, parent._eo_ptr(), EINA_TRUE, EINA_FALSE); + object = ::_efl_add_end(object, EINA_FALSE, EINA_FALSE); } template void do_eo_add(Eo*& object, efl::eo::concrete const& parent, Efl_Class const* klass, F f) { - object = ::_eo_add_internal_start(__FILE__, __LINE__, klass, parent._eo_ptr(), EINA_TRUE, EINA_FALSE); + object = ::_efl_add_internal_start(__FILE__, __LINE__, klass, parent._eo_ptr(), EINA_TRUE, EINA_FALSE); f(); - object = ::_eo_add_end(object, EINA_FALSE, EINA_FALSE); + object = ::_efl_add_end(object, EINA_FALSE, EINA_FALSE); } template diff --git a/src/bindings/cxx/eo_cxx/eo_event.hh b/src/bindings/cxx/eo_cxx/eo_event.hh index 8f49b00a40..7c527dd831 100644 --- a/src/bindings/cxx/eo_cxx/eo_event.hh +++ b/src/bindings/cxx/eo_cxx/eo_event.hh @@ -75,21 +75,21 @@ template struct _event_deleter { _event_deleter(F* data, Eo* eo, ::Efl_Event_Cb cb, Efl_Event_Description const* description) - : _data(data), _eo( ::eo_ref(eo)), _cb(cb), _description(description) + : _data(data), _eo( ::efl_ref(eo)), _cb(cb), _description(description) { } ~_event_deleter() { - ::eo_unref(_eo); + ::efl_unref(_eo); } _event_deleter(_event_deleter const& other) - : _data(other._data), _eo( ::eo_ref(other._eo)), _cb(other._cb), _description(other._description) + : _data(other._data), _eo( ::efl_ref(other._eo)), _cb(other._cb), _description(other._description) {} _event_deleter& operator=(_event_deleter const& other) { - ::eo_unref( _eo); + ::efl_unref( _eo); _data = other._data; - _eo = ::eo_ref(other._eo); + _eo = ::efl_ref(other._eo); _cb = other._cb; _description = other._description; return *this; @@ -137,7 +137,7 @@ void really_call_event(T& wrapper, F& f, void *info, std::false_type) template void event_callback(void *data, ::Eo_Event const* event) { - T wrapper(::eo_ref(event->object)); + T wrapper(::efl_ref(event->object)); F *f = static_cast(data); _detail::really_call_event (wrapper, *f, event->info, std::is_void

{}); diff --git a/src/bindings/cxx/eo_cxx/eo_ops.hh b/src/bindings/cxx/eo_cxx/eo_ops.hh index 22438b9398..8d385fd212 100644 --- a/src/bindings/cxx/eo_cxx/eo_ops.hh +++ b/src/bindings/cxx/eo_cxx/eo_ops.hh @@ -12,49 +12,49 @@ namespace efl { namespace eo { namespace detail { inline void init() { - ::eo_init(); + ::efl_object_init(); } inline void shutdown() { - ::eo_shutdown(); + ::efl_object_shutdown(); } inline Eo* ref(Eo *obj) { - return ::eo_ref(obj); + return ::efl_ref(obj); } inline const Eo* ref(const Eo *obj) { - return ::eo_ref(obj); + return ::efl_ref(obj); } inline void unref(const Eo *obj) { - ::eo_unref(obj); + ::efl_unref(obj); } inline int ref_get(const Eo *obj) { - return ::eo_ref_get(obj); + return ::efl_ref_get(obj); } inline Eina_Bool isa(const Eo *obj, const Efl_Class *klass) { - return eo_isa(obj, klass); + return efl_isa(obj, klass); } inline Eo* add(const Efl_Class *klass, Eo *parent = NULL) { - Eo *eo = eo_add_ref(klass, parent); + Eo *eo = efl_add_ref(klass, parent); return eo; } diff --git a/src/tests/eina_cxx/eina_cxx_test_accessor.cc b/src/tests/eina_cxx/eina_cxx_test_accessor.cc index 9737f0d383..6590779160 100644 --- a/src/tests/eina_cxx/eina_cxx_test_accessor.cc +++ b/src/tests/eina_cxx/eina_cxx_test_accessor.cc @@ -43,10 +43,10 @@ START_TEST(eina_cxx_eo_accessor_indexing) efl::eina::list list; - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w4(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w4(efl_add(SIMPLE_CLASS, NULL)); list.push_back(w1); list.push_back(w2); @@ -97,10 +97,10 @@ START_TEST(eina_cxx_eo_accessor_iterator) efl::eina::list list; - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w4(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w4(efl_add(SIMPLE_CLASS, NULL)); list.push_back(w1); list.push_back(w2); diff --git a/src/tests/eina_cxx/eina_cxx_test_ptrarray.cc b/src/tests/eina_cxx/eina_cxx_test_ptrarray.cc index 6b2f6271d8..2bfa44f68a 100644 --- a/src/tests/eina_cxx/eina_cxx_test_ptrarray.cc +++ b/src/tests/eina_cxx/eina_cxx_test_ptrarray.cc @@ -26,9 +26,9 @@ START_TEST(eina_cxx_ptrarray_push_back) int result[] = {5, 10, 15}; int rresult[] = {15, 10, 5}; - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); { efl::eina::ptr_array array; @@ -102,9 +102,9 @@ START_TEST(eina_cxx_ptrarray_pop_back) ck_assert(std::equal(array.rbegin(), array.rend(), rresult)); } { - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); efl::eina::array array; @@ -197,11 +197,11 @@ START_TEST(eina_cxx_ptrarray_insert) ck_assert(std::equal(array.begin(), array.end(), array4.begin())); } { - wrapper const w0(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w4(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w0(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w4(efl_add(SIMPLE_CLASS, NULL)); efl::eina::array array; ck_assert(std::distance(array.begin(), array.end()) == 0u); @@ -277,7 +277,7 @@ START_TEST(eina_cxx_ptrarray_constructors) efl::eina::eina_init eina_init; efl::eo::eo_init eo_init; - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); { efl::eina::ptr_array array1; @@ -356,12 +356,12 @@ START_TEST(eina_cxx_ptrarray_erase) ck_assert(array1.back() == 25); } { - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w4(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w5(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w6(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w4(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w5(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w6(efl_add(SIMPLE_CLASS, NULL)); efl::eina::array array1; @@ -437,12 +437,12 @@ START_TEST(eina_cxx_ptrarray_range) } { - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w4(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w5(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w6(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w4(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w5(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w6(efl_add(SIMPLE_CLASS, NULL)); efl::eina::array array; array.push_back(w1); diff --git a/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc b/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc index 039ef971bc..7c43854867 100644 --- a/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc +++ b/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc @@ -28,9 +28,9 @@ START_TEST(eina_cxx_ptrlist_push_back) int result[] = {5, 10, 15}; int rresult[] = {15, 10, 5}; - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); { efl::eina::ptr_list list; @@ -77,9 +77,9 @@ START_TEST(eina_cxx_ptrlist_pop_back) int result[] = {5, 10}; int rresult[] = {10, 5}; - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); { efl::eina::ptr_list list; @@ -143,9 +143,9 @@ START_TEST(eina_cxx_ptrlist_push_front) ck_assert(std::equal(list.rbegin(), list.rend(), rresult)); } { - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); efl::eina::list list; @@ -171,9 +171,9 @@ START_TEST(eina_cxx_ptrlist_pop_front) int result[] = {10, 5}; int rresult[] = {5, 10}; - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); { efl::eina::ptr_list list; @@ -273,11 +273,11 @@ START_TEST(eina_cxx_ptrlist_insert) ck_assert(std::equal(list.begin(), list.end(), list4.begin())); } { - wrapper const w0(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w4(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w0(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w4(efl_add(SIMPLE_CLASS, NULL)); efl::eina::list list; @@ -366,11 +366,11 @@ START_TEST(eina_cxx_ptrlist_constructors) ck_assert(list2 == list4); } { - wrapper const w0(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w4(eo_add(SIMPLE_CLASS, NULL)); + wrapper const w0(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w1(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w2(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w3(efl_add(SIMPLE_CLASS, NULL)); + wrapper const w4(efl_add(SIMPLE_CLASS, NULL)); efl::eina::list list1; ck_assert(list1.empty());