Mercurial > octave

diff libgui/src/find-files-dialog.cc @ 29542:3d34b70b5a49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
connect many Qt signals and slots without SIGNAL and SLOT macros This changes switches most code in the libgui/src and libgui/graphics directories to use the new Qt style of connecting signals and slots that uses pointers to member functions or function objects instead of strings to refer to the signal and slot functions. For an introduction, see https://wiki.qt.io/New_Signal_Slot_Syntax. There are many connections left to adapt. In some cases, there are overloaded functions (or default parameters) that need to be handled. Use of QOverload<> or an anonymous function should fix these. In others, we are connecting to parent objects where we only have a pointer to QWidget instead of a specific type of object. To fix those, we need to either move the code that makes th connection to a place where the actual types of both objects are known or pass more specific types as the parent object. In a few cases, there appear to real mismatches in the types of objects and the signal/slot functions. Files affected: ButtonControl.cc, ButtonGroup.cc, ContextMenu.cc, EditControl.cc, Figure.cc, ListBoxControl.cc, Menu.cc, Object.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushTool.cc, SliderControl.cc, Table.cc, ToggleTool.cc, ToolBar.cc, annotation-dialog.cc, qt-graphics-toolkit.cc, color-picker.cc, command-widget.cc, dialog.cc, documentation-bookmarks.cc, documentation.cc, files-dock-widget.cc, find-files-dialog.cc, history-dock-widget.cc, interpreter-qobject.cc, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, find-dialog.cc, octave-qscintilla.cc, main-window.cc, octave-dock-widget.cc, octave-qobject.cc, qt-interpreter-events.cc, set-path-dialog.cc, set-path-model.cc, settings-dialog.cc, shortcut-manager.cc, tab-bar.cc, variable-editor-model.cc, variable-editor.cc, welcome-wizard.cc, welcome-wizard.h, workspace-view.cc, and workspace-view.h.
author John W. Eaton <jwe@octave.org>
date Fri, 16 Apr 2021 23:06:32 -0400
parents 7854d5752dd2
children d4d83344d653
line wrap: on
line diff
--- a/libgui/src/find-files-dialog.cc	Thu Apr 15 11:08:57 2021 -0400
+++ b/libgui/src/find-files-dialog.cc	Fri Apr 16 23:06:32 2021 -0400
@@ -64,8 +64,8 @@
     m_dir_iterator = nullptr;
 
     m_timer = new QTimer (this);
-    connect (m_timer, SIGNAL (timeout (void)),
-             this, SLOT (look_for_files (void)));
+    connect (m_timer, &QTimer::timeout,
+             this, &find_files_dialog::look_for_files);
 
     gui_settings *settings = rmgr.get_settings ();
 
@@ -86,8 +86,8 @@
 
     m_browse_button = new QPushButton (tr ("Browse..."));
     m_browse_button->setToolTip (tr ("Browse for start directory"));
-    connect (m_browse_button, SIGNAL (clicked (void)),
-             this, SLOT (browse_folders (void)));
+    connect (m_browse_button, &QPushButton::clicked,
+             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 ());
@@ -134,22 +134,22 @@
                 // FIXME: use value<Qt::SortOrder> instead of static cast after
                 //        dropping support of Qt 5.4
 
-    connect (m_file_list, SIGNAL (doubleClicked (const QModelIndex&)),
-             this, SLOT (item_double_clicked (const QModelIndex &)));
+    connect (m_file_list, &QTableView::doubleClicked,
+             this, &find_files_dialog::item_double_clicked);
 
     m_status_bar = new QStatusBar;
     m_status_bar->showMessage (tr ("Idle."));
 
     m_find_button = new QPushButton (tr ("Find"));
     m_find_button->setToolTip (tr ("Start search for matching files"));
-    connect (m_find_button, SIGNAL (clicked (void)),
-             this, SLOT (start_find (void)));
+    connect (m_find_button, &QPushButton::clicked,
+             this, &find_files_dialog::start_find);
 
     m_stop_button = new QPushButton (tr ("Stop"));
     m_stop_button->setToolTip (tr ("Stop searching"));
     m_stop_button->setEnabled (false);
-    connect (m_stop_button, SIGNAL (clicked (void)),
-             this, SLOT (stop_find (void)));
+    connect (m_stop_button, &QPushButton::clicked,
+             this, &find_files_dialog::stop_find);
 
     // layout everything
     QDialogButtonBox *button_box = new QDialogButtonBox (Qt::Vertical);
@@ -158,7 +158,8 @@
 
     // add dialog close button
     m_close_button = button_box->addButton (QDialogButtonBox::Close);
-    connect (button_box, SIGNAL (rejected (void)), this, SLOT (close (void)));
+    connect (button_box, &QDialogButtonBox::rejected,
+             this, &find_files_dialog::close);
 
     // name options
     QGroupBox *name_group = new QGroupBox (tr ("Filename/location"));
@@ -197,7 +198,8 @@
 
     setLayout (main_layout);
 
-    connect (this, SIGNAL (finished (int)), this, SLOT (handle_done (int)));
+    connect (this, &find_files_dialog::finished,
+             this, &find_files_dialog::handle_done);
   }
 
   find_files_dialog::~find_files_dialog (void)