[EGIT] [core/efl] master 01/01: cxx: follow eoid to eo_self rename in cxx generator and bindings

[Stefan Schmidt]

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=e981bfc4e8f1ac2eaa2d8c1fa120c4ee27b095c2

commit e981bfc4e8f1ac2eaa2d8c1fa120c4ee27b095c2
Author: Stefan Schmidt <ste...@osg.samsung.com>
Date:   Wed Mar 16 21:11:17 2016 +0100

    cxx: follow eoid to eo_self rename in cxx generator and bindings
    
    Bringing efl back to a building state with cxx enabled.
---
 src/bindings/eo_cxx/eo_cxx_interop.hh                         | 6 +++---
 src/bindings/eo_cxx/eo_inherit.hh                             | 2 +-
 src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/bindings/eo_cxx/eo_cxx_interop.hh 
b/src/bindings/eo_cxx/eo_cxx_interop.hh
index 18af392..1e35d0c 100644
--- a/src/bindings/eo_cxx/eo_cxx_interop.hh
+++ b/src/bindings/eo_cxx/eo_cxx_interop.hh
@@ -472,11 +472,11 @@ F* alloc_static_callback(F&& f)
 
 template <typename... Fs>
 inline
-void call_ctors(Eo* _obj_eoid, Fs&&... fs)
+void call_ctors(Eo* _obj_eo_self, Fs&&... fs)
 {
-   std::initializer_list<int const> const v {(fs(_obj_eoid), 0)...};
+   std::initializer_list<int const> const v {(fs(_obj_eo_self), 0)...};
    (void) v;
-   (void) _obj_eoid;
+   (void) _obj_eo_self;
 }
 
 } } // namespace efl { namespace eolian {
diff --git a/src/bindings/eo_cxx/eo_inherit.hh 
b/src/bindings/eo_cxx/eo_inherit.hh
index 9639e33..4944dc4 100644
--- a/src/bindings/eo_cxx/eo_inherit.hh
+++ b/src/bindings/eo_cxx/eo_inherit.hh
@@ -85,7 +85,7 @@ struct inherit
    inherit(efl::eo::parent_type _p, Args&& ... args)
    {
       _eo_cls = detail::create_class<D, E...> 
(eina::make_index_sequence<sizeof...(E)>());
-      _eo_raw = eo_add_ref(_eo_cls, _p._eo_raw, 
detail::inherit_constructor(eoid, this), ::efl::eolian::call_ctors(eoid, 
args...));
+      _eo_raw = eo_add_ref(_eo_cls, _p._eo_raw, 
detail::inherit_constructor(eo_self, this), ::efl::eolian::call_ctors(eo_self, 
args...));
       ::efl::eolian::register_ev_del_free_callback(_eo_raw, args...);
   }
 
diff --git a/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh 
b/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh
index 2a7091a..21395e9 100644
--- a/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh
+++ b/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh
@@ -158,9 +158,9 @@ operator<<(std::ostream& out, functors_constructor_methods 
const& x)
             << tab(2) << "{}" << endl;
 
         // Struct operator()
-        out << tab(2) << "void operator()(Eo* _obj_eoid)" << endl
+        out << tab(2) << "void operator()(Eo* _obj_eo_self)" << endl
             << tab(2) << "{" << endl
-            << tab(3) << "::" << c.impl << "(_obj_eoid" << (c.params.empty() ? 
"" : ", ")
+            << tab(3) << "::" << c.impl << "(_obj_eo_self" << 
(c.params.empty() ? "" : ", ")
             << parameters_forward_to_c(c.params) << ");" << endl
             << tab(2) << "}" << endl;
 
@@ -580,10 +580,10 @@ operator<<(std::ostream& out, 
function_call_constructor_methods const& x)
        << 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) << "(eoid)";
+        out << ", _c" << (it-first) << "(eo_self)";
      }
    if (!x._cls.optional_constructors.empty())
-     out << ", ::efl::eolian::call_ctors(eoid, _opts...)";
+     out << ", ::efl::eolian::call_ctors(eo_self, _opts...)";
    out << ");" << endl << endl;
 
    for (it = first; it != last; ++it)

--