Consolidate data types

1 files changed, 4 insertions, 37 deletions

diff --git a/src/block-parser.h b/src/block-parser.h
index 41db0b1..0e94f73 100644
--- a/src/block-parser.h
+++ b/src/block-parser.h
@@ -36,20 +36,20 @@ void block_parser_free (BlockParser *parser);
  *                   placeholder will be surrounded by "<!-- $(replace_key) -->"
  *
  */
-void block_parser_register_key (BlockParser *parser, const char *key, const char *replace_key);
+void block_parser_register_key (BlockParser *parser, const gchar *key, const gchar *replace_key);
 
 /*
  *   block_parser_get_data: return retrieved data or NULL if none read yet
  *      returns newly allocated string, caller is responsible for freeing
  *
  */
-char * block_parser_get_data (BlockParser *parser, const char *key);
+gchar * block_parser_get_data (BlockParser *parser, const gchar *key);
 
 /*
  *   block_parser_has_unused_data: indicates whether the data have already been read and used (by calling block_parser_get_data)
  *
  */
-gboolean block_parser_has_unused_data (BlockParser *parser, const char *key);
+gboolean block_parser_has_unused_data (BlockParser *parser, const gchar *key);
 
 /*
  *   block_parser_read_and_parse: reads input from the file and returns parsed line
@@ -61,37 +61,4 @@ gboolean block_parser_has_unused_data (BlockParser *parser, const char *key);
  *      - returns newly allocated string, caller is responsible for freeing
  *
  */
-char * block_parser_read_and_parse (BlockParser *parser, FILE *stream);
-
-
-
-#if 0
-
-/*
- *   replace_table_add_key: add tag/value pair to replace
- *
- *      tag, value will be referenced inside
- *
- */
-void replace_table_add_key (ReplaceTable *table, const gchar *tag, const gchar *value);
-void replace_table_add_key_int (ReplaceTable *table, const gchar *tag, gint value);
-void replace_table_add_key_printf (ReplaceTable *table, const gchar *tag, const gchar *format, ...) G_GNUC_PRINTF (3, 4);
-
-/*
- *   replace_table_process: process buffer and replace all tags filled in the replace table
- *
- *      - reallocates source buffer
- *
- */
-void replace_table_process (gchar **buffer, ReplaceTable *table);
-
-
-/*
- *   adjust_tags_normal:    adjust string for normal HTML use
- *   adjust_tags_parameter: adjust string for use as tag parameter value
- *        - both funtions return newly allocated string
- */
-void adjust_tags_normal (char **str);
-void adjust_tags_parameter (char **str);
-
-#endif
+gchar * block_parser_read_and_parse (BlockParser *parser, FILE *stream);