Mercurial > octave

comparison libgui/src/resource-manager.cc @ 31616:726d2628752c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author John W. Eaton <jwe@octave.org>
date Fri, 02 Dec 2022 10:10:19 -0500
parents 40b151abbb9b
children 1f57ea5dfd4a
comparison
equal deleted inserted replaced
31615:40b151abbb9b 31616:726d2628752c
63 63
64 namespace octave 64 namespace octave
65 { 65 {
66 resource_manager::resource_manager (void) 66 resource_manager::resource_manager (void)
67 : m_settings_directory (), m_settings_file (), m_settings (nullptr), 67 : m_settings_directory (), m_settings_file (), m_settings (nullptr),
68 m_default_settings (nullptr), m_temporary_files (), m_icon_fallbacks () 68 m_temporary_files (), m_icon_fallbacks ()
69 { 69 {
70 // Location, name, and format of settings file determined by 70 // Location, name, and format of settings file determined by
71 // settings in qt_application class construtor. 71 // settings in qt_application class construtor.
72 72
73 m_default_settings = new gui_settings (); 73 m_settings = new gui_settings ();
74 74
75 m_settings_file = m_default_settings->fileName (); 75 m_settings_file = m_settings->fileName ();
76 76
77 QFileInfo sfile (m_settings_file); 77 QFileInfo sfile (m_settings_file);
78 m_settings_directory = sfile.absolutePath (); 78 m_settings_directory = sfile.absolutePath ();
79 } 79 }
80 80
81 resource_manager::~resource_manager (void) 81 resource_manager::~resource_manager (void)
82 { 82 {
83 delete m_settings; 83 delete m_settings;
84 delete m_default_settings;
85 84
86 for (int i = m_temporary_files.count () - 1; i >=0; i--) 85 for (int i = m_temporary_files.count () - 1; i >=0; i--)
87 remove_tmp_file (m_temporary_files.at (i)); 86 remove_tmp_file (m_temporary_files.at (i));
88 } 87 }
89 88
206 } 205 }
207 206
208 return m_settings; 207 return m_settings;
209 } 208 }
210 209
211 gui_settings * resource_manager::get_default_settings (void) const
212 {
213 if (! m_default_settings)
214 {
215 QString msg (QT_TR_NOOP ("Octave has lost its default settings.\n"
216 "This should not happen.\n"
217 "Please report this bug.\n\n"
218 "Octave GUI must be closed now."));
219
220 QMessageBox::critical (nullptr,
221 QString (QT_TR_NOOP ("Octave Critical Error")),
222 msg);
223 exit (1);
224 }
225
226 return m_default_settings;
227 }
228
229 QString resource_manager::get_settings_directory (void) 210 QString resource_manager::get_settings_directory (void)
230 { 211 {
231 return m_settings_directory; 212 return m_settings_directory;
232 } 213 }
233 214