8 files changed, 25 insertions, 25 deletions

diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 5aba944087..05e9ec6986 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -102,7 +102,7 @@ eo_fundef_generate(const Eolian_Class *class, Eolian_Function *func, Eolian_Func
         fsuffix = "_get";
         if (!rettypet)
           {
-             itr = eolian_parameters_get(func);
+             itr = eolian_function_parameters_get(func);
              /* We want to check if there is only one parameter */
              if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
                {
@@ -172,7 +172,7 @@ eo_fundef_generate(const Eolian_Class *class, Eolian_Function *func, Eolian_Func
 
    if (!var_as_ret)
      {
-        itr = eolian_parameters_get(func);
+        itr = eolian_function_parameters_get(func);
         EINA_ITERATOR_FOREACH(itr, data)
           {
              const Eolian_Type *ptypet;
@@ -365,7 +365,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
         add_star = EINA_TRUE;
         if (!rettypet)
           {
-             itr = eolian_parameters_get(funcid);
+             itr = eolian_function_parameters_get(funcid);
              /* We want to check if there is only one parameter */
              if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
                {
@@ -402,7 +402,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
    eina_iterator_free(itr);
    if (!var_as_ret)
      {
-        itr = eolian_parameters_get(funcid);
+        itr = eolian_function_parameters_get(funcid);
         EINA_ITERATOR_FOREACH(itr, data)
           {
              const Eolian_Type *ptypet;
@@ -452,7 +452,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
 
         if (!has_params && !var_as_ret)
           {
-             itr = eolian_parameters_get(funcid);
+             itr = eolian_function_parameters_get(funcid);
              has_params |= (eina_iterator_next(itr, &data));
              eina_iterator_free(itr);
           }
diff --git a/src/bin/eolian/impl_generator.c b/src/bin/eolian/impl_generator.c
index 231adf5331..1043898f71 100644
--- a/src/bin/eolian/impl_generator.c
+++ b/src/bin/eolian/impl_generator.c
@@ -40,7 +40,7 @@ _params_generate(const Eolian_Function *foo, Eolian_Function_Type ftype, Eina_Bo
    if (!var_as_ret)
      {
         Eina_Bool add_star = (ftype == EOLIAN_PROP_GET);
-        itr = eolian_parameters_get(foo);
+        itr = eolian_function_parameters_get(foo);
         EINA_ITERATOR_FOREACH(itr, param)
           {
              const Eolian_Type *ptypet;
@@ -149,7 +149,7 @@ _prototype_generate(const Eolian_Function *foo, Eolian_Function_Type ftype, Eina
    const Eolian_Type *rettypet = eolian_function_return_type_get(foo, ftype);
    if (ftype == EOLIAN_PROP_GET && !rettypet)
      {
-        Eina_Iterator *itr = eolian_parameters_get(foo);
+        Eina_Iterator *itr = eolian_function_parameters_get(foo);
         void *data, *data2;
         /* We want to check if there is only one parameter */
         if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
diff --git a/src/bin/eolian/legacy_generator.c b/src/bin/eolian/legacy_generator.c
index 2ab85ebcc5..fa97578b58 100644
--- a/src/bin/eolian/legacy_generator.c
+++ b/src/bin/eolian/legacy_generator.c
@@ -68,7 +68,7 @@ _eapi_decl_func_generate(const Eolian_Class *class, const Eolian_Function *funci
         add_star = EINA_TRUE;
         if (!rettypet)
           {
-             itr = eolian_parameters_get(funcid);
+             itr = eolian_function_parameters_get(funcid);
              /* We want to check if there is only one parameter */
              if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
                {
@@ -132,7 +132,7 @@ _eapi_decl_func_generate(const Eolian_Class *class, const Eolian_Function *funci
    eina_iterator_free(itr);
    if (!var_as_ret)
      {
-       itr = eolian_parameters_get(funcid);
+       itr = eolian_function_parameters_get(funcid);
        EINA_ITERATOR_FOREACH(itr, data)
          {
             const Eolian_Type *ptypet;
@@ -230,7 +230,7 @@ _eapi_func_generate(const Eolian_Class *class, const Eolian_Function *funcid, Eo
         add_star = EINA_TRUE;
         if (!rettypet)
           {
-             itr = eolian_parameters_get(funcid);
+             itr = eolian_function_parameters_get(funcid);
              /* We want to check if there is only one parameter */
              if (eina_iterator_next(itr, &data) && !eina_iterator_next(itr, &data2))
                {
@@ -274,7 +274,7 @@ _eapi_func_generate(const Eolian_Class *class, const Eolian_Function *funcid, Eo
    eina_iterator_free(itr);
    if (!var_as_ret)
    {
-       itr = eolian_parameters_get(funcid);
+       itr = eolian_function_parameters_get(funcid);
        EINA_ITERATOR_FOREACH(itr, data)
          {
             const Eolian_Type *ptypet;
diff --git a/src/bin/eolian_cxx/convert.cc b/src/bin/eolian_cxx/convert.cc
index 8323d44611..42d68c355c 100644
--- a/src/bin/eolian_cxx/convert.cc
+++ b/src/bin/eolian_cxx/convert.cc
@@ -49,7 +49,7 @@ static efl::eolian::parameters_container_type
 convert_eolian_parameters(Eolian_Function const& func, getter_t func_type)
 {
    return convert_eolian_parameters
-     (::eolian_parameters_get(&func), func_type.value);
+     (::eolian_function_parameters_get(&func), func_type.value);
 }
 
 static efl::eolian::parameters_container_type
@@ -69,7 +69,7 @@ convert_eolian_parameters(Eolian_Function const& func)
 {
    assert(function_type(func) != EOLIAN_PROPERTY);
    return convert_eolian_parameters
-     (::eolian_parameters_get(&func), function_type(func));
+     (::eolian_function_parameters_get(&func), function_type(func));
 }
 
 static efl::eolian::functions_container_type
@@ -144,7 +144,7 @@ convert_eolian_property_to_functions(Eolian_Class const& klass)
                convert_eolian_parameters(::eolian_property_keys_get(prop_),
                                          eolian_cxx::setter);
              efl::eolian::parameters_container_type params =
-               convert_eolian_parameters(::eolian_parameters_get(prop_),
+               convert_eolian_parameters(::eolian_function_parameters_get(prop_),
                                          eolian_cxx::setter);
              set_.params = params;
              if (!keys.empty())
diff --git a/src/bin/eolian_cxx/convert_comments.cc b/src/bin/eolian_cxx/convert_comments.cc
index 7094e6209e..4f13048044 100644
--- a/src/bin/eolian_cxx/convert_comments.cc
+++ b/src/bin/eolian_cxx/convert_comments.cc
@@ -50,7 +50,7 @@ _comment_brief_and_params(Eolian_Function const& function,
      {
         doc += "@brief " + func + "\n\n";
      }
-   std::string params = _comment_parameters_list(::eolian_parameters_get(&function));
+   std::string params = _comment_parameters_list(::eolian_function_parameters_get(&function));
    if (params != "")
      {
         doc += params + "\n";
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 8ef4c092c6..7f290ff2b8 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -528,34 +528,34 @@ EAPI Eina_Bool eolian_function_is_virtual_pure(const Eolian_Function *function_i
 EAPI const Eolian_Function_Parameter *eolian_function_parameter_get(const Eolian_Function *function_id, const char *param_name);
 
 /*
- * @brief Returns an iterator to the keys params of a given function.
+ * @brief Returns an iterator to the parameter handles for a method/ctor/dtor.
  *
  * @param[in] function_id Id of the function
  * @return the iterator
  *
  * @ingroup Eolian
  */
-EAPI Eina_Iterator *eolian_property_keys_get(const Eolian_Function *foo_id);
+EAPI Eina_Iterator *eolian_function_parameters_get(const Eolian_Function *function_id);
 
 /*
- * @brief Returns an iterator to the values params of a given function.
+ * @brief Returns an iterator to the keys params of a given function.
  *
  * @param[in] function_id Id of the function
  * @return the iterator
  *
  * @ingroup Eolian
  */
-EAPI Eina_Iterator *eolian_property_values_get(const Eolian_Function *foo_id);
+EAPI Eina_Iterator *eolian_property_keys_get(const Eolian_Function *foo_id);
 
 /*
- * @brief Returns an iterator to the parameter handles for a method/ctor/dtor.
+ * @brief Returns an iterator to the values params of a given function.
  *
  * @param[in] function_id Id of the function
  * @return the iterator
  *
  * @ingroup Eolian
  */
-EAPI Eina_Iterator *eolian_parameters_get(const Eolian_Function *function_id);
+EAPI Eina_Iterator *eolian_property_values_get(const Eolian_Function *foo_id);
 
 /*
  * @brief Get information about a function parameter
diff --git a/src/lib/eolian/database_function_api.c b/src/lib/eolian/database_function_api.c
index e719d08dce..75e06ad0a4 100644
--- a/src/lib/eolian/database_function_api.c
+++ b/src/lib/eolian/database_function_api.c
@@ -98,11 +98,11 @@ eolian_property_keys_get(const Eolian_Function *fid)
 EAPI Eina_Iterator *
 eolian_property_values_get(const Eolian_Function *fid)
 {
-   return eolian_parameters_get(fid);
+   return eolian_function_parameters_get(fid);
 }
 
 EAPI Eina_Iterator *
-eolian_parameters_get(const Eolian_Function *fid)
+eolian_function_parameters_get(const Eolian_Function *fid)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(fid, NULL);
    return (fid->params ? eina_list_iterator_new(fid->params) : NULL);
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index d2b0645f9e..ed47a0f4ba 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -354,7 +354,7 @@ START_TEST(eolian_complex_type)
    eina_stringshare_del(type_name);
    eina_iterator_free(iter);
    /* Properties parameter type */
-   fail_if(!(iter = eolian_parameters_get(fid)));
+   fail_if(!(iter = eolian_function_parameters_get(fid)));
    fail_if(!(eina_iterator_next(iter, (void**)&param)));
    fail_if(eina_iterator_next(iter, &dummy));
    eina_iterator_free(iter);
@@ -387,7 +387,7 @@ START_TEST(eolian_complex_type)
    eina_stringshare_del(type_name);
    eina_iterator_free(iter);
    /* Methods parameter type */
-   fail_if(!(iter = eolian_parameters_get(fid)));
+   fail_if(!(iter = eolian_function_parameters_get(fid)));
    fail_if(!(eina_iterator_next(iter, (void**)&param)));
    fail_if(eina_iterator_next(iter, &dummy));
    eina_iterator_free(iter);