X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/509cf0693fc440c71bdd3e71ea8947a6b4eb0bcf..bb6822c219eb531a497d0829626ac3b29af198fa:/src/util.h

diff --git a/src/util.h b/src/util.h
index 72121ca..8794394 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,7 @@
 /* GOB C Preprocessor
  * Copyright (C) 1999-2000 the Free Software Foundation.
  * Copyright (C) 2000 Eazel, Inc.
+ * Copyright (C) 2022 Nick Bowler
  *
  * Author: George Lebl
  *
@@ -20,27 +21,60 @@
  * USA.
  */
 
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef UTIL_H
+#define UTIL_H
 
-/* print an error, or warning (if 'is_warn') referring to 'line' */
-void print_error(gboolean is_warn, char *error, int line);
+#include <glib.h>
+
+struct Class;
+struct Type;
+
+enum {
+	GOB_WARN,
+	GOB_ERROR
+};
+
+/* print an error, or warning referring to 'line'
+ * (line can be 0 or negative for no line) */
+void error_print(int type, int line, const char *error);
+void error_printf(int type, int line, const char *error, ...) G_GNUC_PRINTF (3, 4);
 
 /* remove the : separator from a typename */
-char * remove_sep(char *base);
+char * remove_sep(const char *base);
 /* replace the : separator from a typename with a different character*/
-char * replace_sep(char *base, char r);
+char * replace_sep(const char *base, char r);
+
+#if !HAVE_G_STRING_APPEND_PRINTF
+#  define g_string_append_printf g_string_sprintfa
+#  define g_string_printf g_string_sprintf
+#endif
+
+char *gob_strup(char *s);
+char *gob_strdown(char *s);
+
+#if HAVE_G_ASCII_STRCASECMP
+static inline int gob_strcasecmp(const char *s1, const char *s2)
+{
+	return g_ascii_strcasecmp(s1, s2);
+}
+#else
+int gob_strcasecmp(const char *s1, const char *s2);
+#endif
+
+char * gob_str_delete_quotes(char *str);
 
 /*separate the namespace part and then replace rest of
   separators with r*/
-void separns_replace_sep(char *base, char **ns, char **name, char r);
+void separns_replace_sep(const char *base, char **ns, char **name, char r);
 
 /* make a macro with some prefix before the name but after
    namespace */
-char * make_pre_macro(char *base, char *pre);
+char * make_pre_macro(const char *base,const  char *pre);
 
-/* get a name usable for a cast from a GTK+ type (without GTK_TYPE_)*/
-const char * get_cast(char *type, gboolean simple_only);
+/* get a name usable for a cast from a GObject (without G_TYPE_)*/
+const char *get_cast(const char *type, gboolean simple_only);
+struct Type *get_tree_type(const char *type, gboolean simple_only);
+char *get_type(const struct Type *t, gboolean postfix_to_stars);
 
 enum {
 	SPECIAL_2POINTER,
@@ -48,11 +82,10 @@ enum {
 	SPECIAL_INT_POINTER,
 	SPECIAL_LAST
 };
-/* returns TRUE if there are any special types at all */
-gboolean setup_special_array(Class *c, gboolean *special_array);
 
-/* get the id without the first underscore, but only if we're removing them */
-char *get_real_id(char *id);
+/* returns TRUE if there are any special types at all */
+gboolean setup_special_array(struct Class *c, gboolean *special_array);
 
-#endif
+char * make_me_type (const char *type, const char *alt);
 
+#endif /* UTIL_H */