IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: DECLARE_FINAL GNCSearchAccount < GNCSearchCoreType

Browse Source
This commit is contained in:
Richard Cohen 2023-05-19 16:24:35 +01:00
parent 53ab52fa4e
commit a6dcdb6a68
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnucash/gnome-search/search-account.c
View File

@ -89,7 +89,7 @@ static void
gnc_search_account_finalize (GObject *obj) gnc_search_account_finalize (GObject *obj)
{ {
GNCSearchAccount *o = (GNCSearchAccount *)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); G_OBJECT_CLASS (gnc_search_account_parent_class)->finalize(obj);
} }
@ -136,7 +136,7 @@ gncs_validate (GNCSearchCoreType *fe)
gboolean valid = TRUE; gboolean valid = TRUE;
g_return_val_if_fail (fi, FALSE); 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); priv = _PRIVATE(fi);
@ -265,7 +265,7 @@ gncs_get_widget (GNCSearchCoreType *fe)
char *desc; char *desc;
g_return_val_if_fail (fi, NULL); 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); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE); gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
@ -295,7 +295,7 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe)
GList *l = NULL, *node; GList *l = NULL, *node;
g_return_val_if_fail (fi, NULL); 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); priv = _PRIVATE(fi);
for (node = priv->selected_accounts; node; node = node->next) for (node = priv->selected_accounts; node; node = node->next)
@ -315,7 +315,7 @@ static GNCSearchCoreType *gncs_clone(GNCSearchCoreType *fe)
GNCSearchAccountPrivate *se_priv, *fse_priv; GNCSearchAccountPrivate *se_priv, *fse_priv;
g_return_val_if_fail (fse, NULL); 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); fse_priv = _PRIVATE(fse);
se = gnc_search_account_new (); se = gnc_search_account_new ();
@ -334,7 +334,7 @@ pass_parent (GNCSearchCoreType *fe, gpointer parent)
GNCSearchAccountPrivate *priv; GNCSearchAccountPrivate *priv;
g_return_if_fail (fi); 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 = _PRIVATE(fi);
priv->parent = GTK_WINDOW(parent); priv->parent = GTK_WINDOW(parent);

17
gnucash/gnome-search/search-account.h
View File

@ -26,12 +26,7 @@
#include "qof.h" #include "qof.h"
#define GNC_TYPE_SEARCH_ACCOUNT (gnc_search_account_get_type ()) #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) G_DECLARE_FINAL_TYPE (GNCSearchAccount, gnc_search_account, GNC, SEARCH_ACCOUNT, GNCSearchCoreType)
#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;
struct _GNCSearchAccount struct _GNCSearchAccount
{ {
@ -40,16 +35,6 @@ struct _GNCSearchAccount
QofGuidMatch how; 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_new (void);
GNCSearchAccount *gnc_search_account_matchall_new (void); GNCSearchAccount *gnc_search_account_matchall_new (void);