From 39e4aa3c574f7d71b62d19b123547847067a23ac Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Tue, 6 Aug 2019 07:51:23 +0200 Subject: [PATCH] app/core: Use NULL for "simple" signals Apart from being less code, this actually gives us a nice performance improvement. Up until a few years ago, if you pass `NULL` as the marshaller for a signal, GLib would fall back to `g_cclosure_marshal_generic` which uses libffi to pack/unpack its arguments. One could avoid this by specifying a more specific marshaller which would then be used to immediately pack and unpack into GValues with the correct type. Lately however, as a way of optimizing signal emission (which can be quite expensive), GLib added a possibility to set a va_marshaller, which skips the unnecessary GValue packing and unpacking and just uses a valist variant. Since the performance difference is big enough, if the marshaller argument is NULL, `g_signal_new()` will now check for the simple marshallers (return type NONE and a single argument) and set both the generic and the valist marshaller. In other words, less code for us with bigger optimizations. In case you also want va_marshallers for more complex signals, you can use `g_signal_set_va_marshaller()`. --- app/core/gimp.c | 15 ++++------ app/core/gimpcancelable.c | 3 +- app/core/gimpcontainer.c | 12 +++----- app/core/gimpcontext.c | 60 +++++++++++++-------------------------- app/core/gimpimage.c | 33 +++++++-------------- app/core/gimpitem.c | 18 ++++-------- app/core/gimplayer.c | 36 ++++++++--------------- app/core/gimpobject.c | 6 ++-- app/core/gimpviewable.c | 12 +++----- 9 files changed, 65 insertions(+), 130 deletions(-) diff --git a/app/core/gimp.c b/app/core/gimp.c index 0d4b30d585..c0fbd7b2ce 100644 --- a/app/core/gimp.c +++ b/app/core/gimp.c @@ -141,8 +141,7 @@ gimp_class_init (GimpClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpClass, initialize), - NULL, NULL, - gimp_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); @@ -151,8 +150,7 @@ gimp_class_init (GimpClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpClass, restore), - NULL, NULL, - gimp_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); @@ -171,8 +169,7 @@ gimp_class_init (GimpClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpClass, clipboard_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_signals[FILTER_HISTORY_CHANGED] = @@ -181,8 +178,7 @@ gimp_class_init (GimpClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpClass, filter_history_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_signals[IMAGE_OPENED] = @@ -190,8 +186,7 @@ gimp_class_init (GimpClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpClass, image_opened), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_FILE); object_class->constructed = gimp_constructed; diff --git a/app/core/gimpcancelable.c b/app/core/gimpcancelable.c index 9cb5f1230e..d695c3fa68 100644 --- a/app/core/gimpcancelable.c +++ b/app/core/gimpcancelable.c @@ -54,8 +54,7 @@ gimp_cancelable_default_init (GimpCancelableInterface *iface) G_TYPE_FROM_CLASS (iface), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpCancelableInterface, cancel), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff --git a/app/core/gimpcontainer.c b/app/core/gimpcontainer.c index 41497ac4db..3d9da38567 100644 --- a/app/core/gimpcontainer.c +++ b/app/core/gimpcontainer.c @@ -137,8 +137,7 @@ gimp_container_class_init (GimpContainerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContainerClass, add), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_OBJECT); @@ -147,8 +146,7 @@ gimp_container_class_init (GimpContainerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContainerClass, remove), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_OBJECT); @@ -168,8 +166,7 @@ gimp_container_class_init (GimpContainerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpContainerClass, freeze), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); container_signals[THAW] = @@ -177,8 +174,7 @@ gimp_container_class_init (GimpContainerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GimpContainerClass, thaw), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->dispose = gimp_container_dispose; diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c index 37885835af..14f2f778c5 100644 --- a/app/core/gimpcontext.c +++ b/app/core/gimpcontext.c @@ -409,8 +409,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, image_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_IMAGE); @@ -419,8 +418,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, display_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_OBJECT); @@ -429,8 +427,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, tool_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_TOOL_INFO); @@ -439,8 +436,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, paint_info_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_PAINT_INFO); @@ -449,8 +445,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, foreground_changed), - NULL, NULL, - gimp_marshal_VOID__BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_RGB | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -459,8 +454,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, background_changed), - NULL, NULL, - gimp_marshal_VOID__BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_RGB | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -469,8 +463,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, opacity_changed), - NULL, NULL, - gimp_marshal_VOID__DOUBLE, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_DOUBLE); @@ -479,8 +472,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, paint_mode_changed), - NULL, NULL, - gimp_marshal_VOID__ENUM, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_LAYER_MODE); @@ -489,8 +481,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, brush_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_BRUSH); @@ -499,8 +490,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, dynamics_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_DYNAMICS); @@ -509,8 +499,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, mybrush_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_MYBRUSH); @@ -519,8 +508,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, pattern_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_PATTERN); @@ -529,8 +517,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, gradient_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_GRADIENT); @@ -539,8 +526,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, palette_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_PALETTE); @@ -549,8 +535,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, font_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_FONT); @@ -559,8 +544,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, tool_preset_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_TOOL_PRESET); @@ -569,8 +553,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, buffer_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_BUFFER); @@ -579,8 +562,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, imagefile_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_IMAGEFILE); @@ -589,8 +571,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, template_changed), - NULL, NULL, - gimp_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_TEMPLATE); @@ -599,8 +580,7 @@ gimp_context_class_init (GimpContextClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpContextClass, prop_name_changed), - NULL, NULL, - gimp_marshal_VOID__INT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c index 37875b6bfd..379d327ce3 100644 --- a/app/core/gimpimage.c +++ b/app/core/gimpimage.c @@ -277,8 +277,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, mode_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[PRECISION_CHANGED] = @@ -286,8 +285,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, precision_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[ALPHA_CHANGED] = @@ -295,8 +293,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, alpha_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[FLOATING_SELECTION_CHANGED] = @@ -304,8 +301,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, floating_selection_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[ACTIVE_LAYER_CHANGED] = @@ -313,8 +309,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, active_layer_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[ACTIVE_CHANNEL_CHANGED] = @@ -322,8 +317,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, active_channel_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[ACTIVE_VECTORS_CHANGED] = @@ -331,8 +325,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, active_vectors_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[COMPONENT_VISIBILITY_CHANGED] = @@ -340,8 +333,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, component_visibility_changed), - NULL, NULL, - gimp_marshal_VOID__ENUM, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_CHANNEL_TYPE); @@ -350,8 +342,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, component_active_changed), - NULL, NULL, - gimp_marshal_VOID__ENUM, + NULL, NULL, NULL, G_TYPE_NONE, 1, GIMP_TYPE_CHANNEL_TYPE); @@ -360,8 +351,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, mask_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[RESOLUTION_CHANGED] = @@ -369,8 +359,7 @@ gimp_image_class_init (GimpImageClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpImageClass, resolution_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_image_signals[SIZE_CHANGED_DETAILED] = diff --git a/app/core/gimpitem.c b/app/core/gimpitem.c index 507905c152..243c6a789e 100644 --- a/app/core/gimpitem.c +++ b/app/core/gimpitem.c @@ -185,8 +185,7 @@ gimp_item_class_init (GimpItemClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpItemClass, removed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_item_signals[VISIBILITY_CHANGED] = @@ -194,8 +193,7 @@ gimp_item_class_init (GimpItemClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpItemClass, visibility_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_item_signals[LINKED_CHANGED] = @@ -203,8 +201,7 @@ gimp_item_class_init (GimpItemClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpItemClass, linked_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_item_signals[COLOR_TAG_CHANGED] = @@ -212,8 +209,7 @@ gimp_item_class_init (GimpItemClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpItemClass, color_tag_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_item_signals[LOCK_CONTENT_CHANGED] = @@ -221,8 +217,7 @@ gimp_item_class_init (GimpItemClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpItemClass, lock_content_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); gimp_item_signals[LOCK_POSITION_CHANGED] = @@ -230,8 +225,7 @@ gimp_item_class_init (GimpItemClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpItemClass, lock_position_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->constructed = gimp_item_constructed; diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c index 665e018b51..1a6c00ea80 100644 --- a/app/core/gimplayer.c +++ b/app/core/gimplayer.c @@ -306,8 +306,7 @@ gimp_layer_class_init (GimpLayerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLayerClass, opacity_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); layer_signals[MODE_CHANGED] = @@ -315,8 +314,7 @@ gimp_layer_class_init (GimpLayerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLayerClass, mode_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); layer_signals[BLEND_SPACE_CHANGED] = @@ -324,8 +322,7 @@ gimp_layer_class_init (GimpLayerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLayerClass, blend_space_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); layer_signals[COMPOSITE_SPACE_CHANGED] = @@ -333,8 +330,7 @@ gimp_layer_class_init (GimpLayerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLayerClass, composite_space_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); layer_signals[COMPOSITE_MODE_CHANGED] = @@ -342,8 +338,7 @@ gimp_layer_class_init (GimpLayerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLayerClass, composite_mode_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); layer_signals[EFFECTIVE_MODE_CHANGED] = @@ -351,8 +346,7 @@ gimp_layer_class_init (GimpLayerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLayerClass, effective_mode_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); layer_signals[EXCLUDES_BACKDROP_CHANGED] = @@ -360,8 +354,7 @@ gimp_layer_class_init (GimpLayerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLayerClass, excludes_backdrop_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); layer_signals[LOCK_ALPHA_CHANGED] = @@ -369,8 +362,7 @@ gimp_layer_class_init (GimpLayerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLayerClass, lock_alpha_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); layer_signals[MASK_CHANGED] = @@ -378,8 +370,7 @@ gimp_layer_class_init (GimpLayerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLayerClass, mask_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); layer_signals[APPLY_MASK_CHANGED] = @@ -387,8 +378,7 @@ gimp_layer_class_init (GimpLayerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLayerClass, apply_mask_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); layer_signals[EDIT_MASK_CHANGED] = @@ -396,8 +386,7 @@ gimp_layer_class_init (GimpLayerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLayerClass, edit_mask_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); layer_signals[SHOW_MASK_CHANGED] = @@ -405,8 +394,7 @@ gimp_layer_class_init (GimpLayerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpLayerClass, show_mask_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->set_property = gimp_layer_set_property; diff --git a/app/core/gimpobject.c b/app/core/gimpobject.c index cf4450d2e7..1a0a69e0c5 100644 --- a/app/core/gimpobject.c +++ b/app/core/gimpobject.c @@ -93,8 +93,7 @@ gimp_object_class_init (GimpObjectClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpObjectClass, disconnect), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_signals[NAME_CHANGED] = @@ -102,8 +101,7 @@ gimp_object_class_init (GimpObjectClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpObjectClass, name_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->constructed = gimp_object_constructed; diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c index 02a1f6ffac..92b33cab38 100644 --- a/app/core/gimpviewable.c +++ b/app/core/gimpviewable.c @@ -151,8 +151,7 @@ gimp_viewable_class_init (GimpViewableClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpViewableClass, invalidate_preview), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); viewable_signals[SIZE_CHANGED] = @@ -160,8 +159,7 @@ gimp_viewable_class_init (GimpViewableClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpViewableClass, size_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); viewable_signals[EXPANDED_CHANGED] = @@ -169,8 +167,7 @@ gimp_viewable_class_init (GimpViewableClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpViewableClass, expanded_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); viewable_signals[ANCESTRY_CHANGED] = @@ -178,8 +175,7 @@ gimp_viewable_class_init (GimpViewableClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GimpViewableClass, ancestry_changed), - NULL, NULL, - gimp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); object_class->finalize = gimp_viewable_finalize;