From 60d2cb665ef4bc751b4a4a940ec2f336f57b5535 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 27 Aug 2012 23:42:12 -0400 Subject: [PATCH] Use G_DEFINE_QUARK for quarks in GIO --- gio/gioerror.c | 8 ++------ gio/gresolver.c | 7 +------ gio/gresource.c | 6 +----- gio/gtlsconnection.c | 7 +------ 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/gio/gioerror.c b/gio/gioerror.c index dda802d45..ffac3e36a 100644 --- a/gio/gioerror.c +++ b/gio/gioerror.c @@ -35,16 +35,12 @@ /** * g_io_error_quark: - * + * * Gets the GIO Error Quark. * * Return value: a #GQuark. **/ -GQuark -g_io_error_quark (void) -{ - return g_quark_from_static_string ("g-io-error-quark"); -} +G_DEFINE_QUARK ("g-io-error-quark", g_io_error) /** * g_io_error_from_errno: diff --git a/gio/gresolver.c b/gio/gresolver.c index 17855430b..e1569a389 100644 --- a/gio/gresolver.c +++ b/gio/gresolver.c @@ -874,12 +874,7 @@ g_resolver_lookup_records_finish (GResolver *resolver, * * Since: 2.22 */ -GQuark -g_resolver_error_quark (void) -{ - return g_quark_from_static_string ("g-resolver-error-quark"); -} - +G_DEFINE_QUARK ("g-resolver-error-quark", g_resolver_error) static GResolverError g_resolver_error_from_addrinfo_error (gint err) diff --git a/gio/gresource.c b/gio/gresource.c index ded4b7936..a597f926a 100644 --- a/gio/gresource.c +++ b/gio/gresource.c @@ -138,11 +138,7 @@ G_DEFINE_BOXED_TYPE (GResource, g_resource, g_resource_ref, g_resource_unref) * * Since: 2.32 */ -GQuark -g_resource_error_quark (void) -{ - return g_quark_from_static_string ("g-resource-error-quark"); -} +G_DEFINE_QUARK ("g-resource-error-quark", g_resource_error) /** * g_resource_ref: diff --git a/gio/gtlsconnection.c b/gio/gtlsconnection.c index 7d33e3739..6af182c6c 100644 --- a/gio/gtlsconnection.c +++ b/gio/gtlsconnection.c @@ -831,12 +831,7 @@ g_tls_connection_handshake_finish (GTlsConnection *conn, * * Since: 2.28 */ -GQuark -g_tls_error_quark (void) -{ - return g_quark_from_static_string ("g-tls-error-quark"); -} - +G_DEFINE_QUARK ("g-tls-error-quark", g_tls_error) /** * g_tls_connection_emit_accept_certificate: