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 GNCSearchNumeric < GNCSearchCoreType

Browse Source
This commit is contained in:
Richard Cohen 2023-05-19 16:25:55 +01:00
parent f1a77ca782
commit bd6083278d
2 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnucash/gnome-search/search-numeric.c
View File

@ -94,7 +94,7 @@ static void
gnc_search_numeric_finalize (GObject *obj) gnc_search_numeric_finalize (GObject *obj)
{ {
GNCSearchNumeric *o = (GNCSearchNumeric *)obj; GNCSearchNumeric *o = (GNCSearchNumeric *)obj;
g_assert (IS_GNCSEARCH_NUMERIC (o)); g_assert (GNC_IS_SEARCH_NUMERIC (o));
G_OBJECT_CLASS (gnc_search_numeric_parent_class)->finalize(obj); G_OBJECT_CLASS (gnc_search_numeric_parent_class)->finalize(obj);
} }
@ -136,7 +136,7 @@ void
gnc_search_numeric_set_value (GNCSearchNumeric *fi, gnc_numeric value) gnc_search_numeric_set_value (GNCSearchNumeric *fi, gnc_numeric value)
{ {
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_NUMERIC (fi)); g_return_if_fail (GNC_IS_SEARCH_NUMERIC (fi));
fi->value = value; fi->value = value;
} }
@ -145,7 +145,7 @@ void
gnc_search_numeric_set_how (GNCSearchNumeric *fi, QofQueryCompare how) gnc_search_numeric_set_how (GNCSearchNumeric *fi, QofQueryCompare how)
{ {
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_NUMERIC (fi)); g_return_if_fail (GNC_IS_SEARCH_NUMERIC (fi));
fi->how = how; fi->how = how;
} }
@ -153,7 +153,7 @@ void
gnc_search_numeric_set_option (GNCSearchNumeric *fi, QofNumericMatch option) gnc_search_numeric_set_option (GNCSearchNumeric *fi, QofNumericMatch option)
{ {
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_NUMERIC (fi)); g_return_if_fail (GNC_IS_SEARCH_NUMERIC (fi));
fi->option = option; fi->option = option;
} }
@ -164,7 +164,7 @@ pass_parent (GNCSearchCoreType *fe, gpointer parent)
GNCSearchNumericPrivate *priv; GNCSearchNumericPrivate *priv;
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_NUMERIC (fi)); g_return_if_fail (GNC_IS_SEARCH_NUMERIC (fi));
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
priv->parent = GTK_WINDOW(parent); priv->parent = GTK_WINDOW(parent);
@ -179,7 +179,7 @@ gncs_validate (GNCSearchCoreType *fe)
GError *error = NULL; GError *error = NULL;
g_return_val_if_fail (fi, FALSE); g_return_val_if_fail (fi, FALSE);
g_return_val_if_fail (IS_GNCSEARCH_NUMERIC (fi), FALSE); g_return_val_if_fail (GNC_IS_SEARCH_NUMERIC (fi), FALSE);
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
@ -258,7 +258,7 @@ grab_focus (GNCSearchCoreType *fe)
GNCSearchNumericPrivate *priv; GNCSearchNumericPrivate *priv;
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_NUMERIC (fi)); g_return_if_fail (GNC_IS_SEARCH_NUMERIC (fi));
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
if (priv->entry) if (priv->entry)
@ -272,7 +272,7 @@ editable_enters (GNCSearchCoreType *fe)
GNCSearchNumericPrivate *priv; GNCSearchNumericPrivate *priv;
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_NUMERIC (fi)); g_return_if_fail (GNC_IS_SEARCH_NUMERIC (fi));
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
if (priv->entry) if (priv->entry)
@ -287,7 +287,7 @@ gncs_get_widget (GNCSearchCoreType *fe)
GNCSearchNumericPrivate *priv; GNCSearchNumericPrivate *priv;
g_return_val_if_fail (fi, NULL); g_return_val_if_fail (fi, NULL);
g_return_val_if_fail (IS_GNCSEARCH_NUMERIC (fi), NULL); g_return_val_if_fail (GNC_IS_SEARCH_NUMERIC (fi), NULL);
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
@ -321,7 +321,7 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe)
GNCSearchNumericPrivate *priv; GNCSearchNumericPrivate *priv;
g_return_val_if_fail (fi, NULL); g_return_val_if_fail (fi, NULL);
g_return_val_if_fail (IS_GNCSEARCH_NUMERIC (fi), NULL); g_return_val_if_fail (GNC_IS_SEARCH_NUMERIC (fi), NULL);
/* force the computation of the entry, because we may not get the signal */ /* force the computation of the entry, because we may not get the signal */
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
@ -336,7 +336,7 @@ static GNCSearchCoreType *gncs_clone(GNCSearchCoreType *fe)
GNCSearchNumericPrivate *se_priv, *fse_priv; GNCSearchNumericPrivate *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_NUMERIC (fse), NULL); g_return_val_if_fail (GNC_IS_SEARCH_NUMERIC (fse), NULL);
fse_priv = _PRIVATE(fse); fse_priv = _PRIVATE(fse);
se = gnc_search_numeric_new (); se = gnc_search_numeric_new ();

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

@ -27,12 +27,7 @@
#include "qof.h" #include "qof.h"
#define GNC_TYPE_SEARCH_NUMERIC (gnc_search_numeric_get_type ()) #define GNC_TYPE_SEARCH_NUMERIC (gnc_search_numeric_get_type ())
#define GNCSEARCH_NUMERIC(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_SEARCH_NUMERIC, GNCSearchNumeric) G_DECLARE_FINAL_TYPE (GNCSearchNumeric, gnc_search_numeric, GNC, SEARCH_NUMERIC, GNCSearchCoreType)
#define GNCSEARCH_NUMERIC_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_SEARCH_NUMERIC, GNCSearchNumericClass)
#define IS_GNCSEARCH_NUMERIC(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GNC_TYPE_SEARCH_NUMERIC)
typedef struct _GNCSearchNumeric GNCSearchNumeric;
typedef struct _GNCSearchNumericClass GNCSearchNumericClass;
struct _GNCSearchNumeric struct _GNCSearchNumeric
{ {
@ -44,16 +39,6 @@ struct _GNCSearchNumeric
QofNumericMatch option; QofNumericMatch option;
}; };
struct _GNCSearchNumericClass
{
GNCSearchCoreTypeClass parent_class;
/* virtual methods */
/* signals */
};
GType gnc_search_numeric_get_type (void);
GNCSearchNumeric *gnc_search_numeric_new (void); GNCSearchNumeric *gnc_search_numeric_new (void);
GNCSearchNumeric *gnc_search_numeric_debcred_new (void); GNCSearchNumeric *gnc_search_numeric_debcred_new (void);