q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7a68ea5edbf51538c4535244092b577fae293a22
commit 7a68ea5edbf51538c4535244092b577fae293a22
Author: Daniel Kolesa <d.kol...@osg.samsung.com>
Date: Tue Feb 27 16:11:56 2018 +0100
eolian: rename path/filename retrieval APIs
---
src/lib/eolian/Eolian.h | 119 ++++++++++++++++++++++-----------------
src/lib/eolian/eolian_database.c | 80 +++++++++++++++++---------
2 files changed, 119 insertions(+), 80 deletions(-)
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 66cb480fc6..a47115f148 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -86,6 +86,9 @@ extern "C" {
/* State information
*
+ * Possible to cast to Eolian_Unit and use as such, as this represents
+ * a master unit as well as other state.
+ *
* @ingroup Eolian
*/
typedef struct _Eolian_State Eolian_State;
@@ -531,6 +534,58 @@ EAPI Eina_Bool eolian_state_directory_add(Eolian_State
*state, const char *dir);
EAPI Eina_Bool eolian_state_system_directory_add(Eolian_State *state);
/*
+ * @brief Get an iterator to all .eo file names with paths.
+ *
+ * @param[in] state The Eolian state.
+ *
+ * @see eolian_state_eo_files_get
+ * @see eolian_state_eot_file_paths_get
+ * @see eolian_state_eot_files_get
+ *
+ * @ingroup Eolian
+ */
+EAPI Eina_Iterator *eolian_state_eo_file_paths_get(const Eolian_State *state);
+
+/*
+ * @brief Get an iterator to all .eot file names with paths.
+ *
+ * @param[in] state The Eolian state.
+ *
+ * @see eolian_state_eo_files_get
+ * @see eolian_state_eo_file_paths_get
+ * @see eolian_state_eot_files_get
+ *
+ * @ingroup Eolian
+ */
+EAPI Eina_Iterator *eolian_state_eot_file_paths_get(const Eolian_State *state);
+
+/*
+ * @brief Get an iterator to all .eo file names (without paths).
+ *
+ * @param[in] state The Eolian state.
+ *
+ * @see eolian_state_eo_file_paths_get
+ * @see eolian_state_eot_file_paths_get
+ * @see eolian_state_eot_files_get
+ *
+ * @ingroup Eolian
+ */
+EAPI Eina_Iterator *eolian_state_eo_files_get(const Eolian_State *state);
+
+/*
+ * @brief Get an iterator to all .eot file names (without paths).
+ *
+ * @param[in] state The Eolian state.
+ *
+ * @see eolian_state_eo_file_paths_get
+ * @see eolian_stete_eot_file_paths_get
+ * @see eolian_state_eo_files_get
+ *
+ * @ingroup Eolian
+ */
+EAPI Eina_Iterator *eolian_state_eot_files_get(const Eolian_State *state);
+
+/*
* @brief Parse the given .eo or .eot file and fill the database.
*
* The input can be either a full path to the file or only a filename.
@@ -627,58 +682,6 @@ EAPI Eina_Iterator *eolian_unit_children_get(const
Eolian_Unit *unit);
EAPI const char *eolian_unit_file_get(const Eolian_Unit *unit);
/*
- * @brief Get an iterator to all .eo file names with paths.
- *
- * @param[in] state The Eolian state.
- *
- * @see eolian_all_eo_files_get
- * @see eolian_all_eot_file_paths_get
- * @see eolian_all_eot_files_get
- *
- * @ingroup Eolian
- */
-EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian_State *state);
-
-/*
- * @brief Get an iterator to all .eot file names with paths.
- *
- * @param[in] state The Eolian state.
- *
- * @see eolian_all_eo_files_get
- * @see eolian_all_eo_file_paths_get
- * @see eolian_all_eot_files_get
- *
- * @ingroup Eolian
- */
-EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian_State *state);
-
-/*
- * @brief Get an iterator to all .eo file names (without paths).
- *
- * @param[in] state The Eolian state.
- *
- * @see eolian_all_eo_file_paths_get
- * @see eolian_all_eot_file_paths_get
- * @see eolian_all_eot_files_get
- *
- * @ingroup Eolian
- */
-EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian_State *state);
-
-/*
- * @brief Get an iterator to all .eot file names (without paths).
- *
- * @param[in] state The Eolian state.
- *
- * @see eolian_all_eo_file_paths_get
- * @see eolian_all_eot_file_paths_get
- * @see eolian_all_eo_files_get
- *
- * @ingroup Eolian
- */
-EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian_State *state);
-
-/*
* @brief Gets a class by its name
*
* @param[in] unit the unit to look in
@@ -2675,6 +2678,18 @@ EAPI Eina_Bool eolian_all_eo_files_parse(Eolian_State
*state);
/* DEPRECATED */
EAPI Eina_Bool eolian_all_eot_files_parse(Eolian_State *state);
+/* DEPRECATED */
+EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian_State *state);
+
+/* DEPRECATED */
+EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian_State *state);
+
+/* DEPRECATED */
+EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian_State *state);
+
+/* DEPRECATED */
+EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian_State *state);
+
#endif
/**
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index d4c0bfb104..6491f64cab 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -662,6 +662,58 @@ eolian_system_directory_scan(Eolian_State *state)
return eolian_state_system_directory_add(state);
}
+EAPI Eina_Iterator *
+eolian_state_eot_files_get(const Eolian_State *state)
+{
+ if (!state) return NULL;
+ return eina_hash_iterator_key_new(state->filenames_eot);
+}
+
+EAPI Eina_Iterator *
+eolian_state_eo_files_get(const Eolian_State *state)
+{
+ if (!state) return NULL;
+ return eina_hash_iterator_key_new(state->filenames_eo);
+}
+
+EAPI Eina_Iterator *
+eolian_state_eot_file_paths_get(const Eolian_State *state)
+{
+ if (!state) return NULL;
+ return eina_hash_iterator_data_new(state->filenames_eot);
+}
+
+EAPI Eina_Iterator *
+eolian_state_eo_file_paths_get(const Eolian_State *state)
+{
+ if (!state) return NULL;
+ return eina_hash_iterator_data_new(state->filenames_eo);
+}
+
+EAPI Eina_Iterator *
+eolian_all_eot_files_get(const Eolian_State *state)
+{
+ return eolian_state_eot_files_get(state);
+}
+
+EAPI Eina_Iterator *
+eolian_all_eo_files_get(const Eolian_State *state)
+{
+ return eolian_state_eo_files_get(state);
+}
+
+EAPI Eina_Iterator *
+eolian_all_eot_file_paths_get(const Eolian_State *state)
+{
+ return eolian_state_eot_file_paths_get(state);
+}
+
+EAPI Eina_Iterator *
+eolian_all_eo_file_paths_get(const Eolian_State *state)
+{
+ return eolian_state_eo_file_paths_get(state);
+}
+
static Eolian_Unit *
_eolian_file_parse_nodep(Eolian_Unit *parent, const char *filepath)
{
@@ -912,31 +964,3 @@ database_class_to_filename(const char *cname)
return ret;
}
-
-EAPI Eina_Iterator *
-eolian_all_eot_files_get(const Eolian_State *state)
-{
- if (!state) return NULL;
- return eina_hash_iterator_key_new(state->filenames_eot);
-}
-
-EAPI Eina_Iterator *
-eolian_all_eo_files_get(const Eolian_State *state)
-{
- if (!state) return NULL;
- return eina_hash_iterator_key_new(state->filenames_eo);
-}
-
-EAPI Eina_Iterator *
-eolian_all_eot_file_paths_get(const Eolian_State *state)
-{
- if (!state) return NULL;
- return eina_hash_iterator_data_new(state->filenames_eot);
-}
-
-EAPI Eina_Iterator *
-eolian_all_eo_file_paths_get(const Eolian_State *state)
-{
- if (!state) return NULL;
- return eina_hash_iterator_data_new(state->filenames_eo);
-}
--
