From 09296dfb96f2e88039c80337ad6f6d29d1040d62 Mon Sep 17 00:00:00 2001 From: "Frank H. Ellenberger" Date: Fri, 9 Jul 2021 18:44:06 +0200 Subject: [PATCH] Drop commodity-table.scm, no longer required after adjusting qif-dialog-utils --- bindings/guile/CMakeLists.txt | 1 - bindings/guile/commodity-table.scm | 44 -------------------- bindings/guile/engine.scm | 1 - gnucash/import-export/qif-imp/qif-to-gnc.scm | 2 +- libgnucash/app-utils/options.scm | 6 +-- po/POTFILES.in | 1 - 6 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 bindings/guile/commodity-table.scm diff --git a/bindings/guile/CMakeLists.txt b/bindings/guile/CMakeLists.txt index b5446b027e..0cbb7aa3f3 100644 --- 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 deleted file mode 100644 index 511c1eaac3..0000000000 --- a/bindings/guile/commodity-table.scm +++ /dev/null @@ -1,44 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; commodity-table.scm -;;; load and save commodity tables -;;; -;;; Bill Gribble 3 Aug 2000 -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; This program is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License as -;; published by the Free Software Foundation; either version 2 of -;; the License, or (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this program; if not, contact: -;; -;; Free Software Foundation Voice: +1-617-542-5942 -;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 -;; Boston, MA 02110-1301, USA gnu@gnu.org -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define-module (gnucash engine commodity-table)) - -(export GNC_COMMODITY_NS_CURRENCY) -(export GNC_COMMODITY_NS_NASDAQ) -(export GNC_COMMODITY_NS_NYSE) -(export GNC_COMMODITY_NS_AMEX) -(export GNC_COMMODITY_NS_EUREX) -(export GNC_COMMODITY_NS_MUTUAL) - -(define GNC_COMMODITY_NS_CURRENCY "CURRENCY") - -;; If you change the C side, change this too. -(define GNC_COMMODITY_NS_AMEX "AMEX") -(define GNC_COMMODITY_NS_NYSE "NYSE") -(define GNC_COMMODITY_NS_NASDAQ "NASDAQ") -(define GNC_COMMODITY_NS_EUREX "EUREX") -(define GNC_COMMODITY_NS_MUTUAL "FUND") -(define GNC_COMMODITY_NS_ASX "ASX") -(define GNC_COMMODITY_NS_NONCURRENCY (gettext "ALL NON-CURRENCY")) diff --git a/bindings/guile/engine.scm b/bindings/guile/engine.scm index bc75b8172f..c7697068e6 100644 --- 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 index cc785e8253..ec10404371 100644 --- 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 index 52ab8cf3d1..9e950dcfaa 100644 --- 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 index 2194e9e5e3..6a1a85fa78 100644 --- 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