Convert optiondb users in gnome and gnome-utils to C++.

To enable using std::unique_ptr<GncObjectDB> and avoid memory management problems.
Gnucash · Aug 1, 2021 · e2c87f2 · e2c87f2
1 parent ea835b3
commit e2c87f2
Show file tree

Hide file tree

Showing 24 changed files with 640 additions and 611 deletions.
diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
@@ -74,7 +74,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

diff --git a/gnucash/gnome-utils/dialog-options.h b/gnucash/gnome-utils/dialog-options.h
@@ -32,9 +32,9 @@ using GNCOptionDB = GncOptionDB;
 extern "C"
 {
 #else
-#include "option-util.h"
-typedef GNCOption GncOption;
-typedef GNCOptionDB GncOptionDB;
+typedef struct GncOption GncOption;
+typedef struct GncOptionDB GncOptionDB;
+typedef GncOptionDB GNCOptionDB;
 #endif
 #include <guile-mappings.h>
 #include <gtk/gtk.h>

diff --git a/gnucash/gnome-utils/gnc-icons.c b/gnucash/gnome-utils/gnc-icons.c
@@ -33,6 +33,7 @@
 #include "gnc-filepath-utils.h"
 #include "gnc-gnome-utils.h"
 #include "gnc-path.h"
+#include <gnc-engine.h> // For define GNC_MOD_GUI
 
 static QofLogModule log_module = GNC_MOD_GUI;