# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1669989521 18000
# Node ID 59c9da7c43d6367059bee64c7d31d4884afb7f27
# Parent  c6683fcc5c332b1639dbda9d9511e35c45873a3f
set Qt organization, application, and version in main program

* main-gui.cc (main): Pass "octave" and "octave-gui" for organization
and application names and OCTAVE_VERSION as version to qt_application
constructor.

* qt-application.cc (qt_application::qt_application):
Set organization and application names and application version in
QCoreApplication object.  Set default QSettings format.

* octave-qobject.cc (base_qobject::base_qobject): Don't set
QtCoreApplication name and version here.

* resource-manager.cc (resource_manager::resource_manager):
Use default construtor for gui_settings.

diff -r c6683fcc5c33 -r 59c9da7c43d6 libgui/src/octave-qobject.cc
--- a/libgui/src/octave-qobject.cc	Fri Dec 02 08:57:06 2022 -0500
+++ b/libgui/src/octave-qobject.cc	Fri Dec 02 08:58:41 2022 -0500
@@ -208,11 +208,6 @@
     QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8"));
 #endif
 
-    // Initialize global Qt application metadata.
-
-    QCoreApplication::setApplicationName ("GNU Octave");
-    QCoreApplication::setApplicationVersion (OCTAVE_VERSION);
-
     // Register octave_value_list for connecting thread crossing signals.
 
     qRegisterMetaType<octave_value_list> ("octave_value_list");
diff -r c6683fcc5c33 -r 59c9da7c43d6 libgui/src/qt-application.cc
--- a/libgui/src/qt-application.cc	Fri Dec 02 08:57:06 2022 -0500
+++ b/libgui/src/qt-application.cc	Fri Dec 02 08:58:41 2022 -0500
@@ -27,6 +27,10 @@
 #  include "config.h"
 #endif
 
+#include <QCoreApplication>
+#include <QSettings>
+#include <QString>
+
 #include "main-window.h"
 #include "octave-qobject.h"
 #include "qt-application.h"
@@ -60,6 +64,9 @@
       QCoreApplication::setApplicationVersion
         (QString::fromStdString (application_version));
 
+    // FIXME: Is there a better place for this?
+    QSettings::setDefaultFormat (QSettings::IniFormat);
+
     // This should probably happen early.
     sysdep_init ();
   }
diff -r c6683fcc5c33 -r 59c9da7c43d6 libgui/src/resource-manager.cc
--- a/libgui/src/resource-manager.cc	Fri Dec 02 08:57:06 2022 -0500
+++ b/libgui/src/resource-manager.cc	Fri Dec 02 08:58:41 2022 -0500
@@ -67,10 +67,10 @@
     : m_settings_directory (), m_settings_file (), m_settings (nullptr),
       m_default_settings (nullptr), m_temporary_files (), m_icon_fallbacks ()
   {
-    // Let gui_settings decide where to put the ini file with gui preferences
-    m_default_settings
-      = new gui_settings (QSettings::IniFormat, QSettings::UserScope,
-                          "octave", "octave-gui");
+    // Location, name, and format of settings file determined by
+    // settings in qt_application class construtor.
+
+    m_default_settings = new gui_settings ();
 
     m_settings_file = m_default_settings->fileName ();
 
diff -r c6683fcc5c33 -r 59c9da7c43d6 src/main-gui.cc
--- a/src/main-gui.cc	Fri Dec 02 08:57:06 2022 -0500
+++ b/src/main-gui.cc	Fri Dec 02 08:58:41 2022 -0500
@@ -50,6 +50,7 @@
 #include "octave-build-info.h"
 #include "qt-application.h"
 #include "sysdep.h"
+#include "version.h"
 
 static void
 check_hg_versions (void)
@@ -127,7 +128,8 @@
 
   octave::sys::env::set_program_name (argv[0]);
 
-  octave::qt_application app (argc, argv);
+  octave::qt_application app ("octave", "octave-gui", OCTAVE_VERSION,
+                              argc, argv);
 
   return app.execute ();
 }