diff options
61 files changed, 112 insertions, 122 deletions
diff --git a/docs/reference/gobject/tut_gtype.xml b/docs/reference/gobject/tut_gtype.xml index df63c2dee..126eac38e 100644 --- a/docs/reference/gobject/tut_gtype.xml +++ b/docs/reference/gobject/tut_gtype.xml @@ -715,7 +715,7 @@ viewer_file_editable_interface_init (ViewerEditableInterface *iface) G_DEFINE_TYPE_WITH_CODE (ViewerFile, viewer_file, VIEWER_TYPE_FILE, G_IMPLEMENT_INTERFACE (VIEWER_TYPE_EDITABLE, - viewer_file_editable_interface_init)); + viewer_file_editable_interface_init)) </programlisting></informalexample> </para> @@ -836,7 +836,7 @@ struct _GInterfaceInfo <link linkend="G-DEFINE-INTERFACE:CAPS">G_DEFINE_INTERFACE</link> which can be used to define the interface: <informalexample><programlisting> -G_DEFINE_INTERFACE (ViewerEditable, viewer_editable, G_TYPE_OBJECT); +G_DEFINE_INTERFACE (ViewerEditable, viewer_editable, G_TYPE_OBJECT) static void viewer_editable_default_init (ViewerEditableInterface *iface) diff --git a/docs/reference/gobject/tut_howto.xml b/docs/reference/gobject/tut_howto.xml index d436984fe..0696666be 100644 --- a/docs/reference/gobject/tut_howto.xml +++ b/docs/reference/gobject/tut_howto.xml @@ -938,7 +938,7 @@ G_END_DECLS </para></listitem> </itemizedlist> <informalexample><programlisting> -G_DEFINE_INTERFACE (ViewerEditable, viewer_editable, G_TYPE_OBJECT); +G_DEFINE_INTERFACE (ViewerEditable, viewer_editable, G_TYPE_OBJECT) static void viewer_editable_default_init (ViewerEditableInterface *iface) @@ -1091,7 +1091,7 @@ viewer_file_init (ViewerFile *self) the GObject equivalent: <informalexample><programlisting> /* Make the ViewerEditableLossy interface require ViewerEditable interface. */ -G_DEFINE_INTERFACE (ViewerEditableLossy, viewer_editable_lossy, VIEWER_TYPE_EDITABLE); +G_DEFINE_INTERFACE (ViewerEditableLossy, viewer_editable_lossy, VIEWER_TYPE_EDITABLE) </programlisting></informalexample> In the <function><link linkend="G-DEFINE-INTERFACE:CAPS">G_DEFINE_INTERFACE</link></function> call above, the third parameter defines the prerequisite type. This diff --git a/gio/gcredentials.c b/gio/gcredentials.c index 6d6b92a77..5be0234aa 100644 --- a/gio/gcredentials.c +++ b/gio/gcredentials.c @@ -113,7 +113,7 @@ struct _GCredentialsClass GObjectClass parent_class; }; -G_DEFINE_TYPE (GCredentials, g_credentials, G_TYPE_OBJECT); +G_DEFINE_TYPE (GCredentials, g_credentials, G_TYPE_OBJECT) static void g_credentials_finalize (GObject *object) diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py index 3485c1a0e..f9f404c91 100644 --- a/gio/gdbus-2.0/codegen/codegen.py +++ b/gio/gdbus-2.0/codegen/codegen.py @@ -1062,7 +1062,7 @@ class CodeGenerator: self.c.write('\n') self.c.write('typedef %sIface %sInterface;\n'%(i.camel_name, i.camel_name)) - self.c.write('G_DEFINE_INTERFACE (%s, %s, G_TYPE_OBJECT);\n'%(i.camel_name, i.name_lower)) + self.c.write('G_DEFINE_INTERFACE (%s, %s, G_TYPE_OBJECT)\n'%(i.camel_name, i.name_lower)) self.c.write('\n') self.c.write('static void\n' @@ -1604,10 +1604,10 @@ class CodeGenerator: self.c.write('#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38\n') self.c.write('G_DEFINE_TYPE_WITH_CODE (%sProxy, %s_proxy, G_TYPE_DBUS_PROXY,\n'%(i.camel_name, i.name_lower)) self.c.write(' G_ADD_PRIVATE (%sProxy)\n'%(i.camel_name)) - self.c.write(' G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_proxy_iface_init));\n\n'%(i.ns_upper, i.name_upper, i.name_lower)) + self.c.write(' G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_proxy_iface_init))\n\n'%(i.ns_upper, i.name_upper, i.name_lower)) self.c.write('#else\n') self.c.write('G_DEFINE_TYPE_WITH_CODE (%sProxy, %s_proxy, G_TYPE_DBUS_PROXY,\n'%(i.camel_name, i.name_lower)) - self.c.write(' G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_proxy_iface_init));\n\n'%(i.ns_upper, i.name_upper, i.name_lower)) + self.c.write(' G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_proxy_iface_init))\n\n'%(i.ns_upper, i.name_upper, i.name_lower)) self.c.write('#endif\n') # finalize @@ -2391,10 +2391,10 @@ class CodeGenerator: self.c.write('#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38\n') self.c.write('G_DEFINE_TYPE_WITH_CODE (%sSkeleton, %s_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,\n'%(i.camel_name, i.name_lower)) self.c.write(' G_ADD_PRIVATE (%sSkeleton)\n'%(i.camel_name)) - self.c.write(' G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_skeleton_iface_init));\n\n'%(i.ns_upper, i.name_upper, i.name_lower)) + self.c.write(' G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_skeleton_iface_init))\n\n'%(i.ns_upper, i.name_upper, i.name_lower)) self.c.write('#else\n') self.c.write('G_DEFINE_TYPE_WITH_CODE (%sSkeleton, %s_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,\n'%(i.camel_name, i.name_lower)) - self.c.write(' G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_skeleton_iface_init));\n\n'%(i.ns_upper, i.name_upper, i.name_lower)) + self.c.write(' G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_skeleton_iface_init))\n\n'%(i.ns_upper, i.name_upper, i.name_lower)) self.c.write('#endif\n') # finalize @@ -2726,7 +2726,7 @@ class CodeGenerator: self.c.write('\n') self.c.write('typedef %sObjectIface %sObjectInterface;\n'%(self.namespace, self.namespace)) - self.c.write('G_DEFINE_INTERFACE_WITH_CODE (%sObject, %sobject, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT));\n'%(self.namespace, self.ns_lower)) + self.c.write('G_DEFINE_INTERFACE_WITH_CODE (%sObject, %sobject, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT);)\n'%(self.namespace, self.ns_lower)) self.c.write('\n') self.c.write('static void\n' '%sobject_default_init (%sObjectIface *iface)\n' @@ -2846,7 +2846,7 @@ class CodeGenerator: self.c.write('\n') self.c.write('G_DEFINE_TYPE_WITH_CODE (%sObjectProxy, %sobject_proxy, G_TYPE_DBUS_OBJECT_PROXY,\n' ' G_IMPLEMENT_INTERFACE (%sTYPE_OBJECT, %sobject_proxy__%sobject_iface_init)\n' - ' G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, %sobject_proxy__g_dbus_object_iface_init));\n' + ' G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, %sobject_proxy__g_dbus_object_iface_init))\n' '\n' %(self.namespace, self.ns_lower, self.ns_upper, self.ns_lower, self.ns_lower, self.ns_lower)) # class boilerplate @@ -2966,7 +2966,7 @@ class CodeGenerator: %(self.ns_lower, self.ns_lower, self.ns_lower)) self.c.write('G_DEFINE_TYPE_WITH_CODE (%sObjectSkeleton, %sobject_skeleton, G_TYPE_DBUS_OBJECT_SKELETON,\n' ' G_IMPLEMENT_INTERFACE (%sTYPE_OBJECT, %sobject_skeleton__%sobject_iface_init)\n' - ' G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, %sobject_skeleton__g_dbus_object_iface_init));\n' + ' G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, %sobject_skeleton__g_dbus_object_iface_init))\n' '\n' %(self.namespace, self.ns_lower, self.ns_upper, self.ns_lower, self.ns_lower, self.ns_lower)) # class boilerplate @@ -3129,7 +3129,7 @@ class CodeGenerator: self.c.write('\n') # class boilerplate - self.c.write('G_DEFINE_TYPE (%sObjectManagerClient, %sobject_manager_client, G_TYPE_DBUS_OBJECT_MANAGER_CLIENT);\n' + self.c.write('G_DEFINE_TYPE (%sObjectManagerClient, %sobject_manager_client, G_TYPE_DBUS_OBJECT_MANAGER_CLIENT)\n' '\n' %(self.namespace, self.ns_lower)) diff --git a/gio/gdbusauthobserver.c b/gio/gdbusauthobserver.c index 3ae434f72..dce5c2a3e 100644 --- a/gio/gdbusauthobserver.c +++ b/gio/gdbusauthobserver.c @@ -117,7 +117,7 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE (GDBusAuthObserver, g_dbus_auth_observer, G_TYPE_OBJECT); +G_DEFINE_TYPE (GDBusAuthObserver, g_dbus_auth_observer, G_TYPE_OBJECT) /* ---------------------------------------------------------------------------------------------------- */ diff --git a/gio/gdbusdaemon.c b/gio/gdbusdaemon.c index 69a4f79a0..2e67b5d67 100644 --- a/gio/gdbusdaemon.c +++ b/gio/gdbusdaemon.c @@ -75,7 +75,7 @@ static void g_dbus_daemon_iface_init (_GFreedesktopDBusIface *iface); #define g_dbus_daemon_get_type _g_dbus_daemon_get_type G_DEFINE_TYPE_WITH_CODE (GDBusDaemon, g_dbus_daemon, _G_TYPE_FREEDESKTOP_DBUS_SKELETON, G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init) - G_IMPLEMENT_INTERFACE (_G_TYPE_FREEDESKTOP_DBUS, g_dbus_daemon_iface_init)); + G_IMPLEMENT_INTERFACE (_G_TYPE_FREEDESKTOP_DBUS, g_dbus_daemon_iface_init)) typedef struct { GDBusDaemon *daemon; diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c index bb510909a..778930175 100644 --- a/gio/gdbusintrospection.c +++ b/gio/gdbusintrospection.c @@ -46,13 +46,15 @@ #define _MY_DEFINE_BOXED_TYPE(TypeName, type_name) \ G_DEFINE_BOXED_TYPE (TypeName, type_name, type_name##_ref, type_name##_unref) -_MY_DEFINE_BOXED_TYPE (GDBusNodeInfo, g_dbus_node_info); -_MY_DEFINE_BOXED_TYPE (GDBusInterfaceInfo, g_dbus_interface_info); -_MY_DEFINE_BOXED_TYPE (GDBusMethodInfo, g_dbus_method_info); -_MY_DEFINE_BOXED_TYPE (GDBusSignalInfo, g_dbus_signal_info); -_MY_DEFINE_BOXED_TYPE (GDBusPropertyInfo, g_dbus_property_info); -_MY_DEFINE_BOXED_TYPE (GDBusArgInfo, g_dbus_arg_info); -_MY_DEFINE_BOXED_TYPE (GDBusAnnotationInfo, g_dbus_annotation_info); +_MY_DEFINE_BOXED_TYPE (GDBusNodeInfo, g_dbus_node_info) +_MY_DEFINE_BOXED_TYPE (GDBusInterfaceInfo, g_dbus_interface_info) +_MY_DEFINE_BOXED_TYPE (GDBusMethodInfo, g_dbus_method_info) +_MY_DEFINE_BOXED_TYPE (GDBusSignalInfo, g_dbus_signal_info) +_MY_DEFINE_BOXED_TYPE (GDBusPropertyInfo, g_dbus_property_info) +_MY_DEFINE_BOXED_TYPE (GDBusArgInfo, g_dbus_arg_info) +_MY_DEFINE_BOXED_TYPE (GDBusAnnotationInfo, g_dbus_annotation_info) + +#undef _MY_DEFINE_BOXED_TYPE /* ---------------------------------------------------------------------------------------------------- */ diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c index 94b75ff88..e41aebded 100644 --- a/gio/gdbusmessage.c +++ b/gio/gdbusmessage.c @@ -474,7 +474,7 @@ enum PROP_LOCKED }; -G_DEFINE_TYPE (GDBusMessage, g_dbus_message, G_TYPE_OBJECT); +G_DEFINE_TYPE (GDBusMessage, g_dbus_message, G_TYPE_OBJECT) static void g_dbus_message_finalize (GObject *object) diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c index e314ec504..69dc435d1 100644 --- a/gio/gdbusmethodinvocation.c +++ b/gio/gdbusmethodinvocation.c @@ -92,7 +92,7 @@ struct _GDBusMethodInvocation gpointer user_data; }; -G_DEFINE_TYPE (GDBusMethodInvocation, g_dbus_method_invocation, G_TYPE_OBJECT); +G_DEFINE_TYPE (GDBusMethodInvocation, g_dbus_method_invocation, G_TYPE_OBJECT) static void g_dbus_method_invocation_finalize (GObject *object) diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c index a94d2f35a..24327bf7f 100644 --- a/gio/gdbusobjectmanagerclient.c +++ b/gio/gdbusobjectmanagerclient.c @@ -173,7 +173,7 @@ G_DEFINE_TYPE_WITH_CODE (GDBusObjectManagerClient, g_dbus_object_manager_client, G_ADD_PRIVATE (GDBusObjectManagerClient) G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init) G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init) - G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT_MANAGER, dbus_object_manager_interface_init)); + G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT_MANAGER, dbus_object_manager_interface_init)) static void maybe_unsubscribe_signals (GDBusObjectManagerClient *manager); diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c index a50b958f2..580afe275 100644 --- a/gio/gdbusserver.c +++ b/gio/gdbusserver.c @@ -154,8 +154,7 @@ static guint _signals[LAST_SIGNAL] = {0}; static void initable_iface_init (GInitableIface *initable_iface); G_DEFINE_TYPE_WITH_CODE (GDBusServer, g_dbus_server, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init) - ); + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)) static void g_dbus_server_finalize (GObject *object) diff --git a/gio/gdtlsconnection.c b/gio/gdtlsconnection.c index ef9127c8a..b712d9126 100644 --- a/gio/gdtlsconnection.c +++ b/gio/gdtlsconnection.c @@ -68,7 +68,7 @@ * Since: 2.48 */ -G_DEFINE_INTERFACE (GDtlsConnection, g_dtls_connection, G_TYPE_DATAGRAM_BASED); +G_DEFINE_INTERFACE (GDtlsConnection, g_dtls_connection, G_TYPE_DATAGRAM_BASED) enum { ACCEPT_CERTIFICATE, diff --git a/gio/gdummytlsbackend.c b/gio/gdummytlsbackend.c index 016dd21f6..ff8ff2ee7 100644 --- a/gio/gdummytlsbackend.c +++ b/gio/gdummytlsbackend.c @@ -61,7 +61,7 @@ G_DEFINE_TYPE_WITH_CODE (GDummyTlsBackend, g_dummy_tls_backend, G_TYPE_OBJECT, g_io_extension_point_implement (G_TLS_BACKEND_EXTENSION_POINT_NAME, g_define_type_id, "dummy", - -100)) + -100);) static void g_dummy_tls_backend_init (GDummyTlsBackend *dummy) @@ -143,7 +143,7 @@ static void g_dummy_tls_certificate_initable_iface_init (GInitableIface *iface); #define g_dummy_tls_certificate_get_type _g_dummy_tls_certificate_get_type G_DEFINE_TYPE_WITH_CODE (GDummyTlsCertificate, g_dummy_tls_certificate, G_TYPE_TLS_CERTIFICATE, G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_dummy_tls_certificate_initable_iface_init);) + g_dummy_tls_certificate_initable_iface_init)) static void g_dummy_tls_certificate_get_property (GObject *object, @@ -242,10 +242,10 @@ static void g_dummy_tls_connection_initable_iface_init (GInitableIface *iface); #define g_dummy_tls_connection_get_type _g_dummy_tls_connection_get_type G_DEFINE_TYPE_WITH_CODE (GDummyTlsConnection, g_dummy_tls_connection, G_TYPE_TLS_CONNECTION, - G_IMPLEMENT_INTERFACE (G_TYPE_TLS_CLIENT_CONNECTION, NULL); - G_IMPLEMENT_INTERFACE (G_TYPE_TLS_SERVER_CONNECTION, NULL); + G_IMPLEMENT_INTERFACE (G_TYPE_TLS_CLIENT_CONNECTION, NULL) + G_IMPLEMENT_INTERFACE (G_TYPE_TLS_SERVER_CONNECTION, NULL) G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_dummy_tls_connection_initable_iface_init);) + g_dummy_tls_connection_initable_iface_init)) static void g_dummy_tls_connection_get_property (GObject *object, @@ -453,9 +453,9 @@ static void g_dummy_tls_database_initable_iface_init (GInitableIface *iface); #define g_dummy_tls_database_get_type _g_dummy_tls_database_get_type G_DEFINE_TYPE_WITH_CODE (GDummyTlsDatabase, g_dummy_tls_database, G_TYPE_TLS_DATABASE, G_IMPLEMENT_INTERFACE (G_TYPE_TLS_FILE_DATABASE, - g_dummy_tls_database_file_database_iface_init); + g_dummy_tls_database_file_database_iface_init) G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_dummy_tls_database_initable_iface_init);) + g_dummy_tls_database_initable_iface_init)) static void diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c index 5577ce151..447713bb3 100644 --- a/gio/gfileinfo.c +++ b/gio/gfileinfo.c @@ -83,7 +83,7 @@ struct _GFileInfoClass }; -G_DEFINE_TYPE (GFileInfo, g_file_info, G_TYPE_OBJECT); +G_DEFINE_TYPE (GFileInfo, g_file_info, G_TYPE_OBJECT) typedef struct { guint32 id; diff --git a/gio/gfilenamecompleter.c b/gio/gfilenamecompleter.c index f1d9f8a18..bf681f076 100644 --- a/gio/gfilenamecompleter.c +++ b/gio/gfilenamecompleter.c @@ -68,7 +68,7 @@ struct _GFilenameCompleter { LoadBasenamesData *basename_loader; }; -G_DEFINE_TYPE (GFilenameCompleter, g_filename_completer, G_TYPE_OBJECT); +G_DEFINE_TYPE (GFilenameCompleter, g_filename_completer, G_TYPE_OBJECT) static void cancel_load_basenames (GFilenameCompleter *completer); diff --git a/gio/giomodule.c b/gio/giomodule.c index 7b9662dca..ad4d4e640 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -96,7 +96,7 @@ * * |[<!-- language="C" --> * // Implement an extension point - * G_DEFINE_TYPE (MyExampleImpl, my_example_impl, MY_TYPE_EXAMPLE); + * G_DEFINE_TYPE (MyExampleImpl, my_example_impl, MY_TYPE_EXAMPLE) * g_io_extension_point_implement ("my-extension-point", * my_example_impl_get_type (), * "my-example", @@ -261,7 +261,7 @@ struct _GIOExtensionPoint { static GHashTable *extension_points = NULL; G_LOCK_DEFINE_STATIC(extension_points); -G_DEFINE_TYPE (GIOModule, g_io_module, G_TYPE_TYPE_MODULE); +G_DEFINE_TYPE (GIOModule, g_io_module, G_TYPE_TYPE_MODULE) static void g_io_module_class_init (GIOModuleClass *class) diff --git a/gio/glistmodel.c b/gio/glistmodel.c index e68ef0240..1be34af32 100644 --- a/gio/glistmodel.c +++ b/gio/glistmodel.c @@ -25,7 +25,7 @@ #include "glistmodel.h" #include "glibintl.h" -G_DEFINE_INTERFACE (GListModel, g_list_model, G_TYPE_OBJECT); +G_DEFINE_INTERFACE (GListModel, g_list_model, G_TYPE_OBJECT) /** * SECTION:glistmodel diff --git a/gio/glocalfileenumerator.c b/gio/glocalfileenumerator.c index 8f0d091e2..ddf8e56ef 100644 --- a/gio/glocalfileenumerator.c +++ b/gio/glocalfileenumerator.c @@ -76,7 +76,7 @@ struct _GLocalFileEnumerator }; #define g_local_file_enumerator_get_type _g_local_file_enumerator_get_type -G_DEFINE_TYPE (GLocalFileEnumerator, g_local_file_enumerator, G_TYPE_FILE_ENUMERATOR); +G_DEFINE_TYPE (GLocalFileEnumerator, g_local_file_enumerator, G_TYPE_FILE_ENUMERATOR) static GFileInfo *g_local_file_enumerator_next_file (GFileEnumerator *enumerator, GCancellable *cancellable, diff --git a/gio/glocalfileiostream.c b/gio/glocalfileiostream.c index b55d2aa33..ad03d2ba6 100644 --- a/gio/glocalfileiostream.c +++ b/gio/glocalfileiostream.c @@ -35,7 +35,7 @@ #define g_local_file_io_stream_get_type _g_local_file_io_stream_get_type -G_DEFINE_TYPE (GLocalFileIOStream, g_local_file_io_stream, G_TYPE_FILE_IO_STREAM); +G_DEFINE_TYPE (GLocalFileIOStream, g_local_file_io_stream, G_TYPE_FILE_IO_STREAM) static void g_local_file_io_stream_finalize (GObject *object) diff --git a/gio/gnativevolumemonitor.c b/gio/gnativevolumemonitor.c index 163c5aed9..3a99c9501 100644 --- a/gio/gnativevolumemonitor.c +++ b/gio/gnativevolumemonitor.c @@ -26,7 +26,7 @@ #include "gnativevolumemonitor.h" -G_DEFINE_ABSTRACT_TYPE (GNativeVolumeMonitor, g_native_volume_monitor, G_TYPE_VOLUME_MONITOR); +G_DEFINE_ABSTRACT_TYPE (GNativeVolumeMonitor, g_native_volume_monitor, G_TYPE_VOLUME_MONITOR) static void g_native_volume_monitor_finalize (GObject *object) diff --git a/gio/gnotification.c b/gio/gnotification.c index bdf053243..06a41b9f3 100644 --- a/gio/gnotification.c +++ b/gio/gnotification.c @@ -86,7 +86,7 @@ typedef struct GVariant *target; } Button; -G_DEFINE_TYPE (GNotification, g_notification, G_TYPE_OBJECT); +G_DEFINE_TYPE (GNotification, g_notification, G_TYPE_OBJECT) static void button_free (gpointer data) diff --git a/gio/gnotificationbackend.c b/gio/gnotificationbackend.c index c5d5b5be9..5fa50bbbd 100644 --- a/gio/gnotificationbackend.c +++ b/gio/gnotificationbackend.c @@ -24,7 +24,7 @@ #include "gactiongroup.h" #include "giomodule-priv.h" -G_DEFINE_TYPE (GNotificationBackend, g_notification_backend, G_TYPE_OBJECT); +G_DEFINE_TYPE (GNotificationBackend, g_notification_backend, G_TYPE_OBJECT) static void g_notification_backend_class_init (GNotificationBackendClass *class) diff --git a/gio/gresourcefile.c b/gio/gresourcefile.c index fde563fd7..85c2152e6 100644 --- a/gio/gresourcefile.c +++ b/gio/gresourcefile.c @@ -96,7 +96,7 @@ G_DEFINE_TYPE_WITH_CODE (GResourceFile, g_resource_file, G_TYPE_OBJECT, g_resource_file_file_iface_init)) #define g_resource_file_enumerator_get_type _g_resource_file_enumerator_get_type -G_DEFINE_TYPE (GResourceFileEnumerator, g_resource_file_enumerator, G_TYPE_FILE_ENUMERATOR); +G_DEFINE_TYPE (GResourceFileEnumerator, g_resource_file_enumerator, G_TYPE_FILE_ENUMERATOR) static GFileEnumerator *_g_resource_file_enumerator_new (GResourceFile *file, const char *attributes, @@ -778,7 +778,7 @@ struct _GResourceFileInputStreamClass }; #define g_resource_file_input_stream_get_type _g_resource_file_input_stream_get_type -G_DEFINE_TYPE (GResourceFileInputStream, g_resource_file_input_stream, G_TYPE_FILE_INPUT_STREAM); +G_DEFINE_TYPE (GResourceFileInputStream, g_resource_file_input_stream, G_TYPE_FILE_INPUT_STREAM) static gssize g_resource_file_input_stream_read (GInputStream *stream, void *buffer, diff --git a/gio/gsocketaddressenumerator.c b/gio/gsocketaddressenumerator.c index 2b6935a8f..06ea72483 100644 --- a/gio/gsocketaddressenumerator.c +++ b/gio/gsocketaddressenumerator.c @@ -23,7 +23,7 @@ #include "gtask.h" -G_DEFINE_ABSTRACT_TYPE (GSocketAddressEnumerator, g_socket_address_enumerator, G_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE (GSocketAddressEnumerator, g_socket_address_enumerator, G_TYPE_OBJECT) static void g_socket_address_enumerator_real_next_async (GSocketAddressEnumerator *enumerator, GCancellable *cancellable, diff --git a/gio/gsocketcontrolmessage.c b/gio/gsocketcontrolmessage.c index c9c4cc634..e78a86c23 100644 --- a/gio/gsocketcontrolmessage.c +++ b/gio/gsocketcontrolmessage.c @@ -54,9 +54,7 @@ #endif -G_DEFINE_ABSTRACT_TYPE (GSocketControlMessage, - g_socket_control_message, - G_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE (GSocketControlMessage, g_socket_control_message, G_TYPE_OBJECT) /** * g_socket_control_message_get_size: diff --git a/gio/gsubprocess.c b/gio/gsubprocess.c index bec991c41..bbfa522b5 100644 --- a/gio/gsubprocess.c +++ b/gio/gsubprocess.c @@ -169,7 +169,7 @@ struct _GSubprocess }; G_DEFINE_TYPE_WITH_CODE (GSubprocess, g_subprocess, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)); + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)) enum { diff --git a/gio/gsubprocesslauncher.c b/gio/gsubprocesslauncher.c index 2c148f2f6..654de4d3f 100644 --- a/gio/gsubprocesslauncher.c +++ b/gio/gsubprocesslauncher.c @@ -54,7 +54,7 @@ typedef GObjectClass GSubprocessLauncherClass; -G_DEFINE_TYPE (GSubprocessLauncher, g_subprocess_launcher, G_TYPE_OBJECT); +G_DEFINE_TYPE (GSubprocessLauncher, g_subprocess_launcher, G_TYPE_OBJECT) static gboolean verify_disposition (const gchar *stream_name, diff --git a/gio/gtlsbackend.c b/gio/gtlsbackend.c index a0a4b46b7..ca0e0906c 100644 --- a/gio/gtlsbackend.c +++ b/gio/gtlsbackend.c @@ -82,7 +82,7 @@ * Since: 2.28 */ -G_DEFINE_INTERFACE (GTlsBackend, g_tls_backend, G_TYPE_OBJECT); +G_DEFINE_INTERFACE (GTlsBackend, g_tls_backend, G_TYPE_OBJECT) static void g_tls_backend_default_init (GTlsBackendInterface *iface) diff --git a/gio/gtlscertificate.c b/gio/gtlscertificate.c index b30ed1fd2..7c6ce076d 100644 --- a/gio/gtlscertificate.c +++ b/gio/gtlscertificate.c @@ -50,7 +50,7 @@ * Since: 2.28 */ -G_DEFINE_ABSTRACT_TYPE (GTlsCertificate, g_tls_certificate, G_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE (GTlsCertificate, g_tls_certificate, G_TYPE_OBJECT) enum { diff --git a/gio/gtlsdatabase.c b/gio/gtlsdatabase.c index 590aef211..098b1e99c 100644 --- a/gio/gtlsdatabase.c +++ b/gio/gtlsdatabase.c @@ -89,7 +89,7 @@ * Since: 2.30 */ -G_DEFINE_ABSTRACT_TYPE (GTlsDatabase, g_tls_database, G_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE (GTlsDatabase, g_tls_database, G_TYPE_OBJECT) enum { UNLOCK_REQUIRED, diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c index 6af2664b6..2394d4add 100644 --- a/gio/gunionvolumemonitor.c +++ b/gio/gunionvolumemonitor.c @@ -48,7 +48,7 @@ static void g_union_volume_monitor_remove_monitor (GUnionVolumeMonitor *union_mo #define g_union_volume_monitor_get_type _g_union_volume_monitor_get_type -G_DEFINE_TYPE (GUnionVolumeMonitor, g_union_volume_monitor, G_TYPE_VOLUME_MONITOR); +G_DEFINE_TYPE (GUnionVolumeMonitor, g_union_volume_monitor, G_TYPE_VOLUME_MONITOR) static GRecMutex the_volume_monitor_mutex; diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index b2e720bf9..c7effd607 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -1557,7 +1557,7 @@ struct _GUnixMountMonitorClass { }; -G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT); +G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT) static GContextSpecificGroup mount_monitor_group; static GFileMonitor *fstab_monitor; diff --git a/gio/gvfs.c b/gio/gvfs.c index 3beebf4d7..0634f1c12 100644 --- a/gio/gvfs.c +++ b/gio/gvfs.c @@ -54,7 +54,7 @@ typedef struct { GDestroyNotify parse_name_destroy; } GVfsURISchemeData; -G_DEFINE_TYPE_WITH_PRIVATE (GVfs, g_vfs, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE (GVfs, g_vfs, G_TYPE_OBJECT) static void g_vfs_dispose (GObject *object) diff --git a/gio/gvolumemonitor.c b/gio/gvolumemonitor.c index 441afc667..f6da0c05d 100644 --- a/gio/gvolumemonitor.c +++ b/gio/gvolumemonitor.c @@ -45,7 +45,7 @@ * thread-default-context active. **/ -G_DEFINE_TYPE (GVolumeMonitor, g_volume_monitor, G_TYPE_OBJECT); +G_DEFINE_TYPE (GVolumeMonitor, g_volume_monitor, G_TYPE_OBJECT) enum { VOLUME_ADDED, diff --git a/gio/tests/filter-streams.c b/gio/tests/filter-streams.c index 5ec23ae84..dd83ac8e5 100644 --- a/gio/tests/filter-streams.c +++ b/gio/tests/filter-streams.c @@ -35,8 +35,8 @@ typedef GFilterInputStreamClass TestFilterInputStreamClass; typedef GFilterOutputStream TestFilterOutputStream; typedef GFilterOutputStreamClass TestFilterOutputStreamClass; -G_DEFINE_TYPE (TestFilterInputStream, test_filter_input_stream, G_TYPE_FILTER_INPUT_STREAM); -G_DEFINE_TYPE (TestFilterOutputStream, test_filter_output_stream, G_TYPE_FILTER_OUTPUT_STREAM); +G_DEFINE_TYPE (TestFilterInputStream, test_filter_input_stream, G_TYPE_FILTER_INPUT_STREAM) +G_DEFINE_TYPE (TestFilterOutputStream, test_filter_output_stream, G_TYPE_FILTER_OUTPUT_STREAM) static void test_filter_input_stream_init (TestFilterInputStream *stream) diff --git a/gio/tests/gdbus-bz627724.c b/gio/tests/gdbus-bz627724.c index 132b2a0b3..b8839bc2a 100644 --- a/gio/tests/gdbus-bz627724.c +++ b/gio/tests/gdbus-bz627724.c @@ -40,7 +40,7 @@ typedef struct { GType my_object_get_type (void) G_GNUC_CONST; -G_DEFINE_TYPE (MyObject, my_object, G_TYPE_OBJECT); +G_DEFINE_TYPE (MyObject, my_object, G_TYPE_OBJECT) static void my_object_init (MyObject *object) diff --git a/gio/tests/gdbus-example-export.c b/gio/tests/gdbus-example-export.c index 341ce60d3..f712d88f0 100644 --- a/gio/tests/gdbus-example-export.c +++ b/gio/tests/gdbus-example-export.c @@ -28,7 +28,7 @@ enum }; static GType my_object_get_type (void); -G_DEFINE_TYPE (MyObject, my_object, G_TYPE_OBJECT); +G_DEFINE_TYPE (MyObject, my_object, G_TYPE_OBJECT) static void my_object_finalize (GObject *object) diff --git a/gio/tests/gdbus-example-proxy-subclass.c b/gio/tests/gdbus-example-proxy-subclass.c index fb1a52879..ef2ed2037 100644 --- a/gio/tests/gdbus-example-proxy-subclass.c +++ b/gio/tests/gdbus-example-proxy-subclass.c @@ -108,7 +108,7 @@ enum static guint signals[LAST_SIGNAL] = {0}; -G_DEFINE_TYPE (AccountsUser, accounts_user, G_TYPE_DBUS_PROXY); +G_DEFINE_TYPE (AccountsUser, accounts_user, G_TYPE_DBUS_PROXY) static void accounts_user_finalize (GObject *object) diff --git a/gio/tests/gdbus-peer-object-manager.c b/gio/tests/gdbus-peer-object-manager.c index edd44e9aa..c40d60378 100644 --- a/gio/tests/gdbus-peer-object-manager.c +++ b/gio/tests/gdbus-peer-object-manager.c @@ -38,7 +38,7 @@ typedef struct { } MockInterfaceClass; static GType mock_interface_get_type (void); -G_DEFINE_TYPE (MockInterface, mock_interface, G_TYPE_DBUS_INTERFACE_SKELETON); +G_DEFINE_TYPE (MockInterface, mock_interface, G_TYPE_DBUS_INTERFACE_SKELETON) static void mock_interface_init (MockInterface *self) diff --git a/gio/tests/gmenumodel.c b/gio/tests/gmenumodel.c index 2aec1a91c..a604f996f 100644 --- a/gio/tests/gmenumodel.c +++ b/gio/tests/gmenumodel.c @@ -170,7 +170,7 @@ typedef struct { typedef GMenuModelClass RandomMenuClass; static GType random_menu_get_type (void); -G_DEFINE_TYPE (RandomMenu, random_menu, G_TYPE_MENU_MODEL); +G_DEFINE_TYPE (RandomMenu, random_menu, G_TYPE_MENU_MODEL) static gboolean random_menu_is_mutable (GMenuModel *model) @@ -346,7 +346,7 @@ typedef struct { typedef GMenuModelClass MirrorMenuClass; static GType mirror_menu_get_type (void); -G_DEFINE_TYPE (MirrorMenu, mirror_menu, G_TYPE_MENU_MODEL); +G_DEFINE_TYPE (MirrorMenu, mirror_menu, G_TYPE_MENU_MODEL) static gboolean mirror_menu_is_mutable (GMenuModel *model) diff --git a/gio/tests/gnotification-server.c b/gio/tests/gnotification-server.c index 300761beb..5dcc86e2c 100644 --- a/gio/tests/gnotification-server.c +++ b/gio/tests/gnotification-server.c @@ -37,7 +37,7 @@ struct _GNotificationServer GHashTable *applications; }; -G_DEFINE_TYPE (GNotificationServer, g_notification_server, G_TYPE_OBJECT); +G_DEFINE_TYPE (GNotificationServer, g_notification_server, G_TYPE_OBJECT) enum { diff --git a/gio/tests/gtesttlsbackend.c b/gio/tests/gtesttlsbackend.c index b97e4efd4..0ee7cbbba 100644 --- a/gio/tests/gtesttlsbackend.c +++ b/gio/tests/gtesttlsbackend.c @@ -39,7 +39,7 @@ G_DEFINE_TYPE_WITH_CODE (GTestTlsBackend, g_test_tls_backend, G_TYPE_OBJECT, g_io_extension_point_implement (G_TLS_BACKEND_EXTENSION_POINT_NAME, g_define_type_id, "test", - 999)) + 999);) static void g_test_tls_backend_init (GTestTlsBackend *backend) @@ -91,7 +91,7 @@ static void g_test_tls_certificate_initable_iface_init (GInitableIface *iface); #define g_test_tls_certificate_get_type _g_test_tls_certificate_get_type G_DEFINE_TYPE_WITH_CODE (GTestTlsCertificate, g_test_tls_certificate, G_TYPE_TLS_CERTIFICATE, G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_test_tls_certificate_initable_iface_init);) + g_test_tls_certificate_initable_iface_init)) static GTlsCertificateFlags g_test_tls_certificate_verify (GTlsCertificate *cert, @@ -242,10 +242,10 @@ static void g_test_tls_connection_initable_iface_init (GInitableIface *iface); #define g_test_tls_connection_get_type _g_test_tls_connection_get_type G_DEFINE_TYPE_WITH_CODE (GTestTlsConnection, g_test_tls_connection, G_TYPE_TLS_CONNECTION, - G_IMPLEMENT_INTERFACE (G_TYPE_TLS_CLIENT_CONNECTION, NULL); - G_IMPLEMENT_INTERFACE (G_TYPE_TLS_SERVER_CONNECTION, NULL); + G_IMPLEMENT_INTERFACE (G_TYPE_TLS_CLIENT_CONNECTION, NULL) + G_IMPLEMENT_INTERFACE (G_TYPE_TLS_SERVER_CONNECTION, NULL) G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_test_tls_connection_initable_iface_init);) + g_test_tls_connection_initable_iface_init)) static void g_test_tls_connection_get_property (GObject *object, diff --git a/gio/tests/gtlsconsoleinteraction.c b/gio/tests/gtlsconsoleinteraction.c index b3dcd6977..bdb2f5e2a 100644 --- a/gio/tests/gtlsconsoleinteraction.c +++ b/gio/tests/gtlsconsoleinteraction.c @@ -36,7 +36,7 @@ * functions like getpass() and does lazy things with threads. */ -G_DEFINE_TYPE (GTlsConsoleInteraction, g_tls_console_interaction, G_TYPE_TLS_INTERACTION); +G_DEFINE_TYPE (GTlsConsoleInteraction, g_tls_console_interaction, G_TYPE_TLS_INTERACTION) #if defined(G_OS_WIN32) || defined(__BIONIC__) /* win32 doesn't have getpass() */ diff --git a/gio/tests/socket-service.c b/gio/tests/socket-service.c index f14cedf58..16b669558 100644 --- a/gio/tests/socket-service.c +++ b/gio/tests/socket-service.c @@ -105,7 +105,7 @@ GType test_threaded_socket_service_get_type (void); typedef GThreadedSocketService TestThreadedSocketService; typedef GThreadedSocketServiceClass TestThreadedSocketServiceClass; -G_DEFINE_TYPE (TestThreadedSocketService, test_threaded_socket_service, G_TYPE_THREADED_SOCKET_SERVICE); +G_DEFINE_TYPE (TestThreadedSocketService, test_threaded_socket_service, G_TYPE_THREADED_SOCKET_SERVICE) static void test_threaded_socket_service_init (TestThreadedSocketService *service) diff --git a/gio/tests/tls-interaction.c b/gio/tests/tls-interaction.c index 5fc4b1eab..64e0104be 100644 --- a/gio/tests/tls-interaction.c +++ b/gio/tests/tls-interaction.c @@ -63,7 +63,7 @@ typedef struct { } TestInteractionClass; static GType test_interaction_get_type (void); -G_DEFINE_TYPE (TestInteraction, test_interaction, G_TYPE_TLS_INTERACTION); +G_DEFINE_TYPE (TestInteraction, test_interaction, G_TYPE_TLS_INTERACTION) #define TEST_TYPE_INTERACTION (test_interaction_get_type ()) #define TEST_INTERACTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TEST_TYPE_INTERACTION, TestInteraction)) diff --git a/gio/win32/gwinhttpfileinputstream.c b/gio/win32/gwinhttpfileinputstream.c index 484294888..685212c55 100644 --- a/gio/win32/gwinhttpfileinputstream.c +++ b/gio/win32/gwinhttpfileinputstream.c @@ -45,7 +45,7 @@ struct _GWinHttpFileInputStreamClass }; #define g_winhttp_file_input_stream_get_type _g_winhttp_file_input_stream_get_type -G_DEFINE_TYPE (GWinHttpFileInputStream, g_winhttp_file_input_stream, G_TYPE_FILE_INPUT_STREAM); +G_DEFINE_TYPE (GWinHttpFileInputStream, g_winhttp_file_input_stream, G_TYPE_FILE_INPUT_STREAM) static gssize g_winhttp_file_input_stream_read (GInputStream *stream, void *buffer, diff --git a/gio/win32/gwinhttpfileoutputstream.c b/gio/win32/gwinhttpfileoutputstream.c index d596a6844..6c3e2cf48 100644 --- a/gio/win32/gwinhttpfileoutputstream.c +++ b/gio/win32/gwinhttpfileoutputstream.c @@ -44,7 +44,7 @@ struct _GWinHttpFileOutputStreamClass }; #define g_winhttp_file_output_stream_get_type _g_winhttp_file_output_stream_get_type -G_DEFINE_TYPE (GWinHttpFileOutputStream, g_winhttp_file_output_stream, G_TYPE_FILE_OUTPUT_STREAM); +G_DEFINE_TYPE (GWinHttpFileOutputStream, g_winhttp_file_output_stream, G_TYPE_FILE_OUTPUT_STREAM) static gssize g_winhttp_file_output_stream_write (GOutputStream *stream, const void *buffer, diff --git a/gobject/gbinding.c b/gobject/gbinding.c index 31c3418ea..d477ffd85 100644 --- a/gobject/gbinding.c +++ b/gobject/gbinding.c @@ -193,7 +193,7 @@ enum static guint gobject_notify_signal_id; -G_DEFINE_TYPE (GBinding, g_binding, G_TYPE_OBJECT); +G_DEFINE_TYPE (GBinding, g_binding, G_TYPE_OBJECT) /* the basic assumption is that if either the source or the target * goes away then the binding does not exist any more and it should diff --git a/gobject/gboxed.c b/gobject/gboxed.c index a9010434a..17719f2de 100644 --- a/gobject/gboxed.c +++ b/gobject/gboxed.c @@ -137,7 +137,7 @@ G_DEFINE_BOXED_TYPE (GHashTable, g_hash_table, g_hash_table_ref, g_hash_table_un G_DEFINE_BOXED_TYPE (GArray, g_array, g_array_ref, g_array_unref) G_DEFINE_BOXED_TYPE (GPtrArray, g_ptr_array,g_ptr_array_ref, g_ptr_array_unref) G_DEFINE_BOXED_TYPE (GByteArray, g_byte_array, g_byte_array_ref, g_byte_array_unref) -G_DEFINE_BOXED_TYPE (GBytes, g_bytes, g_bytes_ref, g_bytes_unref); +G_DEFINE_BOXED_TYPE (GBytes, g_bytes, g_bytes_ref, g_bytes_unref) G_DEFINE_BOXED_TYPE (GRegex, g_regex, g_regex_ref, g_regex_unref) G_DEFINE_BOXED_TYPE (GMatchInfo, g_match_info, g_match_info_ref, g_match_info_unref) @@ -151,8 +151,8 @@ G_DEFINE_BOXED_TYPE (GVariantDict, g_variant_dict, g_variant_dict_ref, g_variant G_DEFINE_BOXED_TYPE (GError, g_error, g_error_copy, g_error_free) -G_DEFINE_BOXED_TYPE (GDateTime, g_date_time, g_date_time_ref, g_date_time_unref); -G_DEFINE_BOXED_TYPE (GTimeZone, g_time_zone, g_time_zone_ref, g_time_zone_unref); +G_DEFINE_BOXED_TYPE (GDateTime, g_date_time, g_date_time_ref, g_date_time_unref) +G_DEFINE_BOXED_TYPE (GTimeZone, g_time_zone, g_time_zone_ref, g_time_zone_unref) G_DEFINE_BOXED_TYPE (GKeyFile, g_key_file, g_key_file_ref, g_key_file_unref) G_DEFINE_BOXED_TYPE (GMappedFile, g_mapped_file, g_mapped_file_ref, g_mapped_file_unref) diff --git a/gobject/gobject.c b/gobject/gobject.c index 2bf5e6ff7..05ea1e90e 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -4232,7 +4232,7 @@ g_object_compat_control (gsize what, } } -G_DEFINE_TYPE (GInitiallyUnowned, g_initially_unowned, G_TYPE_OBJECT); +G_DEFINE_TYPE (GInitiallyUnowned, g_initially_unowned, G_TYPE_OBJECT) static void g_initially_unowned_init (GInitiallyUnowned *object) diff --git a/gobject/tests/binding.c b/gobject/tests/binding.c index b327faf6a..e088ca7a4 100644 --- a/gobject/tests/binding.c +++ b/gobject/tests/binding.c @@ -28,7 +28,7 @@ enum }; static GType binding_source_get_type (void); -G_DEFINE_TYPE (BindingSource, binding_source, G_TYPE_OBJECT); +G_DEFINE_TYPE (BindingSource, binding_source, G_TYPE_OBJECT) static void binding_source_set_property (GObject *gobject, @@ -150,7 +150,7 @@ enum }; static GType binding_target_get_type (void); -G_DEFINE_TYPE (BindingTarget, binding_target, G_TYPE_OBJECT); +G_DEFINE_TYPE (BindingTarget, binding_target, G_TYPE_OBJECT) static void binding_target_set_property (GObject *gobject, diff --git a/gobject/tests/dynamictests.c b/gobject/tests/dynamictests.c index d299c3f27..59a5aebed 100644 --- a/gobject/tests/dynamictests.c +++ b/gobject/tests/dynamictests.c @@ -130,7 +130,7 @@ struct _DynamicObjectClass }; static GType dynamic_object_get_type (void); -G_DEFINE_DYNAMIC_TYPE(DynamicObject, dynamic_object, G_TYPE_OBJECT); +G_DEFINE_DYNAMIC_TYPE(DynamicObject, dynamic_object, G_TYPE_OBJECT) static void dynamic_object_class_init (DynamicObjectClass *class) diff --git a/gobject/tests/param.c b/gobject/tests/param.c index 40f453e78..758289bf8 100644 --- a/gobject/tests/param.c +++ b/gobject/tests/param.c @@ -410,19 +410,19 @@ test_value_transform (void) static GType test_object_a_get_type (void); typedef GObject TestObjectA; typedef GObjectClass TestObjectAClass; -G_DEFINE_TYPE (TestObjectA, test_object_a, G_TYPE_OBJECT); +G_DEFINE_TYPE (TestObjectA, test_object_a, G_TYPE_OBJECT) static void test_object_a_class_init (TestObjectAClass *class) { } static void test_object_a_init (TestObjectA *a) { } static GType test_object_b_get_type (void); typedef GObject TestObjectB; typedef GObjectClass TestObjectBClass; -G_DEFINE_TYPE (TestObjectB, test_object_b, test_object_a_get_type ()); +G_DEFINE_TYPE (TestObjectB, test_object_b, test_object_a_get_type ()) static void test_object_b_class_init (TestObjectBClass *class) { } static void test_object_b_init (TestObjectB *b) { } static GType test_object_c_get_type (void); typedef GObject TestObjectC; typedef GObjectClass TestObjectCClass; -G_DEFINE_TYPE (TestObjectC, test_object_c, G_TYPE_OBJECT); +G_DEFINE_TYPE (TestObjectC, test_object_c, G_TYPE_OBJECT) static void test_object_c_class_init (TestObjectCClass *class) { } static void test_object_c_init (TestObjectC *c) { } diff --git a/gobject/tests/properties.c b/gobject/tests/properties.c index a65933735..a1af3f8ba 100644 --- a/gobject/tests/properties.c +++ b/gobject/tests/properties.c @@ -19,7 +19,7 @@ enum { PROP_0, PROP_FOO, PROP_BAR, PROP_BAZ, PROP_QUUX, N_PROPERTIES }; static GParamSpec *properties[N_PROPERTIES] = { NULL, }; static GType test_object_get_type (void); -G_DEFINE_TYPE (TestObject, test_object, G_TYPE_OBJECT); +G_DEFINE_TYPE (TestObject, test_object, G_TYPE_OBJECT) static void test_object_set_foo (TestObject *obj, diff --git a/gobject/tests/threadtests.c b/gobject/tests/threadtests.c index 7408c0a8c..b623e8ba4 100644 --- a/gobject/tests/threadtests.c +++ b/gobject/tests/threadtests.c @@ -48,11 +48,11 @@ static void interface_per_class_init (void) { call_counter_init (NULL); } /* define 3 test interfaces */ typedef GTypeInterface MyFace0Interface; static GType my_face0_get_type (void); -G_DEFINE_INTERFACE (MyFace0, my_face0, G_TYPE_OBJECT); +G_DEFINE_INTERFACE (MyFace0, my_face0, G_TYPE_OBJECT) static void my_face0_default_init (MyFace0Interface *iface) { call_counter_init (iface); } typedef GTypeInterface MyFace1Interface; static GType my_face1_get_type (void); -G_DEFINE_INTERFACE (MyFace1, my_face1, G_TYPE_OBJECT); +G_DEFINE_INTERFACE (MyFace1, my_face1, G_TYPE_OBJECT) static void my_face1_default_init (MyFace1Interface *iface) { call_counter_init (iface); } /* define 3 test objects, adding interfaces 0 & 1, and adding interface 2 after class initialization */ @@ -60,9 +60,8 @@ typedef GObject MyTester0; typedef GObjectClass MyTester0Class; static GType my_tester0_get_type (void); G_DEFINE_TYPE_WITH_CODE (MyTester0, my_tester0, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (my_face0_get_type(), interface_per_class_init); - G_IMPLEMENT_INTERFACE (my_face1_get_type(), interface_per_class_init); - ); + G_IMPLEMENT_INTERFACE (my_face0_get_type(), interface_per_class_init) + G_IMPLEMENT_INTERFACE (my_face1_get_type(), interface_per_class_init)) static void my_tester0_init (MyTester0*t) {} static void my_tester0_class_init (MyTester0Class*c) { call_counter_init (c); } typedef GObject MyTester1; @@ -72,23 +71,21 @@ typedef GObjectClass MyTester1Class; #if 0 typedef GTypeInterface MyFace2Interface; static GType my_face2_get_type (void); -G_DEFINE_INTERFACE (MyFace2, my_face2, G_TYPE_OBJECT); +G_DEFINE_INTERFACE (MyFace2, my_face2, G_TYPE_OBJECT) static void my_face2_default_init (MyFace2Interface *iface) { call_counter_init (iface); } static GType my_tester1_get_type (void); G_DEFINE_TYPE_WITH_CODE (MyTester1, my_tester1, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (my_face0_get_type(), interface_per_class_init); - G_IMPLEMENT_INTERFACE (my_face1_get_type(), interface_per_class_init); - ); + G_IMPLEMENT_INTERFACE (my_face0_get_type(), interface_per_class_init) + G_IMPLEMENT_INTERFACE (my_face1_get_type(), interface_per_class_init)) static void my_tester1_init (MyTester1*t) {} static void my_tester1_class_init (MyTester1Class*c) { call_counter_init (c); } typedef GObject MyTester2; typedef GObjectClass MyTester2Class; static GType my_tester2_get_type (void); G_DEFINE_TYPE_WITH_CODE (MyTester2, my_tester2, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (my_face0_get_type(), interface_per_class_init); - G_IMPLEMENT_INTERFACE (my_face1_get_type(), interface_per_class_init); - ); + G_IMPLEMENT_INTERFACE (my_face0_get_type(), interface_per_class_init) + G_IMPLEMENT_INTERFACE (my_face1_get_type(), interface_per_class_init)) static void my_tester2_init (MyTester2*t) {} static void my_tester2_class_init (MyTester2Class*c) { call_counter_init (c); } @@ -152,7 +149,7 @@ typedef struct { } PropTester; typedef GObjectClass PropTesterClass; static GType prop_tester_get_type (void); -G_DEFINE_TYPE (PropTester, prop_tester, G_TYPE_OBJECT); +G_DEFINE_TYPE (PropTester, prop_tester, G_TYPE_OBJECT) #define PROP_NAME 1 static void prop_tester_init (PropTester* t) diff --git a/tests/gobject/performance.c b/tests/gobject/performance.c index cd4554323..a592b7d85 100644 --- a/tests/gobject/performance.c +++ b/tests/gobject/performance.c @@ -181,7 +181,7 @@ struct _SimpleObjectClass GObjectClass parent_class; }; -G_DEFINE_TYPE (SimpleObject, simple_object, G_TYPE_OBJECT); +G_DEFINE_TYPE (SimpleObject, simple_object, G_TYPE_OBJECT) static void simple_object_finalize (GObject *object) @@ -265,17 +265,11 @@ static void complex_test_iface_init (gpointer g_iface, G_DEFINE_TYPE_EXTENDED (ComplexObject, complex_object, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE (TEST_TYPE_IFACE1, - complex_test_iface_init) - G_IMPLEMENT_INTERFACE (TEST_TYPE_IFACE2, - complex_test_iface_init) - G_IMPLEMENT_INTERFACE (TEST_TYPE_IFACE3, - complex_test_iface_init) - G_IMPLEMENT_INTERFACE (TEST_TYPE_IFACE4, - complex_test_iface_init) - G_IMPLEMENT_INTERFACE (TEST_TYPE_IFACE5, - complex_test_iface_init) - ); + G_IMPLEMENT_INTERFACE (TEST_TYPE_IFACE1, complex_test_iface_init) + G_IMPLEMENT_INTERFACE (TEST_TYPE_IFACE2, complex_test_iface_init) + G_IMPLEMENT_INTERFACE (TEST_TYPE_IFACE3, complex_test_iface_init) + G_IMPLEMENT_INTERFACE (TEST_TYPE_IFACE4, complex_test_iface_init) + G_IMPLEMENT_INTERFACE (TEST_TYPE_IFACE5, complex_test_iface_init)) #define COMPLEX_OBJECT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), COMPLEX_TYPE_OBJECT, ComplexObject)) diff --git a/tests/gobject/references.c b/tests/gobject/references.c index b2812d120..dc959bb22 100644 --- a/tests/gobject/references.c +++ b/tests/gobject/references.c @@ -56,7 +56,7 @@ struct _TestObjectClass GObjectClass parent_class; }; -G_DEFINE_TYPE (TestObject, test_object, G_TYPE_OBJECT); +G_DEFINE_TYPE (TestObject, test_object, G_TYPE_OBJECT) static void test_object_finalize (GObject *object) diff --git a/tests/gobject/singleton.c b/tests/gobject/singleton.c index 6f2899b97..3a6497c90 100644 --- a/tests/gobject/singleton.c +++ b/tests/gobject/singleton.c @@ -35,7 +35,7 @@ static GType my_singleton_get_type (void); #define MY_IS_SINGLETON_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), MY_TYPE_SINGLETON)) #define MY_SINGLETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MY_TYPE_SINGLETON, MySingletonClass)) -G_DEFINE_TYPE (MySingleton, my_singleton, G_TYPE_OBJECT); +G_DEFINE_TYPE (MySingleton, my_singleton, G_TYPE_OBJECT) static MySingleton *the_one_and_only = NULL; diff --git a/tests/refcount/closures.c b/tests/refcount/closures.c index 1f702b2dc..25b0a2779 100644 --- a/tests/refcount/closures.c +++ b/tests/refcount/closures.c @@ -47,7 +47,7 @@ typedef struct { #define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) static GType my_test_get_type (void); -G_DEFINE_TYPE (GTest, my_test, G_TYPE_OBJECT); +G_DEFINE_TYPE (GTest, my_test, G_TYPE_OBJECT) /* --- variables --- */ static volatile gboolean stopping = FALSE; diff --git a/tests/refcount/properties3.c b/tests/refcount/properties3.c index 582118885..bc8820661 100644 --- a/tests/refcount/properties3.c +++ b/tests/refcount/properties3.c @@ -32,7 +32,7 @@ struct _GTestClass }; static GType my_test_get_type (void); -G_DEFINE_TYPE (GTest, my_test, G_TYPE_OBJECT); +G_DEFINE_TYPE (GTest, my_test, G_TYPE_OBJECT) static volatile gboolean stopping; diff --git a/tests/refcount/properties4.c b/tests/refcount/properties4.c index 94b704afa..d4bca9486 100644 --- a/tests/refcount/properties4.c +++ b/tests/refcount/properties4.c @@ -30,7 +30,7 @@ struct _MyBadgerClass }; static GType my_badger_get_type (void); -G_DEFINE_TYPE (MyBadger, my_badger, G_TYPE_OBJECT); +G_DEFINE_TYPE (MyBadger, my_badger, G_TYPE_OBJECT) static void my_badger_dispose (GObject * object); |