q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b3596252eb8ad1ffaf38a83982f260f0937063cc
commit b3596252eb8ad1ffaf38a83982f260f0937063cc
Author: Daniel Kolesa <d.kol...@osg.samsung.com>
Date: Tue Feb 27 16:04:19 2018 +0100
eolian: rename all_files_parse functions
---
src/lib/eolian/Eolian.h | 63 +++++++++++++++++++++-------------------
src/lib/eolian/eolian_database.c | 16 ++++++++--
2 files changed, 47 insertions(+), 32 deletions(-)
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index a1e89b3762..66cb480fc6 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -547,6 +547,34 @@ EAPI Eina_Bool
eolian_state_system_directory_add(Eolian_State *state);
EAPI const Eolian_Unit *eolian_state_file_parse(Eolian_State *state, const
char *filepath);
/*
+ * @brief Parse all known eo files.
+ *
+ * @param[in] state The Eolian state.
+ *
+ * @return EINA_TRUE on success, EINA_FALSE otherwise.
+ *
+ * @see eolian_state_directory_add
+ * @see eolian_state_all_eot_files_parse
+ *
+ * @ingroup Eolian
+ */
+EAPI Eina_Bool eolian_state_all_eo_files_parse(Eolian_State *state);
+
+/*
+ * @brief Parse all known eot files.
+ *
+ * @param[in] state The Eolian state.
+ *
+ * @return EINA_TRUE on success, EINA_FALSE otherwise.
+ *
+ * @see eolian_state_directory_add
+ * @see eolian_state_all_eo_files_parse
+ *
+ * @ingroup Eolian
+ */
+EAPI Eina_Bool eolian_state_all_eot_files_parse(Eolian_State *state);
+
+/*
* @brief Get an Eolian unit by file name.
*
* For any .eo or .eot file (must be within a directory previously scanned
@@ -651,36 +679,6 @@ EAPI Eina_Iterator *eolian_all_eo_files_get(const
Eolian_State *state);
EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian_State *state);
/*
- * @brief Force parsing of all the .eo files located in the directories
- * given in eolian_directory_scan..
- *
- * @param[in] state The Eolian state.
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise.
- *
- * @see eolian_directory_scan
- * @see eolian_all_eot_files_parse
- *
- * @ingroup Eolian
- */
-EAPI Eina_Bool eolian_all_eo_files_parse(Eolian_State *state);
-
-/*
- * @brief Force parsing of all the .eot files located in the directories
- * given in eolian_directory_scan..
- *
- * @param[in] state The Eolian state.
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise.
- *
- * @see eolian_directory_scan
- * @see eolian_all_eo_files_parse
- *
- * @ingroup Eolian
- */
-EAPI Eina_Bool eolian_all_eot_files_parse(Eolian_State *state);
-
-/*
* @brief Gets a class by its name
*
* @param[in] unit the unit to look in
@@ -2671,6 +2669,11 @@ EAPI Eina_Bool eolian_system_directory_scan(Eolian_State
*state);
/* DEPRECATED */
EAPI const Eolian_Unit *eolian_file_parse(Eolian_State *state, const char
*filepath);
+/* DEPRECATED */
+EAPI Eina_Bool eolian_all_eo_files_parse(Eolian_State *state);
+
+/* DEPRECATED */
+EAPI Eina_Bool eolian_all_eot_files_parse(Eolian_State *state);
#endif
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index 3d5dedcefc..d4c0bfb104 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -808,7 +808,7 @@ static Eina_Bool _tfile_parse(const Eina_Hash *hash
EINA_UNUSED, const void *key
}
EAPI Eina_Bool
-eolian_all_eot_files_parse(Eolian_State *state)
+eolian_state_all_eot_files_parse(Eolian_State *state)
{
Parse_Data pd = { state, EINA_TRUE };
@@ -824,6 +824,12 @@ eolian_all_eot_files_parse(Eolian_State *state)
return pd.ret;
}
+EAPI Eina_Bool
+eolian_all_eot_files_parse(Eolian_State *state)
+{
+ return eolian_state_all_eot_files_parse(state);
+}
+
static Eina_Bool _file_parse(const Eina_Hash *hash EINA_UNUSED, const void
*key EINA_UNUSED, void *data, void *fdata)
{
Parse_Data *pd = fdata;
@@ -837,7 +843,7 @@ static Eina_Bool _file_parse(const Eina_Hash *hash
EINA_UNUSED, const void *key
}
EAPI Eina_Bool
-eolian_all_eo_files_parse(Eolian_State *state)
+eolian_state_all_eo_files_parse(Eolian_State *state)
{
Parse_Data pd = { state, EINA_TRUE };
@@ -853,6 +859,12 @@ eolian_all_eo_files_parse(Eolian_State *state)
return pd.ret;
}
+EAPI Eina_Bool
+eolian_all_eo_files_parse(Eolian_State *state)
+{
+ return eolian_state_all_eo_files_parse(state);
+}
+
EAPI const Eolian_Unit *
eolian_state_unit_by_file_get(const Eolian_State *state, const char *file_name)
{
--
