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

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

20
gnucash/gnome-search/search-int64.c
View File

@ -92,7 +92,7 @@ static void
gnc_search_int64_finalize (GObject *obj) gnc_search_int64_finalize (GObject *obj)
{ {
GNCSearchInt64 *o = (GNCSearchInt64 *)obj; GNCSearchInt64 *o = (GNCSearchInt64 *)obj;
g_assert (IS_GNCSEARCH_INT64 (o)); g_assert (GNC_IS_SEARCH_INT64 (o));
G_OBJECT_CLASS (gnc_search_int64_parent_class)->finalize(obj); G_OBJECT_CLASS (gnc_search_int64_parent_class)->finalize(obj);
} }
@ -115,7 +115,7 @@ void
gnc_search_int64_set_value (GNCSearchInt64 *fi, gint64 value) gnc_search_int64_set_value (GNCSearchInt64 *fi, gint64 value)
{ {
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_INT64 (fi)); g_return_if_fail (GNC_IS_SEARCH_INT64 (fi));
fi->value = value; fi->value = value;
} }
@ -124,7 +124,7 @@ void
gnc_search_int64_set_how (GNCSearchInt64 *fi, QofQueryCompare how) gnc_search_int64_set_how (GNCSearchInt64 *fi, QofQueryCompare how)
{ {
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_INT64 (fi)); g_return_if_fail (GNC_IS_SEARCH_INT64 (fi));
fi->how = how; fi->how = how;
} }
@ -135,7 +135,7 @@ pass_parent (GNCSearchCoreType *fe, gpointer parent)
GNCSearchInt64Private *priv; GNCSearchInt64Private *priv;
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_INT64 (fi)); g_return_if_fail (GNC_IS_SEARCH_INT64 (fi));
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
priv->parent = GTK_WINDOW(parent); priv->parent = GTK_WINDOW(parent);
@ -150,7 +150,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_INT64 (fi), FALSE); g_return_val_if_fail (GNC_IS_SEARCH_INT64 (fi), FALSE);
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
@ -198,7 +198,7 @@ grab_focus (GNCSearchCoreType *fe)
GNCSearchInt64Private *priv; GNCSearchInt64Private *priv;
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_INT64 (fi)); g_return_if_fail (GNC_IS_SEARCH_INT64 (fi));
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
if (priv->entry) if (priv->entry)
@ -212,7 +212,7 @@ editable_enters (GNCSearchCoreType *fe)
GNCSearchInt64Private *priv; GNCSearchInt64Private *priv;
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_INT64 (fi)); g_return_if_fail (GNC_IS_SEARCH_INT64 (fi));
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
if (priv->entry) if (priv->entry)
@ -227,7 +227,7 @@ gncs_get_widget (GNCSearchCoreType *fe)
GNCSearchInt64Private *priv; GNCSearchInt64Private *priv;
g_return_val_if_fail (fi, NULL); g_return_val_if_fail (fi, NULL);
g_return_val_if_fail (IS_GNCSEARCH_INT64 (fi), NULL); g_return_val_if_fail (GNC_IS_SEARCH_INT64 (fi), NULL);
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
@ -261,7 +261,7 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe)
GNCSearchInt64Private *priv; GNCSearchInt64Private *priv;
g_return_val_if_fail (fi, NULL); g_return_val_if_fail (fi, NULL);
g_return_val_if_fail (IS_GNCSEARCH_INT64 (fi), NULL); g_return_val_if_fail (GNC_IS_SEARCH_INT64 (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);
@ -275,7 +275,7 @@ static GNCSearchCoreType *gncs_clone(GNCSearchCoreType *fe)
GNCSearchInt64 *se, *fse = (GNCSearchInt64 *)fe; GNCSearchInt64 *se, *fse = (GNCSearchInt64 *)fe;
g_return_val_if_fail (fse, NULL); g_return_val_if_fail (fse, NULL);
g_return_val_if_fail (IS_GNCSEARCH_INT64 (fse), NULL); g_return_val_if_fail (GNC_IS_SEARCH_INT64 (fse), NULL);
se = gnc_search_int64_new (); se = gnc_search_int64_new ();
gnc_search_int64_set_value (se, fse->value); gnc_search_int64_set_value (se, fse->value);

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

@ -26,12 +26,7 @@
#include "qof.h" #include "qof.h"
#define GNC_TYPE_SEARCH_INT64 (gnc_search_int64_get_type ()) #define GNC_TYPE_SEARCH_INT64 (gnc_search_int64_get_type ())
#define GNCSEARCH_INT64(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_SEARCH_INT64, GNCSearchInt64) G_DECLARE_FINAL_TYPE (GNCSearchInt64, gnc_search_int64, GNC, SEARCH_INT64, GNCSearchCoreType)
#define GNCSEARCH_INT64_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_SEARCH_INT64, GNCSearchInt64Class)
#define IS_GNCSEARCH_INT64(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GNC_TYPE_SEARCH_INT64)
typedef struct _GNCSearchInt64 GNCSearchInt64;
typedef struct _GNCSearchInt64Class GNCSearchInt64Class;
struct _GNCSearchInt64 struct _GNCSearchInt64
{ {
@ -41,16 +36,6 @@ struct _GNCSearchInt64
gint64 value; gint64 value;
}; };
struct _GNCSearchInt64Class
{
GNCSearchCoreTypeClass parent_class;
/* virtual methods */
/* signals */
};
GType gnc_search_int64_get_type (void);
GNCSearchInt64 *gnc_search_int64_new (void); GNCSearchInt64 *gnc_search_int64_new (void);
/* methods */ /* methods */