///
template<typename... Args>
inherit(efl::eo::parent_type _p, Args&& ... args)
- : _eo_cls(nullptr), _eo_raw(nullptr)
{
_eo_cls = detail::create_class<D, E...> (eina::make_index_sequence<sizeof...(E)>());
- eo_add_ref(&_eo_raw, _eo_cls, _p._eo_raw, detail::inherit_constructor(_eo_raw, this), ::efl::eolian::call_ctors(_eo_raw, args...));
+ _eo_raw = eo_add_ref(_eo_cls, _p._eo_raw, detail::inherit_constructor(eoid, this), ::efl::eolian::call_ctors(eoid, args...));
::efl::eolian::register_ev_del_free_callback(_eo_raw, args...);
}
inline Eo*
add(const Eo_Class *klass, Eo *parent = NULL)
{
- Eo *eo = nullptr;
- eo_add_ref(&eo, klass, parent);
+ Eo *eo = eo_add_ref(klass, parent);
return eo;
}
out << ")" << endl
<< tab(1) << "{" << endl
- << tab(2) << "Eo* _ret_eo = nullptr;" << endl
- << tab(2) << "eo_add_ref(&_ret_eo, " << x._cls.eo_name << ", _p._eo_raw";
+ << tab(2) << "Eo* _ret_eo = eo_add_ref(" << x._cls.eo_name << ", _p._eo_raw";
for (it = first; it != last; ++it)
{
- out << ", _c" << (it-first) << "(_ret_eo)";
+ out << ", _c" << (it-first) << "(eoid)";
}
if (!x._cls.optional_constructors.empty())
- out << ", ::efl::eolian::call_ctors(_ret_eo, _opts...)";
+ out << ", ::efl::eolian::call_ctors(eoid, _opts...)";
out << ");" << endl << endl;
for (it = first; it != last; ++it)
efl::eina::list<wrapper> list;
- Eo* eoptr = nullptr;
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w4(eo_add(&eoptr, 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));
list.push_back(w1);
list.push_back(w2);
efl::eina::list<wrapper> list;
- Eo* eoptr = nullptr;
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w4(eo_add(&eoptr, 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));
list.push_back(w1);
list.push_back(w2);
int result[] = {5, 10, 15};
int rresult[] = {15, 10, 5};
- Eo* eoptr = nullptr;
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, 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));
{
efl::eina::ptr_array<int> array;
ck_assert(std::equal(array.rbegin(), array.rend(), rresult));
}
{
- Eo* eoptr = nullptr;
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, 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));
efl::eina::array<wrapper> array;
ck_assert(std::equal(array.begin(), array.end(), array4.begin()));
}
{
- Eo* eoptr = nullptr;
- wrapper const w0(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w4(eo_add(&eoptr, SIMPLE_CLASS, NULL));
+ 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));
efl::eina::array<wrapper> array;
ck_assert(std::distance(array.begin(), array.end()) == 0u);
efl::eina::eina_init eina_init;
efl::eo::eo_init eo_init;
- Eo* eoptr = nullptr;
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
+ wrapper const w1(eo_add(SIMPLE_CLASS, NULL));
{
efl::eina::ptr_array<int> array1;
ck_assert(array1.back() == 25);
}
{
- Eo* eoptr = nullptr;
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w4(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w5(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w6(eo_add(&eoptr, 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 w5(eo_add(SIMPLE_CLASS, NULL));
+ wrapper const w6(eo_add(SIMPLE_CLASS, NULL));
efl::eina::array<wrapper> array1;
}
{
- Eo* eoptr = nullptr;
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w4(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w5(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w6(eo_add(&eoptr, 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 w5(eo_add(SIMPLE_CLASS, NULL));
+ wrapper const w6(eo_add(SIMPLE_CLASS, NULL));
efl::eina::array<wrapper> array;
array.push_back(w1);
int result[] = {5, 10, 15};
int rresult[] = {15, 10, 5};
- Eo* eoptr = nullptr;
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, 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));
{
efl::eina::ptr_list<int> list;
int result[] = {5, 10};
int rresult[] = {10, 5};
- Eo* eoptr = nullptr;
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, 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));
{
efl::eina::ptr_list<int> list;
ck_assert(std::equal(list.rbegin(), list.rend(), rresult));
}
{
- Eo* eoptr = nullptr;
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, 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));
efl::eina::list<wrapper> list;
int result[] = {10, 5};
int rresult[] = {5, 10};
- Eo* eoptr = nullptr;
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, 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));
{
efl::eina::ptr_list<int> list;
ck_assert(std::equal(list.begin(), list.end(), list4.begin()));
}
{
- Eo* eoptr = nullptr;
- wrapper const w0(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w4(eo_add(&eoptr, SIMPLE_CLASS, NULL));
+ 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));
efl::eina::list<wrapper> list;
ck_assert(list2 == list4);
}
{
- Eo* eoptr = nullptr;
- wrapper const w0(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL));
- wrapper const w4(eo_add(&eoptr, SIMPLE_CLASS, NULL));
+ 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));
efl::eina::list<wrapper> list1;
ck_assert(list1.empty());