Drop commodity-table.scm, no longer required after adjusting qif-dial…

…og-utils
Gnucash · Mar 2, 2022 · 09296df · 09296df
1 parent 716d746
commit 09296df
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 51 deletions.
diff --git a/bindings/guile/CMakeLists.txt b/bindings/guile/CMakeLists.txt
@@ -85,7 +85,6 @@ gnc_add_scheme_targets(scm-core-utils
     DEPENDS "${GUILE_DEPENDS}")
 
 set (engine_SCHEME_0
-    commodity-table.scm
     gnc-numeric.scm
     business-core.scm
 )

diff --git a/bindings/guile/commodity-table.scm b/bindings/guile/commodity-table.scm
diff --git a/bindings/guile/engine.scm b/bindings/guile/engine.scm
@@ -28,7 +28,6 @@
 
 (load-and-reexport (sw_engine)
                    (gnucash engine business-core)
-                   (gnucash engine commodity-table)
                    (gnucash engine gnc-numeric))
 
 (export gnc-pricedb-lookup-latest-before-t64)

diff --git a/gnucash/import-export/qif-imp/qif-to-gnc.scm b/gnucash/import-export/qif-imp/qif-to-gnc.scm
@@ -270,7 +270,7 @@
            (default-currency
              (gnc-commodity-table-find-full
               (gnc-commodity-table-get-table (gnc-get-current-book))
-              GNC_COMMODITY_NS_CURRENCY default-currency-name))
+              (GNC-COMMODITY-NS-CURRENCY) default-currency-name))
            (sorted-accounts-list '())
            (markable-xtns '())
            (sorted-qif-files-list (sort qif-files-list

diff --git a/libgnucash/app-utils/options.scm b/libgnucash/app-utils/options.scm
@@ -435,7 +435,7 @@ the option '~a'."))
     (if (string? currency)
         (gnc-commodity-table-lookup
          (gnc-commodity-table-get-table (gnc-get-current-book))
-         GNC_COMMODITY_NS_CURRENCY currency)
+         (GNC-COMMODITY-NS-CURRENCY) currency)
         currency))
 
    (let* ((value (currency->scm default-value))
@@ -561,7 +561,7 @@ the option '~a'."))
   (define (commodity->scm commodity)
     (if (string? commodity)
         (list 'commodity-scm
-              GNC_COMMODITY_NS_CURRENCY
+              (GNC-COMMODITY-NS-CURRENCY)
               commodity)
         (list 'commodity-scm
               (gnc-commodity-get-namespace commodity)
@@ -1560,7 +1560,7 @@ the option '~a'."))
     (if (string? currency-string)
         (gnc-commodity-table-lookup
          (gnc-commodity-table-get-table (gnc-get-current-book))
-         GNC_COMMODITY_NS_CURRENCY currency-string)
+         (GNC-COMMODITY-NS-CURRENCY) currency-string)
         #f))
 
   (define (currency? val)

diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -1,7 +1,6 @@
 # This is a list of files which contain translatable strings.
 # This file was autogenerated by cmake.
 bindings/guile/business-core.scm
-bindings/guile/commodity-table.scm
 bindings/guile/core-utils.scm
 bindings/guile/engine.scm
 bindings/guile/glib-guile.c