[tepl] Rename metadata-store-loader to metadata-parser
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tepl] Rename metadata-store-loader to metadata-parser
- Date: Sat, 18 Apr 2020 17:20:33 +0000 (UTC)
commit ddddd661b90da77411fb42711fc2692fc3c3f7cb
Author: Sébastien Wilmet <swilmet gnome org>
Date: Sat Apr 18 02:21:39 2020 +0200
Rename metadata-store-loader to metadata-parser
It's shorter.
po/POTFILES.in | 2 +-
tepl/meson.build | 4 ++--
.../{tepl-metadata-store-loader.c => tepl-metadata-parser.c} | 9 ++++-----
.../{tepl-metadata-store-loader.h => tepl-metadata-parser.h} | 12 ++++++------
tepl/tepl-metadata-store.c | 8 ++++----
5 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 35f7f07..995464e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,8 +19,8 @@ tepl/tepl-init.c
tepl/tepl-io-error-info-bars.c
tepl/tepl-iter.c
tepl/tepl-menu-shell.c
+tepl/tepl-metadata-parser.c
tepl/tepl-metadata-store.c
-tepl/tepl-metadata-store-loader.c
tepl/tepl-notebook.c
tepl/tepl-signal-group.c
tepl/tepl-tab.c
diff --git a/tepl/meson.build b/tepl/meson.build
index 59fd1be..8f9991c 100644
--- a/tepl/meson.build
+++ b/tepl/meson.build
@@ -61,7 +61,7 @@ TEPL_PRIVATE_HEADERS = [
'tepl-file-content.h',
'tepl-file-content-loader.h',
'tepl-io-error-info-bar.h',
- 'tepl-metadata-store-loader.h',
+ 'tepl-metadata-parser.h',
'tepl-progress-info-bar.h',
'tepl-signal-group.h',
'tepl-tab-saving.h'
@@ -74,7 +74,7 @@ tepl_private_c_files = [
'tepl-file-content.c',
'tepl-file-content-loader.c',
'tepl-io-error-info-bar.c',
- 'tepl-metadata-store-loader.c',
+ 'tepl-metadata-parser.c',
'tepl-progress-info-bar.c',
'tepl-signal-group.c',
'tepl-tab-saving.c'
diff --git a/tepl/tepl-metadata-store-loader.c b/tepl/tepl-metadata-parser.c
similarity index 98%
rename from tepl/tepl-metadata-store-loader.c
rename to tepl/tepl-metadata-parser.c
index cfbf091..676933c 100644
--- a/tepl/tepl-metadata-store-loader.c
+++ b/tepl/tepl-metadata-parser.c
@@ -18,10 +18,9 @@
*/
#include "config.h"
-#include "tepl-metadata-store-loader.h"
+#include "tepl-metadata-parser.h"
#include <glib/gi18n-lib.h>
#include "tepl-file-metadata.h"
-#include "tepl-utils.h"
typedef struct _ParsingData ParsingData;
struct _ParsingData
@@ -337,9 +336,9 @@ parse_xml_file_content (GBytes *xml_file_bytes,
}
gboolean
-_tepl_metadata_store_loader (GFile *from_file,
- GHashTable *hash_table,
- GError **error)
+_tepl_metadata_parser_read_file (GFile *from_file,
+ GHashTable *hash_table,
+ GError **error)
{
GBytes *bytes;
GError *my_error = NULL;
diff --git a/tepl/tepl-metadata-store-loader.h b/tepl/tepl-metadata-parser.h
similarity index 78%
rename from tepl/tepl-metadata-store-loader.h
rename to tepl/tepl-metadata-parser.h
index fcde6cc..9d5728d 100644
--- a/tepl/tepl-metadata-store-loader.h
+++ b/tepl/tepl-metadata-parser.h
@@ -17,18 +17,18 @@
* along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef TEPL_METADATA_STORE_LOADER_H
-#define TEPL_METADATA_STORE_LOADER_H
+#ifndef TEPL_METADATA_PARSER_H
+#define TEPL_METADATA_PARSER_H
#include <gio/gio.h>
G_BEGIN_DECLS
G_GNUC_INTERNAL
-gboolean _tepl_metadata_store_loader (GFile *from_file,
- GHashTable *hash_table,
- GError **error);
+gboolean _tepl_metadata_parser_read_file (GFile *from_file,
+ GHashTable *hash_table,
+ GError **error);
G_END_DECLS
-#endif /* TEPL_METADATA_STORE_LOADER_H */
+#endif /* TEPL_METADATA_PARSER_H */
diff --git a/tepl/tepl-metadata-store.c b/tepl/tepl-metadata-store.c
index 524acd0..63abd04 100644
--- a/tepl/tepl-metadata-store.c
+++ b/tepl/tepl-metadata-store.c
@@ -18,7 +18,7 @@
*/
#include "tepl-metadata-store.h"
-#include "tepl-metadata-store-loader.h"
+#include "tepl-metadata-parser.h"
#include "tepl-utils.h"
/**
@@ -213,9 +213,9 @@ tepl_metadata_store_load (TeplMetadataStore *store,
g_return_val_if_fail (G_IS_FILE (from_file), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- return _tepl_metadata_store_loader (from_file,
- store->priv->hash_table,
- error);
+ return _tepl_metadata_parser_read_file (from_file,
+ store->priv->hash_table,
+ error);
}
static GBytes *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]