# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1669993819 18000
# Node ID 726d2628752cecae4e1fc3b77401f75260114473
# Parent  40b151abbb9bd87a66371d673444cacc9a57f497
eliminate unused default_settings variable from resource manager

* resource-manager.h, resource-manager.cc
(resource_manager::m_default_settings):
Delete member variable, accessor function, and all uses.

diff -r 40b151abbb9b -r 726d2628752c libgui/src/resource-manager.cc
--- a/libgui/src/resource-manager.cc	Fri Dec 02 10:07:32 2022 -0500
+++ b/libgui/src/resource-manager.cc	Fri Dec 02 10:10:19 2022 -0500
@@ -65,14 +65,14 @@
 {
   resource_manager::resource_manager (void)
     : m_settings_directory (), m_settings_file (), m_settings (nullptr),
-      m_default_settings (nullptr), m_temporary_files (), m_icon_fallbacks ()
+      m_temporary_files (), m_icon_fallbacks ()
   {
     // Location, name, and format of settings file determined by
     // settings in qt_application class construtor.
 
-    m_default_settings = new gui_settings ();
+    m_settings = new gui_settings ();
 
-    m_settings_file = m_default_settings->fileName ();
+    m_settings_file = m_settings->fileName ();
 
     QFileInfo sfile (m_settings_file);
     m_settings_directory = sfile.absolutePath ();
@@ -81,7 +81,6 @@
   resource_manager::~resource_manager (void)
   {
     delete m_settings;
-    delete m_default_settings;
 
     for (int i = m_temporary_files.count () - 1; i >=0; i--)
       remove_tmp_file (m_temporary_files.at (i));
@@ -208,24 +207,6 @@
     return m_settings;
   }
 
-  gui_settings * resource_manager::get_default_settings (void) const
-  {
-    if (! m_default_settings)
-      {
-        QString msg (QT_TR_NOOP ("Octave has lost its default settings.\n"
-                                 "This should not happen.\n"
-                                 "Please report this bug.\n\n"
-                                 "Octave GUI must be closed now."));
-
-        QMessageBox::critical (nullptr,
-                               QString (QT_TR_NOOP ("Octave Critical Error")),
-                               msg);
-        exit (1);
-      }
-
-    return m_default_settings;
-  }
-
   QString resource_manager::get_settings_directory (void)
   {
     return m_settings_directory;
diff -r 40b151abbb9b -r 726d2628752c libgui/src/resource-manager.h
--- a/libgui/src/resource-manager.h	Fri Dec 02 10:07:32 2022 -0500
+++ b/libgui/src/resource-manager.h	Fri Dec 02 10:10:19 2022 -0500
@@ -65,8 +65,6 @@
 
     gui_settings * get_settings (void) const;
 
-    gui_settings * get_default_settings (void) const;
-
     QString get_settings_directory (void);
 
     QString get_settings_file (void);
@@ -121,8 +119,6 @@
 
     gui_settings *m_settings;
 
-    gui_settings *m_default_settings;
-
     QList<QTemporaryFile *> m_temporary_files;
 
     QStringList m_icon_fallbacks;