gnucash master: Move simple-obj.scm to import-export/qif-imp, the one place it's used.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/354e8687 (commit)
	from  https://github.com/Gnucash/gnucash/commit/a552d0d4 (commit)



commit 354e868716a53a127ec4699b394ea736744659fb
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jun 13 16:04:09 2019 -0700

    Move simple-obj.scm to import-export/qif-imp, the one place it's used.

diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index 02e2aebff..4f36a46bd 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -51,6 +51,7 @@ set (qif_import_SCHEME
   qif-to-gnc.scm
   qif-utils.scm
   qif-import.scm # yes, included in both SETs
+  simple-obj.scm
 )
 
 set(qif_import_SCHEME_2
diff --git a/gnucash/import-export/qif-imp/qif-objects.scm b/gnucash/import-export/qif-imp/qif-objects.scm
index 0f1a7aa5c..9eafeb309 100644
--- a/gnucash/import-export/qif-imp/qif-objects.scm
+++ b/gnucash/import-export/qif-imp/qif-objects.scm
@@ -23,7 +23,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu at gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-
+(load-from-path "qif-import/simple-obj")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  qif-file class 
diff --git a/libgnucash/app-utils/simple-obj.scm b/gnucash/import-export/qif-imp/simple-obj.scm
similarity index 100%
rename from libgnucash/app-utils/simple-obj.scm
rename to gnucash/import-export/qif-imp/simple-obj.scm
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index d5627e0dc..8fa296843 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -161,7 +161,6 @@ set (app_utils_SCHEME_1
     date-utilities.scm
     options.scm
     prefs.scm
-    simple-obj.scm
     fin.scm
 )
 
diff --git a/libgnucash/app-utils/app-utils.scm b/libgnucash/app-utils/app-utils.scm
index 3dab4eee2..a325e81ec 100644
--- a/libgnucash/app-utils/app-utils.scm
+++ b/libgnucash/app-utils/app-utils.scm
@@ -263,15 +263,6 @@
 (export gnc:get-start-next-year)
 (export gnc:get-three-months-ahead)
 
-;; simple-obj
-(export make-simple-class)
-(export simple-obj-getter)
-(export simple-obj-setter)
-(export simple-obj-print)
-(export simple-obj-to-list)
-(export simple-obj-from-list)
-(export make-simple-obj)
-
 (define gnc:*kvp-option-path* (list KVP-OPTION-PATH))
 (export gnc:*kvp-option-path*)
 
@@ -279,7 +270,6 @@
 (load-from-path "options")
 (load-from-path "prefs")
 (load-from-path "date-utilities")
-(load-from-path "simple-obj")
 
 ;; Business options
 (define gnc:*business-label* (N_ "Business"))
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d74c507ea..157509e17 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -365,6 +365,7 @@ gnucash/import-export/qif-imp/qif-objects.scm
 gnucash/import-export/qif-imp/qif-parse.scm
 gnucash/import-export/qif-imp/qif-to-gnc.scm
 gnucash/import-export/qif-imp/qif-utils.scm
+gnucash/import-export/qif-imp/simple-obj.scm
 gnucash/import-export/qif-imp/string.scm
 gnucash/python/gncmod-python.c
 gnucash/register/ledger-core/gncEntryLedger.c
@@ -538,7 +539,6 @@ libgnucash/app-utils/options.scm
 libgnucash/app-utils/option-util.c
 libgnucash/app-utils/prefs.scm
 libgnucash/app-utils/QuickFill.c
-libgnucash/app-utils/simple-obj.scm
 libgnucash/backend/dbi/gnc-backend-dbi.cpp
 libgnucash/backend/dbi/gnc-dbisqlconnection.cpp
 libgnucash/backend/dbi/gnc-dbisqlresult.cpp



Summary of changes:
 gnucash/import-export/qif-imp/CMakeLists.txt                   |  1 +
 gnucash/import-export/qif-imp/qif-objects.scm                  |  2 +-
 .../app-utils => gnucash/import-export/qif-imp}/simple-obj.scm |  0
 libgnucash/app-utils/CMakeLists.txt                            |  1 -
 libgnucash/app-utils/app-utils.scm                             | 10 ----------
 po/POTFILES.in                                                 |  2 +-
 6 files changed, 3 insertions(+), 13 deletions(-)
 rename {libgnucash/app-utils => gnucash/import-export/qif-imp}/simple-obj.scm (100%)