Mercurial > octave

diff libgui/src/m-editor/file-editor-tab.cc @ 27620:45bb5bbaf291

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't use singleton pattern for resource manager in GUI Move ownership of the resource_manager object to the base_qobject class. Store reference to resource_manager object as a member variable in most objects that need to access it. Eliminate static member functions in resource_managar class. Provide a get_resource_manager method in the base_qboject class and a global __get_resource_manager__ function for those instances where we can't easily provide local access to the resource_manager object. There are many changes to many files, but most are straightforward.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Nov 2019 18:16:49 -0400
parents 0495b64288f7
children 8b6e928e0705
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc	Sat Nov 02 15:24:14 2019 -0400
+++ b/libgui/src/m-editor/file-editor-tab.cc	Fri Nov 01 18:16:49 2019 -0400
@@ -95,7 +95,9 @@
 
   // Make parent null for the file editor tab so that warning WindowModal
   // messages don't affect grandparents.
-  file_editor_tab::file_editor_tab (const QString& directory_arg)
+  file_editor_tab::file_editor_tab (resource_manager& rmgr,
+                                    const QString& directory_arg)
+    : m_resource_manager (rmgr)
   {
     m_lexer_apis = nullptr;
     m_is_octave_file = true;
@@ -106,7 +108,7 @@
     m_file_name = "";
     m_file_system_watcher.setObjectName ("_qt_autotest_force_engine_poller");
 
-    m_edit_area = new octave_qscintilla (this);
+    m_edit_area = new octave_qscintilla (this, m_resource_manager);
     m_line = 0;
     m_col  = 0;
 
@@ -254,7 +256,7 @@
     connect (this, SIGNAL (do_save_file_signal (const QString&, bool, bool)),
              this, SLOT (do_save_file (const QString&, bool, bool)));
 
-    gui_settings *settings = resource_manager::get_settings ();
+    gui_settings *settings = m_resource_manager.get_settings ();
     if (settings)
       notice_settings (settings, true);
 
@@ -696,7 +698,7 @@
   {
     QsciLexer *lexer = m_edit_area->lexer ();
 
-    gui_settings *settings = resource_manager::get_settings ();
+    gui_settings *settings = m_resource_manager.get_settings ();
 
     if (m_lexer_apis)
       {
@@ -1656,7 +1658,7 @@
         if (input_str)
           {
             bool ok;
-            gui_settings *settings = resource_manager::get_settings ();
+            gui_settings *settings = m_resource_manager.get_settings ();
 
             used_comment_str
               = QInputDialog::getText (this, tr ("Comment selected text"),
@@ -2040,7 +2042,7 @@
                             "This does not change the default encoding.\n"));
 
         QComboBox *enc_combo = new QComboBox ();
-        resource_manager::combo_encoding (enc_combo);
+        m_resource_manager.combo_encoding (enc_combo);
         m_new_encoding = enc_combo->currentText ();
         connect (enc_combo, SIGNAL (currentTextChanged (const QString&)),
                  this , SLOT (handle_current_enc_changed (const QString&)));
@@ -2097,7 +2099,7 @@
 #else
     int os_eol_mode = QsciScintilla::EolUnix;
 #endif
-    gui_settings *settings = resource_manager::get_settings ();
+    gui_settings *settings = m_resource_manager.get_settings ();
     QsciScintilla::EolMode eol_mode
       = static_cast<QsciScintilla::EolMode> (settings->value ("editor/default_eol_mode",os_eol_mode).toInt ());
 
@@ -2180,7 +2182,7 @@
   {
     update_window_title (false); // window title (no modification)
 
-    gui_settings *settings = resource_manager::get_settings ();
+    gui_settings *settings = m_resource_manager.get_settings ();
 
     // set the eol mode from the settings or depending on the OS if the entry is
     // missing in the settings
@@ -2482,7 +2484,7 @@
     fileDialog->setViewMode (QFileDialog::Detail);
 
     // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved.
-    if (! resource_manager::get_settings ()->value ("use_native_file_dialogs",
+    if (! m_resource_manager.get_settings ()->value ("use_native_file_dialogs",
                                                     true).toBool ())
       fileDialog->setOption(QFileDialog::DontUseNativeDialog);