Merge branch 'c++options'

Gnucash · Mar 29, 2022 · abd1a0b · abd1a0b
2 parents 73ddaa8 + 4fe83c3
commit abd1a0b
Show file tree

Hide file tree

Showing 106 changed files with 15,976 additions and 13,846 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -568,7 +568,7 @@ endif()
 
 add_definitions(-D_GNU_SOURCE)
 
-# Also, set the C++ version to c++11
+# Set up the language standards:
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)

diff --git a/bindings/engine.i b/bindings/engine.i
@@ -401,10 +401,6 @@ void qof_book_set_string_option(QofBook* book, const char* opt_name, const char*
 
     SET_ENUM("OPTION-SECTION-ACCOUNTS");
     SET_ENUM("OPTION-NAME-TRADING-ACCOUNTS");
-    SET_ENUM("OPTION-NAME-CURRENCY-ACCOUNTING");
-    SET_ENUM("OPTION-NAME-BOOK-CURRENCY");
-    SET_ENUM("OPTION-NAME-DEFAULT-GAINS-POLICY");
-    SET_ENUM("OPTION-NAME-DEFAULT-GAINS-LOSS-ACCT-GUID");
     SET_ENUM("OPTION-NAME-AUTO-READONLY-DAYS");
     SET_ENUM("OPTION-NAME-NUM-FIELD-SOURCE");
 

diff --git a/bindings/guile/glib-guile.c b/bindings/guile/glib-guile.c
@@ -77,7 +77,7 @@ glist_to_scm_list_helper(GList *glist, swig_type_info *wct)
 }
 
 SCM
-gnc_glist_to_scm_list(GList *glist, gchar *wct)
+gnc_glist_to_scm_list(GList *glist, const gchar *wct)
 {
     swig_type_info *stype = SWIG_TypeQuery(wct);
     g_return_val_if_fail(stype, SCM_UNDEFINED);

diff --git a/bindings/guile/glib-guile.h b/bindings/guile/glib-guile.h
@@ -28,7 +28,7 @@
 #include <glib.h>
 #include <libguile.h>
 
-SCM gnc_glist_to_scm_list(GList *glist, gchar *wct);
+SCM gnc_glist_to_scm_list(GList *glist, const gchar *wct);
 GList* gnc_scm_list_to_glist(SCM wcp_list);
 
 SCM     gnc_glist_string_to_scm(GList * list);

diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
@@ -36,7 +36,7 @@ set (gnome_utils_SOURCES
   dialog-dup-trans.c
   dialog-file-access.c
   dialog-object-references.c
-  dialog-options.c
+  dialog-options.cpp
   dialog-preferences.c
   dialog-query-view.c
   dialog-reset-warnings.c
@@ -60,7 +60,7 @@ set (gnome_utils_SOURCES
   gnc-currency-edit.c
   gnc-date-delta.c
   gnc-date-edit.c
-  gnc-date-format.c 
+  gnc-date-format.c
   gnc-dense-cal.c
   gnc-dense-cal-model.c
   gnc-dense-cal-store.c
@@ -75,7 +75,7 @@ set (gnome_utils_SOURCES
   gnc-gui-query.c
   gnc-icons.c
   gnc-keyring.c
-  gnc-main-window.c
+  gnc-main-window.cpp
   gnc-menu-extensions.c
   gnc-plugin-file-history.c
   gnc-plugin-manager.c
@@ -110,6 +110,7 @@ set (gnome_utils_SOURCES
 
 set(gnome_utils_noinst_HEADERS
   dialog-tax-table.h
+  dialog-options.hpp
   gnc-autosave.h
   gnc-gobject-utils.h
   gnc-gtk-utils.h
@@ -127,7 +128,6 @@ set (gnome_utils_HEADERS
   dialog-file-access.h
   dialog-preferences.h
   dialog-object-references.h
-  dialog-options.h
   dialog-query-view.h
   dialog-reset-warnings.h
   dialog-totd.h