Refactor: hide implementation of GNCSearch* (move from .h to .c)

Gnucash · Jun 13, 2023 · 4eb20b2 · 4eb20b2
1 parent 5d3eaa5
commit 4eb20b2
Show file tree

Hide file tree

Showing 18 changed files with 71 additions and 72 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 */