Refactor: remove unnecessary GncPlugin*Private

Gnucash · Jun 14, 2023 · e6a564d · e6a564d
1 parent 1255d61
commit e6a564d
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 199 deletions.
diff --git a/gnucash/gnome-utils/gnc-plugin-file-history.c b/gnucash/gnome-utils/gnc-plugin-file-history.c
@@ -105,17 +105,6 @@ struct _GncPluginFileHistory
     GncPlugin gnc_plugin;
 };
 
-/** The instance private data for a file history plugin.  This data
- *  structure is unused. */
-typedef struct GncPluginFileHistoryPrivate
-{
-    gpointer dummy;
-} GncPluginFileHistoryPrivate;
-
-
-#define GNC_PLUGIN_FILE_HISTORY_GET_PRIVATE(o)  \
-   ((GncPluginFileHistoryPrivate*)gnc_plugin_file_history_get_instance_private((GncPluginFileHistory*)o))
-
 /************************************************************
  *                     Other Functions                      *
  ************************************************************/
@@ -552,7 +541,7 @@ gnc_plugin_history_list_changed (gpointer prefs,
  *                  Object Implementation                   *
  ************************************************************/
 
-G_DEFINE_TYPE_WITH_PRIVATE(GncPluginFileHistory, gnc_plugin_file_history, GNC_TYPE_PLUGIN)
+G_DEFINE_TYPE(GncPluginFileHistory, gnc_plugin_file_history, GNC_TYPE_PLUGIN)
 
 /** Initialize the file history plugin class. */
 static void

diff --git a/gnucash/gnome-utils/gnc-plugin-menu-additions.c b/gnucash/gnome-utils/gnc-plugin-menu-additions.c
@@ -63,17 +63,9 @@ static QofLogModule log_module = GNC_MOD_GUI;
 struct _GncPluginMenuAdditions
 {
     GncPlugin gnc_plugin;
-};
 
-/** Private data for this plugin.  This data structure is unused. */
-typedef struct GncPluginMenuAdditionsPrivate
-{
     GHashTable *item_hash;
-} GncPluginMenuAdditionsPrivate;
-
-#define GNC_PLUGIN_MENU_ADDITIONS_GET_PRIVATE(o)  \
-   ((GncPluginMenuAdditionsPrivate*)gnc_plugin_menu_additions_get_instance_private((GncPluginMenuAdditions*)o))
-
+};
 
 /** Per-window private data for this plugin.  This plugin is unique in
  *  that it manages its own menu items. */
@@ -101,7 +93,7 @@ static guint gnc_plugin_n_actions = G_N_ELEMENTS(gnc_plugin_actions);
  *                  Object Implementation                   *
  ************************************************************/
 
-G_DEFINE_TYPE_WITH_PRIVATE(GncPluginMenuAdditions, gnc_plugin_menu_additions, GNC_TYPE_PLUGIN)
+G_DEFINE_TYPE(GncPluginMenuAdditions, gnc_plugin_menu_additions, GNC_TYPE_PLUGIN)
 
 static void
 gnc_plugin_menu_additions_class_init (GncPluginMenuAdditionsClass *klass)
@@ -132,14 +124,11 @@ gnc_plugin_menu_additions_init (GncPluginMenuAdditions *plugin)
 static void
 gnc_plugin_menu_additions_finalize (GObject *object)
 {
-    GncPluginMenuAdditionsPrivate *priv;
     g_return_if_fail (GNC_IS_PLUGIN_MENU_ADDITIONS(object));
 
     ENTER("plugin %p", object);
 
-    priv = GNC_PLUGIN_MENU_ADDITIONS_GET_PRIVATE(object);
-
-    g_hash_table_destroy (priv->item_hash);
+    g_hash_table_destroy (GNC_PLUGIN_MENU_ADDITIONS(object)->item_hash);
 
     G_OBJECT_CLASS (gnc_plugin_menu_additions_parent_class)->finalize (object);
     LEAVE("");
@@ -185,10 +174,6 @@ gnc_plugin_menu_additions_action_new_cb (GSimpleAction *simple,
                                          GVariant      *parameter,
                                          gpointer       user_data)
 {
-    GncMainWindowActionData *cb_data = user_data;
-    GncPlugin *plugin = cb_data->data;
-    GncPluginMenuAdditionsPrivate *priv;
-
     SCM extension;
     gsize length;
     const gchar *action_name;
@@ -197,13 +182,13 @@ gnc_plugin_menu_additions_action_new_cb (GSimpleAction *simple,
 
     ENTER("");
 
-    priv = GNC_PLUGIN_MENU_ADDITIONS_GET_PRIVATE(plugin);
-
     action_name = g_variant_get_string (parameter, &length);
 
     PINFO("action name is '%s'", action_name);
 
-    extension = g_hash_table_lookup (priv->item_hash, action_name);
+    GncMainWindowActionData *cb_data = user_data;
+    GncPluginMenuAdditions *plugin = GNC_PLUGIN_MENU_ADDITIONS(cb_data->data);
+    extension = g_hash_table_lookup (plugin->item_hash, action_name);
 
     if (extension)
     {
@@ -482,7 +467,6 @@ gnc_plugin_menu_additions_add_to_window (GncPlugin *plugin,
                                          GncMainWindow *window,
                                          GQuark type)
 {
-    GncPluginMenuAdditionsPrivate *priv = GNC_PLUGIN_MENU_ADDITIONS_GET_PRIVATE(plugin);
     GncPluginMenuAdditionsPerWindow per_window;
     static GOnce accel_table_init = G_ONCE_INIT;
     static GHashTable *table;
@@ -492,10 +476,11 @@ gnc_plugin_menu_additions_add_to_window (GncPlugin *plugin,
 
     ENTER(" ");
 
-    if (!priv->item_hash)
-        priv->item_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+    GncPluginMenuAdditions *menu_plugin = GNC_PLUGIN_MENU_ADDITIONS (plugin);
+    if (!menu_plugin->item_hash)
+        menu_plugin->item_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 
-    per_window.item_hash = priv->item_hash;
+    per_window.item_hash = menu_plugin->item_hash;
     per_window.build_menu_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
     per_window.report_menu = g_menu_new ();
 

diff --git a/gnucash/gnome/gnc-plugin-account-tree.c b/gnucash/gnome/gnc-plugin-account-tree.c
@@ -72,16 +72,7 @@ struct _GncPluginAccountTree
     GncPlugin gnc_plugin;
 };
 
-/** The instance private data structure for an account tree plugin. */
-typedef struct GncPluginAccountTreePrivate
-{
-    gpointer dummy;
-} GncPluginAccountTreePrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE(GncPluginAccountTree, gnc_plugin_account_tree, GNC_TYPE_PLUGIN)
-
-#define GNC_PLUGIN_ACCOUNT_TREE_GET_PRIVATE(o)  \
-   ((GncPluginAccountTreePrivate*)gnc_plugin_account_tree_get_instance_private((GncPluginAccountTree*)o))
+G_DEFINE_TYPE(GncPluginAccountTree, gnc_plugin_account_tree, GNC_TYPE_PLUGIN)
 
 /*  Create a new account tree menu plugin. */
 GncPlugin *

diff --git a/gnucash/gnome/gnc-plugin-basic-commands.c b/gnucash/gnome/gnc-plugin-basic-commands.c
@@ -182,16 +182,6 @@ struct _GncPluginBasicCommands
     GncPlugin gnc_plugin;
 };
 
-/** The instance private data structure for an basic commands
- *  plugin. */
-typedef struct GncPluginBasicCommandsPrivate
-{
-    gpointer dummy;
-} GncPluginBasicCommandsPrivate;
-
-#define GNC_PLUGIN_BASIC_COMMANDS_GET_PRIVATE(o)  \
-   ((GncPluginBasicCommandsPrivate*)gnc_plugin_basic_commands_get_instance_private ((GncPluginBasicCommands*)o))
-
 /** Create a new basic commands menu plugin. */
 GncPlugin *
 gnc_plugin_basic_commands_new (void)
@@ -278,7 +268,7 @@ gnc_plugin_basic_commands_main_window_page_changed (GncMainWindow *window,
     }
 }
 
-G_DEFINE_TYPE_WITH_PRIVATE(GncPluginBasicCommands, gnc_plugin_basic_commands, GNC_TYPE_PLUGIN)
+G_DEFINE_TYPE(GncPluginBasicCommands, gnc_plugin_basic_commands, GNC_TYPE_PLUGIN)
 
 /** Initialize the class for a new basic commands plugin.  This will
  *  set up any function pointers that override functions in the parent

diff --git a/gnucash/gnome/gnc-plugin-budget.c b/gnucash/gnome/gnc-plugin-budget.c
@@ -83,14 +83,6 @@ struct _GncPluginBudget
     GncPlugin gnc_plugin;
 };
 
-typedef struct GncPluginBudgetPrivate
-{
-    gpointer dummy;
-} GncPluginBudgetPrivate;
-
-#define GNC_PLUGIN_BUDGET_GET_PRIVATE(o)  \
-   ((GncPluginBudgetPrivate*)gnc_plugin_budget_get_instance_private((GncPluginBudget*)o))
-
 GncPlugin * 
 gnc_plugin_budget_new (void)
 {
@@ -129,7 +121,7 @@ remove_from_window (GncPlugin *plugin, GncMainWindow *window, GQuark type)
     g_signal_handlers_disconnect_by_func (window, G_CALLBACK(page_changed), plugin);
 }
 
-G_DEFINE_TYPE_WITH_PRIVATE(GncPluginBudget, gnc_plugin_budget, GNC_TYPE_PLUGIN)
+G_DEFINE_TYPE(GncPluginBudget, gnc_plugin_budget, GNC_TYPE_PLUGIN)
 
 static void
 gnc_plugin_budget_class_init (GncPluginBudgetClass *klass)