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

Browse Source
This commit is contained in:
Richard Cohen 2023-05-19 16:25:18 +01:00
parent 74517c44a5
commit f935d7868b
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-date.c
View File

@ -93,9 +93,9 @@ gnc_search_date_finalize (GObject *obj)
GNCSearchDate *o; GNCSearchDate *o;
GNCSearchDatePrivate *priv; GNCSearchDatePrivate *priv;
g_assert (IS_GNCSEARCH_DATE (obj)); g_assert (GNC_IS_SEARCH_DATE (obj));
o = GNCSEARCH_DATE(obj); o = GNC_SEARCH_DATE(obj);
priv = _PRIVATE(o); priv = _PRIVATE(o);
if (priv->entry) if (priv->entry)
gtk_widget_destroy (priv->entry); gtk_widget_destroy (priv->entry);
@ -121,7 +121,7 @@ void
gnc_search_date_set_date (GNCSearchDate *fi, time64 tt) gnc_search_date_set_date (GNCSearchDate *fi, time64 tt)
{ {
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_DATE (fi)); g_return_if_fail (GNC_IS_SEARCH_DATE (fi));
fi->tt = tt; fi->tt = tt;
} }
@ -130,7 +130,7 @@ void
gnc_search_date_set_how (GNCSearchDate *fi, QofQueryCompare how) gnc_search_date_set_how (GNCSearchDate *fi, QofQueryCompare how)
{ {
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_DATE (fi)); g_return_if_fail (GNC_IS_SEARCH_DATE (fi));
fi->how = how; fi->how = how;
} }
@ -141,7 +141,7 @@ pass_parent (GNCSearchCoreType *fe, gpointer parent)
GNCSearchDatePrivate *priv; GNCSearchDatePrivate *priv;
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_DATE (fi)); g_return_if_fail (GNC_IS_SEARCH_DATE (fi));
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
priv->parent = GTK_WINDOW(parent); priv->parent = GTK_WINDOW(parent);
@ -154,7 +154,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_DATE (fi), FALSE); g_return_val_if_fail (GNC_IS_SEARCH_DATE (fi), FALSE);
/* XXX */ /* XXX */
@ -207,7 +207,7 @@ grab_focus (GNCSearchCoreType *fe)
GNCSearchDatePrivate *priv; GNCSearchDatePrivate *priv;
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_DATE (fi)); g_return_if_fail (GNC_IS_SEARCH_DATE (fi));
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
if (priv->entry) if (priv->entry)
@ -221,7 +221,7 @@ editable_enters (GNCSearchCoreType *fe)
GNCSearchDatePrivate *priv; GNCSearchDatePrivate *priv;
g_return_if_fail (fi); g_return_if_fail (fi);
g_return_if_fail (IS_GNCSEARCH_DATE (fi)); g_return_if_fail (GNC_IS_SEARCH_DATE (fi));
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
if (priv->entry) if (priv->entry)
@ -236,7 +236,7 @@ gncs_get_widget (GNCSearchCoreType *fe)
GNCSearchDatePrivate *priv; GNCSearchDatePrivate *priv;
g_return_val_if_fail (fi, NULL); g_return_val_if_fail (fi, NULL);
g_return_val_if_fail (IS_GNCSEARCH_DATE (fi), NULL); g_return_val_if_fail (GNC_IS_SEARCH_DATE (fi), NULL);
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
@ -263,7 +263,7 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe)
GNCSearchDatePrivate *priv; GNCSearchDatePrivate *priv;
g_return_val_if_fail (fi, NULL); g_return_val_if_fail (fi, NULL);
g_return_val_if_fail (IS_GNCSEARCH_DATE (fi), NULL); g_return_val_if_fail (GNC_IS_SEARCH_DATE (fi), NULL);
/* Make sure we actually use the currently-entered date */ /* Make sure we actually use the currently-entered date */
priv = _PRIVATE(fi); priv = _PRIVATE(fi);
@ -281,7 +281,7 @@ static GNCSearchCoreType *gncs_clone(GNCSearchCoreType *fe)
GNCSearchDate *se, *fse = (GNCSearchDate *)fe; GNCSearchDate *se, *fse = (GNCSearchDate *)fe;
g_return_val_if_fail (fse, NULL); g_return_val_if_fail (fse, NULL);
g_return_val_if_fail (IS_GNCSEARCH_DATE (fse), NULL); g_return_val_if_fail (GNC_IS_SEARCH_DATE (fse), NULL);
se = gnc_search_date_new (); se = gnc_search_date_new ();
gnc_search_date_set_date (se, fse->tt); gnc_search_date_set_date (se, fse->tt);

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

@ -27,12 +27,7 @@
#include "qof.h" #include "qof.h"
#define GNC_TYPE_SEARCH_DATE (gnc_search_date_get_type ()) #define GNC_TYPE_SEARCH_DATE (gnc_search_date_get_type ())
#define GNCSEARCH_DATE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_SEARCH_DATE, GNCSearchDate) G_DECLARE_FINAL_TYPE (GNCSearchDate, gnc_search_date, GNC, SEARCH_DATE, GNCSearchCoreType)
#define GNCSEARCH_DATE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_SEARCH_DATE, GNCSearchDateClass)
#define IS_GNCSEARCH_DATE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GNC_TYPE_SEARCH_DATE)
typedef struct _GNCSearchDate GNCSearchDate;
typedef struct _GNCSearchDateClass GNCSearchDateClass;
struct _GNCSearchDate struct _GNCSearchDate
{ {
@ -42,16 +37,6 @@ struct _GNCSearchDate
time64 tt; time64 tt;
}; };
struct _GNCSearchDateClass
{
GNCSearchCoreTypeClass parent_class;
/* virtual methods */
/* signals */
};
GType gnc_search_date_get_type (void);
GNCSearchDate *gnc_search_date_new (void); GNCSearchDate *gnc_search_date_new (void);
/* methods */ /* methods */