From e386a2a77d83dd219afc08a5a191baa927ff5538 Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Sun, 1 Sep 2019 13:37:08 +0800 Subject: [PATCH] [report-utilities] deprecate gnc:acccounts-get-all-subaccounts * this function has a typo in name * all uses of accounts-get-all-subaccounts were followed by appending the result to the original accounts list. we have already rewritten to use the better function in previous commit. this is now obsolete. * inline its last use, omit sorting. list is sorted anyway afterwards. --- gnucash/report/report-system/report-system.scm | 2 +- gnucash/report/report-system/report-utilities.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnucash/report/report-system/report-system.scm b/gnucash/report/report-system/report-system.scm index 68da72afe6..33c2229b2b 100644 --- a/gnucash/report/report-system/report-system.scm +++ b/gnucash/report/report-system/report-system.scm @@ -687,7 +687,7 @@ (export gnc:accounts-get-commodities) (export gnc:get-current-account-tree-depth) (export gnc:accounts-and-all-descendants) -(export gnc:acccounts-get-all-subaccounts) +(export gnc:acccounts-get-all-subaccounts) ;deprecated (export gnc:make-stats-collector) ;deprecated (export gnc:make-drcr-collector) ;deprecated (export gnc:make-value-collector) diff --git a/gnucash/report/report-system/report-utilities.scm b/gnucash/report/report-system/report-utilities.scm index ef6050bbe8..75cc9979b3 100644 --- a/gnucash/report/report-system/report-utilities.scm +++ b/gnucash/report/report-system/report-utilities.scm @@ -146,14 +146,14 @@ construct gnc:make-gnc-monetary and use gnc:monetary->string instead.") ;; Get all children of this list of accounts. (define (gnc:acccounts-get-all-subaccounts accountlist) + (issue-deprecation-warning "gnc:acccounts-get-all-subaccounts is unused.") (append-map gnc-account-get-descendants-sorted accountlist)) ;; Return accountslist *and* their descendant accounts (define (gnc:accounts-and-all-descendants accountslist) (sort-and-delete-duplicates - (append accountslist - (gnc:acccounts-get-all-subaccounts accountslist)) + (apply append accountslist (map gnc-account-get-descendants accountslist)) (lambda (a b) (string