Mercurial > octave-nkf

diff gui/src/main-window.cc @ 15164:bc801a44bb1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
follow Octave pattern for resource_manager singleton * resource-manager.h, resource-manager.cc: Don't expose pointer to instance. Use static forwarding functions to access instance and perform actions. * files-dockwidget.cc, file-editor-tab.cc, lexer-octave-gui.cc, main-window.cc, octave-gui.cc, settings-dialog.cc, workspace-view.cc: Use resource_manager::METHOD instead of resource_manager::instance()->METHOD.
author John W. Eaton <jwe@octave.org>
date Mon, 13 Aug 2012 12:16:26 -0400
parents 59175df7dcf6
children
line wrap: on
line diff
--- a/gui/src/main-window.cc	Mon Aug 13 10:32:19 2012 -0400
+++ b/gui/src/main-window.cc	Mon Aug 13 12:16:26 2012 -0400
@@ -91,7 +91,7 @@
 {
   QString selectedFile =
       QFileDialog::getSaveFileName (this, tr ("Save Workspace"),
-                                    resource_manager::instance ()->get_home_path ());
+                                    resource_manager::get_home_path ());
   if (!selectedFile.isEmpty ())
     {
       octave_link::instance ()
@@ -105,7 +105,7 @@
 {
   QString selectedFile =
       QFileDialog::getOpenFileName (this, tr ("Load Workspace"),
-                                    resource_manager::instance ()->get_home_path ());
+                                    resource_manager::get_home_path ());
   if (!selectedFile.isEmpty ())
     {
       octave_link::instance ()
@@ -166,7 +166,9 @@
 main_window::notice_settings ()
 {
   // Set terminal font:
-  QSettings *settings = resource_manager::instance ()->get_settings ();
+  QSettings *settings = resource_manager::get_settings ();
+
+  // FIXME -- what should happen if settings is 0?
 
   QFont font = QFont();
   font.setFamily(settings->value("terminal/fontName").toString());
@@ -183,7 +185,7 @@
     _terminal->setCursorType(QTerminalInterface::UnderlineCursor,
                              cursorBlinking);
 
-  resource_manager::instance ()->update_network_settings ();
+  resource_manager::update_network_settings ();
 }
 
 void
@@ -414,7 +416,10 @@
 void
 main_window::read_settings ()
 {
-  QSettings *settings = resource_manager::instance ()->get_settings ();
+  QSettings *settings = resource_manager::get_settings ();
+
+  // FIXME -- what should happen if settings is 0?
+
   restoreGeometry (settings->value ("MainWindow/geometry").toByteArray ());
   restoreState (settings->value ("MainWindow/windowState").toByteArray ());
   emit settings_changed ();
@@ -423,7 +428,10 @@
 void
 main_window::write_settings ()
 {
-  QSettings *settings = resource_manager::instance ()->get_settings ();
+  QSettings *settings = resource_manager::get_settings ();
+
+  // FIXME -- what should happen if settings is 0?
+
   settings->setValue ("MainWindow/geometry", saveGeometry ());
   settings->setValue ("MainWindow/windowState", saveState ());
   settings->sync ();