Refactor: DECLARE_FINAL GNCSearchReconciled < GNCSearchCoreType

Gnucash · Jun 13, 2023 · b1d1f6b · b1d1f6b
1 parent bd60832
commit b1d1f6b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/gnucash/gnome-search/search-reconciled.c b/gnucash/gnome-search/search-reconciled.c
@@ -87,7 +87,7 @@ static void
 gnc_search_reconciled_finalize (GObject *obj)
 {
     GNCSearchReconciled *o = (GNCSearchReconciled *)obj;
-    g_assert (IS_GNCSEARCH_RECONCILED (o));
+    g_assert (GNC_IS_SEARCH_RECONCILED (o));
 
     G_OBJECT_CLASS (gnc_search_reconciled_parent_class)->finalize(obj);
 }
@@ -110,7 +110,7 @@ void
 gnc_search_reconciled_set_value (GNCSearchReconciled *fi, cleared_match_t value)
 {
     g_return_if_fail (fi);
-    g_return_if_fail (IS_GNCSEARCH_RECONCILED (fi));
+    g_return_if_fail (GNC_IS_SEARCH_RECONCILED (fi));
 
     fi->value = value;
 }
@@ -119,7 +119,7 @@ void
 gnc_search_reconciled_set_how (GNCSearchReconciled *fi, QofCharMatch how)
 {
     g_return_if_fail (fi);
-    g_return_if_fail (IS_GNCSEARCH_RECONCILED (fi));
+    g_return_if_fail (GNC_IS_SEARCH_RECONCILED (fi));
     fi->how = how;
 }
 
@@ -130,7 +130,7 @@ pass_parent (GNCSearchCoreType *fe, gpointer parent)
     GNCSearchReconciledPrivate *priv;
 
     g_return_if_fail (fi);
-    g_return_if_fail (IS_GNCSEARCH_RECONCILED (fi));
+    g_return_if_fail (GNC_IS_SEARCH_RECONCILED (fi));
 
     priv = _PRIVATE(fi);
     priv->parent = GTK_WINDOW(parent);
@@ -143,7 +143,7 @@ gncs_validate (GNCSearchCoreType *fe)
     gboolean valid = TRUE;
 
     g_return_val_if_fail (fi, FALSE);
-    g_return_val_if_fail (IS_GNCSEARCH_RECONCILED (fi), FALSE);
+    g_return_val_if_fail (GNC_IS_SEARCH_RECONCILED (fi), FALSE);
 
     /* XXX */
 
@@ -203,7 +203,7 @@ gncs_get_widget (GNCSearchCoreType *fe)
     GNCSearchReconciled *fi = (GNCSearchReconciled *)fe;
 
     g_return_val_if_fail (fi, NULL);
-    g_return_val_if_fail (IS_GNCSEARCH_RECONCILED (fi), NULL);
+    g_return_val_if_fail (GNC_IS_SEARCH_RECONCILED (fi), NULL);
 
     box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
     gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
@@ -240,7 +240,7 @@ static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe)
     int i;
 
     g_return_val_if_fail (fi, NULL);
-    g_return_val_if_fail (IS_GNCSEARCH_RECONCILED (fi), NULL);
+    g_return_val_if_fail (GNC_IS_SEARCH_RECONCILED (fi), NULL);
 
     /* This code should look a lot like xaccQueryAddClearedMatch() */
 
@@ -267,7 +267,7 @@ static GNCSearchCoreType *gncs_clone(GNCSearchCoreType *fe)
     GNCSearchReconciled *se, *fse = (GNCSearchReconciled *)fe;
 
     g_return_val_if_fail (fse, NULL);
-    g_return_val_if_fail (IS_GNCSEARCH_RECONCILED (fse), NULL);
+    g_return_val_if_fail (GNC_IS_SEARCH_RECONCILED (fse), NULL);
 
     se = gnc_search_reconciled_new ();
     gnc_search_reconciled_set_value (se, fse->value);

diff --git a/gnucash/gnome-search/search-reconciled.h b/gnucash/gnome-search/search-reconciled.h
@@ -26,12 +26,7 @@
 #include "Query.h"		/* for cleared_match_t */
 
 #define GNC_TYPE_SEARCH_RECONCILED	  (gnc_search_reconciled_get_type ())
-#define GNCSEARCH_RECONCILED(obj)	  G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_SEARCH_RECONCILED, GNCSearchReconciled)
-#define GNCSEARCH_RECONCILED_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_SEARCH_RECONCILED, GNCSearchReconciledClass)
-#define IS_GNCSEARCH_RECONCILED(obj)      G_TYPE_CHECK_INSTANCE_TYPE (obj, GNC_TYPE_SEARCH_RECONCILED)
-
-typedef struct _GNCSearchReconciled	GNCSearchReconciled;
-typedef struct _GNCSearchReconciledClass	GNCSearchReconciledClass;
+G_DECLARE_FINAL_TYPE (GNCSearchReconciled, gnc_search_reconciled, GNC, SEARCH_RECONCILED, GNCSearchCoreType)
 
 struct _GNCSearchReconciled
 {
@@ -41,16 +36,6 @@ struct _GNCSearchReconciled
     cleared_match_t   value;
 };
 
-struct _GNCSearchReconciledClass
-{
-    GNCSearchCoreTypeClass parent_class;
-
-    /* virtual methods */
-
-    /* signals */
-};
-
-GType		gnc_search_reconciled_get_type	(void);
 GNCSearchReconciled	*gnc_search_reconciled_new	(void);
 
 /* methods */