From a6dcdb6a68c475162d35bc6ecda8007c7cd97bee Mon Sep 17 00:00:00 2001 From: Richard Cohen Date: Fri, 19 May 2023 16:24:35 +0100 Subject: [PATCH] Refactor: DECLARE_FINAL GNCSearchAccount < GNCSearchCoreType --- gnucash/gnome-search/search-account.c | 12 ++++++------ gnucash/gnome-search/search-account.h | 17 +---------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/gnucash/gnome-search/search-account.c b/gnucash/gnome-search/search-account.c index a623fae96d..fcf606dd0c 100644 --- a/gnucash/gnome-search/search-account.c +++ b/gnucash/gnome-search/search-account.c @@ -89,7 +89,7 @@ static void gnc_search_account_finalize (GObject *obj) { GNCSearchAccount *o = (GNCSearchAccount *)obj; - g_assert (IS_GNCSEARCH_ACCOUNT (o)); + g_assert (GNC_IS_SEARCH_ACCOUNT (o)); G_OBJECT_CLASS (gnc_search_account_parent_class)->finalize(obj); } @@ -136,7 +136,7 @@ gncs_validate (GNCSearchCoreType *fe) gboolean valid = TRUE; g_return_val_if_fail (fi, FALSE); - g_return_val_if_fail (IS_GNCSEARCH_ACCOUNT (fi), FALSE); + g_return_val_if_fail (GNC_IS_SEARCH_ACCOUNT (fi), FALSE); priv = _PRIVATE(fi); @@ -265,7 +265,7 @@ gncs_get_widget (GNCSearchCoreType *fe) char *desc; g_return_val_if_fail (fi, NULL); - g_return_val_if_fail (IS_GNCSEARCH_ACCOUNT (fi), NULL); + g_return_val_if_fail (GNC_IS_SEARCH_ACCOUNT (fi), NULL); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); gtk_box_set_homogeneous (GTK_BOX (box), FALSE); @@ -295,7 +295,7 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe) GList *l = NULL, *node; g_return_val_if_fail (fi, NULL); - g_return_val_if_fail (IS_GNCSEARCH_ACCOUNT (fi), NULL); + g_return_val_if_fail (GNC_IS_SEARCH_ACCOUNT (fi), NULL); priv = _PRIVATE(fi); for (node = priv->selected_accounts; node; node = node->next) @@ -315,7 +315,7 @@ static GNCSearchCoreType *gncs_clone(GNCSearchCoreType *fe) GNCSearchAccountPrivate *se_priv, *fse_priv; g_return_val_if_fail (fse, NULL); - g_return_val_if_fail (IS_GNCSEARCH_ACCOUNT (fse), NULL); + g_return_val_if_fail (GNC_IS_SEARCH_ACCOUNT (fse), NULL); fse_priv = _PRIVATE(fse); se = gnc_search_account_new (); @@ -334,7 +334,7 @@ pass_parent (GNCSearchCoreType *fe, gpointer parent) GNCSearchAccountPrivate *priv; g_return_if_fail (fi); - g_return_if_fail (IS_GNCSEARCH_ACCOUNT (fi)); + g_return_if_fail (GNC_IS_SEARCH_ACCOUNT (fi)); priv = _PRIVATE(fi); priv->parent = GTK_WINDOW(parent); diff --git a/gnucash/gnome-search/search-account.h b/gnucash/gnome-search/search-account.h index 23cbd3abc4..5308f3f5e0 100644 --- a/gnucash/gnome-search/search-account.h +++ b/gnucash/gnome-search/search-account.h @@ -26,12 +26,7 @@ #include "qof.h" #define GNC_TYPE_SEARCH_ACCOUNT (gnc_search_account_get_type ()) -#define GNCSEARCH_ACCOUNT(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_SEARCH_ACCOUNT, GNCSearchAccount) -#define GNCSEARCH_ACCOUNT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_SEARCH_ACCOUNT, GNCSearchAccountClass) -#define IS_GNCSEARCH_ACCOUNT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GNC_TYPE_SEARCH_ACCOUNT) - -typedef struct _GNCSearchAccount GNCSearchAccount; -typedef struct _GNCSearchAccountClass GNCSearchAccountClass; +G_DECLARE_FINAL_TYPE (GNCSearchAccount, gnc_search_account, GNC, SEARCH_ACCOUNT, GNCSearchCoreType) struct _GNCSearchAccount { @@ -40,16 +35,6 @@ struct _GNCSearchAccount QofGuidMatch how; }; -struct _GNCSearchAccountClass -{ - GNCSearchCoreTypeClass parent_class; - - /* virtual methods */ - - /* signals */ -}; - -GType gnc_search_account_get_type (void); GNCSearchAccount *gnc_search_account_new (void); GNCSearchAccount *gnc_search_account_matchall_new (void);