r14968 - gnucash/branches/swig-redo/src - Automated rename of swig-wrapped app-utils functions to their swig-names.
Chris Shoemaker
chris at cvs.gnucash.org
Mon Oct 9 20:00:19 EDT 2006
Author: chris
Date: 2006-10-09 20:00:17 -0400 (Mon, 09 Oct 2006)
New Revision: 14968
Trac: http://svn.gnucash.org/trac/changeset/14968
Modified:
gnucash/branches/swig-redo/src/app-utils/c-interface.scm
gnucash/branches/swig-redo/src/app-utils/date-utilities.scm
gnucash/branches/swig-redo/src/app-utils/gw-app-utils-spec.scm
gnucash/branches/swig-redo/src/app-utils/options.scm
gnucash/branches/swig-redo/src/business/business-reports/aging.scm
gnucash/branches/swig-redo/src/business/business-reports/fancy-invoice.scm
gnucash/branches/swig-redo/src/business/business-reports/owner-report.scm
gnucash/branches/swig-redo/src/business/business-utils/business-options.scm
gnucash/branches/swig-redo/src/gnome-utils/gnome-utils.scm
gnucash/branches/swig-redo/src/import-export/qif-import/druid-qif-import.c
gnucash/branches/swig-redo/src/import-export/qif-import/qif-dialog-utils.scm
gnucash/branches/swig-redo/src/import-export/qif-import/qif-guess-map.scm
gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm
gnucash/branches/swig-redo/src/import-export/qif-import/qif-to-gnc.scm
gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-acct-table.scm
gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-bank-xtn-import.scm
gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-invst-xtn-import.scm
gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf-de_DE.scm
gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf.scm
gnucash/branches/swig-redo/src/report/report-system/commodity-utilities.scm
gnucash/branches/swig-redo/src/report/report-system/html-acct-table.scm
gnucash/branches/swig-redo/src/report/report-system/html-style-info.scm
gnucash/branches/swig-redo/src/report/report-system/html-utilities.scm
gnucash/branches/swig-redo/src/report/report-system/options-utilities.scm
gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm
gnucash/branches/swig-redo/src/report/standard-reports/account-piecharts.scm
gnucash/branches/swig-redo/src/report/standard-reports/account-summary.scm
gnucash/branches/swig-redo/src/report/standard-reports/advanced-portfolio.scm
gnucash/branches/swig-redo/src/report/standard-reports/average-balance.scm
gnucash/branches/swig-redo/src/report/standard-reports/balance-sheet.scm
gnucash/branches/swig-redo/src/report/standard-reports/budget.scm
gnucash/branches/swig-redo/src/report/standard-reports/cash-flow.scm
gnucash/branches/swig-redo/src/report/standard-reports/category-barchart.scm
gnucash/branches/swig-redo/src/report/standard-reports/daily-reports.scm
gnucash/branches/swig-redo/src/report/standard-reports/equity-statement.scm
gnucash/branches/swig-redo/src/report/standard-reports/general-journal.scm
gnucash/branches/swig-redo/src/report/standard-reports/income-statement.scm
gnucash/branches/swig-redo/src/report/standard-reports/net-barchart.scm
gnucash/branches/swig-redo/src/report/standard-reports/portfolio.scm
gnucash/branches/swig-redo/src/report/standard-reports/price-scatter.scm
gnucash/branches/swig-redo/src/report/standard-reports/register.scm
gnucash/branches/swig-redo/src/report/standard-reports/transaction.scm
gnucash/branches/swig-redo/src/report/standard-reports/trial-balance.scm
gnucash/branches/swig-redo/src/report/utility-reports/hello-world.scm
gnucash/branches/swig-redo/src/scm/main-window.scm
gnucash/branches/swig-redo/src/scm/price-quotes.scm
Log:
Automated rename of swig-wrapped app-utils functions to their swig-names.
s/gnc:get-current-group)/gnc-get-current-group)/g
s/gnc:get-current-book/gnc-get-current-book/g
s/gnc:gettext-helper/gnc-gettext-helper/g
s/gnc:option-db-/gnc-option-db-/g
s/gnc:default-currency/gnc-default-currency/g
s/gnc:default-report-currency/gnc-default-report-currency/g
s/gnc:default-print-info/gnc-default-print-info/g
s/gnc:option-invoke-callback/gncp_option_invoke_callback/g
s/gnc:locale-default-iso-currency-code/gnc-locale-default-iso-currency-code/g
s/gnc:account-get-full-name/gnc-account-get-full-name/g
s/gnc:commodity-print-info/gnc-commodity-print-info/g
s/gnc:account-print-info/gnc-account-print-info/g
s/gnc:share-print-info-places/gnc-share-print-info-places/g
s/gnc:account-reverse-balance?/gnc-reverse-balance/g
s/gnc:is-euro-currency/gnc-is-euro-currency/g
s/gnc:convert-to-euro/gnc-convert-to-euro/g
s/gnc:convert-from-euro/gnc-convert-from-euro/g
s/gnc:commodity-table-get-quotable-commodities-info/gnc-commodity-table-get-quotable-commodities/g
s/gnc:accounting-period-start/gnc-accounting-period-fiscal-start/g
s/gnc:accounting-period-end/gnc-accounting-period-fiscal-end/g
s/gnc:amount->string/xaccPrintAmount/g
Modified: gnucash/branches/swig-redo/src/app-utils/c-interface.scm
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/c-interface.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/app-utils/c-interface.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -41,7 +41,7 @@
;; gettext functions
-(define gnc:gettext gnc:gettext-helper)
+(define gnc:gettext gnc-gettext-helper)
(define gnc:_ gnc:gettext)
(define _ gnc:gettext)
(define-syntax N_
Modified: gnucash/branches/swig-redo/src/app-utils/date-utilities.scm
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/date-utilities.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/app-utils/date-utilities.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -454,10 +454,10 @@
(gnc:date->timepair now)))
(define (gnc:get-start-accounting-period)
- (gnc:secs->timepair (gnc:accounting-period-start)))
+ (gnc:secs->timepair (gnc-accounting-period-fiscal-start)))
(define (gnc:get-end-accounting-period)
- (gnc:secs->timepair (gnc:accounting-period-end)))
+ (gnc:secs->timepair (gnc-accounting-period-fiscal-end)))
(define (gnc:get-start-this-month)
(let ((now (localtime (current-time))))
Modified: gnucash/branches/swig-redo/src/app-utils/gw-app-utils-spec.scm
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/gw-app-utils-spec.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/app-utils/gw-app-utils-spec.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -63,7 +63,7 @@
(gw:wrap-function
ws
- 'gnc:get-current-book
+ 'gnc-get-current-book
'<gnc:Book*>
"gnc_get_current_book"
'()
@@ -88,7 +88,7 @@
(gw:wrap-function
ws
- 'gnc:gettext-helper
+ 'gnc-gettext-helper
'(<gw:mchars> caller-owned const)
"gnc_gettext_helper"
'(((<gw:mchars> caller-owned const) str))
@@ -96,7 +96,7 @@
(gw:wrap-function
ws
- 'gnc:option-db-new
+ 'gnc-option-db-new
'<gnc:OptionDB*>
"gnc_option_db_new"
'((<gw:scm> guile-options))
@@ -104,7 +104,7 @@
(gw:wrap-function
ws
- 'gnc:option-db-destroy
+ 'gnc-option-db-destroy
'<gw:void>
"gnc_option_db_destroy"
'((<gnc:OptionDB*> option-db))
@@ -112,7 +112,7 @@
(gw:wrap-function
ws
- 'gnc:option-db-set-option-selectable-by-name
+ 'gnc-option-db-set-option-selectable-by-name
'<gw:void>
"gnc_option_db_set_option_selectable_by_name"
'((<gw:scm> guile-options)
@@ -123,7 +123,7 @@
(gw:wrap-function
ws
- 'gnc:default-currency
+ 'gnc-default-currency
'(<gnc:commodity*> const)
"gnc_default_currency"
'()
@@ -131,7 +131,7 @@
(gw:wrap-function
ws
- 'gnc:default-report-currency
+ 'gnc-default-report-currency
'(<gnc:commodity*> const)
"gnc_default_report_currency"
'()
@@ -149,7 +149,7 @@
(gw:wrap-function
ws
- 'gnc:option-invoke-callback
+ 'gncp_option_invoke_callback
'<gw:void>
"gncp_option_invoke_callback"
'((<gnc:OptionChangeCallback> callback) (<gw:void*> data))
@@ -157,7 +157,7 @@
(gw:wrap-function
ws
- 'gnc:option-db-register-option
+ 'gnc-option-db-register-option
'<gw:void>
"gncp_option_db_register_option"
'((<gw:int> db_handle) (<gw:scm> option))
@@ -181,7 +181,7 @@
(gw:wrap-function
ws
- 'gnc:locale-default-iso-currency-code
+ 'gnc-locale-default-iso-currency-code
'(<gw:mchars> callee-owned const)
"gnc_locale_default_iso_currency_code"
'()
@@ -235,7 +235,7 @@
(gw:wrap-function
ws
- 'gnc:account-get-full-name
+ 'gnc-account-get-full-name
'(<gw:mchars> caller-owned)
"gnc_account_get_full_name"
'((<gnc:Account*> account))
@@ -243,7 +243,7 @@
(gw:wrap-function
ws
- 'gnc:default-print-info
+ 'gnc-default-print-info
'<gnc:print-amount-info-scm>
"gnc_default_print_info"
'((<gw:bool> use_symbol))
@@ -251,7 +251,7 @@
(gw:wrap-function
ws
- 'gnc:commodity-print-info
+ 'gnc-commodity-print-info
'<gnc:print-amount-info-scm>
"gnc_commodity_print_info"
'((<gnc:commodity*> commodity) (<gw:bool> use_symbol))
@@ -259,7 +259,7 @@
(gw:wrap-function
ws
- 'gnc:account-print-info
+ 'gnc-account-print-info
'<gnc:print-amount-info-scm>
"gnc_account_print_info"
'((<gnc:Account*> account) (<gw:bool> use_symbol))
@@ -283,7 +283,7 @@
(gw:wrap-function
ws
- 'gnc:share-print-info-places
+ 'gnc-share-print-info-places
'<gnc:print-amount-info-scm>
"gnc_share_print_info_places"
'((<gw:int> decplaces))
@@ -307,7 +307,7 @@
(gw:wrap-function
ws
- 'gnc:account-reverse-balance?
+ 'gnc-reverse-balance
'<gw:bool>
"gnc_reverse_balance"
'((<gnc:Account*> account))
@@ -315,7 +315,7 @@
(gw:wrap-function
ws
- 'gnc:is-euro-currency
+ 'gnc-is-euro-currency
'<gw:bool>
"gnc_is_euro_currency"
'((<gnc:commodity*> currency))
@@ -331,7 +331,7 @@
(gw:wrap-function
ws
- 'gnc:convert-to-euro
+ 'gnc-convert-to-euro
'<gnc:numeric>
"gnc_convert_to_euro"
'((<gnc:commodity*> currency) (<gnc:numeric> value))
@@ -339,7 +339,7 @@
(gw:wrap-function
ws
- 'gnc:convert-from-euro
+ 'gnc-convert-from-euro
'<gnc:numeric>
"gnc_convert_from_euro"
'((<gnc:commodity*> currency) (<gnc:numeric> value))
@@ -371,7 +371,7 @@
(gw:wrap-function
ws
- 'gnc:accounting-period-start
+ 'gnc_accounting_period_fiscal_start
'<gw:int>
"gnc_accounting_period_fiscal_start"
'()
@@ -379,7 +379,7 @@
(gw:wrap-function
ws
- 'gnc:accounting-period-end
+ 'gnc_accounting_period_fiscal_end
'<gw:int>
"gnc_accounting_period_fiscal_end"
'()
Modified: gnucash/branches/swig-redo/src/app-utils/options.scm
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/options.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/app-utils/options.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -281,7 +281,7 @@
(define (scm->currency currency)
(if (string? currency)
(gnc:commodity-table-lookup
- (gnc:book-get-commodity-table (gnc:get-current-book))
+ (gnc:book-get-commodity-table (gnc-get-current-book))
GNC_COMMODITY_NS_CURRENCY currency)
currency))
@@ -316,10 +316,10 @@
(define (guid->budget budget)
(if (string? budget)
- (gnc:budget-lookup budget (gnc:get-current-book))
+ (gnc:budget-lookup budget (gnc-get-current-book))
budget))
- (let* ((default-value (gnc:budget-get-default (gnc:get-current-book)))
+ (let* ((default-value (gnc:budget-get-default (gnc-get-current-book)))
(value (budget->guid default-value))
(option-set #f)
(value->string (lambda ()
@@ -340,7 +340,7 @@
(set! option-set #t)) ;; setter
(lambda ()
(guid->budget
- (gnc:budget-get-default (gnc:get-current-book)))) ;; default-getter
+ (gnc:budget-get-default (gnc-get-current-book)))) ;; default-getter
(gnc:restore-form-generator value->string) ;; ??
(lambda (f p) (gnc:kvp-frame-set-slot-path f value p))
(lambda (f p)
@@ -370,7 +370,7 @@
(define (scm->commodity scm)
(gnc:commodity-table-lookup
- (gnc:book-get-commodity-table (gnc:get-current-book))
+ (gnc:book-get-commodity-table (gnc-get-current-book))
(cadr scm) (caddr scm)))
(let* ((value (commodity->scm default-value))
@@ -617,7 +617,7 @@
(define (convert-to-account item)
(if (string? item)
- (gnc:account-lookup item (gnc:get-current-book))
+ (gnc:account-lookup item (gnc-get-current-book))
item))
(let* ((option (map convert-to-guid (default-getter)))
@@ -641,7 +641,7 @@
(set! account-list
(filter (lambda (x) (if (string? x)
(gnc:account-lookup
- x (gnc:get-current-book))
+ x (gnc-get-current-book))
x)) account-list))
(let* ((result (validator account-list))
(valid (car result))
@@ -719,7 +719,7 @@
(define (convert-to-account item)
(if (string? item)
- (gnc:account-lookup item (gnc:get-current-book))
+ (gnc:account-lookup item (gnc-get-current-book))
item))
(define (find-first-account)
@@ -733,7 +733,7 @@
this-account
(find-first (cdr account-list))))))
- (let* ((current-group (gnc:get-current-group))
+ (let* ((current-group (gnc-get-current-group))
(account-list (gnc:group-get-subaccounts current-group)))
(find-first account-list)))
@@ -1447,7 +1447,7 @@
((options 'register-callback) section name callback))
(define (gnc:options-register-c-callback section name c-callback data options)
- (let ((callback (lambda () (gnc:option-invoke-callback c-callback data))))
+ (let ((callback (lambda () (gncp-option-invoke-callback c-callback data))))
((options 'register-callback) section name callback)))
(define (gnc:options-unregister-callback-id id options)
@@ -1507,7 +1507,7 @@
(define (gnc:send-options db_handle options)
(gnc:options-for-each
(lambda (option)
- (gnc:option-db-register-option db_handle option))
+ (gnc-option-db-register-option db_handle option))
options))
(define (gnc:save-options options options-string file header truncate?)
Modified: gnucash/branches/swig-redo/src/business/business-reports/aging.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-reports/aging.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/business/business-reports/aging.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -304,8 +304,8 @@
(set! begindate (decdate begindate NinetyDayDelta)) ;XXX - 360 days!?!
(gnc:debug "begindate" begindate)
(gnc:debug "date" date)
- (gnc:query-set-book query (gnc:get-current-book))
- (gnc:query-set-match-non-voids-only! query (gnc:get-current-book))
+ (gnc:query-set-book query (gnc-get-current-book))
+ (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
(gnc:query-add-single-account-match query account 'query-and)
(gnc:query-add-date-match-timepair query #t begindate #t date 'query-and)
(gnc:query-set-sort-order query
Modified: gnucash/branches/swig-redo/src/business/business-reports/fancy-invoice.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-reports/fancy-invoice.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/business/business-reports/fancy-invoice.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -349,7 +349,7 @@
(gnc:make-complex-boolean-option
(N_ "Display") (N_ "Payable to")
"ua1" (N_ "Display the Payable to: information") #t #f
- (lambda (x) (gnc:option-db-set-option-selectable-by-name
+ (lambda (x) (gnc-option-db-set-option-selectable-by-name
gnc:*report-options* "Display" "Payable to string" x))))
(gnc:register-inv-option
@@ -362,7 +362,7 @@
(gnc:make-complex-boolean-option
(N_ "Display") (N_ "Company contact")
"ub1" (N_ "Display the Company contact information") #t #f
- (lambda (x) (gnc:option-db-set-option-selectable-by-name
+ (lambda (x) (gnc-option-db-set-option-selectable-by-name
gnc:*report-options* "Display" "Company contact string" x))))
(gnc:register-inv-option
Modified: gnucash/branches/swig-redo/src/business/business-reports/owner-report.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-reports/owner-report.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/business/business-reports/owner-report.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -129,7 +129,7 @@
(let ((lots (gnc:query-get-lots query 'query-txn-match-any))
(buckets (new-bucket-vector))
(payments (gnc:numeric-zero))
- (currency (gnc:default-currency)) ;XXX
+ (currency (gnc-default-currency)) ;XXX
(table (gnc:make-html-table)))
(define (in-interval this-date current-bucket)
@@ -276,7 +276,7 @@
(let ((txns (gnc:query-get-transactions query 'query-txn-match-any))
(used-columns (build-column-used options))
(total (gnc:numeric-zero))
- (currency (gnc:default-currency)) ;XXX
+ (currency (gnc-default-currency)) ;XXX
(table (gnc:make-html-table))
(inv-str (gnc:option-value (gnc:lookup-option options "__reg"
"inv-str")))
@@ -449,7 +449,7 @@
(gnc:query-add-single-account-match q account 'query-and)
(gnc:query-add-date-match-timepair q #f end-date #t end-date 'query-and)
- (gnc:query-set-book q (gnc:get-current-book))
+ (gnc:query-set-book q (gnc-get-current-book))
q))
(define (make-owner-table owner)
@@ -540,7 +540,7 @@
(end-date (gnc:timepair-end-day-time
(gnc:date-option-absolute-time
(opt-val gnc:pagename-general (N_ "To")))))
- (book (gnc:get-current-book)) ;XXX Grab this from elsewhere
+ (book (gnc-get-current-book)) ;XXX Grab this from elsewhere
(type (opt-val "__reg" "owner-type"))
(type-str ""))
@@ -632,7 +632,7 @@
this-account
(find-first group num (+ index 1))))))
- (let* ((current-group (gnc:get-current-group))
+ (let* ((current-group (gnc-get-current-group))
(num-accounts (gnc:group-get-num-accounts
current-group)))
(if (> num-accounts 0)
Modified: gnucash/branches/swig-redo/src/business/business-utils/business-options.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-utils/business-options.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/business/business-utils/business-options.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -41,7 +41,7 @@
(define (convert-to-invoice item)
(if (string? item)
- (gncInvoiceLookupFlip item (gnc:get-current-book))
+ (gncInvoiceLookupFlip item (gnc-get-current-book))
item))
(let* ((option (convert-to-guid (default-getter)))
@@ -102,7 +102,7 @@
(define (convert-to-customer item)
(if (string? item)
- (gncCustomerLookupFlip item (gnc:get-current-book))
+ (gncCustomerLookupFlip item (gnc-get-current-book))
item))
(let* ((option (convert-to-guid (default-getter)))
@@ -163,7 +163,7 @@
(define (convert-to-vendor item)
(if (string? item)
- (gncVendorLookupFlip item (gnc:get-current-book))
+ (gncVendorLookupFlip item (gnc-get-current-book))
item))
(let* ((option (convert-to-guid (default-getter)))
@@ -224,7 +224,7 @@
(define (convert-to-employee item)
(if (string? item)
- (gncEmployeeLookupFlip item (gnc:get-current-book))
+ (gncEmployeeLookupFlip item (gnc-get-current-book))
item))
(let* ((option (convert-to-guid (default-getter)))
@@ -294,25 +294,25 @@
((eqv? type GNC-OWNER-CUSTOMER)
(gncOwnerInitCustomer
option-value
- (gncCustomerLookupFlip (cdr pair) (gnc:get-current-book)))
+ (gncCustomerLookupFlip (cdr pair) (gnc-get-current-book)))
option-value)
((eqv? type GNC-OWNER-VENDOR)
(gncOwnerInitVendor
option-value
- (gncVendorLookupFlip (cdr pair) (gnc:get-current-book)))
+ (gncVendorLookupFlip (cdr pair) (gnc-get-current-book)))
option-value)
((eqv? type GNC-OWNER-EMPLOYEE)
(gncOwnerInitEmployee
option-value
- (gncEmployeeLookupFlip (cdr pair) (gnc:get-current-book)))
+ (gncEmployeeLookupFlip (cdr pair) (gnc-get-current-book)))
option-value)
((eqv? type GNC-OWNER-JOB)
(gncOwnerInitJob
option-value
- (gncJobLookupFlip (cdr pair) (gnc:get-current-book)))
+ (gncJobLookupFlip (cdr pair) (gnc-get-current-book)))
option-value)
(else '())))
@@ -390,7 +390,7 @@
(define (convert-to-taxtable item)
(if (string? item)
- (gncTaxTableLookupFlip item (gnc:get-current-book))
+ (gncTaxTableLookupFlip item (gnc-get-current-book))
item))
(let* ((option (convert-to-guid (default-getter)))
Modified: gnucash/branches/swig-redo/src/gnome-utils/gnome-utils.scm
===================================================================
--- gnucash/branches/swig-redo/src/gnome-utils/gnome-utils.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/gnome-utils/gnome-utils.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -21,7 +21,7 @@
(define (gnc:kvp-option-dialog id-type slots title changed_cb)
(let* ((options (gnc:make-kvp-options id-type))
- (optiondb (gnc:option-db-new options))
+ (optiondb (gnc-option-db-new options))
(optionwin (gnc-options-dialog-new title)))
(define (apply-cb)
@@ -30,7 +30,7 @@
(define (close-cb)
(gnc-options-dialog-destroy optionwin)
- (gnc:option-db-destroy optiondb))
+ (gnc-option-db-destroy optiondb))
(gnc:options-kvp->scm options slots gnc:*kvp-option-path*)
(gnc-options-dialog-set-scm-callbacks optionwin apply-cb close-cb)
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/druid-qif-import.c
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/druid-qif-import.c 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/druid-qif-import.c 2006-10-10 00:00:17 UTC (rev 14968)
@@ -1289,7 +1289,7 @@
/* now detect duplicate transactions */
gnc_set_busy_cursor(NULL, TRUE);
retval = scm_call_3(find_duplicates,
- scm_c_eval_string("(gnc:get-current-group)"),
+ scm_c_eval_string("(gnc-get-current-group)"),
wind->imported_account_group, window);
gnc_unset_busy_cursor(NULL);
@@ -1861,7 +1861,7 @@
/* actually add in the new transactions. */
scm_call_2(cat_and_merge,
- scm_c_eval_string("(gnc:get-current-group)"),
+ scm_c_eval_string("(gnc-get-current-group)"),
wind->imported_account_group);
gnc_resume_gui_refresh();
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-dialog-utils.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-dialog-utils.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-dialog-utils.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -607,9 +607,9 @@
(let* ((separator (string-ref (gnc:account-separator-string) 0))
(existing-gnc-acct
(gnc:get-account-from-full-name
- (gnc:get-current-group)
+ (gnc-get-current-group)
(qif-map-entry:gnc-name map-entry)))
- (book (gnc:group-get-book (gnc:get-current-group)))
+ (book (gnc:group-get-book (gnc-get-current-group)))
(existing-type
(gnc:account-get-type existing-gnc-acct)))
(if (and existing-gnc-acct
@@ -709,11 +709,11 @@
(set! accts
(cons
(cons (string-split
- (gnc:account-get-full-name acct)
+ (gnc-account-get-full-name acct)
separator)
#f)
accts)))
- (gnc:group-get-subaccounts (gnc:get-current-group)))
+ (gnc:group-get-subaccounts (gnc-get-current-group)))
;; now build a tree structure
(for-each
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-guess-map.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-guess-map.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-guess-map.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -110,7 +110,7 @@
(make-hash-table 20)))))
;; now build the list of all known account names
- (let* ((all-accounts (gnc:get-current-group))
+ (let* ((all-accounts (gnc-get-current-group))
(all-account-info (extract-all-account-info all-accounts #f)))
(set! results (cons all-account-info results)))
results))
@@ -154,7 +154,7 @@
(mnemonic (caddr entry)))
(hash-set! table name
(gnc:commodity-table-lookup
- (gnc:book-get-commodity-table (gnc:get-current-book))
+ (gnc:book-get-commodity-table (gnc-get-current-book))
namespace mnemonic)))))
commlist)
table))
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -88,7 +88,7 @@
(gnc:query-add-single-account-match
sq
(gnc:get-account-from-full-name
- old-group (gnc:account-get-full-name
+ old-group (gnc-account-get-full-name
(gnc:split-get-account split)))
'query-and)
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-to-gnc.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-to-gnc.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-to-gnc.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -79,7 +79,7 @@
;; acct)
(if (and existing-account (compatible? existing-account))
existing-account
- (let ((new-acct (gnc:malloc-account (gnc:get-current-book)))
+ (let ((new-acct (gnc:malloc-account (gnc-get-current-book)))
(parent-acct #f)
(parent-name #f)
(acct-name #f)
@@ -177,13 +177,13 @@
default-currency-name window)
(gnc:backtrace-if-exception
(lambda ()
- (let* ((old-group (gnc:get-current-group))
- (new-group (gnc:malloc-account-group (gnc:get-current-book)))
+ (let* ((old-group (gnc-get-current-group))
+ (new-group (gnc:malloc-account-group (gnc-get-current-book)))
(gnc-acct-hash (make-hash-table 20))
(separator (string-ref (gnc:account-separator-string) 0))
(default-currency
(gnc:commodity-table-find-full
- (gnc:book-get-commodity-table (gnc:get-current-book))
+ (gnc:book-get-commodity-table (gnc-get-current-book))
GNC_COMMODITY_NS_CURRENCY default-currency-name))
(sorted-accounts-list '())
(markable-xtns '())
@@ -334,12 +334,12 @@
(begin
;; create and fill in the GNC transaction
(let ((gnc-xtn (gnc:transaction-create
- (gnc:get-current-book))))
+ (gnc-get-current-book))))
(gnc:transaction-begin-edit gnc-xtn)
;; FIXME. This is probably wrong
(gnc:transaction-set-currency gnc-xtn
- (gnc:default-currency))
+ (gnc-default-currency))
;; build the transaction
(qif-import:qif-xtn-to-gnc-xtn
@@ -367,7 +367,7 @@
gnc-acct-hash
qif-acct-map qif-cat-map qif-memo-map)
(let ((splits (qif-xtn:splits qif-xtn))
- (gnc-near-split (gnc:split-create (gnc:get-current-book)))
+ (gnc-near-split (gnc:split-create (gnc-get-current-book)))
(near-split-total (gnc:numeric-zero))
(near-acct-info #f)
(near-acct-name #f)
@@ -421,7 +421,7 @@
(lambda (qif-split)
(if (not (qif-split:mark qif-split))
(let ((gnc-far-split (gnc:split-create
- (gnc:get-current-book)))
+ (gnc-get-current-book)))
(far-acct-info #f)
(far-acct-name #f)
(far-acct-type #f)
@@ -509,7 +509,7 @@
(commission-amt (qif-xtn:commission qif-xtn))
(commission-split #f)
(defer-share-price #f)
- (gnc-far-split (gnc:split-create (gnc:get-current-book))))
+ (gnc-far-split (gnc:split-create (gnc-get-current-book))))
(if (not num-shares) (set! num-shares (gnc:numeric-zero)))
(if (not share-price) (set! share-price (gnc:numeric-zero)))
@@ -625,7 +625,7 @@
(if (and commission-amt commission-acct)
(begin
(set! commission-split (gnc:split-create
- (gnc:get-current-book)))
+ (gnc-get-current-book)))
(gnc:split-set-value commission-split commission-amt)
(gnc:split-set-amount commission-split commission-amt)))
Modified: gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-acct-table.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-acct-table.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-acct-table.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -49,7 +49,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (qif-io:acct-table-make-gnc-group acct-table qif-file commodity)
- (let ((group (gnc:malloc-account-group (gnc:get-current-book))))
+ (let ((group (gnc:malloc-account-group (gnc-get-current-book))))
;; poke through the qif-file accounts to see if any of them
;; show up in the data
(let ((qif-acct-table (qif-io:acct-table-accounts acct-table)))
Modified: gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-bank-xtn-import.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-bank-xtn-import.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-bank-xtn-import.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -35,7 +35,7 @@
(define (qif-io:bank-xtn-import qif-xtn qif-file gnc-acct-info commodity)
(let* ((format-info
(qif-io:file-bank-xtn-format qif-file))
- (gnc-xtn (gnc:transaction-create (gnc:get-current-book)))
+ (gnc-xtn (gnc:transaction-create (gnc-get-current-book)))
(near-split-amt
;; the u-amount has a larger range and is more correct,
;; but is optional
@@ -54,11 +54,11 @@
(acct-type (cdr acct-info))
(acct (qif-io:acct-table-lookup
gnc-acct-info acct-name acct-type))
- (split (gnc:split-create (gnc:get-current-book))))
+ (split (gnc:split-create (gnc-get-current-book))))
;; make the account if necessary
(if (not acct)
(begin
- (set! acct (gnc:malloc-account (gnc:get-current-book)))
+ (set! acct (gnc:malloc-account (gnc-get-current-book)))
(gnc:account-begin-edit acct)
(gnc:account-set-name acct acct-name)
(gnc:account-commit-edit acct)
Modified: gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-invst-xtn-import.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-invst-xtn-import.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-invst-xtn-import.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -145,7 +145,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (qif-io:invst-xtn-import qif-xtn qif-file gnc-acct-info commodity)
- (let ((gnc-xtn (gnc:transaction-create (gnc:get-current-book)))
+ (let ((gnc-xtn (gnc:transaction-create (gnc-get-current-book)))
(format-info (qif-io:file-invst-xtn-format qif-file)))
;; utility to make a new split and add it both to an
;; account and to the transaction
@@ -154,11 +154,11 @@
(acct-type (cdr acct-info))
(acct (qif-io:acct-table-lookup
gnc-acct-info acct-name acct-type))
- (split (gnc:split-create (gnc:get-current-book))))
+ (split (gnc:split-create (gnc-get-current-book))))
;; make the account if necessary
(if (not acct)
(begin
- (set! acct (gnc:malloc-account (gnc:get-current-book)))
+ (set! acct (gnc:malloc-account (gnc-get-current-book)))
(gnc:account-set-name acct acct-name)
(qif-io:acct-table-insert! gnc-acct-info
acct-name acct-type acct)))
Modified: gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf-de_DE.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf-de_DE.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf-de_DE.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -235,7 +235,7 @@
(gnc:account-get-txf-code acc))
"\" has duplicates in "
(number->string cnt) " accounts:")
- (map gnc:account-get-full-name
+ (map gnc-account-get-full-name
(cdr x))))
'())))
txf-dups-alist)))
@@ -288,7 +288,7 @@
(make-sub-headers (- max-level 1)))))
(define (render-txf-account account account-value d? date x? x-date)
- (let* ((print-info (gnc:account-print-info account #t))
+ (let* ((print-info (gnc-account-print-info account #t))
(txf? (gnc:account-get-txf account)))
(if (and txf?
(not (gnc:numeric-zero-p account-value)))
@@ -387,11 +387,11 @@
(let* ((account-name (if txf-date ; special split
(strftime "%d.%m.%Y" (localtime (car txf-date)))
(if (or full-names (equal? level 1))
- (gnc:account-get-full-name account)
+ (gnc-account-get-full-name account)
(gnc:account-get-name account))))
(blue? (gnc:account-get-txf account))
- (print-info (gnc:account-print-info account #f))
- (value (gnc:amount->string lx-value print-info))
+ (print-info (gnc-account-print-info account #f))
+ (value (xaccPrintAmount lx-value print-info))
(value-formatted (if (= 1 level)
(gnc:html-markup-b value)
value))
@@ -484,7 +484,7 @@
valid-user-sel-accnts
(validate (reverse
(gnc:group-get-account-list
- (gnc:get-current-group))))))
+ (gnc-get-current-group))))))
(generations (if (pair? selected-accounts)
(apply max (map (lambda (x) (num-generations x 1))
selected-accounts))
@@ -753,7 +753,7 @@
(cons (current-time) 0))))))
(tax-nr (or
(gnc:kvp-frame-get-slot-path
- (gnc:book-get-slots (gnc:get-current-book))
+ (gnc:book-get-slots (gnc-get-current-book))
(append gnc:*kvp-option-path*
(list gnc:*tax-label* gnc:*tax-nr-label*)))
""))
Modified: gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -219,7 +219,7 @@
(gnc:account-get-txf-code acc))
"\" has duplicates in "
(number->string cnt) " accounts:")
- (map gnc:account-get-full-name
+ (map gnc-account-get-full-name
(cdr x))))
'())))
txf-dups-alist)))
@@ -272,8 +272,8 @@
(make-sub-headers (- max-level 1)))))
(define (render-txf-account account account-value d? date x? x-date)
- (let* ((print-info (gnc:account-print-info account #t))
- (value (gnc:amount->string account-value print-info))
+ (let* ((print-info (gnc-account-print-info account #t))
+ (value (xaccPrintAmount account-value print-info))
(txf? (gnc:account-get-txf account)))
(if (and txf?
(not (gnc:numeric-zero-p account-value)))
@@ -364,11 +364,11 @@
(let* ((account-name (if txf-date ; special split
(strftime "%Y-%b-%d" (localtime (car txf-date)))
(if (or full-names (equal? level 1))
- (gnc:account-get-full-name account)
+ (gnc-account-get-full-name account)
(gnc:account-get-name account))))
(blue? (gnc:account-get-txf account))
- (print-info (gnc:account-print-info account #f))
- (value (gnc:amount->string lx-value print-info))
+ (print-info (gnc-account-print-info account #f))
+ (value (xaccPrintAmount lx-value print-info))
(value-formatted (if (= 1 level)
(gnc:html-markup-b value)
value))
@@ -461,7 +461,7 @@
valid-user-sel-accnts
(validate (reverse
(gnc:group-get-account-list
- (gnc:get-current-group))))))
+ (gnc-get-current-group))))))
(generations (if (pair? selected-accounts)
(apply max (map (lambda (x) (num-generations x 1))
selected-accounts))
Modified: gnucash/branches/swig-redo/src/report/report-system/commodity-utilities.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/commodity-utilities.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/report-system/commodity-utilities.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -43,8 +43,8 @@
(let ((query (gnc:malloc-query))
(splits #f))
- (gnc:query-set-book query (gnc:get-current-book))
- (gnc:query-set-match-non-voids-only! query (gnc:get-current-book))
+ (gnc:query-set-book query (gnc-get-current-book))
+ (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
(gnc:query-add-account-match query
currency-accounts
'guid-match-any 'query-and)
@@ -210,7 +210,7 @@
(let ((currency-accounts
;;(filter gnc:account-has-shares?
;; -- use all accounts, not only share accounts, since gnucash-1.7
- (gnc:group-get-subaccounts (gnc:get-current-group)))
+ (gnc:group-get-subaccounts (gnc-get-current-group)))
(work-to-do (length commodity-list))
(work-done 0))
(map
@@ -311,7 +311,7 @@
(let ((currency-accounts
;;(filter gnc:account-has-shares?
;; -- use all accounts, not only share accounts, since gnucash-1.7
- (gnc:group-get-subaccounts (gnc:get-current-group)))
+ (gnc:group-get-subaccounts (gnc-get-current-group)))
(work-to-do (length commodity-list))
(work-done 0))
(map
@@ -530,7 +530,7 @@
(let ((curr-accounts
;;(filter gnc:account-has-shares? ))
;; -- use all accounts, not only share accounts, since gnucash-1.7
- (gnc:group-get-subaccounts (gnc:get-current-group)))
+ (gnc:group-get-subaccounts (gnc-get-current-group)))
;; sumlist: a multilevel alist. Each element has a commodity
;; as key, and another alist as a value. The value-alist's
;; elements consist of a commodity as a key, and a pair of two
@@ -642,14 +642,14 @@
;; doesn't check for it. Returns a <gnc-monetary>, or #f if at least
;; one of the currencies is not in the EURO.
(define (gnc:exchange-by-euro foreign domestic date)
- (and (gnc:is-euro-currency domestic)
- (gnc:is-euro-currency (gnc:gnc-monetary-commodity foreign))
+ (and (gnc-is-euro-currency domestic)
+ (gnc-is-euro-currency (gnc:gnc-monetary-commodity foreign))
;; FIXME: implement the date check.
(gnc:make-gnc-monetary
domestic
- (gnc:convert-from-euro
+ (gnc-convert-from-euro
domestic
- (gnc:convert-to-euro (gnc:gnc-monetary-commodity foreign)
+ (gnc-convert-to-euro (gnc:gnc-monetary-commodity foreign)
(gnc:gnc-monetary-amount foreign))))))
@@ -752,7 +752,7 @@
(gnc:make-gnc-monetary
domestic
(gnc:pricedb-convert-balance-latest-price
- (gnc:book-get-pricedb (gnc:get-current-book))
+ (gnc:book-get-pricedb (gnc-get-current-book))
(gnc:gnc-monetary-amount foreign)
(gnc:gnc-monetary-commodity foreign)
domestic)))
@@ -775,7 +775,7 @@
(gnc:make-gnc-monetary
domestic
(gnc:pricedb-convert-balance-nearest-price
- (gnc:book-get-pricedb (gnc:get-current-book))
+ (gnc:book-get-pricedb (gnc-get-current-book))
(gnc:gnc-monetary-amount foreign)
(gnc:gnc-monetary-commodity foreign)
domestic (gnc:timepair-canonical-day-time date))))
Modified: gnucash/branches/swig-redo/src/report/report-system/html-acct-table.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/html-acct-table.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/report-system/html-acct-table.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -152,12 +152,12 @@
;; the commodity into which to convert any balances containing
;; foreign currencies. the balance will be converted using
;; the exchange function exchange-fn. the default is the
-;; currency returned by (gnc:default-report-currency). [CAS:
+;; currency returned by (gnc-default-report-currency). [CAS:
;; what if I don't want the report to have a
;; "report-commodity"? Say e.g. I want to show each account
;; balance in its native commodity? I can see the benefit of
;; individual reports that have a report-commodity using
-;; gnc:default-report-currency to set the default value for a
+;; gnc-default-report-currency to set the default value for a
;; report-commodity option. But, with the default sucked in
;; here, in what is supposed to be a more general api, means
;; reports can't specify NO report-commodity. ]
@@ -557,8 +557,8 @@
(string<? (gnc:account-get-name a)
(gnc:account-get-name b)))
(define (gnc:account-path-less-p a b)
- (string<? (gnc:account-get-full-name a)
- (gnc:account-get-full-name b)))
+ (string<? (gnc-account-get-full-name a)
+ (gnc-account-get-full-name b)))
(define (gnc:html-acct-table-add-accounts! acct-table accounts)
;;
@@ -599,7 +599,7 @@
(end-date (or (get-val env 'end-date)
(cons 'absolute (cons (current-time) 0))))
(report-commodity (or (get-val env 'report-commodity)
- (gnc:default-report-currency)))
+ (gnc-default-report-currency)))
;; BUG: other code expects a real function here, maybe
;; someone was thinking price-source?
(exchange-fn (or (get-val env 'exchange-fn)
@@ -631,7 +631,7 @@
)
))
;; local variables
- (toplvl-accts (gnc:group-get-account-list (gnc:get-current-group)))
+ (toplvl-accts (gnc:group-get-account-list (gnc-get-current-group)))
(acct-depth-reached 0)
(logi-depth-reached (if depth-limit (- depth-limit 1) 0))
(disp-depth-reached 0)
@@ -720,7 +720,7 @@
(account acct)
(account-name (gnc:account-get-name acct))
(account-code (gnc:account-get-code acct))
- (account-path (gnc:account-get-full-name acct))
+ (account-path (gnc-account-get-full-name acct))
(account-anchor (gnc:html-account-anchor acct))
(account-parent (gnc:account-get-parent-account acct))
(account-children subaccts)
@@ -1175,7 +1175,7 @@
(or (if (equal? mode #t) 'show-balance mode)
'show-balance)
))
- (reverse-balance (gnc:account-reverse-balance? acct))
+ (reverse-balance (gnc-reverse-balance acct))
(native-comm?
(lambda (amt)
(gnc:uniform-commodity? amt report-commodity)))
Modified: gnucash/branches/swig-redo/src/report/report-system/html-style-info.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/html-style-info.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/report-system/html-style-info.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -281,12 +281,12 @@
datum)
(define (gnc:default-html-gnc-numeric-renderer datum params)
- (gnc:amount->string datum (gnc:default-print-info #f)))
+ (xaccPrintAmount datum (gnc-default-print-info #f)))
(define (gnc:default-html-gnc-monetary-renderer datum params)
- (let* ((result (gnc:amount->string
+ (let* ((result (xaccPrintAmount
(gnc:gnc-monetary-amount datum)
- (gnc:commodity-print-info
+ (gnc-commodity-print-info
(gnc:gnc-monetary-commodity datum) #t)))
(ind (string-index result (integer->char 164))))
(if ind
@@ -295,9 +295,9 @@
result)))
(define (gnc:default-html-number-renderer datum params)
- (gnc:amount->string
+ (xaccPrintAmount
(gnc:double-to-gnc-numeric datum 100 GNC-RND-ROUND)
- (gnc:default-print-info #f)))
+ (gnc-default-print-info #f)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Modified: gnucash/branches/swig-redo/src/report/report-system/html-utilities.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/html-utilities.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/report-system/html-utilities.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -429,7 +429,7 @@
(work-to-do 0)
(work-done 0)
(topl-accounts (gnc:group-get-account-list
- (gnc:get-current-group))))
+ (gnc-get-current-group))))
;; The following functions are defined inside build-acct-table
;; to avoid passing tons of arguments which are constant anyway
@@ -539,7 +539,7 @@
(gnc:html-account-anchor acct)
(gnc:account-get-commodity acct)
(my-get-balance acct)
- (gnc:account-reverse-balance? acct)
+ (gnc-reverse-balance acct)
(gnc:account-has-shares? acct)
row-style row-style
#f #f)
@@ -548,7 +548,7 @@
(gnc:html-account-anchor acct)
(gnc:sum-collector-commodity (my-get-balance acct)
report-commodity exchange-fn)
- (gnc:account-reverse-balance? acct)
+ (gnc-reverse-balance acct)
row-style
#f #f))))
@@ -627,7 +627,7 @@
;; includes the appropriate subaccounts.)
(let ((subbalance (gnc:accounts-get-balance-helper
subaccounts my-get-balance
- gnc:account-reverse-balance?)))
+ gnc-reverse-balance)))
(if thisbalance
(gnc:commodity-collector-merge subbalance thisbalance))
subbalance)
@@ -662,7 +662,7 @@
subaccts
(gnc:accounts-get-balance-helper
(list acct) my-get-balance-nosub
- gnc:account-reverse-balance?)
+ gnc-reverse-balance)
show-parent-total?))))
(sort-fn accnts)))))
Modified: gnucash/branches/swig-redo/src/report/report-system/options-utilities.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/options-utilities.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/report-system/options-utilities.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -146,7 +146,7 @@
pagename name-report-currency
sort-tag
(N_ "Select the currency to display the values of this report in.")
- (gnc:default-report-currency))))
+ (gnc-default-report-currency))))
;; These are common options for the selection of the report's
;; currency/commodity.
Modified: gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -39,16 +39,16 @@
;; pair is a list of one gnc:commodity and one gnc:numeric
;; value. Deprecated -- use <gnc-monetary> instead.
(define (gnc:commodity-value->string pair)
- (gnc:amount->string
- (cadr pair) (gnc:commodity-print-info (car pair) #t)))
+ (xaccPrintAmount
+ (cadr pair) (gnc-commodity-print-info (car pair) #t)))
;; Just for convenience. But in reports you should rather stick to the
;; style-info mechanism and simple plug the <gnc-monetary> into the
;; html-renderer.
(define (gnc:monetary->string value)
- (gnc:amount->string
+ (xaccPrintAmount
(gnc:gnc-monetary-amount value)
- (gnc:commodity-print-info (gnc:gnc-monetary-commodity value) #t)))
+ (gnc-commodity-print-info (gnc:gnc-monetary-commodity value) #t)))
;; True if the account is of type currency, stock, or mutual-fund
(define (gnc:account-has-shares? account)
@@ -152,7 +152,7 @@
(+ 1 (accounts-get-children-depth children)))))
accounts)))
(accounts-get-children-depth
- (gnc:group-get-account-list (gnc:get-current-group))))
+ (gnc:group-get-account-list (gnc-get-current-group))))
(define (gnc:split-get-corr-account-full-name split)
(gnc:split-get-corr-account-full-name-internal split))
@@ -506,7 +506,7 @@
(query (gnc:malloc-query))
(splits #f))
- (gnc:query-set-book query (gnc:get-current-book))
+ (gnc:query-set-book query (gnc-get-current-book))
(gnc:query-add-single-account-match query account 'query-and)
(gnc:query-add-date-match-timepair query #f date #t date 'query-and)
(gnc:query-set-sort-order query
@@ -527,7 +527,7 @@
;; Adds all accounts' balances, where the balances are determined with
;; the get-balance-fn. The reverse-balance-fn
-;; (e.g. gnc:account-reverse-balance?) should return #t if the
+;; (e.g. gnc-reverse-balance) should return #t if the
;; account's balance sign should get reversed. Returns a
;; commodity-collector.
(define (gnc:accounts-get-balance-helper
@@ -727,8 +727,8 @@
(regexp (if (get-val type 'regexp) 1 0))
(total (gnc:make-commodity-collector))
)
- (gnc:query-set-book query (gnc:get-current-book))
- (gnc:query-set-match-non-voids-only! query (gnc:get-current-book))
+ (gnc:query-set-book query (gnc-get-current-book))
+ (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
(gnc:query-add-account-match query group 'guid-match-any 'query-and)
(gnc:query-add-date-match-timepair
query
@@ -770,10 +770,10 @@
(pos? (if (get-val type 'positive) #t #f))
(total (gnc:make-commodity-collector))
)
- (gnc:query-set-book str-query (gnc:get-current-book))
- (gnc:query-set-book sign-query (gnc:get-current-book))
- (gnc:query-set-match-non-voids-only! str-query (gnc:get-current-book))
- (gnc:query-set-match-non-voids-only! sign-query (gnc:get-current-book))
+ (gnc:query-set-book str-query (gnc-get-current-book))
+ (gnc:query-set-book sign-query (gnc-get-current-book))
+ (gnc:query-set-match-non-voids-only! str-query (gnc-get-current-book))
+ (gnc:query-set-match-non-voids-only! sign-query (gnc-get-current-book))
(gnc:query-add-account-match str-query group 'guid-match-any 'query-and)
(gnc:query-add-account-match sign-query group 'guid-match-any 'query-and)
(gnc:query-add-date-match-timepair
Modified: gnucash/branches/swig-redo/src/report/standard-reports/account-piecharts.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/account-piecharts.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/account-piecharts.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -110,7 +110,7 @@
(lambda ()
(gnc:filter-accountlist-type
account-types
- (gnc:group-get-subaccounts (gnc:get-current-group))))
+ (gnc:group-get-subaccounts (gnc-get-current-group))))
(lambda (accounts)
(list #t
(gnc:filter-accountlist-type
@@ -201,7 +201,7 @@
(topl-accounts (gnc:filter-accountlist-type
account-types
(gnc:group-get-account-list
- (gnc:get-current-group)))))
+ (gnc-get-current-group)))))
;; Returns true if the account a was selected in the account
;; selection option.
@@ -227,7 +227,7 @@
account-levels))
(combined '())
(other-anchor "")
- (print-info (gnc:commodity-print-info report-currency #t)))
+ (print-info (gnc-commodity-print-info report-currency #t)))
;; Converts a commodity-collector into one single double
;; number, depending on the report currency and the
@@ -316,10 +316,10 @@
((eq? sort-method 'alphabetical)
(lambda (a b)
(string<? ((if show-fullname?
- gnc:account-get-full-name
+ gnc-account-get-full-name
gnc:account-get-name) (cadr a))
((if show-fullname?
- gnc:account-get-full-name
+ gnc-account-get-full-name
gnc:account-get-name) (cadr b)))))
(else
(lambda (a b) (> (car a) (car b)))))))
@@ -377,7 +377,7 @@
(list gnc:pagename-general
gnc:optname-reportname
((if show-fullname?
- gnc:account-get-full-name
+ gnc-account-get-full-name
gnc:account-get-name) acct))))))))
combined)))
(gnc:html-piechart-set-button-1-slice-urls!
@@ -410,7 +410,7 @@
(let ((total (apply + (unzip1 combined))))
(sprintf
#f ": %s"
- (gnc:amount->string
+ (xaccPrintAmount
(gnc:double-to-gnc-numeric
total
(gnc:commodity-get-fraction report-currency)
@@ -426,13 +426,13 @@
(if (string? (cadr pair))
(cadr pair)
((if show-fullname?
- gnc:account-get-full-name
+ gnc-account-get-full-name
gnc:account-get-name) (cadr pair)))
'pre " " (_ "and") " " 'post)
(if show-total?
(string-append
" - "
- (gnc:amount->string
+ (xaccPrintAmount
(gnc:double-to-gnc-numeric
(car pair)
(gnc:commodity-get-fraction report-currency)
Modified: gnucash/branches/swig-redo/src/report/standard-reports/account-summary.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/account-summary.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/account-summary.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -24,7 +24,7 @@
;; summary to no more than daily resolution.
;;
;; The Company Name field does not currently default to the name
-;; in (gnc:get-current-book).
+;; in (gnc-get-current-book).
;;
;; The variables in this code could use more consistent naming.
;;
@@ -138,7 +138,7 @@
(gnc:make-string-option
gnc:pagename-general optname-party-name
"b" opthelp-party-name ""))
- ;; this should default to company name in (gnc:get-current-book)
+ ;; this should default to company name in (gnc-get-current-book)
;; does anyone know the function to get the company name??
;; date at which to report balance
@@ -155,7 +155,7 @@
(gnc:filter-accountlist-type
'(bank cash credit asset liability stock mutual-fund currency
payable receivable equity income expense)
- (gnc:group-get-subaccounts (gnc:get-current-group))))
+ (gnc:group-get-subaccounts (gnc-get-current-group))))
#f #t))
(gnc:options-add-account-levels!
options gnc:pagename-accounts optname-depth-limit
Modified: gnucash/branches/swig-redo/src/report/standard-reports/advanced-portfolio.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/advanced-portfolio.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/advanced-portfolio.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -152,7 +152,7 @@
(N_ "Stock Accounts to report on")
(lambda () (filter gnc:account-is-stock?
(gnc:group-get-subaccounts
- (gnc:get-current-group))))
+ (gnc-get-current-group))))
(lambda (accounts) (list #t
(filter gnc:account-is-stock? accounts)))
#t))
@@ -286,7 +286,7 @@
total-gain total-ugain)
(let ((share-print-info
- (gnc:share-print-info-places
+ (gnc-share-print-info-places
(inexact->exact (get-option gnc:pagename-display
optname-shares-digits)))))
@@ -492,7 +492,7 @@
(if show-symbol (append! activecols (list ticker-symbol)))
(if show-listing (append! activecols (list listing)))
(if show-shares (append! activecols (list (gnc:make-html-table-header-cell/markup
- "number-cell" (gnc:amount->string units share-print-info)))))
+ "number-cell" (xaccPrintAmount units share-print-info)))))
(if show-price (append! activecols (list (gnc:make-html-table-header-cell/markup
"number-cell"
(if use-txn
@@ -592,7 +592,7 @@
(if (not (null? accounts))
; at least 1 account selected
(let* ((exchange-fn (gnc:case-exchange-fn price-source currency to-date))
- (pricedb (gnc:book-get-pricedb (gnc:get-current-book)))
+ (pricedb (gnc:book-get-pricedb (gnc-get-current-book)))
(price-fn
(case price-source
((pricedb-latest)
Modified: gnucash/branches/swig-redo/src/report/standard-reports/average-balance.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/average-balance.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/average-balance.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -74,7 +74,7 @@
'(bank cash credit asset liability payable receivable)
;; or: '(bank cash checking savings stock
;; mutual-fund money-market)
- (gnc:group-get-account-list (gnc:get-current-group)))))))
+ (gnc:group-get-account-list (gnc-get-current-group)))))))
#f #t))
;; Display tab
@@ -337,11 +337,11 @@
;; initialize the query to find splits in the right
;; date range and accounts
- (gnc:query-set-book query (gnc:get-current-book))
+ (gnc:query-set-book query (gnc-get-current-book))
;; 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))
+ (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
;; add accounts to the query (include subaccounts
;; if requested)
(gnc:report-percent-done 25)
@@ -382,7 +382,7 @@
accounts
(lambda (acct) (gnc:account-get-comm-balance-at-date
acct beforebegindate #f))
- gnc:account-reverse-balance?))
+ gnc-reverse-balance))
(gnc:report-percent-done 50)
(set! startbal
Modified: gnucash/branches/swig-redo/src/report/standard-reports/balance-sheet.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/balance-sheet.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/balance-sheet.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -22,7 +22,7 @@
;; sheet to no more than daily resolution.
;;
;; The Company Name field does not currently default to the name
-;; in (gnc:get-current-book).
+;; in (gnc-get-current-book).
;;
;; Line & column alignments still do not conform with
;; textbook accounting practice (they're close though!).
@@ -156,7 +156,7 @@
(gnc:make-string-option
gnc:pagename-general optname-party-name
"b" opthelp-party-name ""))
- ;; this should default to company name in (gnc:get-current-book)
+ ;; this should default to company name in (gnc-get-current-book)
;; does anyone know the function to get the company name??
;; (GnuCash is *so* well documented... sigh)
@@ -179,7 +179,7 @@
(gnc:filter-accountlist-type
'(bank cash credit asset liability stock mutual-fund currency
payable receivable equity income expense)
- (gnc:group-get-subaccounts (gnc:get-current-group))))
+ (gnc:group-get-subaccounts (gnc-get-current-group))))
#f #t))
(gnc:options-add-account-levels!
options gnc:pagename-accounts optname-depth-limit
Modified: gnucash/branches/swig-redo/src/report/standard-reports/budget.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/budget.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/budget.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -91,7 +91,7 @@
(lambda ()
(gnc:filter-accountlist-type
'(asset liability income expense)
- (gnc:group-get-subaccounts (gnc:get-current-group))))
+ (gnc:group-get-subaccounts (gnc-get-current-group))))
#f)
;; Set the general page as default option tab
@@ -123,7 +123,7 @@
budget acct period))
(act-val (gnc:make-gnc-monetary
comm numeric-val))
- (reverse-balance? (gnc:account-reverse-balance? acct))
+ (reverse-balance? (gnc-reverse-balance acct))
)
(cond (reverse-balance? (set! act-val
@@ -277,7 +277,7 @@
;; helper for sorting of account list
(define (account-full-name<? a b)
- (string<? (gnc:account-get-full-name a) (gnc:account-get-full-name b)))
+ (string<? (gnc-account-get-full-name a) (gnc-account-get-full-name b)))
;; helper for account depth
(define (account-get-depth account)
Modified: gnucash/branches/swig-redo/src/report/standard-reports/cash-flow.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/cash-flow.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/cash-flow.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -92,7 +92,7 @@
(lambda ()
(gnc:filter-accountlist-type
'(bank cash asset stock mutual-fund)
- (gnc:group-get-subaccounts (gnc:get-current-group))))
+ (gnc:group-get-subaccounts (gnc-get-current-group))))
#f)
;; Set the general page as default option tab
@@ -178,7 +178,7 @@
;; helper for sorting of account list
(define (account-full-name<? a b)
- (string<? (gnc:account-get-full-name a) (gnc:account-get-full-name b)))
+ (string<? (gnc-account-get-full-name a) (gnc-account-get-full-name b)))
;; helper for account depth
(define (account-get-depth account)
@@ -389,7 +389,7 @@
(gnc:html-markup-anchor
(gnc:account-anchor-text account)
(if show-full-names?
- (gnc:account-get-full-name account)
+ (gnc-account-get-full-name account)
(gnc:account-get-name account))))))
(set! account-disp-list (cons anchor account-disp-list))
@@ -438,7 +438,7 @@
(gnc:html-markup-anchor
(gnc:account-anchor-text acct)
(if show-full-names?
- (gnc:account-get-full-name acct)
+ (gnc-account-get-full-name acct)
(gnc:account-get-name acct))))
(gnc:make-html-table-header-cell/markup
"number-cell" (gnc:sum-collector-commodity (cadr pair) report-currency exchange-fn))))
@@ -483,7 +483,7 @@
(gnc:html-markup-anchor
(gnc:account-anchor-text acct)
(if show-full-names?
- (gnc:account-get-full-name acct)
+ (gnc-account-get-full-name acct)
(gnc:account-get-name acct))))
(gnc:make-html-table-header-cell/markup
"number-cell" (gnc:sum-collector-commodity (cadr pair) report-currency exchange-fn))))
Modified: gnucash/branches/swig-redo/src/report/standard-reports/category-barchart.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/category-barchart.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/category-barchart.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -116,7 +116,7 @@
(lambda ()
(gnc:filter-accountlist-type
account-types
- (gnc:group-get-subaccounts (gnc:get-current-group))))
+ (gnc:group-get-subaccounts (gnc-get-current-group))))
(lambda (accounts)
(list #t
(gnc:filter-accountlist-type account-types accounts)))
@@ -213,7 +213,7 @@
(topl-accounts (gnc:filter-accountlist-type
account-types
(gnc:group-get-account-list
- (gnc:get-current-group)))))
+ (gnc-get-current-group)))))
;; Returns true if the account a was selected in the account
;; selection option.
@@ -375,10 +375,10 @@
((eq? sort-method 'alphabetical)
(lambda (a b)
(string<? ((if show-fullname?
- gnc:account-get-full-name
+ gnc-account-get-full-name
gnc:account-get-name) (car a))
((if show-fullname?
- gnc:account-get-full-name
+ gnc-account-get-full-name
gnc:account-get-name) (car b)))))
(else
(lambda (a b)
@@ -468,7 +468,7 @@
(if (string? (car pair))
(car pair)
((if show-fullname?
- gnc:account-get-full-name
+ gnc-account-get-full-name
gnc:account-get-name) (car pair)))
'pre " " (_ "and") " " 'post))
all-data))
@@ -507,7 +507,7 @@
(list gnc:pagename-general
gnc:optname-reportname
((if show-fullname?
- gnc:account-get-full-name
+ gnc-account-get-full-name
gnc:account-get-name) acct))))))))
all-data)))
(gnc:html-barchart-set-button-1-bar-urls!
Modified: gnucash/branches/swig-redo/src/report/standard-reports/daily-reports.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/daily-reports.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/daily-reports.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -102,7 +102,7 @@
(lambda ()
(gnc:filter-accountlist-type
account-types
- (gnc:group-get-subaccounts (gnc:get-current-group))))
+ (gnc:group-get-subaccounts (gnc-get-current-group))))
(lambda (accounts)
(list #t
(gnc:filter-accountlist-type
@@ -306,7 +306,7 @@
(commodity-list #f)
(exchange-fn #f)
- (print-info (gnc:commodity-print-info report-currency #t))
+ (print-info (gnc-commodity-print-info report-currency #t))
(beforebegindate (gnc:timepair-end-day-time
(gnc:timepair-previous-day from-date-tp)))
@@ -315,7 +315,7 @@
(topl-accounts (gnc:filter-accountlist-type
account-types
(gnc:group-get-account-list
- (gnc:get-current-group)))))
+ (gnc-get-current-group)))))
(define (monetary->double foreign-monetary date)
(gnc:numeric-to-double
@@ -378,11 +378,11 @@
;; initialize the query to find splits in the right
;; date range and accounts
- (gnc:query-set-book query (gnc:get-current-book))
+ (gnc:query-set-book query (gnc-get-current-book))
;; 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))
+ (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
;; add accounts to the query (include subaccounts
;; if requested)
(gnc:report-percent-done 25)
@@ -423,7 +423,7 @@
accounts
(lambda (acct) (gnc:account-get-comm-balance-at-date
acct beforebegindate #f))
- gnc:account-reverse-balance?))
+ gnc-reverse-balance))
(gnc:report-percent-done 50)
(set! startbal
@@ -463,7 +463,7 @@
(string-append
(car p)
" - "
- (gnc:amount->string
+ (xaccPrintAmount
(gnc:double-to-gnc-numeric
(cadr p)
(gnc:commodity-get-fraction report-currency)
@@ -488,7 +488,7 @@
(let ((total (apply + daily-totals)))
(sprintf
#f ": %s"
- (gnc:amount->string
+ (xaccPrintAmount
(gnc:double-to-gnc-numeric
total
(gnc:commodity-get-fraction report-currency)
Modified: gnucash/branches/swig-redo/src/report/standard-reports/equity-statement.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/equity-statement.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/equity-statement.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -112,7 +112,7 @@
(gnc:make-string-option
(N_ "General") optname-party-name
"b" opthelp-party-name ""))
- ;; this should default to company name in (gnc:get-current-book)
+ ;; this should default to company name in (gnc-get-current-book)
;; does anyone know the function to get the company name??
;; (GnuCash is *so* well documented... sigh)
@@ -131,7 +131,7 @@
(gnc:filter-accountlist-type
'(bank cash credit asset liability stock mutual-fund currency
payable receivable equity income expense)
- (gnc:group-get-subaccounts (gnc:get-current-group))))
+ (gnc:group-get-subaccounts (gnc-get-current-group))))
#f #t))
;; all about currencies
Modified: gnucash/branches/swig-redo/src/report/standard-reports/general-journal.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/general-journal.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/general-journal.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -60,8 +60,8 @@
;; however, may be of issue here. Since I don't know if the
;; Register Report properly ignores voided transactions, I'll err
;; on the side of safety by excluding them from the query....
- (gnc:query-set-book query (gnc:get-current-book))
- (gnc:query-set-match-non-voids-only! query (gnc:get-current-book))
+ (gnc:query-set-book query (gnc-get-current-book))
+ (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
(gnc:query-set-sort-order query
(list gnc:split-trans gnc:trans-date-posted)
(list gnc:query-default-sort)
@@ -70,7 +70,7 @@
(gnc:query-add-account-match
query
- (gnc:group-get-subaccounts (gnc:book-get-template-group (gnc:get-current-book)))
+ (gnc:group-get-subaccounts (gnc:book-get-template-group (gnc-get-current-book)))
'guid-match-none
'query-and)
Modified: gnucash/branches/swig-redo/src/report/standard-reports/income-statement.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/income-statement.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/income-statement.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -10,7 +10,7 @@
;; statement to no more than daily resolution.
;;
;; The Company Name field does not currently default to the name
-;; in (gnc:get-current-book).
+;; in (gnc-get-current-book).
;;
;; Line & column alignments may still not conform with
;; textbook accounting practice (they're close though!).
@@ -139,7 +139,7 @@
(gnc:make-string-option
gnc:pagename-general optname-party-name
"b" opthelp-party-name ""))
- ;; this should default to company name in (gnc:get-current-book)
+ ;; this should default to company name in (gnc-get-current-book)
;; does anyone know the function to get the company name??
;; (GnuCash is *so* well documented... sigh)
@@ -158,7 +158,7 @@
(gnc:filter-accountlist-type
;; select, by default, only income and expense accounts
'(income expense)
- (gnc:group-get-subaccounts (gnc:get-current-group))))
+ (gnc:group-get-subaccounts (gnc-get-current-group))))
#f #t))
(gnc:options-add-account-levels!
options gnc:pagename-accounts optname-depth-limit
Modified: gnucash/branches/swig-redo/src/report/standard-reports/net-barchart.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/net-barchart.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/net-barchart.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -88,7 +88,7 @@
(if inc-exp?
gnc:account-is-inc-exp?
(lambda (account) (not (gnc:account-is-inc-exp? account))))
- (gnc:group-get-subaccounts (gnc:get-current-group))))
+ (gnc:group-get-subaccounts (gnc-get-current-group))))
(lambda (accounts)
(list #t
(filter
Modified: gnucash/branches/swig-redo/src/report/standard-reports/portfolio.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/portfolio.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/portfolio.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -73,7 +73,7 @@
(N_ "Stock Accounts to report on")
(lambda () (filter gnc:account-is-stock?
(gnc:group-get-subaccounts
- (gnc:get-current-group))))
+ (gnc-get-current-group))))
(lambda (accounts) (list #t
(filter gnc:account-is-stock? accounts)))
#t))
@@ -110,7 +110,7 @@
exchange-fn price-fn include-empty collector)
(let ((share-print-info
- (gnc:share-print-info-places
+ (gnc-share-print-info-places
(inexact->exact (get-option gnc:pagename-general
optname-shares-digits)))))
@@ -142,7 +142,7 @@
listing
(gnc:make-html-table-header-cell/markup
"number-cell"
- (gnc:amount->string units share-print-info))
+ (xaccPrintAmount units share-print-info))
(gnc:make-html-table-header-cell/markup
"number-cell"
(gnc:html-price-anchor
@@ -192,7 +192,7 @@
(append
(gnc:acccounts-get-all-subaccounts
accounts) accounts) currency))
- (pricedb (gnc:book-get-pricedb (gnc:get-current-book)))
+ (pricedb (gnc:book-get-pricedb (gnc-get-current-book)))
(exchange-fn (gnc:case-exchange-fn price-source currency to-date))
(price-fn
(case price-source
Modified: gnucash/branches/swig-redo/src/report/standard-reports/price-scatter.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/price-scatter.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/price-scatter.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -77,7 +77,7 @@
pagename-price optname-price-commodity
"e"
(N_ "Calculate the price of this commodity.")
- (gnc:locale-default-iso-currency-code)))
+ (gnc-locale-default-iso-currency-code)))
(add-option
(gnc:make-multichoice-option
@@ -167,7 +167,7 @@
(chart (gnc:make-html-scatter))
(currency-accounts
(filter gnc:account-has-shares? (gnc:group-get-subaccounts
- (gnc:get-current-group))))
+ (gnc-get-current-group))))
(data '()))
;; Short helper for all the warnings below
@@ -229,7 +229,7 @@
(list (gnc:price-get-time p)
(gnc:price-get-value p)))
(gnc:pricedb-get-prices
- (gnc:book-get-pricedb (gnc:get-current-book))
+ (gnc:book-get-pricedb (gnc-get-current-book))
price-commodity report-currency)))
)))
Modified: gnucash/branches/swig-redo/src/report/standard-reports/register.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/register.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/register.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -116,7 +116,7 @@
(define (gnc:split-get-balance-display split)
(let ((account (gnc:split-get-account split))
(balance (gnc:split-get-balance split)))
- (if (and account (gnc:account-reverse-balance? account))
+ (if (and account (gnc-reverse-balance account))
(gnc:numeric-neg balance)
balance)))
@@ -127,7 +127,7 @@
(account (gnc:split-get-account split))
(currency (if account
(gnc:account-get-commodity account)
- (gnc:default-currency)))
+ (gnc-default-currency)))
(damount (gnc:split-get-amount split))
(split-value (gnc:make-gnc-monetary currency damount)))
@@ -158,10 +158,10 @@
(let ((other-split
(gnc:split-get-other-split split)))
(if other-split
- (gnc:account-get-full-name
+ (gnc-account-get-full-name
(gnc:split-get-account other-split))
(_ "-- Split Transaction --")))
- (gnc:account-get-full-name account))
+ (gnc-account-get-full-name account))
" ")))
(if (shares-col column-vector)
(addto! row-contents
@@ -343,7 +343,7 @@
(define (display-subtotal monetary)
(if (amount-single-col used-columns)
- (if (and leader (gnc:account-reverse-balance? leader))
+ (if (and leader (gnc-reverse-balance leader))
(gnc:monetary-neg monetary)
monetary)
(if (gnc:numeric-negative-p (gnc:gnc-monetary-amount monetary))
@@ -561,7 +561,7 @@
(set! query (gnc:scm->query query-scm))
- (gnc:query-set-book query (gnc:get-current-book))
+ (gnc:query-set-book query (gnc-get-current-book))
(set! splits (if journal?
(gnc:query-get-splits-unique-trans query)
Modified: gnucash/branches/swig-redo/src/report/standard-reports/transaction.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/transaction.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/transaction.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -140,7 +140,7 @@
(if show-account-name
;; display full account name?
(if show-account-full-name
- (gnc:account-get-full-name account)
+ (gnc-account-get-full-name account)
(gnc:account-get-name account))
""))))
@@ -418,7 +418,7 @@
(gnc:account-get-type account) #f))
(currency (if account
(gnc:account-get-commodity account)
- (gnc:default-currency)))
+ (gnc-default-currency)))
(report-currency (if (opt-val gnc:pagename-general optname-common-currency)
(opt-val gnc:pagename-general optname-currency)
currency))
@@ -545,7 +545,7 @@
gnc:pagename-general optname-common-currency
"e" (N_ "Convert all transactions into a common currency") #f
#f
- (lambda (x) (gnc:option-db-set-option-selectable-by-name
+ (lambda (x) (gnc-option-db-set-option-selectable-by-name
gnc:*transaction-report-options*
gnc:pagename-general
optname-currency
@@ -572,7 +572,7 @@
(gnc:filter-accountlist-type
'(bank cash credit asset liability stock mutual-fund currency
payable receivable equity income expense)
- (gnc:group-get-subaccounts (gnc:get-current-group))))
+ (gnc:group-get-subaccounts (gnc-get-current-group))))
#f #t))
(gnc:register-trep-option
@@ -583,9 +583,9 @@
;; FIXME : gnc:get-current-accounts disappeared.
(let ((current-accounts '())
(num-accounts (gnc:group-get-num-accounts
- (gnc:get-current-group)))
+ (gnc-get-current-group)))
(first-account (gnc:group-get-account
- (gnc:get-current-group) 0)))
+ (gnc-get-current-group) 0)))
(cond ((not (null? current-accounts))
(list (car current-accounts)))
((> num-accounts 0) (list first-account))
@@ -710,10 +710,10 @@
'account-name
key-choice-list #f
(lambda (x)
- (gnc:option-db-set-option-selectable-by-name
+ (gnc-option-db-set-option-selectable-by-name
options pagename-sorting optname-prime-subtotal
(and (member x subtotal-enabled) #t))
- (gnc:option-db-set-option-selectable-by-name
+ (gnc-option-db-set-option-selectable-by-name
options pagename-sorting optname-prime-date-subtotal
(if (member x date-sorting-types) #t #f)))))
@@ -761,10 +761,10 @@
'register-order
key-choice-list #f
(lambda (x)
- (gnc:option-db-set-option-selectable-by-name
+ (gnc-option-db-set-option-selectable-by-name
options pagename-sorting optname-sec-subtotal
(and (member x subtotal-enabled) #t))
- (gnc:option-db-set-option-selectable-by-name
+ (gnc-option-db-set-option-selectable-by-name
options pagename-sorting optname-sec-date-subtotal
(if (member x date-sorting-types) #t #f)))))
@@ -1213,7 +1213,7 @@
3 2))
(define (get-other-account-names account-list)
- ( map (lambda (acct) (gnc:account-get-full-name acct)) account-list))
+ ( map (lambda (acct) (gnc-account-get-full-name acct)) account-list))
(define (is-filter-member split account-list splits-ok?)
(let ((fullname (gnc:split-get-corr-account-full-name split)))
@@ -1275,7 +1275,7 @@
(if (not (or (null? c_account_1) (and-map not c_account_1)))
(begin
- (gnc:query-set-book query (gnc:get-current-book))
+ (gnc:query-set-book query (gnc-get-current-book))
;;(gnc:warn "query is:" query)
(gnc:query-add-account-match query
c_account_1
@@ -1294,9 +1294,9 @@
(case void-status
((non-void-only)
- (gnc:query-set-match-non-voids-only! query (gnc:get-current-book)))
+ (gnc:query-set-match-non-voids-only! query (gnc-get-current-book)))
((void-only)
- (gnc:query-set-match-voids-only! query (gnc:get-current-book)))
+ (gnc:query-set-match-voids-only! query (gnc-get-current-book)))
(else #f))
(set! splits (gnc:query-get-splits query))
Modified: gnucash/branches/swig-redo/src/report/standard-reports/trial-balance.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/trial-balance.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/standard-reports/trial-balance.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -16,7 +16,7 @@
;; balance to no more than daily resolution.
;;
;; The Company Name field does not currently default to the name
-;; in (gnc:get-current-book).
+;; in (gnc-get-current-book).
;;
;; Progress bar functionality is currently mostly broken.
;;
@@ -149,7 +149,7 @@
(gnc:make-string-option
(N_ "General") optname-party-name
"b" opthelp-party-name ""))
- ;; this should default to company name in (gnc:get-current-book)
+ ;; this should default to company name in (gnc-get-current-book)
;; the period over which to collect adjusting/closing entries and
;; date at which to report the balance
@@ -182,7 +182,7 @@
(gnc:filter-accountlist-type
'(bank cash credit asset liability stock mutual-fund currency
payable receivable equity income expense)
- (gnc:group-get-subaccounts (gnc:get-current-group))))
+ (gnc:group-get-subaccounts (gnc-get-current-group))))
#f #t))
(gnc:options-add-account-levels!
options gnc:pagename-accounts optname-depth-limit
Modified: gnucash/branches/swig-redo/src/report/utility-reports/hello-world.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/utility-reports/hello-world.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/report/utility-reports/hello-world.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -391,7 +391,7 @@
;; Here we print the value of the number option formatted as
;; currency. When printing currency values, you should use
- ;; the function (gnc:amount->string), which is defined in
+ ;; the function (xaccPrintAmount), which is defined in
;; report-utilities. This functions will format the number
;; appropriately in the current locale. Don't try to format
;; it yourself -- it will be wrong in other locales.
@@ -399,9 +399,9 @@
(gnc:html-markup/format
(_ "The number option formatted as currency is %s.")
(gnc:html-markup-b
- (gnc:amount->string
+ (xaccPrintAmount
(gnc:make-gnc-numeric (inexact->exact num-val) 1)
- (gnc:default-print-info #f)))))))
+ (gnc-default-print-info #f)))))))
;; you can add as many objects as you want. Here's another
;; one. We'll make a single-column table of the selected list
@@ -430,7 +430,7 @@
;; need to do is pass the HREF "gnc-register:account=My
;; Account Name" to html-markup-anchor. The account name
;; passed must be the "full" account name that you get from
- ;; gnc:account-get-full-name. You should build this url using
+ ;; gnc-account-get-full-name. You should build this url using
;; (gnc-build-url ...)
;;
;; html-markup-anchor takes the link to jump to as its first
@@ -449,7 +449,7 @@
(gnc:html-markup-anchor
(gnc-build-url URL-TYPE-REGISTER
(string-append "account="
- (gnc:account-get-full-name
+ (gnc-account-get-full-name
acct))
"")
(gnc:account-get-name acct)))
Modified: gnucash/branches/swig-redo/src/scm/main-window.scm
===================================================================
--- gnucash/branches/swig-redo/src/scm/main-window.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/scm/main-window.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -48,7 +48,7 @@
))
(define (gnc:main-window-properties-cb)
- (let* ((book (gnc:get-current-book))
+ (let* ((book (gnc-get-current-book))
(slots (gnc:book-get-slots book)))
(define (changed_cb)
Modified: gnucash/branches/swig-redo/src/scm/price-quotes.scm
===================================================================
--- gnucash/branches/swig-redo/src/scm/price-quotes.scm 2006-10-09 23:59:40 UTC (rev 14967)
+++ gnucash/branches/swig-redo/src/scm/price-quotes.scm 2006-10-10 00:00:17 UTC (rev 14968)
@@ -398,7 +398,7 @@
(let* ((ct (gnc:book-get-commodity-table book))
(big-list
- (gnc:commodity-table-get-quotable-commodities-info
+ (gnc-commodity-table-get-quotable-commodities
ct))
(commodity-list #f)
(currency-list (filter
More information about the gnucash-changes
mailing list