This commit just deals with glib/.
gobject/ and gio/ will be handled in separate commits.
return (time_t) stamp.tv_sec;
}
-
-
-GQuark
-g_bookmark_file_error_quark (void)
-{
- return g_quark_from_static_string ("g-bookmark-file-error-quark");
-}
-
-
+G_DEFINE_QUARK ("g-bookmark-file-error-quark", g_bookmark_file_error)
/********************
* Public API *
*/
#define NUL_TERMINATOR_LENGTH 4
-GQuark
-g_convert_error_quark (void)
-{
- return g_quark_from_static_string ("g_convert_error");
-}
+G_DEFINE_QUARK ("g_convert_error", g_convert_error)
static gboolean
try_conversion (const char *to_codeset,
#endif
}
-GQuark
-g_file_error_quark (void)
-{
- return g_quark_from_static_string ("g-file-error-quark");
-}
+G_DEFINE_QUARK ("g-file-error-quark", g_file_error)
/**
* g_file_error_from_errno:
*
* Error codes returned by #GIOChannel operations.
**/
-GQuark
-g_io_channel_error_quark (void)
-{
- return g_quark_from_static_string ("g-io-channel-error-quark");
-}
+
+G_DEFINE_QUARK ("g-io-channel-error-quark", g_io_channel_error)
static void g_key_file_flush_parse_buffer (GKeyFile *key_file,
GError **error);
-
-GQuark
-g_key_file_error_quark (void)
-{
- return g_quark_from_static_string ("g-key-file-error-quark");
-}
+G_DEFINE_QUARK ("g-key-file-error-quark", g_key_file_error)
static void
g_key_file_init (GKeyFile *key_file)
* "glib-unix.h" header.
*/
-GQuark
-g_unix_error_quark (void)
-{
- return g_quark_from_static_string ("g-unix-error-quark");
-}
+G_DEFINE_QUARK ("g-unix-error-quark", g_unix_error)
static gboolean
g_unix_set_error_from_errno (GError **error,
* </itemizedlist>
*/
-GQuark
-g_markup_error_quark (void)
-{
- return g_quark_from_static_string ("g-markup-error-quark");
-}
+G_DEFINE_QUARK ("g-markup-error-quark", g_markup_error)
typedef enum
{
return len;
}
-
-GQuark
-g_option_error_quark (void)
-{
- return g_quark_from_static_string ("g-option-context-error-quark");
-}
+G_DEFINE_QUARK ("g-option-context-error-quark", g_option_error)
/**
* g_option_context_new:
/* GRegex */
-GQuark
-g_regex_error_quark (void)
-{
- static GQuark error_quark = 0;
-
- if (error_quark == 0)
- error_quark = g_quark_from_static_string ("g-regex-error-quark");
-
- return error_quark;
-}
+G_DEFINE_QUARK ("g-regex-error-quark", g_regex_error)
/**
* g_regex_ref:
*
* Error codes returned by shell functions.
**/
-GQuark
-g_shell_error_quark (void)
-{
- return g_quark_from_static_string ("g-shell-error-quark");
-}
+G_DEFINE_QUARK ("g-shell-error-quark", g_shell_error)
/* Single quotes preserve the literal string exactly. escape
* sequences are not allowed; not even \' - if you want a '
return argc;
}
-GQuark
-g_spawn_error_quark (void)
-{
- return g_quark_from_static_string ("g-exec-error-quark");
-}
-
-GQuark
-g_spawn_exit_error_quark (void)
-{
- return g_quark_from_static_string ("g-spawn-exit-error-quark");
-}
+G_DEFINE_QUARK ("g-exec-error-quark", g_spawn_error)
+G_DEFINE_QUARK ("g-spawn-exit-error-quark", g_spawn_exit_error)
gboolean
g_spawn_async_utf8 (const gchar *working_directory,
gint *standard_error,
GError **error);
-GQuark
-g_spawn_error_quark (void)
-{
- return g_quark_from_static_string ("g-exec-error-quark");
-}
-
-GQuark
-g_spawn_exit_error_quark (void)
-{
- return g_quark_from_static_string ("g-spawn-exit-error-quark");
-}
+G_DEFINE_QUARK ("g-exec-error-quark", g_spawn_error)
+G_DEFINE_QUARK ("g-spawn-exit-error-quark", g_spawn_exit_error)
/**
* g_spawn_async:
*
* The error domain of the GLib thread subsystem.
**/
-GQuark
-g_thread_error_quark (void)
-{
- return g_quark_from_static_string ("g_thread_error");
-}
+G_DEFINE_QUARK ("g_thread_error", g_thread_error)
/* Local Data {{{1 -------------------------------------------------------- */
*
* Error codes returned by parsing text-format GVariants.
**/
-GQuark
-g_variant_parser_get_error_quark (void)
-{
- static GQuark the_quark;
-
- if (the_quark == 0)
- the_quark = g_quark_from_static_string ("g-variant-parse-error-quark");
-
- return the_quark;
-}
+G_DEFINE_QUARK ("g-variant-parse-error-quark", g_variant_parser_get_error)
typedef struct
{