Mercurial > octave

diff libgui/src/m-editor/find-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 81be7e4ddb0f
line wrap: on
line diff
--- a/libgui/src/m-editor/find-dialog.cc	Thu Apr 15 11:08:57 2021 -0400
+++ b/libgui/src/m-editor/find-dialog.cc	Fri Apr 16 23:06:32 2021 -0400
@@ -144,23 +144,23 @@
     _search_selection_check_box = new QCheckBox (tr ("Search se&lection"));
     _search_selection_check_box->setCheckable (true);
 
-    connect (_find_next_button,   SIGNAL (clicked ()),
-             this,                SLOT (find_next ()));
-    connect (_find_prev_button,   SIGNAL (clicked ()),
-             this,                SLOT (find_prev ()));
-    connect (_more_button,        SIGNAL (toggled (bool)),
-             _extension,          SLOT (setVisible (bool)));
-    connect (_replace_button,     SIGNAL (clicked ()),
-             this,                SLOT (replace ()));
-    connect (_replace_all_button, SIGNAL (clicked ()),
-             this,                SLOT (replace_all ()));
-    connect (_backward_check_box, SIGNAL (stateChanged (int)),
-             this,                SLOT (handle_backward_search_changed (int)));
-    connect (_button_box,         SIGNAL (rejected ()),
-             this,                SLOT (close ()));
+    connect (_find_next_button, &QPushButton::clicked,
+             this, &find_dialog::find_next);
+    connect (_find_prev_button, &QPushButton::clicked,
+             this, &find_dialog::find_prev);
+    connect (_more_button, &QPushButton::toggled,
+             _extension, &QWidget::setVisible);
+    connect (_replace_button, &QPushButton::clicked,
+             this, &find_dialog::replace);
+    connect (_replace_all_button, &QPushButton::clicked,
+             this, &find_dialog::replace_all);
+    connect (_backward_check_box, &QCheckBox::stateChanged,
+             this, &find_dialog::handle_backward_search_changed);
+    connect (_button_box, &QDialogButtonBox::rejected,
+             this, &find_dialog::close);
 
-    connect (_search_selection_check_box, SIGNAL (stateChanged (int)),
-             this,                        SLOT (handle_sel_search_changed (int)));
+    connect (_search_selection_check_box, &QCheckBox::stateChanged,
+             this, &find_dialog::handle_sel_search_changed);
 
     QVBoxLayout *extension_layout = new QVBoxLayout ();
     extension_layout->setMargin (0);
@@ -212,8 +212,8 @@
     _edit_area = edit_area;
     _search_selection_check_box->setEnabled (edit_area->hasSelectedText ());
 
-    connect (_edit_area, SIGNAL (copyAvailable (bool)),
-             this,       SLOT (handle_selection_changed (bool)),
+    connect (_edit_area, &octave_qscintilla::copyAvailable,
+             this, &find_dialog::handle_selection_changed,
              Qt::UniqueConnection);
   }