From 5393c63b65e27d0479abb6674f2a2571eaa0c429 Mon Sep 17 00:00:00 2001 From: Christoph Holtermann Date: Fri, 7 Dec 2018 11:09:31 +0100 Subject: [PATCH] use G_DEFINE_TYPE_WITH_PRIVATE to replace g_type_class_add_private gnc_plugin_menu_additions_get_type is being replaced by that provided by G_DEFINE_TYPE_WITH_PRIVATE. Rename GNCDateFormatPriv to GNCDateFormatPrivate. --- .../gnome-utils/gnc-plugin-menu-additions.c | 30 +------------------ 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/gnucash/gnome-utils/gnc-plugin-menu-additions.c b/gnucash/gnome-utils/gnc-plugin-menu-additions.c index cb2c587b01..b8d1eff2b0 100644 --- a/gnucash/gnome-utils/gnc-plugin-menu-additions.c +++ b/gnucash/gnome-utils/gnc-plugin-menu-additions.c @@ -89,33 +89,7 @@ typedef struct _GncPluginMenuAdditionsPerWindow * Object Implementation * ************************************************************/ -GType -gnc_plugin_menu_additions_get_type (void) -{ - static GType gnc_plugin_menu_additions_type = 0; - - if (gnc_plugin_menu_additions_type == 0) - { - static const GTypeInfo our_info = - { - sizeof (GncPluginMenuAdditionsClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gnc_plugin_menu_additions_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GncPluginMenuAdditions), - 0, - (GInstanceInitFunc) gnc_plugin_menu_additions_init - }; - - gnc_plugin_menu_additions_type = g_type_register_static (GNC_TYPE_PLUGIN, - "GncPluginMenuAdditions", - &our_info, 0); - } - - return gnc_plugin_menu_additions_type; -} +G_DEFINE_TYPE_WITH_PRIVATE(GncPluginMenuAdditions, gnc_plugin_menu_additions, GNC_TYPE_PLUGIN) static void gnc_plugin_menu_additions_class_init (GncPluginMenuAdditionsClass *klass) @@ -133,8 +107,6 @@ gnc_plugin_menu_additions_class_init (GncPluginMenuAdditionsClass *klass) /* function overrides */ plugin_class->add_to_window = gnc_plugin_menu_additions_add_to_window; plugin_class->remove_from_window = gnc_plugin_menu_additions_remove_from_window; - - g_type_class_add_private(klass, sizeof(GncPluginMenuAdditionsPrivate)); } static void