From f93800fa313b27da6ec9a0bc5aecddae5b5ae767 Mon Sep 17 00:00:00 2001 From: Vitor Sousa Date: Thu, 3 Mar 2016 15:10:13 -0300 Subject: [PATCH] eolian-cxx: Fix Eolian C++ constructing methods with new eo_add Also fix Eolian C++ examples using the new "eo_super". --- unsorted/eolian_cxx/colourable_cxx.cc | 6 +++--- unsorted/eolian_cxx/colourablesquare_cxx.cc | 2 +- unsorted/eolian_cxx/eolian_cxx_inherit_01.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/unsorted/eolian_cxx/colourable_cxx.cc b/unsorted/eolian_cxx/colourable_cxx.cc index 934a5d0c..f1f6beca 100644 --- a/unsorted/eolian_cxx/colourable_cxx.cc +++ b/unsorted/eolian_cxx/colourable_cxx.cc @@ -24,14 +24,14 @@ _colourable_eo_base_constructor(Eo *obj, Colourable_Data *self) { EINA_CXX_DOM_LOG_DBG(domain) << __func__ << std::endl; self->r = self->g = self->b = 0; - return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + return eo_constructor(eo_super(obj, MY_CLASS)); } void _colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED) { EINA_CXX_DOM_LOG_DBG(domain) << __func__ << std::endl; - eo_do_super(obj, MY_CLASS, eo_destructor()); + eo_destructor(eo_super(obj, MY_CLASS)); } void @@ -42,7 +42,7 @@ _colourable_rgb_24bits_constructor(Eo *obj, Colourable_Data *self, int rgb) self->r = (rgb & 0x00ff0000) >> 16; self->g = (rgb & 0x0000ff00) >> 8; self->b = rgb & 0x000000ff; - eo_do_super(obj, MY_CLASS, eo_constructor()); + eo_constructor(eo_super(obj, MY_CLASS)); } void diff --git a/unsorted/eolian_cxx/colourablesquare_cxx.cc b/unsorted/eolian_cxx/colourablesquare_cxx.cc index 906183a2..6908f732 100644 --- a/unsorted/eolian_cxx/colourablesquare_cxx.cc +++ b/unsorted/eolian_cxx/colourablesquare_cxx.cc @@ -25,7 +25,7 @@ _colourablesquare_size_constructor(Eo *obj, ColourableSquare_Data *self, int siz { self->size = size; EINA_CXX_DOM_LOG_DBG(domain) << __func__ << " [ size = " << size << " ]" << std::endl; - eo_do_super(obj, MY_CLASS, eo_constructor()); + eo_constructor(eo_super(obj, MY_CLASS)); } int diff --git a/unsorted/eolian_cxx/eolian_cxx_inherit_01.cc b/unsorted/eolian_cxx/eolian_cxx_inherit_01.cc index bdfa3ad1..b0fb1698 100644 --- a/unsorted/eolian_cxx/eolian_cxx_inherit_01.cc +++ b/unsorted/eolian_cxx/eolian_cxx_inherit_01.cc @@ -23,7 +23,7 @@ struct ColourableCircle int colour_get() { int rgb = 0; - eo_do_super(_eo_ptr(), _eo_class(), rgb = ::colourable_colour_get()); + rgb = ::colourable_colour_get(eo_super(_eo_ptr(), _eo_class())); std::cout << "ColourableCircle::colour_get(" << this << ") ==> " << std::hex << rgb << std::endl; return rgb; @@ -52,7 +52,7 @@ struct ColourableBar int colour_get() { int rgb = 0; - eo_do_super(_eo_ptr(), _eo_class(), rgb = ::colourable_colour_get()); + rgb = ::colourable_colour_get(eo_super(_eo_ptr(), _eo_class())); std::cout << "ColourableBar::colour_get(" << this << ") ==> " << std::hex << rgb << std::endl; return rgb;