Mercurial > octave

diff libgui/src/find-files-dialog.cc @ 31619:ad014fc78bd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use individual local gui_settings objects Previously, we created a single gui_settings object (derived from QSettings) and accessed it from the resource_manager object. That design is not necessary and is not the way QSettings was designed to be used. Instead of managing a single object, we should be using individual QSettings objects where needed. Each individual QSettings object manages thread-safe access to a single global collection of settings. The Qt docs say that operations on QSettings are not thread safe, but that means that you can't create a QSettings object in one thread and use it in another without some locking. I'm not sure whether we were doing that correctly, but with this change it no longer matters. Each QSettings object does perform locking when reading or writing the underlying global data. * resource-manager.h, resource-manager.cc (resource_manager::m_settings): Delete data member. (resource_manager::get_settings): Delete. * annotation-dialog.cc, QTerminal.cc, QTerminal.h, command-widget.cc, command-widget.h, community-news.cc, dialog.cc, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, history-dock-widget.cc, history-dock-widget.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, octave-qscintilla.cc, main-window.cc, main-window.h, news-reader.cc, octave-dock-widget.cc, octave-dock-widget.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, resource-manager.cc, resource-manager.h, set-path-dialog.cc, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, workspace-model.cc, workspace-model.h, workspace-view.cc: Use local gui_settings objects instead of accessing a pointer to a single gui_settings object owned by the resource_manager object.
author John W. Eaton <jwe@octave.org>
date Fri, 02 Dec 2022 14:23:53 -0500
parents 796f54d4ddbf
children 0645ea65ca6b
line wrap: on
line diff
--- a/libgui/src/find-files-dialog.cc	Fri Dec 02 15:51:44 2022 -0500
+++ b/libgui/src/find-files-dialog.cc	Fri Dec 02 14:23:53 2022 -0500
@@ -49,6 +49,7 @@
 #include "find-files-model.h"
 #include "gui-preferences-global.h"
 #include "gui-preferences-ff.h"
+#include "gui-settings.h"
 #include "octave-qobject.h"
 
 namespace octave
@@ -67,20 +68,20 @@
     connect (m_timer, &QTimer::timeout,
              this, &find_files_dialog::look_for_files);
 
-    gui_settings *settings = rmgr.get_settings ();
+    gui_settings settings;
 
     QLabel *file_name_label = new QLabel (tr ("Named:"));
     m_file_name_edit = new QLineEdit;
     m_file_name_edit->setToolTip (tr ("Enter the filename search expression"));
 
-    m_file_name_edit->setText (settings->value (ff_file_name).toString ());
+    m_file_name_edit->setText (settings.value (ff_file_name).toString ());
     file_name_label->setBuddy (m_file_name_edit);
 
     QLabel *start_dir_label = new QLabel (tr ("Start in:"));
 
     m_start_dir_edit = new QLineEdit;
-    m_start_dir_edit->setText (settings->value (ff_start_dir.key,
-                                                QDir::currentPath ()).toString ());
+    m_start_dir_edit->setText (settings.value (ff_start_dir.key,
+                                               QDir::currentPath ()).toString ());
     m_start_dir_edit->setToolTip (tr ("Enter the start directory"));
     start_dir_label->setBuddy (m_start_dir_edit);
 
@@ -90,27 +91,27 @@
              this, &find_files_dialog::browse_folders);
 
     m_recurse_dirs_check = new QCheckBox (tr ("Search subdirectories"));
-    m_recurse_dirs_check->setChecked (settings->value (ff_recurse_dirs).toBool ());
+    m_recurse_dirs_check->setChecked (settings.value (ff_recurse_dirs).toBool ());
     m_recurse_dirs_check->setToolTip (tr ("Search recursively through directories for matching files"));
 
     m_include_dirs_check = new QCheckBox (tr ("Include directory names"));
-    m_include_dirs_check->setChecked (settings->value (ff_include_dirs).toBool ());
+    m_include_dirs_check->setChecked (settings.value (ff_include_dirs).toBool ());
     m_include_dirs_check->setToolTip (tr ("Include matching directories in search results"));
 
     m_name_case_check = new QCheckBox (tr ("Name case insensitive"));
-    m_name_case_check->setChecked (settings->value (ff_name_case).toBool ());
+    m_name_case_check->setChecked (settings.value (ff_name_case).toBool ());
     m_name_case_check->setToolTip (tr ("Set matching name is case insensitive"));
 
     m_contains_text_check = new QCheckBox (tr ("Contains text:"));
     m_contains_text_check->setToolTip (tr ("Enter the file content search expression"));
-    m_contains_text_check->setChecked (settings->value (ff_check_text).toBool ());
+    m_contains_text_check->setChecked (settings.value (ff_check_text).toBool ());
 
     m_contains_text_edit = new QLineEdit ();
     m_contains_text_edit->setToolTip (tr ("Text to match"));
-    m_contains_text_edit->setText (settings->value (ff_contains_text).toString ());
+    m_contains_text_edit->setText (settings.value (ff_contains_text).toString ());
 
     m_content_case_check = new QCheckBox (tr ("Text case insensitive"));
-    m_content_case_check->setChecked (settings->value (ff_content_case).toBool ());
+    m_content_case_check->setChecked (settings.value (ff_content_case).toBool ());
     m_content_case_check->setToolTip (tr ("Set text content is case insensitive"));
 
     find_files_model *model = new find_files_model (this);
@@ -124,13 +125,13 @@
     m_file_list->setAlternatingRowColors (true);
     m_file_list->setToolTip (tr ("Search results"));
     m_file_list->setSortingEnabled (true);
-    m_file_list->horizontalHeader ()->restoreState (settings->value (ff_column_state.key).toByteArray ());
+    m_file_list->horizontalHeader ()->restoreState (settings.value (ff_column_state.key).toByteArray ());
     m_file_list->horizontalHeader ()->setSortIndicatorShown (true);
     m_file_list->horizontalHeader ()->setSectionsClickable (true);
     m_file_list->horizontalHeader ()->setStretchLastSection (true);
-    m_file_list->sortByColumn (settings->value (ff_sort_files_by_column).toInt (),
+    m_file_list->sortByColumn (settings.value (ff_sort_files_by_column).toInt (),
                                static_cast<Qt::SortOrder>
-                               (settings->value (ff_sort_files_by_order).toUInt ()));
+                               (settings.value (ff_sort_files_by_order).toUInt ()));
                 // FIXME: use value<Qt::SortOrder> instead of static cast after
                 //        dropping support of Qt 5.4
 
@@ -209,32 +210,28 @@
 
   void find_files_dialog::save_settings (void)
   {
-    resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
-    gui_settings *settings = rmgr.get_settings ();
-
-    if (! settings)
-      return;
+    gui_settings settings;
 
     int sort_column = m_file_list->horizontalHeader ()->sortIndicatorSection ();
     Qt::SortOrder sort_order
       = m_file_list->horizontalHeader ()->sortIndicatorOrder ();
-    settings->setValue (ff_sort_files_by_column.key, sort_column);
-    settings->setValue (ff_sort_files_by_order.key, sort_order);
-    settings->setValue (ff_column_state.key, m_file_list->horizontalHeader ()->saveState ());
+    settings.setValue (ff_sort_files_by_column.key, sort_column);
+    settings.setValue (ff_sort_files_by_order.key, sort_order);
+    settings.setValue (ff_column_state.key, m_file_list->horizontalHeader ()->saveState ());
 
-    settings->setValue (ff_file_name.key, m_file_name_edit->text ());
+    settings.setValue (ff_file_name.key, m_file_name_edit->text ());
 
-    settings->setValue (ff_start_dir.key, m_start_dir_edit->text ());
+    settings.setValue (ff_start_dir.key, m_start_dir_edit->text ());
 
-    settings->setValue (ff_recurse_dirs.key, m_recurse_dirs_check->text ());
-    settings->setValue (ff_include_dirs.key, m_include_dirs_check->text ());
-    settings->setValue (ff_name_case.key, m_name_case_check->text ());
+    settings.setValue (ff_recurse_dirs.key, m_recurse_dirs_check->text ());
+    settings.setValue (ff_include_dirs.key, m_include_dirs_check->text ());
+    settings.setValue (ff_name_case.key, m_name_case_check->text ());
 
-    settings->setValue (ff_contains_text.key, m_contains_text_edit->text ());
-    settings->setValue (ff_check_text.key, m_contains_text_check->isChecked ());
-    settings->setValue (ff_content_case.key, m_content_case_check->isChecked ());
+    settings.setValue (ff_contains_text.key, m_contains_text_edit->text ());
+    settings.setValue (ff_check_text.key, m_contains_text_check->isChecked ());
+    settings.setValue (ff_content_case.key, m_content_case_check->isChecked ());
 
-    settings->sync ();
+    settings.sync ();
   }
 
   void find_files_dialog::set_search_dir (const QString& dir)
@@ -311,10 +308,12 @@
   void find_files_dialog::browse_folders (void)
   {
     int opts = 0;  // No options by default.
+
     // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved.
-    resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
-    gui_settings *settings = rmgr.get_settings ();
-    if (! settings->value (global_use_native_dialogs).toBool ())
+
+    gui_settings settings;
+
+    if (! settings.value (global_use_native_dialogs).toBool ())
       opts = QFileDialog::DontUseNativeDialog;
 
     QString dir =