consistant glib type usage

[chaz/openbox] / parser / parse.h

diff --git a/parser/parse.h b/parser/parse.h
index 5974b7809aa6cdced34d88f84782ac0c95638a31..886b867de026b93e8a071e8c88104ce1ebb446fe 100644 (file)
--- a/parser/parse.h
+++ b/parser/parse.h
@@ -22,6 +22,8 @@
 #include <libxml/parser.h>
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 typedef struct _ObParseInst ObParseInst;
 
 typedef void (*ParseCallback)(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -35,34 +37,34 @@ gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root);
 /* Loads an Openbox menu, from the normal paths */
 gboolean parse_load_menu(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root);
 
-void parse_register(ObParseInst *inst, const char *tag,
+void parse_register(ObParseInst *inst, const gchar *tag,
                     ParseCallback func, gpointer data);
 void parse_tree(ObParseInst *inst, xmlDocPtr doc, xmlNodePtr node);
 
 
 /* open/close */
 
-gboolean parse_load(const char *path, const char *rootname,
+gboolean parse_load(const gchar *path, const gchar *rootname,
                     xmlDocPtr *doc, xmlNodePtr *root);
-gboolean parse_load_mem(gpointer data, guint len, const char *rootname,
+gboolean parse_load_mem(gpointer data, guint len, const gchar *rootname,
                         xmlDocPtr *doc, xmlNodePtr *root);
 void parse_close(xmlDocPtr doc);
 
 
 /* helpers */
 
-xmlNodePtr parse_find_node(const char *tag, xmlNodePtr node);
+xmlNodePtr parse_find_node(const gchar *tag, xmlNodePtr node);
 
-char *parse_string(xmlDocPtr doc, xmlNodePtr node);
-int parse_int(xmlDocPtr doc, xmlNodePtr node);
+gchar *parse_string(xmlDocPtr doc, xmlNodePtr node);
+gint parse_int(xmlDocPtr doc, xmlNodePtr node);
 gboolean parse_bool(xmlDocPtr doc, xmlNodePtr node);
 
-gboolean parse_contains(const char *val, xmlDocPtr doc, xmlNodePtr node);
-gboolean parse_attr_contains(const char *val, xmlNodePtr node,
-                             const char *name);
+gboolean parse_contains(const gchar *val, xmlDocPtr doc, xmlNodePtr node);
+gboolean parse_attr_contains(const gchar *val, xmlNodePtr node,
+                             const gchar *name);
 
-gboolean parse_attr_string(const char *name, xmlNodePtr node, char **value);
-gboolean parse_attr_int(const char *name, xmlNodePtr node, int *value);
+gboolean parse_attr_string(const gchar *name, xmlNodePtr node, gchar **value);
+gboolean parse_attr_int(const gchar *name, xmlNodePtr node, gint *value);
 
 /* paths */
 
@@ -80,4 +82,6 @@ gchar *parse_expand_tilde(const gchar *f);
 /*! Makes a directory and all its parents */
 void parse_mkdir_path(const gchar *path, gint mode);
 
+G_END_DECLS
+
 #endif