Mercurial > octave
changeset 33239:775dde0cb3e5
use qOverload<T>(fptr) instead of QOverload<T>::of(fptr)
Now that we are using C++17 we can use qOverload<T> (function_pointer)
instead of QOverload<T...>::of (function_pointer)
Affected files: ButtonGroup.cc, Container.cc, Figure.cc,
PopupMenuControl.cc, command-widget.cc, documentation-bookmarks.cc,
file-editor-tab.cc, file-editor.cc, main-window.cc, octave-qobject.cc,
octave-qobject.h, set-path-dialog.cc, settings-dialog.cc,
terminal-dock-widget.cc, and variable-editor.cc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 22 Mar 2024 23:51:33 -0400 |
| parents | ddd3da3f1a70 |
| children | 4e5bc9c4f657 |
| files | libgui/graphics/ButtonGroup.cc libgui/graphics/Container.cc libgui/graphics/Figure.cc libgui/graphics/PopupMenuControl.cc libgui/src/command-widget.cc libgui/src/documentation-bookmarks.cc libgui/src/m-editor/file-editor-tab.cc libgui/src/m-editor/file-editor.cc libgui/src/main-window.cc libgui/src/octave-qobject.cc libgui/src/octave-qobject.h libgui/src/set-path-dialog.cc libgui/src/settings-dialog.cc libgui/src/terminal-dock-widget.cc libgui/src/variable-editor.cc |
| diffstat | 15 files changed, 69 insertions(+), 69 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/ButtonGroup.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/graphics/ButtonGroup.cc Fri Mar 22 23:51:33 2024 -0400 @@ -179,7 +179,7 @@ frame->hide (); connect (m_buttongroup, - QOverload<QAbstractButton *>::of (&QButtonGroup::buttonClicked), + qOverload<QAbstractButton *> (&QButtonGroup::buttonClicked), this, &ButtonGroup::buttonClicked); }
--- a/libgui/graphics/Container.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/graphics/Container.cc Fri Mar 22 23:51:33 2024 -0400 @@ -69,11 +69,11 @@ m_canvas = Canvas::create (m_interpreter, gh, this, fig.get ("renderer").string_value ()); - connect (m_canvas, QOverload<const octave::fcn_callback&>::of (&Canvas::interpreter_event), - this, QOverload<const octave::fcn_callback&>::of (&Container::interpreter_event)); + connect (m_canvas, qOverload<const octave::fcn_callback&> (&Canvas::interpreter_event), + this, qOverload<const octave::fcn_callback&> (&Container::interpreter_event)); - connect (m_canvas, QOverload<const octave::meth_callback&>::of (&Canvas::interpreter_event), - this, QOverload<const octave::meth_callback&>::of (&Container::interpreter_event)); + connect (m_canvas, qOverload<const octave::meth_callback&> (&Canvas::interpreter_event), + this, qOverload<const octave::meth_callback&> (&Container::interpreter_event)); connect (m_canvas, SIGNAL (gh_callback_event (const graphics_handle&,
--- a/libgui/graphics/Figure.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/graphics/Figure.cc Fri Mar 22 23:51:33 2024 -0400 @@ -122,11 +122,11 @@ m_container = new Container (win, interp); win->setCentralWidget (m_container); - connect (m_container, QOverload<const octave::fcn_callback&>::of (&Container::interpreter_event), - this, QOverload<const octave::fcn_callback&>::of (&Figure::interpreter_event)); + connect (m_container, qOverload<const octave::fcn_callback&> (&Container::interpreter_event), + this, qOverload<const octave::fcn_callback&> (&Figure::interpreter_event)); - connect (m_container, QOverload<const octave::meth_callback&>::of (&Container::interpreter_event), - this, QOverload<const octave::meth_callback&>::of (&Figure::interpreter_event)); + connect (m_container, qOverload<const octave::meth_callback&> (&Container::interpreter_event), + this, qOverload<const octave::meth_callback&> (&Figure::interpreter_event)); figure::properties& fp = properties<figure> ();
--- a/libgui/graphics/PopupMenuControl.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/graphics/PopupMenuControl.cc Fri Mar 22 23:51:33 2024 -0400 @@ -64,7 +64,7 @@ update (uicontrol::properties::ID_VALUE); - connect (box, QOverload<int>::of (&QComboBox::activated), + connect (box, qOverload<int> (&QComboBox::activated), this, &PopupMenuControl::currentIndexChanged); }
--- a/libgui/src/command-widget.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/src/command-widget.cc Fri Mar 22 23:51:33 2024 -0400 @@ -90,11 +90,11 @@ connect (this, &command_widget::new_command_line_signal, m_console, &console::new_command_line); - connect (m_console, QOverload<const fcn_callback&>::of (&console::interpreter_event), - this, QOverload<const fcn_callback&>::of (&command_widget::interpreter_event)); + connect (m_console, qOverload<const fcn_callback&> (&console::interpreter_event), + this, qOverload<const fcn_callback&> (&command_widget::interpreter_event)); - connect (m_console, QOverload<const meth_callback&>::of (&console::interpreter_event), - this, QOverload<const meth_callback&>::of (&command_widget::interpreter_event)); + connect (m_console, qOverload<const meth_callback&> (&console::interpreter_event), + this, qOverload<const meth_callback&> (&command_widget::interpreter_event)); insert_interpreter_output ("\n\n Welcome to Octave\n\n");
--- a/libgui/src/documentation-bookmarks.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/src/documentation-bookmarks.cc Fri Mar 22 23:51:33 2024 -0400 @@ -340,7 +340,7 @@ } menu.addAction (tr ("&Add Folder"), this, - QOverload<bool>::of (&documentation_bookmarks::add_folder)); + qOverload<bool> (&documentation_bookmarks::add_folder)); menu.addSeparator ();
--- a/libgui/src/m-editor/file-editor-tab.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/src/m-editor/file-editor-tab.cc Fri Mar 22 23:51:33 2024 -0400 @@ -232,11 +232,11 @@ // Any interpreter_event signal from a file_editor_tab_widget is // handled the same as for the parent main_window object. - connect (m_edit_area, QOverload<const fcn_callback&>::of (&octave_qscintilla::interpreter_event), - this, QOverload<const fcn_callback&>::of (&file_editor_tab::interpreter_event)); - - connect (m_edit_area, QOverload<const meth_callback&>::of (&octave_qscintilla::interpreter_event), - this, QOverload<const meth_callback&>::of (&file_editor_tab::interpreter_event)); + connect (m_edit_area, qOverload<const fcn_callback&> (&octave_qscintilla::interpreter_event), + this, qOverload<const fcn_callback&> (&file_editor_tab::interpreter_event)); + + connect (m_edit_area, qOverload<const meth_callback&> (&octave_qscintilla::interpreter_event), + this, qOverload<const meth_callback&> (&file_editor_tab::interpreter_event)); // connect modified signal connect (m_edit_area, SIGNAL (modificationChanged (bool)),
--- a/libgui/src/m-editor/file-editor.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/src/m-editor/file-editor.cc Fri Mar 22 23:51:33 2024 -0400 @@ -2629,8 +2629,8 @@ connect (this, &file_editor::fetab_change_request, f, &file_editor_tab::change_editor_state); - connect (this, QOverload<const QWidget *, const QString&, bool>::of (&file_editor::fetab_save_file), - f, QOverload<const QWidget *, const QString&, bool>::of (&file_editor_tab::save_file)); + connect (this, qOverload<const QWidget *, const QString&, bool> (&file_editor::fetab_save_file), + f, qOverload<const QWidget *, const QString&, bool> (&file_editor_tab::save_file)); // Signals from the file_editor trivial operations connect (this, &file_editor::fetab_recover_from_exit, @@ -2652,11 +2652,11 @@ connect (this, &file_editor::fetab_context_edit, f, &file_editor_tab::context_edit); - connect (this, QOverload<const QWidget *>::of (&file_editor::fetab_save_file), - f, QOverload<const QWidget *>::of (&file_editor_tab::save_file)); + connect (this, qOverload<const QWidget *> (&file_editor::fetab_save_file), + f, qOverload<const QWidget *> (&file_editor_tab::save_file)); connect (this, &file_editor::fetab_save_file_as, - f, QOverload<const QWidget *>::of (&file_editor_tab::save_file_as)); + f, qOverload<const QWidget *> (&file_editor_tab::save_file_as)); connect (this, &file_editor::fetab_print_file, f, &file_editor_tab::print_file); @@ -2756,11 +2756,11 @@ // Any interpreter_event signal from a file_editor_tab_widget is // handled the same as for the parent main_window object. - connect (f, QOverload<const fcn_callback&>::of (&file_editor_tab::interpreter_event), - this, QOverload<const fcn_callback&>::of (&file_editor::interpreter_event)); - - connect (f, QOverload<const meth_callback&>::of (&file_editor_tab::interpreter_event), - this, QOverload<const meth_callback&>::of (&file_editor::interpreter_event)); + connect (f, qOverload<const fcn_callback&> (&file_editor_tab::interpreter_event), + this, qOverload<const fcn_callback&> (&file_editor::interpreter_event)); + + connect (f, qOverload<const meth_callback&> (&file_editor_tab::interpreter_event), + this, qOverload<const meth_callback&> (&file_editor::interpreter_event)); return f; }
--- a/libgui/src/main-window.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/src/main-window.cc Fri Mar 22 23:51:33 2024 -0400 @@ -258,7 +258,7 @@ this, &main_window::edit_mfile); connect (cmd_widget, &QTerminal::request_open_file_signal, - this, QOverload<const QString&, const QString&, int>::of (&main_window::open_file_signal)); + this, qOverload<const QString&, const QString&, int> (&main_window::open_file_signal)); connect (cmd_widget, &QTerminal::set_screen_size_signal, this, &main_window::set_screen_size); @@ -289,7 +289,7 @@ make_dock_widget_connections (m_file_browser_window); connect (m_file_browser_window, &files_dock_widget::open_file, - this, QOverload<const QString&>::of (&main_window::open_file_signal)); + this, qOverload<const QString&> (&main_window::open_file_signal)); connect (m_file_browser_window, &files_dock_widget::displayed_directory_changed, this, &main_window::set_current_working_directory); @@ -357,7 +357,7 @@ &workspace_model::show_symbol_tooltip); connect (editor, &file_editor::request_settings_dialog, - this, QOverload<const QString&>::of (&main_window::process_settings_dialog_request)); + this, qOverload<const QString&> (&main_window::process_settings_dialog_request)); connect (editor, &file_editor::request_dbcont_signal, this, &main_window::debug_continue); @@ -1894,11 +1894,11 @@ // Any interpreter_event signal from a set_path_dialog object is // handled the same as for the main_window object. - connect (m_set_path_dlg, QOverload<const fcn_callback&>::of (&set_path_dialog::interpreter_event), - this, QOverload<const fcn_callback&>::of (&main_window::interpreter_event)); - - connect (m_set_path_dlg, QOverload<const meth_callback&>::of (&set_path_dialog::interpreter_event), - this, QOverload<const meth_callback&>::of (&main_window::interpreter_event)); + connect (m_set_path_dlg, qOverload<const fcn_callback&> (&set_path_dialog::interpreter_event), + this, qOverload<const fcn_callback&> (&main_window::interpreter_event)); + + connect (m_set_path_dlg, qOverload<const meth_callback&> (&set_path_dialog::interpreter_event), + this, qOverload<const meth_callback&> (&main_window::interpreter_event)); connect (m_set_path_dlg, &set_path_dialog::modify_path_signal, this, &main_window::modify_path); @@ -1931,7 +1931,7 @@ m_file_browser_window, &files_dock_widget::set_current_directory); connect (m_find_files_dlg, &find_files_dialog::file_selected, - this, QOverload<const QString&>::of (&main_window::open_file_signal)); + this, qOverload<const QString&> (&main_window::open_file_signal)); m_find_files_dlg->setWindowModality (Qt::NonModal); } @@ -2166,11 +2166,11 @@ connect (qt_link, &qt_interpreter_events::file_remove_signal, this, &main_window::file_remove_proxy); - connect (this, QOverload<const fcn_callback&>::of (&main_window::interpreter_event), - &m_octave_qobj, QOverload<const fcn_callback&>::of (&base_qobject::interpreter_event)); - - connect (this, QOverload<const meth_callback&>::of (&main_window::interpreter_event), - &m_octave_qobj, QOverload<const meth_callback&>::of (&base_qobject::interpreter_event)); + connect (this, qOverload<const fcn_callback&> (&main_window::interpreter_event), + &m_octave_qobj, qOverload<const fcn_callback&> (&base_qobject::interpreter_event)); + + connect (this, qOverload<const meth_callback&> (&main_window::interpreter_event), + &m_octave_qobj, qOverload<const meth_callback&> (&base_qobject::interpreter_event)); configure_shortcuts (); }
--- a/libgui/src/octave-qobject.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/src/octave-qobject.cc Fri Mar 22 23:51:33 2024 -0400 @@ -239,11 +239,11 @@ // Handle any interpreter_event signal from the octave_qapplication // object here. - connect (m_qapplication, QOverload<const fcn_callback&>::of (&octave_qapplication::interpreter_event), - this, QOverload<const fcn_callback&>::of (&base_qobject::interpreter_event)); + connect (m_qapplication, qOverload<const fcn_callback&> (&octave_qapplication::interpreter_event), + this, qOverload<const fcn_callback&> (&base_qobject::interpreter_event)); - connect (m_qapplication, QOverload<const meth_callback&>::of (&octave_qapplication::interpreter_event), - this, QOverload<const meth_callback&>::of (&base_qobject::interpreter_event)); + connect (m_qapplication, qOverload<const meth_callback&> (&octave_qapplication::interpreter_event), + this, qOverload<const meth_callback&> (&base_qobject::interpreter_event)); if (m_app_context.experimental_terminal_widget ()) {
--- a/libgui/src/octave-qobject.h Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/src/octave-qobject.h Fri Mar 22 23:51:33 2024 -0400 @@ -194,11 +194,11 @@ template <typename T> void connect_interpreter_events (T *widget) { - connect (widget, QOverload<const fcn_callback&>::of (&T::interpreter_event), - this, QOverload<const fcn_callback&>::of (&base_qobject::interpreter_event)); + connect (widget, qOverload<const fcn_callback&> (&T::interpreter_event), + this, qOverload<const fcn_callback&> (&base_qobject::interpreter_event)); - connect (widget, QOverload<const meth_callback&>::of (&T::interpreter_event), - this, QOverload<const meth_callback&>::of (&base_qobject::interpreter_event)); + connect (widget, qOverload<const meth_callback&> (&T::interpreter_event), + this, qOverload<const meth_callback&> (&base_qobject::interpreter_event)); } public slots:
--- a/libgui/src/set-path-dialog.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/src/set-path-dialog.cc Fri Mar 22 23:51:33 2024 -0400 @@ -120,11 +120,11 @@ // Any interpreter_event signal from a set_path_model object is // handled the same as for the parent set_path_dialog object. - connect (model, QOverload<const fcn_callback&>::of (&set_path_model::interpreter_event), - this, QOverload<const fcn_callback&>::of (&set_path_dialog::interpreter_event)); + connect (model, qOverload<const fcn_callback&> (&set_path_model::interpreter_event), + this, qOverload<const fcn_callback&> (&set_path_dialog::interpreter_event)); - connect (model, QOverload<const meth_callback&>::of (&set_path_model::interpreter_event), - this, QOverload<const meth_callback&>::of (&set_path_dialog::interpreter_event)); + connect (model, qOverload<const meth_callback&> (&set_path_model::interpreter_event), + this, qOverload<const meth_callback&> (&set_path_dialog::interpreter_event)); m_path_list = new QListView (this); m_path_list->setWordWrap (false);
--- a/libgui/src/settings-dialog.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/src/settings-dialog.cc Fri Mar 22 23:51:33 2024 -0400 @@ -437,7 +437,7 @@ { proxy_type->addItems (global_proxy_all_types); // Connect relevant signals for dis-/enabling some elements - connect (proxy_type, QOverload<int>::of (&QComboBox::currentIndexChanged), + connect (proxy_type, qOverload<int> (&QComboBox::currentIndexChanged), this, &settings_dialog::proxy_items_update); connect (use_proxy_server, &QCheckBox::toggled, this, &settings_dialog::proxy_items_update);
--- a/libgui/src/terminal-dock-widget.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/src/terminal-dock-widget.cc Fri Mar 22 23:51:33 2024 -0400 @@ -92,11 +92,11 @@ connect (this, &terminal_dock_widget::visibilityChanged, widget, &QTerminal::handle_visibility_changed); - connect (widget, QOverload<const fcn_callback&>::of (&QTerminal::interpreter_event), - this, QOverload<const fcn_callback&>::of (&terminal_dock_widget::interpreter_event)); + connect (widget, qOverload<const fcn_callback&> (&QTerminal::interpreter_event), + this, qOverload<const fcn_callback&> (&terminal_dock_widget::interpreter_event)); - connect (widget, QOverload<const meth_callback&>::of (&QTerminal::interpreter_event), - this, QOverload<const meth_callback&>::of (&terminal_dock_widget::interpreter_event)); + connect (widget, qOverload<const meth_callback&> (&QTerminal::interpreter_event), + this, qOverload<const meth_callback&> (&terminal_dock_widget::interpreter_event)); m_terminal = widget; }
--- a/libgui/src/variable-editor.cc Fri Mar 22 17:31:33 2024 -0700 +++ b/libgui/src/variable-editor.cc Fri Mar 22 23:51:33 2024 -0400 @@ -1297,11 +1297,11 @@ // Any interpreter_event signal from a variable_editor_stack object is // handled the same as for the parent variable_editor object. - connect (stack, QOverload<const fcn_callback&>::of (&variable_editor_stack::interpreter_event), - this, QOverload<const fcn_callback&>::of (&variable_editor::interpreter_event)); + connect (stack, qOverload<const fcn_callback&> (&variable_editor_stack::interpreter_event), + this, qOverload<const fcn_callback&> (&variable_editor::interpreter_event)); - connect (stack, QOverload<const meth_callback&>::of (&variable_editor_stack::interpreter_event), - this, QOverload<const meth_callback&>::of (&variable_editor::interpreter_event)); + connect (stack, qOverload<const meth_callback&> (&variable_editor_stack::interpreter_event), + this, qOverload<const meth_callback&> (&variable_editor::interpreter_event)); connect (stack, &variable_editor_stack::edit_variable_signal, this, &variable_editor::edit_variable); @@ -1373,11 +1373,11 @@ // Any interpreter_event signal from a variable_editor_model object is // handled the same as for the parent variable_editor object. - connect (model, QOverload<const fcn_callback&>::of (&variable_editor_model::interpreter_event), - this, QOverload<const fcn_callback&>::of (&variable_editor::interpreter_event)); + connect (model, qOverload<const fcn_callback&> (&variable_editor_model::interpreter_event), + this, qOverload<const fcn_callback&> (&variable_editor::interpreter_event)); - connect (model, QOverload<const meth_callback&>::of (&variable_editor_model::interpreter_event), - this, QOverload<const meth_callback&>::of (&variable_editor::interpreter_event)); + connect (model, qOverload<const meth_callback&> (&variable_editor_model::interpreter_event), + this, qOverload<const meth_callback&> (&variable_editor::interpreter_event)); // Must supply a title for a QLabel to be created. Calling set_title() // more than once will add more QLabels. Could change octave_dock_widget