From 4eb20b245681fdaa30c00af5a1297c93e3085d68 Mon Sep 17 00:00:00 2001 From: Richard Cohen Date: Fri, 26 May 2023 15:37:28 +0100 Subject: [PATCH] Refactor: hide implementation of GNCSearch* (move from .h to .c) --- gnucash/gnome-search/search-account.c | 7 +++++++ gnucash/gnome-search/search-account.h | 7 ------- gnucash/gnome-search/search-boolean.c | 7 +++++++ gnucash/gnome-search/search-boolean.h | 7 ------- gnucash/gnome-search/search-date.c | 8 ++++++++ gnucash/gnome-search/search-date.h | 8 -------- gnucash/gnome-search/search-double.c | 8 ++++++++ gnucash/gnome-search/search-double.h | 8 -------- gnucash/gnome-search/search-int64.c | 7 +++++++ gnucash/gnome-search/search-int64.h | 8 -------- gnucash/gnome-search/search-numeric.c | 10 ++++++++++ gnucash/gnome-search/search-numeric.h | 10 ---------- gnucash/gnome-search/search-reconciled.c | 8 ++++++++ gnucash/gnome-search/search-reconciled.h | 8 -------- gnucash/gnome-search/search-string.c | 9 +++++++++ gnucash/gnome-search/search-string.h | 9 --------- gnucash/gnome/search-owner.c | 7 +++++++ gnucash/gnome/search-owner.h | 7 ------- 18 files changed, 71 insertions(+), 72 deletions(-) diff --git a/gnucash/gnome-search/search-account.c b/gnucash/gnome-search/search-account.c index fcf606dd0c9..1116148b22b 100644 --- a/gnucash/gnome-search/search-account.c +++ b/gnucash/gnome-search/search-account.c @@ -47,6 +47,13 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_account_finalize (GObject *obj); +struct _GNCSearchAccount +{ + GNCSearchCoreType parent; + + QofGuidMatch how; +}; + typedef struct _GNCSearchAccountPrivate GNCSearchAccountPrivate; struct _GNCSearchAccountPrivate diff --git a/gnucash/gnome-search/search-account.h b/gnucash/gnome-search/search-account.h index 5308f3f5e0e..c5453294346 100644 --- a/gnucash/gnome-search/search-account.h +++ b/gnucash/gnome-search/search-account.h @@ -28,13 +28,6 @@ #define GNC_TYPE_SEARCH_ACCOUNT (gnc_search_account_get_type ()) G_DECLARE_FINAL_TYPE (GNCSearchAccount, gnc_search_account, GNC, SEARCH_ACCOUNT, GNCSearchCoreType) -struct _GNCSearchAccount -{ - GNCSearchCoreType parent; - - QofGuidMatch how; -}; - GNCSearchAccount *gnc_search_account_new (void); GNCSearchAccount *gnc_search_account_matchall_new (void); diff --git a/gnucash/gnome-search/search-boolean.c b/gnucash/gnome-search/search-boolean.c index 208b396a490..36afbe85cb7 100644 --- a/gnucash/gnome-search/search-boolean.c +++ b/gnucash/gnome-search/search-boolean.c @@ -43,6 +43,13 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_boolean_finalize (GObject *obj); +struct _GNCSearchBoolean +{ + GNCSearchCoreType parent; + + gboolean value; +}; + typedef struct _GNCSearchBooleanPrivate GNCSearchBooleanPrivate; struct _GNCSearchBooleanPrivate diff --git a/gnucash/gnome-search/search-boolean.h b/gnucash/gnome-search/search-boolean.h index 6796167c34b..6e73f71ea96 100644 --- a/gnucash/gnome-search/search-boolean.h +++ b/gnucash/gnome-search/search-boolean.h @@ -28,13 +28,6 @@ #define GNC_TYPE_SEARCH_BOOLEAN (gnc_search_boolean_get_type ()) G_DECLARE_FINAL_TYPE (GNCSearchBoolean, gnc_search_boolean, GNC, SEARCH_BOOLEAN, GNCSearchCoreType) -struct _GNCSearchBoolean -{ - GNCSearchCoreType parent; - - gboolean value; -}; - GNCSearchBoolean *gnc_search_boolean_new (void); /* methods */ diff --git a/gnucash/gnome-search/search-date.c b/gnucash/gnome-search/search-date.c index 61a2860fa2c..85119e489c0 100644 --- a/gnucash/gnome-search/search-date.c +++ b/gnucash/gnome-search/search-date.c @@ -47,6 +47,14 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_date_finalize (GObject *obj); +struct _GNCSearchDate +{ + GNCSearchCoreType parent; + + QofQueryCompare how; + time64 tt; +}; + typedef struct _GNCSearchDatePrivate GNCSearchDatePrivate; struct _GNCSearchDatePrivate diff --git a/gnucash/gnome-search/search-date.h b/gnucash/gnome-search/search-date.h index f943793a4f7..ff91b885213 100644 --- a/gnucash/gnome-search/search-date.h +++ b/gnucash/gnome-search/search-date.h @@ -29,14 +29,6 @@ #define GNC_TYPE_SEARCH_DATE (gnc_search_date_get_type ()) G_DECLARE_FINAL_TYPE (GNCSearchDate, gnc_search_date, GNC, SEARCH_DATE, GNCSearchCoreType) -struct _GNCSearchDate -{ - GNCSearchCoreType parent; - - QofQueryCompare how; - time64 tt; -}; - GNCSearchDate *gnc_search_date_new (void); /* methods */ diff --git a/gnucash/gnome-search/search-double.c b/gnucash/gnome-search/search-double.c index df57bd088f2..eea6116218e 100644 --- a/gnucash/gnome-search/search-double.c +++ b/gnucash/gnome-search/search-double.c @@ -47,6 +47,14 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_double_finalize (GObject *obj); +struct _GNCSearchDouble +{ + GNCSearchCoreType parent; + + QofQueryCompare how; + double value; +}; + typedef struct _GNCSearchDoublePrivate GNCSearchDoublePrivate; struct _GNCSearchDoublePrivate diff --git a/gnucash/gnome-search/search-double.h b/gnucash/gnome-search/search-double.h index 989ff130c23..2a3e0be2bc5 100644 --- a/gnucash/gnome-search/search-double.h +++ b/gnucash/gnome-search/search-double.h @@ -28,14 +28,6 @@ #define GNC_TYPE_SEARCH_DOUBLE (gnc_search_double_get_type ()) G_DECLARE_FINAL_TYPE (GNCSearchDouble, gnc_search_double, GNC, SEARCH_DOUBLE, GNCSearchCoreType) -struct _GNCSearchDouble -{ - GNCSearchCoreType parent; - - QofQueryCompare how; - double value; -}; - GNCSearchDouble *gnc_search_double_new (void); /* methods */ diff --git a/gnucash/gnome-search/search-int64.c b/gnucash/gnome-search/search-int64.c index 763b94a8cb8..6961ef7c228 100644 --- a/gnucash/gnome-search/search-int64.c +++ b/gnucash/gnome-search/search-int64.c @@ -47,6 +47,13 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_int64_finalize (GObject *obj); +struct _GNCSearchInt64 +{ + GNCSearchCoreType parent; + + QofQueryCompare how; + gint64 value; +}; typedef struct _GNCSearchInt64Private GNCSearchInt64Private; diff --git a/gnucash/gnome-search/search-int64.h b/gnucash/gnome-search/search-int64.h index 26b263a02cf..2d046aff702 100644 --- a/gnucash/gnome-search/search-int64.h +++ b/gnucash/gnome-search/search-int64.h @@ -28,14 +28,6 @@ #define GNC_TYPE_SEARCH_INT64 (gnc_search_int64_get_type ()) G_DECLARE_FINAL_TYPE (GNCSearchInt64, gnc_search_int64, GNC, SEARCH_INT64, GNCSearchCoreType) -struct _GNCSearchInt64 -{ - GNCSearchCoreType parent; - - QofQueryCompare how; - gint64 value; -}; - GNCSearchInt64 *gnc_search_int64_new (void); /* methods */ diff --git a/gnucash/gnome-search/search-numeric.c b/gnucash/gnome-search/search-numeric.c index 38d59df4685..42b4fb20f4d 100644 --- a/gnucash/gnome-search/search-numeric.c +++ b/gnucash/gnome-search/search-numeric.c @@ -47,6 +47,16 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_numeric_finalize (GObject *obj); +struct _GNCSearchNumeric +{ + GNCSearchCoreType parent; + struct _GNCSearchNumericPrivate *priv; + + QofQueryCompare how; + gnc_numeric value; + QofNumericMatch option; +}; + typedef struct _GNCSearchNumericPrivate GNCSearchNumericPrivate; struct _GNCSearchNumericPrivate diff --git a/gnucash/gnome-search/search-numeric.h b/gnucash/gnome-search/search-numeric.h index 0f3d053cfd1..b3dd462f19c 100644 --- a/gnucash/gnome-search/search-numeric.h +++ b/gnucash/gnome-search/search-numeric.h @@ -29,16 +29,6 @@ #define GNC_TYPE_SEARCH_NUMERIC (gnc_search_numeric_get_type ()) G_DECLARE_FINAL_TYPE (GNCSearchNumeric, gnc_search_numeric, GNC, SEARCH_NUMERIC, GNCSearchCoreType) -struct _GNCSearchNumeric -{ - GNCSearchCoreType parent; - struct _GNCSearchNumericPrivate *priv; - - QofQueryCompare how; - gnc_numeric value; - QofNumericMatch option; -}; - GNCSearchNumeric *gnc_search_numeric_new (void); GNCSearchNumeric *gnc_search_numeric_debcred_new (void); diff --git a/gnucash/gnome-search/search-reconciled.c b/gnucash/gnome-search/search-reconciled.c index e4ad4c80e4c..52dd519c22f 100644 --- a/gnucash/gnome-search/search-reconciled.c +++ b/gnucash/gnome-search/search-reconciled.c @@ -45,6 +45,14 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_reconciled_finalize (GObject *obj); +struct _GNCSearchReconciled +{ + GNCSearchCoreType parent; + + QofCharMatch how; + cleared_match_t value; +}; + typedef struct _GNCSearchReconciledPrivate GNCSearchReconciledPrivate; struct _GNCSearchReconciledPrivate diff --git a/gnucash/gnome-search/search-reconciled.h b/gnucash/gnome-search/search-reconciled.h index b73990ab8c6..a2c4b12c122 100644 --- a/gnucash/gnome-search/search-reconciled.h +++ b/gnucash/gnome-search/search-reconciled.h @@ -28,14 +28,6 @@ #define GNC_TYPE_SEARCH_RECONCILED (gnc_search_reconciled_get_type ()) G_DECLARE_FINAL_TYPE (GNCSearchReconciled, gnc_search_reconciled, GNC, SEARCH_RECONCILED, GNCSearchCoreType) -struct _GNCSearchReconciled -{ - GNCSearchCoreType parent; - - QofCharMatch how; - cleared_match_t value; -}; - GNCSearchReconciled *gnc_search_reconciled_new (void); /* methods */ diff --git a/gnucash/gnome-search/search-string.c b/gnucash/gnome-search/search-string.c index 31cb32367c4..58400cc142e 100644 --- a/gnucash/gnome-search/search-string.c +++ b/gnucash/gnome-search/search-string.c @@ -47,6 +47,15 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_string_finalize (GObject *obj); +struct _GNCSearchString +{ + GNCSearchCoreType parent; + + GNCSearchString_Type how; + gboolean ign_case; + char * value; +}; + typedef struct _GNCSearchStringPrivate GNCSearchStringPrivate; struct _GNCSearchStringPrivate diff --git a/gnucash/gnome-search/search-string.h b/gnucash/gnome-search/search-string.h index ed294c355b5..d9d413ee2d8 100644 --- a/gnucash/gnome-search/search-string.h +++ b/gnucash/gnome-search/search-string.h @@ -37,15 +37,6 @@ typedef enum _search_string_how SEARCH_STRING_NOT_EQUAL } GNCSearchString_Type; -struct _GNCSearchString -{ - GNCSearchCoreType parent; - - GNCSearchString_Type how; - gboolean ign_case; - char * value; -}; - GNCSearchString *gnc_search_string_new (void); /* methods */ diff --git a/gnucash/gnome/search-owner.c b/gnucash/gnome/search-owner.c index ff70c816bbc..c7df5e24220 100644 --- a/gnucash/gnome/search-owner.c +++ b/gnucash/gnome/search-owner.c @@ -47,6 +47,13 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_owner_finalize (GObject *obj); +struct _GNCSearchOwner +{ + GNCSearchCoreType parent; + + QofGuidMatch how; +}; + typedef struct _GNCSearchOwnerPrivate { GncOwner owner; diff --git a/gnucash/gnome/search-owner.h b/gnucash/gnome/search-owner.h index 1acb790a387..2e1bd7b8b08 100644 --- a/gnucash/gnome/search-owner.h +++ b/gnucash/gnome/search-owner.h @@ -28,13 +28,6 @@ #define GNC_TYPE_SEARCH_OWNER (gnc_search_owner_get_type ()) G_DECLARE_FINAL_TYPE (GNCSearchOwner, gnc_search_owner, GNC, SEARCH_OWNER, GNCSearchCoreType) -struct _GNCSearchOwner -{ - GNCSearchCoreType parent; - - QofGuidMatch how; -}; - GNCSearchOwner *gnc_search_owner_new (void); /* methods */