gnucash maint: Inline gnc:query-set-match-non-voids-only!

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/e0062b65 (commit)
	from  https://github.com/Gnucash/gnucash/commit/9a948eb3 (commit)



commit e0062b65218b4d4deb4644befdbcc118663e7ae1
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Thu Sep 17 21:33:04 2020 +0800

    Inline gnc:query-set-match-non-voids-only!
    
    Addendum to 683fe2f37 - completion deprecate old function

diff --git a/gnucash/report/commodity-utilities.scm b/gnucash/report/commodity-utilities.scm
index 398aa0f3e..c6c87efa2 100644
--- a/gnucash/report/commodity-utilities.scm
+++ b/gnucash/report/commodity-utilities.scm
@@ -30,7 +30,8 @@
 (define (get-all-splits accounts end-date)
   (let ((query (qof-query-create-for-splits)))
     (qof-query-set-book query (gnc-get-current-book))
-    (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
+    (xaccQueryAddClearedMatch
+     query (logand CLEARED-ALL (lognot CLEARED-VOIDED)) QOF-QUERY-AND)
     (xaccQueryAddAccountMatch query accounts QOF-GUID-MATCH-ANY QOF-QUERY-AND)
     (xaccQueryAddDateMatchTT query #f 0 (and end-date #t) (or end-date 0) QOF-QUERY-AND)
     (let ((splits (qof-query-run query)))
diff --git a/gnucash/report/reports/aging.scm b/gnucash/report/reports/aging.scm
index 3f364f8bc..9ef5bc555 100644
--- a/gnucash/report/reports/aging.scm
+++ b/gnucash/report/reports/aging.scm
@@ -303,7 +303,8 @@ more than one currency. This report is not designed to cope with this possibilit
 ;; set up the query to get the splits in the chosen account
 (define (setup-query query account date)
   (qof-query-set-book query (gnc-get-current-book))
-  (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
+  (xaccQueryAddClearedMatch
+   query (logand CLEARED-ALL (lognot CLEARED-VOIDED)) QOF-QUERY-AND)
   (xaccQueryAddSingleAccountMatch query account QOF-QUERY-AND)
   (xaccQueryAddDateMatchTT query #f 0 #t date QOF-QUERY-AND)
   (qof-query-set-sort-order query
diff --git a/gnucash/report/reports/example/average-balance.scm b/gnucash/report/reports/example/average-balance.scm
index 10fdd53a4..042a7d36c 100644
--- a/gnucash/report/reports/example/average-balance.scm
+++ b/gnucash/report/reports/example/average-balance.scm
@@ -338,7 +338,8 @@
 
 	  ;; for balance purposes, we don't need to do this, but it cleans up
 	  ;; the table display.
-          (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
+          (xaccQueryAddClearedMatch
+           query (logand CLEARED-ALL (lognot CLEARED-VOIDED)) QOF-QUERY-AND)
           ;; add accounts to the query (include subaccounts 
           ;; if requested)
 	  (gnc:report-percent-done 25)
diff --git a/gnucash/report/reports/example/daily-reports.scm b/gnucash/report/reports/example/daily-reports.scm
index b34ccd2e0..e8cd581e3 100644
--- a/gnucash/report/reports/example/daily-reports.scm
+++ b/gnucash/report/reports/example/daily-reports.scm
@@ -217,7 +217,8 @@
 
           ;; for balance purposes, we don't need to do this, but it cleans up
           ;; the table display.
-          (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
+          (xaccQueryAddClearedMatch
+           query (logand CLEARED-ALL (lognot CLEARED-VOIDED)) QOF-QUERY-AND)
           ;; add accounts to the query (include subaccounts
           ;; if requested)
           (gnc:report-percent-done 25)
diff --git a/gnucash/report/reports/standard/general-journal.scm b/gnucash/report/reports/standard/general-journal.scm
index 9ec1c6370..c2c25f785 100644
--- a/gnucash/report/reports/standard/general-journal.scm
+++ b/gnucash/report/reports/standard/general-journal.scm
@@ -56,7 +56,8 @@
     ;; Register Report properly ignores voided transactions, I'll err
     ;; on the side of safety by excluding them from the query....
     (qof-query-set-book query (gnc-get-current-book))
-    (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
+    (xaccQueryAddClearedMatch
+     query (logand CLEARED-ALL (lognot CLEARED-VOIDED)) QOF-QUERY-AND)
     (qof-query-set-sort-order query
 			      (list SPLIT-TRANS TRANS-DATE-POSTED)
 			      (list QUERY-DEFAULT-SORT)
diff --git a/gnucash/report/reports/standard/lot-viewer.scm b/gnucash/report/reports/standard/lot-viewer.scm
index 37ee7b2d1..1975e4ee7 100644
--- a/gnucash/report/reports/standard/lot-viewer.scm
+++ b/gnucash/report/reports/standard/lot-viewer.scm
@@ -104,7 +104,8 @@
          (splits
           (let ((query (qof-query-create-for-splits)))
             (qof-query-set-book query (gnc-get-current-book))
-            (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
+            (xaccQueryAddClearedMatch
+             query (logand CLEARED-ALL (lognot CLEARED-VOIDED)) QOF-QUERY-AND)
             (xaccQueryAddSingleAccountMatch query account QOF-QUERY-AND)
             (xaccQueryAddDateMatchTT query #t from-date #t to-date QOF-QUERY-AND)
             (filter desc-filter? (qof-query-run query))))
diff --git a/gnucash/report/reports/standard/new-aging.scm b/gnucash/report/reports/standard/new-aging.scm
index c9fbfa397..fbf181d92 100644
--- a/gnucash/report/reports/standard/new-aging.scm
+++ b/gnucash/report/reports/standard/new-aging.scm
@@ -70,7 +70,8 @@ exist but have no suitable transactions."))
 
 (define (setup-query query accounts date)
   (qof-query-set-book query (gnc-get-current-book))
-  (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
+  (xaccQueryAddClearedMatch
+   query (logand CLEARED-ALL (lognot CLEARED-VOIDED)) QOF-QUERY-AND)
   (xaccQueryAddAccountMatch query accounts QOF-GUID-MATCH-ANY QOF-QUERY-AND)
   (xaccQueryAddDateMatchTT query #f 0 #t date QOF-QUERY-AND)
   (qof-query-set-sort-order query (list SPLIT-TRANS TRANS-DATE-POSTED) '() '())



Summary of changes:
 gnucash/report/commodity-utilities.scm              | 3 ++-
 gnucash/report/reports/aging.scm                    | 3 ++-
 gnucash/report/reports/example/average-balance.scm  | 3 ++-
 gnucash/report/reports/example/daily-reports.scm    | 3 ++-
 gnucash/report/reports/standard/general-journal.scm | 3 ++-
 gnucash/report/reports/standard/lot-viewer.scm      | 3 ++-
 gnucash/report/reports/standard/new-aging.scm       | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)