From f8400ffaaeae7fa2da84783f03001e649d8e773e Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 28 Sep 2022 13:04:09 +0100 Subject: [PATCH] trivial: Rename the FuPluginClass signals callbacks The aim is to fold FuPluginVfuncs into this, and the names clash. --- libfwupdplugin/fu-plugin.c | 12 ++++++------ libfwupdplugin/fu-plugin.h | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libfwupdplugin/fu-plugin.c b/libfwupdplugin/fu-plugin.c index f1349403b..f31924182 100644 --- a/libfwupdplugin/fu-plugin.c +++ b/libfwupdplugin/fu-plugin.c @@ -2678,7 +2678,7 @@ fu_plugin_class_init(FuPluginClass *klass) signals[SIGNAL_DEVICE_ADDED] = g_signal_new("device-added", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(FuPluginClass, device_added), + G_STRUCT_OFFSET(FuPluginClass, _device_added), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, @@ -2698,7 +2698,7 @@ fu_plugin_class_init(FuPluginClass *klass) g_signal_new("device-removed", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(FuPluginClass, device_removed), + G_STRUCT_OFFSET(FuPluginClass, _device_removed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, @@ -2718,7 +2718,7 @@ fu_plugin_class_init(FuPluginClass *klass) g_signal_new("device-register", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(FuPluginClass, device_register), + G_STRUCT_OFFSET(FuPluginClass, _device_register), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, @@ -2741,7 +2741,7 @@ fu_plugin_class_init(FuPluginClass *klass) g_signal_new("check-supported", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(FuPluginClass, check_supported), + G_STRUCT_OFFSET(FuPluginClass, _check_supported), NULL, NULL, g_cclosure_marshal_generic, @@ -2751,7 +2751,7 @@ fu_plugin_class_init(FuPluginClass *klass) signals[SIGNAL_RULES_CHANGED] = g_signal_new("rules-changed", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(FuPluginClass, rules_changed), + G_STRUCT_OFFSET(FuPluginClass, _rules_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, @@ -2770,7 +2770,7 @@ fu_plugin_class_init(FuPluginClass *klass) g_signal_new("config-changed", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(FuPluginClass, config_changed), + G_STRUCT_OFFSET(FuPluginClass, _config_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, diff --git a/libfwupdplugin/fu-plugin.h b/libfwupdplugin/fu-plugin.h index c2f4fd42c..65b4562a0 100644 --- a/libfwupdplugin/fu-plugin.h +++ b/libfwupdplugin/fu-plugin.h @@ -48,14 +48,14 @@ G_DECLARE_DERIVABLE_TYPE(FuPlugin, fu_plugin, FU, PLUGIN, FwupdPlugin) struct _FuPluginClass { FwupdPluginClass parent_class; /* signals */ - void (*device_added)(FuPlugin *self, FuDevice *device); - void (*device_removed)(FuPlugin *self, FuDevice *device); - void (*status_changed)(FuPlugin *self, FwupdStatus status); - void (*percentage_changed)(FuPlugin *self, guint percentage); - void (*device_register)(FuPlugin *self, FuDevice *device); - gboolean (*check_supported)(FuPlugin *self, const gchar *guid); - void (*rules_changed)(FuPlugin *self); - void (*config_changed)(FuPlugin *self); + void (*_device_added)(FuPlugin *self, FuDevice *device); + void (*_device_removed)(FuPlugin *self, FuDevice *device); + void (*_status_changed)(FuPlugin *self, FwupdStatus status); + void (*_percentage_changed)(FuPlugin *self, guint percentage); + void (*_device_register)(FuPlugin *self, FuDevice *device); + gboolean (*_check_supported)(FuPlugin *self, const gchar *guid); + void (*_rules_changed)(FuPlugin *self); + void (*_config_changed)(FuPlugin *self); }; /**