From 13de9d089c4e2dc7fd243915c1d7f95b47f58968 Mon Sep 17 00:00:00 2001
From: Savio Sena <savio@expertisesolutions.com.br>
Date: Thu, 25 Sep 2014 16:09:40 -0300
Subject: [PATCH] eolian-cxx: Get rid of class_prefix and related code.

This patch fixes the use of eolian_function_full_c_name_get API also.
---
 src/bin/eolian_cxx/convert.cc         | 11 ++++-------
 src/bin/eolian_cxx/eolian_wrappers.hh | 14 ++------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/bin/eolian_cxx/convert.cc b/src/bin/eolian_cxx/convert.cc
index 2cf8725..4e68b87 100644
--- a/src/bin/eolian_cxx/convert.cc
+++ b/src/bin/eolian_cxx/convert.cc
@@ -76,12 +76,11 @@ static efl::eolian::eo_function
 _convert_property_set_to_function(Eolian_Class const& klass,
                                   Eolian_Function const& prop_)
 {
-   std::string prefix(class_prefix(klass));
    efl::eolian::eo_function set_ =
      {
        efl::eolian::eo_function::regular_,
        function_name(prop_) + "_set",
-       function_impl(prop_, prefix) + "_set",
+       function_impl(prop_) + "_set",
        function_return_type(prop_, eolian_cxx::setter),
        _convert_eolian_parameters(::eolian_function_parameters_get(&prop_),
                                   eolian_cxx::setter),
@@ -104,12 +103,11 @@ static efl::eolian::eo_function
 _convert_property_get_to_function(Eolian_Class const& klass,
                                   Eolian_Function const& prop_)
 {
-   std::string prefix(class_prefix(klass));
    efl::eolian::eo_function get_ =
      {
        efl::eolian::eo_function::regular_,
        function_name(prop_) + "_get",
-       function_impl(prop_, prefix) + "_get",
+       function_impl(prop_) + "_get",
        function_return_type(prop_, eolian_cxx::getter),
        _convert_eolian_parameters(prop_, eolian_cxx::getter),
        convert_comments_function(klass, prop_, eolian_cxx::getter)
@@ -209,7 +207,6 @@ convert_eolian_class_new(Eolian_Class const& klass)
 void
 convert_eolian_implements(efl::eolian::eo_class& cls, Eolian_Class const& klass)
 {
-   std::string prefix(class_prefix(klass));
    efl::eina::iterator<const Eolian_Implement> itr = implements_get(klass);
    efl::eina::iterator<const Eolian_Implement> end;
 
@@ -241,7 +238,7 @@ convert_eolian_implements(efl::eolian::eo_class& cls, Eolian_Class const& klass)
         else if (function_is_constructor(klass, func))
           {
              cls.constructors.push_back({
-                  function_impl(func, class_prefix(icls)),
+                  function_impl(func),
                   _convert_eolian_parameters(func),
                   convert_comments_function(icls, func)
              });
@@ -251,7 +248,7 @@ convert_eolian_implements(efl::eolian::eo_class& cls, Eolian_Class const& klass)
              cls.functions.push_back({
                  function_type(func),
                  function_name(func),
-                 function_impl(func, class_prefix(icls)),
+                 function_impl(func),
                  function_return_type(func),
                  _convert_eolian_parameters(func),
                  convert_comments_function(icls, func, eolian_cxx::method)
diff --git a/src/bin/eolian_cxx/eolian_wrappers.hh b/src/bin/eolian_cxx/eolian_wrappers.hh
index 80efcd2..3dcb5e3 100644
--- a/src/bin/eolian_cxx/eolian_wrappers.hh
+++ b/src/bin/eolian_cxx/eolian_wrappers.hh
@@ -101,16 +101,6 @@ class_format_cxx(std::string const& fullname)
    return s;
 }
 
-inline std::string
-class_prefix(Eolian_Class const& klass)
-{
-   std::string prefix = safe_lower(::eolian_class_eo_prefix_get(&klass));
-   if (prefix.empty())
-     prefix = safe_lower(find_replace(class_full_name(klass), ".", "_"));
-   assert(!prefix.empty());
-   return prefix;
-}
-
 inline efl::eolian::eo_class::eo_class_type
 class_type(Eolian_Class const& klass)
 {
@@ -176,9 +166,9 @@ function_name(Eolian_Function const& func)
 }
 
 inline std::string
-function_impl(Eolian_Function const& func, std::string const& prefix)
+function_impl(Eolian_Function const& func)
 {
-   const char *s = ::eolian_function_full_c_name_get(&func, prefix.c_str());
+   const char *s = ::eolian_function_full_c_name_get(&func);
    std::string ret(s);
    ::eina_stringshare_del(s);
    return ret;
-- 
2.7.4