octave: libgui/src/main-window.cc comparison

comparison libgui/src/main-window.cc @ 31771:21f9b34eb893

maint: Eliminate "(void)" in C++ function prototypes/declarations. * mk-opts.pl, external.txi, embedded.cc, make_int.cc, standalone.cc, standalonebuiltin.cc, BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.h, qdialog.cpp, qfontdialog.cpp, qprintdialog_win.cpp, liboctgui-build-info.h, liboctgui-build-info.in.cc, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, 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, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, gui-preferences.cc, gui-preferences.h, gui-settings.cc, gui-settings.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, release-notes.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcuts-tree-widget.cc, shortcuts-tree-widget.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h, build-env.h, Cell.cc, Cell.h, __contourc__.cc, __magick_read__.cc, auto-shlib.cc, auto-shlib.h, base-text-renderer.h, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, debug.cc, defaults.cc, defaults.h, defun.cc, display.cc, display.h, dynamic-ld.cc, dynamic-ld.h, environment.cc, environment.h, error.cc, error.h, errwarn.cc, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, ft-text-renderer.cc, ft-text-renderer.h, genprops.awk, gh-manager.cc, gh-manager.h, gl-render.cc, gl-render.h, gl2ps-print.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, jsondecode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, ls-hdf5.cc, ls-hdf5.h, mxarray.h, oct-errno.h, oct-errno.in.cc, oct-fstrm.cc, oct-fstrm.h, oct-handle.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, pager.cc, pager.h, pr-flt-fmt.cc, pr-flt-fmt.h, pr-output.cc, pr-output.h, procstream.cc, procstream.h, settings.cc, settings.h, sighandlers.cc, sighandlers.h, stack-frame.cc, stack-frame.h, svd.cc, syminfo.cc, syminfo.h, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, toplev.cc, url-handle-manager.cc, url-handle-manager.h, variables.cc, xpow.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, audiodevinfo.cc, gzip.cc, liboctinterp-build-info.h, liboctinterp-build-info.in.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-lazy-idx.h, ov-legacy-range.cc, ov-legacy-range.h, ov-magic-int.cc, ov-magic-int.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-null-mat.h, ov-oncleanup.cc, ov-oncleanup.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, ovl.h, octave.cc, octave.h, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.h, pt-cbinop.h, pt-cell.h, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.h, pt.cc, pt.h, token.cc, token.h, usage.h, Array-base.cc, Array.h, CColVector.cc, CColVector.h, CDiagMatrix.cc, CDiagMatrix.h, CMatrix.cc, CMatrix.h, CNDArray.cc, CNDArray.h, CRowVector.cc, CRowVector.h, CSparse.cc, CSparse.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.h, MSparse.h, MatrixType.cc, MatrixType.h, PermMatrix.cc, PermMatrix.h, Range.cc, Range.h, Sparse-b.cc, Sparse.cc, Sparse.h, boolMatrix.cc, boolMatrix.h, boolNDArray.cc, boolNDArray.h, boolSparse.cc, boolSparse.h, chMatrix.h, chNDArray.h, dColVector.cc, dColVector.h, dDiagMatrix.cc, dDiagMatrix.h, dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.cc, dRowVector.h, dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h, fCColVector.cc, fCColVector.h, fCDiagMatrix.cc, fCDiagMatrix.h, fCMatrix.cc, fCMatrix.h, fCNDArray.cc, fCNDArray.h, fCRowVector.cc, fCRowVector.h, fColVector.cc, fColVector.h, fDiagMatrix.cc, fDiagMatrix.h, fMatrix.cc, fMatrix.h, fNDArray.cc, fNDArray.h, fRowVector.cc, fRowVector.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, liboctave-build-info.h, liboctave-build-info.in.cc, CollocWt.cc, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h, DASSL.cc, DASSL.h, DET.h, EIG.h, LSODE.cc, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h, Quad.h, aepbalance.cc, aepbalance.h, base-dae.h, base-de.h, chol.cc, chol.h, eigs-base.cc, fEIG.h, gepbalance.h, gsvd.cc, gsvd.h, hess.h, lu.cc, lu.h, oct-fftw.cc, oct-fftw.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randmtzig.cc, randmtzig.h, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.h, base-list.h, caseless-str.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, data-conv.cc, file-info.h, glob-match.cc, glob-match.h, kpse.cc, kpse.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.cc, lo-ieee.h, lo-regexp.cc, lo-regexp.h, oct-inttypes.cc, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sort.h, oct-sparse.cc, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, singleton-cleanup.cc, singleton-cleanup.h, str-vec.cc, str-vec.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h, version.cc, version.in.h, cxx-signal-helpers.cc, acinclude.m4, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc, octave-build-info.h, octave-build-info.in.cc, octave-config.in.cc, octave-svgconvert.cc, shared-fcns.h: maint: Eliminate "(void)" in C++ function prototypes/declarations.

author	Rik <rik@octave.org>
date	Tue, 24 Jan 2023 17:19:44 -0800
parents	90a741992f3f
children	2891372cce9f

comparison

equal deleted inserted replaced

-:1d1eff97670e
+:21f9b34eb893
 emit init_window_menu ();
 focus_command_window ();
 }
-main_window::~main_window (void) { }
+main_window::~main_window () { }
-void main_window::adopt_dock_widgets (void)
+void main_window::adopt_dock_widgets ()
 {
 adopt_terminal_widget ();
 adopt_documentation_widget ();
 adopt_file_browser_widget ();
 adopt_history_widget ();
 adopt_variable_editor_widget ();
 m_previous_dock = m_command_window;
 }
-void main_window::adopt_terminal_widget (void)
+void main_window::adopt_terminal_widget ()
 {
 m_command_window = m_octave_qobj.terminal_widget (this);
 make_dock_widget_connections (m_command_window);
 connect (this, &main_window::execute_command_signal,
 m_command_window, &terminal_dock_widget::execute_command_signal);
 }
 }
-void main_window::adopt_documentation_widget (void)
+void main_window::adopt_documentation_widget ()
 {
 m_doc_browser_window = m_octave_qobj.documentation_widget (this);
 make_dock_widget_connections (m_doc_browser_window);
 }
-void main_window::adopt_file_browser_widget (void)
+void main_window::adopt_file_browser_widget ()
 {
 m_file_browser_window = m_octave_qobj.file_browser_widget (this);
 make_dock_widget_connections (m_file_browser_window);
 connect (m_file_browser_window, &files_dock_widget::find_files_signal,
 this, &main_window::find_files);
 }
-void main_window::adopt_history_widget (void)
+void main_window::adopt_history_widget ()
 {
 m_history_window = m_octave_qobj.history_widget (this);
 make_dock_widget_connections (m_history_window);
 connect (m_history_window, &history_dock_widget::command_double_clicked,
 this, &main_window::execute_command_in_terminal);
 }
-void main_window::adopt_workspace_widget (void)
+void main_window::adopt_workspace_widget ()
 {
 m_workspace_window = m_octave_qobj.workspace_widget (this);
 make_dock_widget_connections (m_workspace_window);
 connect (m_workspace_window, &workspace_view::command_requested,
 this, &main_window::execute_command_in_terminal);
 }
-void main_window::adopt_editor_widget (void)
+void main_window::adopt_editor_widget ()
 {
 interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
 qt_interpreter_events *qt_link = interp_qobj->qt_link ();
 connect (qt_link, SIGNAL (edit_file_signal (const QString&)),
 m_active_editor, SLOT (handle_edit_file_request (const QString&)));
 }
-void main_window::adopt_variable_editor_widget (void)
+void main_window::adopt_variable_editor_widget ()
 {
 m_variable_editor_window = m_octave_qobj.variable_editor_widget (this);
 make_dock_widget_connections (m_variable_editor_window);
 }
 // and the main window is closed (no exit via interpreter)
 connect (this, &main_window::close_gui_signal,
 dw, &octave_dock_widget::save_settings);
 }
-bool main_window::command_window_has_focus (void) const
+bool main_window::command_window_has_focus () const
 {
 return m_command_window->has_focus ();
 }
-void main_window::focus_command_window (void)
+void main_window::focus_command_window ()
 {
 m_command_window->activate ();
 }
 void main_window::focus_window (const QString& win_name)
 m_workspace_window->activate ();
 else if (win_name == "filebrowser")
 m_file_browser_window->activate ();
 }
-bool main_window::confirm_shutdown (void)
+bool main_window::confirm_shutdown ()
 {
 bool closenow = true;
 gui_settings settings;
 if (cmd_involved)
 configure_shortcuts ();
 }
 }
-void main_window::request_reload_settings (void)
+void main_window::request_reload_settings ()
 {
 emit settings_changed ();
 }
 void main_window::report_status_message (const QString& statusMessage)
 {
 m_status_bar->showMessage (statusMessage, 1000);
 }
-void main_window::handle_save_workspace_request (void)
+void main_window::handle_save_workspace_request ()
 {
 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved.
 int opts = 0;  // No options by default.
 gui_settings settings;
 xevmgr.set_workspace (true, tw.get_symbol_info ());
 });
 }
 }
-void main_window::handle_clear_workspace_request (void)
+void main_window::handle_clear_workspace_request ()
 {
 emit interpreter_event
 ([] (interpreter& interp)
 {
 // INTERPRETER THREAD
 Fclear (interp);
 });
 }
-void main_window::handle_clear_command_window_request (void)
+void main_window::handle_clear_command_window_request ()
 {
 emit interpreter_event
-([] (void)
+([] ()
 {
 // INTERPRETER THREAD
 command_editor::kill_full_line ();
 command_editor::clear_screen ();
 });
 }
-void main_window::handle_clear_history_request (void)
+void main_window::handle_clear_history_request ()
 {
 emit interpreter_event
 ([] (interpreter& interp)
 {
 // INTERPRETER THREAD
 history_sys.do_history (ovl ("-c"));
 });
 }
-void main_window::handle_undo_request (void)
+void main_window::handle_undo_request ()
 {
 if (command_window_has_focus ())
 {
 emit interpreter_event
-([] (void)
+([] ()
 {
 // INTERPRETER THREAD
 command_editor::undo ();
 command_editor::redisplay ();
 // We are done: Unlock and wake the worker thread
 qt_link->unlock ();
 qt_link->wake_all ();
 }
-void main_window::open_online_documentation_page (void)
+void main_window::open_online_documentation_page ()
 {
 QDesktopServices::openUrl
 (QUrl ("https://octave.org/doc/interpreter/index.html"));
 }
-void main_window::open_bug_tracker_page (void)
+void main_window::open_bug_tracker_page ()
 {
 QDesktopServices::openUrl (QUrl ("https://octave.org/bugs.html"));
 }
-void main_window::open_octave_packages_page (void)
+void main_window::open_octave_packages_page ()
 {
 QDesktopServices::openUrl (QUrl ("https://packages.octave.org/index.html"));
 }
-void main_window::open_contribute_page (void)
+void main_window::open_contribute_page ()
 {
 QDesktopServices::openUrl (QUrl ("https://octave.org/contribute.html"));
 }
-void main_window::open_donate_page (void)
+void main_window::open_donate_page ()
 {
 QDesktopServices::openUrl (QUrl ("https://octave.org/donate.html"));
 }
 void main_window::process_settings_dialog_request (const QString& desired_tab)
 m_settings_dlg->setModal (false);
 m_settings_dlg->setAttribute (Qt::WA_DeleteOnClose);
 m_settings_dlg->show ();
 }
-void main_window::show_about_octave (void)
+void main_window::show_about_octave ()
 {
 std::string message
 = octave_name_version_copyright_copying_warranty_and_bugs (true);
 QMessageBox::about (this, tr ("About Octave"),
 darkPalette.setColor(QPalette::Disabled, QPalette::HighlightedText, QColor(127, 127, 127));
 return darkPalette;
 }
-void main_window::prepare_to_exit (void)
+void main_window::prepare_to_exit ()
 {
 // Find files dialog is constructed dynamically, not at time of main_window
 // construction.  Connecting it to qApp aboutToQuit signal would have
 // caused it to run after gui_settings is deleted.
 if (m_find_files_dlg)
 // No more active dock, otherwise, focus_changed would try to set
 // the focus to a dock widget that might not exist anymore
 m_active_dock = nullptr;
 }
-void main_window::go_to_previous_widget (void)
+void main_window::go_to_previous_widget ()
 {
 m_previous_dock->activate ();
 }
 void main_window::update_octave_directory (const QString& dir)
 m_current_directory_combo_box->insertItem (0, dir);
 m_current_directory_combo_box->setCurrentIndex (0);
 }
-void main_window::browse_for_directory (void)
+void main_window::browse_for_directory ()
 {
 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved.
 int opts = QFileDialog::ShowDirsOnly;
 gui_settings settings;
 interp.chdir (xdir.toStdString ());
 });
 }
 }
-void main_window::change_directory_up (void)
+void main_window::change_directory_up ()
 {
 set_current_working_directory ("..");
 }
 // Slot that is called if return is pressed in the line edit of the
 // combobox to change to a new directory or a directory that is already
 // in the drop down list.
-void main_window::accept_directory_line_edit (void)
+void main_window::accept_directory_line_edit ()
 {
 // Get new directory name, and change to it if it is new.  Otherwise,
 // the combo box will trigger the "activated" signal to change to the
 // directory.
 emit execute_command_signal (command);
 }
 else
 {
 emit interpreter_event
-([=] (void)
+([=] ()
 {
 // INTERPRETER THREAD
 std::string pending_input = command_editor::get_current_line ();
 });
 focus_console_after_command ();
 }
-void main_window::handle_new_figure_request (void)
+void main_window::handle_new_figure_request ()
 {
 emit interpreter_event
 ([] (interpreter& interp)
 {
 // INTERPRETER THREAD
 Fbuiltin (interp, ovl ("figure"));
 Fdrawnow (interp);
 });
 }
-void main_window::handle_enter_debugger (void)
+void main_window::handle_enter_debugger ()
 {
 setWindowTitle ("Octave (Debugging)");
 m_debug_continue->setEnabled (true);
 m_debug_step_into->setEnabled (true);
 m_debug_step_over->setEnabled (true);
 m_debug_step_out->setEnabled (true);
 m_debug_quit->setEnabled (true);
 }
-void main_window::handle_exit_debugger (void)
+void main_window::handle_exit_debugger ()
 {
 setWindowTitle ("Octave");
 m_debug_continue->setEnabled (false);
 m_debug_step_into->setEnabled (false);
 m_debug_step_over->setEnabled (m_editor_has_tabs && m_editor_is_octave_file);
 m_debug_step_out->setEnabled (false);
 m_debug_quit->setEnabled (false);
 }
-void main_window::debug_continue (void)
+void main_window::debug_continue ()
 {
 emit interpreter_event
 ([=] (interpreter& interp)
 {
 // INTERPRETER THREAD
 command_editor::interrupt (true);
 });
 }
-void main_window::debug_step_into (void)
+void main_window::debug_step_into ()
 {
 emit interpreter_event
 ([=] (interpreter& interp)
 {
 // INTERPRETER THREAD
 command_editor::interrupt (true);
 });
 }
-void main_window::debug_step_over (void)
+void main_window::debug_step_over ()
 {
 if (m_debug_quit->isEnabled ())
 {
 // We are in debug mode, just call dbstep.
 // Not in debug mode: "step into" the current editor file
 emit step_into_file_signal ();
 }
 }
-void main_window::debug_step_out (void)
+void main_window::debug_step_out ()
 {
 emit interpreter_event
 ([=] (interpreter& interp)
 {
 // INTERPRETER THREAD
 command_editor::interrupt (true);
 });
 }
-void main_window::debug_quit (void)
+void main_window::debug_quit ()
 {
 emit interpreter_event
 ([] (interpreter& interp)
 {
 // INTERPRETER THREAD
 // Functions related to file editing
 //
 // These are moved from editor to here for also using them when octave
 // is built without qscintilla
 //
-void main_window::request_open_file (void)
+void main_window::request_open_file ()
 {
 // Open file isn't a file_editor_tab or editor function since the file
 // might be opened in an external editor.  Hence, functionality is here.
 gui_settings settings;
 // check whether new files are created without prompt
 if (! settings.bool_value (ed_create_new_file))
 {
 // no, so enable this settings and wait for end of new file loading
 settings.setValue (ed_create_new_file.settings_key (), true);
-connect (m_editor_window, SIGNAL (file_loaded_signal (void)),
+connect (m_editor_window, SIGNAL (file_loaded_signal ()),
-this, SLOT (restore_create_file_setting (void)));
+this, SLOT (restore_create_file_setting ()));
 }
 // start the edit command
 execute_command_in_terminal ("edit " + new_name);
 }
 }
 if (cmd_focus)
 focus_command_window ();
 }
-void main_window::read_settings (void)
+void main_window::read_settings ()
 {
 gui_settings settings;
 set_window_layout ();
 }
 emit settings_changed ();
 }
-void main_window::init_terminal_size (void)
+void main_window::init_terminal_size ()
 {
 emit init_terminal_size_signal ();
 }
-void main_window::set_window_layout (void)
+void main_window::set_window_layout ()
 {
 gui_settings settings;
 // For resetting from some inconsistent state, first reset layout
 // without saving or showing it
 }
 show ();
 }
-void main_window::write_settings (void)
+void main_window::write_settings ()
 {
 gui_settings settings;
 settings.setValue (mw_geometry.settings_key (), saveGeometry ());
 settings.setValue (mw_state.settings_key (), saveState ());
 }
 settings.setValue (mw_dir_list.settings_key (), curr_dirs);
 settings.sync ();
 }
-void main_window::copyClipboard (void)
+void main_window::copyClipboard ()
 {
 if (m_current_directory_combo_box->hasFocus ())
 {
 QLineEdit *edit = m_current_directory_combo_box->lineEdit ();
 if (edit && edit->hasSelectedText ())
 }
 else
 emit copyClipboard_signal ();
 }
-void main_window::pasteClipboard (void)
+void main_window::pasteClipboard ()
 {
 if (m_current_directory_combo_box->hasFocus ())
 {
 QLineEdit *edit = m_current_directory_combo_box->lineEdit ();
 QClipboard *clipboard = QApplication::clipboard ();
 }
 else
 emit pasteClipboard_signal ();
 }
-void main_window::selectAll (void)
+void main_window::selectAll ()
 {
 if (m_current_directory_combo_box->hasFocus ())
 {
 QLineEdit *edit = m_current_directory_combo_box->lineEdit ();
 if (edit)
 else if (! status.compare ("off", Qt::CaseInsensitive))
 handle_profiler_status_update (false);
 }
 }
-void main_window::handle_octave_ready (void)
+void main_window::handle_octave_ready ()
 {
 // actions after the startup files are executed
 gui_settings settings;
 m_command_window->init_command_prompt ();
 focus_command_window ();  // make sure that the command window has focus
 }
-void main_window::handle_set_path_dialog_request (void)
+void main_window::handle_set_path_dialog_request ()
 {
 if (m_set_path_dlg)  // m_set_path_dlg is a guarded pointer!
 return;
 m_set_path_dlg = new set_path_dialog (this);
 }
 void main_window::set_screen_size (int ht, int wd)
 {
 emit interpreter_event
-([=] (void)
+([=] ()
 {
 // INTERPRETER THREAD
 command_editor::set_screen_size (ht, wd);
 });
 }
-void main_window::clipboard_has_changed (void)
+void main_window::clipboard_has_changed ()
 {
 if (m_clipboard->text ().isEmpty ())
 {
 m_paste_action->setEnabled (false);
 m_clear_clipboard_action->setEnabled (false);
 m_paste_action->setEnabled (true);
 m_clear_clipboard_action->setEnabled (true);
 }
 }
-void main_window::clear_clipboard (void)
+void main_window::clear_clipboard ()
 {
 m_clipboard->clear (QClipboard::Clipboard);
 }
 void main_window::disable_menu_shortcuts (bool disable)
 i.key ()->setTitle (i.value ().at (disable));
 ++i;
 }
 }
-void main_window::restore_create_file_setting (void)
+void main_window::restore_create_file_setting ()
 {
 // restore the new files creation setting
 gui_settings settings;
 settings.setValue (ed_create_new_file.settings_key (), false);
-disconnect (m_editor_window, SIGNAL (file_loaded_signal (void)),
+disconnect (m_editor_window, SIGNAL (file_loaded_signal ()),
-this, SLOT (restore_create_file_setting (void)));
+this, SLOT (restore_create_file_setting ()));
 }
 void main_window::set_file_encoding (const QString& new_encoding)
 {
 m_file_encoding = new_encoding;
 {
 for (int i = 0; i < open_file_names.count (); i++)
 emit open_file_signal (open_file_names.at (i), m_file_encoding, -1);
 }
-void main_window::profiler_session (void)
+void main_window::profiler_session ()
 {
 emit interpreter_event
 ([=] (interpreter& interp)
 {
 // INTERPRETER THREAD
 Ffeval (interp, ovl ("profile","on"));
 });
 }
-void main_window::profiler_session_resume (void)
+void main_window::profiler_session_resume ()
 {
 emit interpreter_event
 ([=] (interpreter& interp)
 {
 // INTERPRETER THREAD
 Ffeval (interp, ovl ("profile","resume"));
 });
 }
-void main_window::profiler_stop (void)
+void main_window::profiler_stop ()
 {
 emit interpreter_event
 ([=] (interpreter& interp)
 {
 // INTERPRETER THREAD
 if (active)
 state = led_indicator::LED_STATE_ACTIVE;
 m_profiler_status_indicator->set_state (state);
 }
-void main_window::profiler_show (void)
+void main_window::profiler_show ()
 {
 // Do not use a separate interpreter event as in the other
 // profiler slots since the output of the command "profshow"
 // would obscure the prompt and we do not need to emimt a signal
 // for action that is required in the gui after rhe command
 }
 else
 e->ignore ();
 }
-void main_window::construct_central_widget (void)
+void main_window::construct_central_widget ()
 {
 // Create and set the central widget.  QMainWindow takes ownership of
 // the widget (pointer) so there is no need to delete the object upon
 // destroying this main_window.
 setCentralWidget (dummyWidget);
 }
 // Main subroutine of the constructor
-void main_window::construct (void)
+void main_window::construct ()
 {
 setWindowIcon (QIcon (dw_icon_set_names["NONE"]));
 interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
 &m_octave_qobj, QOverload<const meth_callback&>::of (&base_qobject::interpreter_event));
 configure_shortcuts ();
 }
-void main_window::construct_octave_qt_link (void)
+void main_window::construct_octave_qt_link ()
 {
 interpreter_qobject *interp_qobj = m_octave_qobj.interpreter_qobj ();
 qt_interpreter_events *qt_link = interp_qobj->qt_link ();
 m_hash_menu_text[menu] = QStringList ({ name, base_name });
 return menu;
 }
-void main_window::construct_menu_bar (void)
+void main_window::construct_menu_bar ()
 {
 QMenuBar *menu_bar = menuBar ();
 construct_file_menu (menu_bar);
 gui_settings settings;
 m_open_action
 = add_action (file_menu, settings.icon ("document-open"), tr ("Open..."),
-SLOT (request_open_file (void)), this);
+SLOT (request_open_file ()), this);
 m_open_action->setToolTip (tr ("Open an existing file in editor"));
 #if defined (HAVE_QSCINTILLA)
 file_menu->addMenu (m_editor_window->get_mru_menu ());
 #endif
 file_menu->addSeparator ();
 m_load_workspace_action
 = add_action (file_menu, QIcon (), tr ("Load Workspace..."),
-SLOT (handle_load_workspace_request (void)), this);
+SLOT (handle_load_workspace_request ()), this);
 m_save_workspace_action
 = add_action (file_menu, QIcon (), tr ("Save Workspace As..."),
-SLOT (handle_save_workspace_request (void)), this);
+SLOT (handle_save_workspace_request ()), this);
 file_menu->addSeparator ();
 m_exit_action
 = add_action (file_menu, QIcon (), tr ("Exit"),
-SLOT (close (void)), this);
+SLOT (close ()), this);
 m_exit_action->setMenuRole (QAction::QuitRole);
 // Connect signal related to opening or creating editor files
 connect (this, SIGNAL (new_file_signal (const QString&)),
 m_active_editor, SLOT (request_new_file (const QString&)));
 gui_settings settings;
 m_new_script_action
 = add_action (new_menu, settings.icon ("document-new"), tr ("New Script"),
-SLOT (request_new_script (void)), this);
+SLOT (request_new_script ()), this);
 m_new_function_action
 = add_action (new_menu, QIcon (), tr ("New Function..."),
-SLOT (request_new_function (void)), this);
+SLOT (request_new_function ()), this);
 m_new_figure_action
 = add_action (new_menu, QIcon (), tr ("New Figure"),
-SLOT (handle_new_figure_request (void)), this);
+SLOT (handle_new_figure_request ()), this);
 }
 void main_window::construct_edit_menu (QMenuBar *p)
 {
 QMenu *edit_menu = m_add_menu (p, tr ("&Edit"));
 {
 m_debug_menu = m_add_menu (p, tr ("De&bug"));
 m_debug_step_over
 = construct_debug_menu_item ("db-step", tr ("Step"),
-SLOT (debug_step_over (void)));
+SLOT (debug_step_over ()));
 m_debug_step_into
 = construct_debug_menu_item ("db-step-in", tr ("Step In"),
-SLOT (debug_step_into (void)));
+SLOT (debug_step_into ()));
 m_debug_step_out
 = construct_debug_menu_item ("db-step-out", tr ("Step Out"),
-SLOT (debug_step_out (void)));
+SLOT (debug_step_out ()));
 m_debug_continue
 = construct_debug_menu_item ("db-cont", tr ("Continue"),
-SLOT (debug_continue (void)));
+SLOT (debug_continue ()));
 m_debug_menu->addSeparator ();
 #if defined (HAVE_QSCINTILLA)
 m_editor_window->debug_menu ()->addSeparator ();
 #endif
 m_debug_quit
 = construct_debug_menu_item ("db-stop", tr ("Quit Debug Mode"),
-SLOT (debug_quit (void)));
+SLOT (debug_quit ()));
 }
 void main_window::construct_tools_menu (QMenuBar *p)
 {
 QMenu *tools_menu = m_add_menu (p, tr ("&Tools"));
 action, SLOT (setChecked (bool)));
 }
 else
 {
 // action for focus of dock widget
-connect (action, SIGNAL (triggered (void)),
+connect (action, SIGNAL (triggered ()),
-widget, SLOT (activate (void)));
+widget, SLOT (activate ()));
 }
 }
 else
 {
 action->setEnabled (false);
 (window_menu, tr ("Variable Editor"), false, m_variable_editor_window);
 window_menu->addSeparator ();
 m_previous_dock_action = add_action (window_menu, QIcon (),
-tr ("Previous Widget"), SLOT (go_to_previous_widget (void)));
+tr ("Previous Widget"), SLOT (go_to_previous_widget ()));
 window_menu->addSeparator ();
 m_reset_windows_action = add_action (window_menu, QIcon (),
-tr ("Reset Default Window Layout"), SLOT (reset_windows (void)));
+tr ("Reset Default Window Layout"), SLOT (reset_windows ()));
 }
 void main_window::construct_help_menu (QMenuBar *p)
 {
 QMenu *help_menu = m_add_menu (p, tr ("&Help"));
 });
 addAction (m_current_news_action);
 m_current_news_action->setShortcutContext (Qt::ApplicationShortcut);
 }
-void main_window::construct_tool_bar (void)
+void main_window::construct_tool_bar ()
 {
 m_main_tool_bar = addToolBar (tr ("Toolbar"));
 m_main_tool_bar->setStyleSheet (m_main_tool_bar->styleSheet ()
 + global_toolbar_style);
 connect (m_undo_action, &QAction::triggered,
 this, &main_window::handle_undo_request);
 }
-void main_window::focus_console_after_command (void)
+void main_window::focus_console_after_command ()
 {
 gui_settings settings;
 if (settings.bool_value (cs_focus_cmd))
 focus_command_window ();
 }
-void main_window::configure_shortcuts (void)
+void main_window::configure_shortcuts ()
 {
 gui_settings settings;
 bool enable
 = ! ((m_active_dock == m_command_window) && m_prevent_readline_conflicts);
 // news menu
 settings.set_shortcut (m_release_notes_action, sc_main_news_release_notes, enable);
 settings.set_shortcut (m_current_news_action, sc_main_news_community_news, enable);
 }
-QList<octave_dock_widget *> main_window::dock_widget_list (void)
+QList<octave_dock_widget *> main_window::dock_widget_list ()
 {
 QList<octave_dock_widget *> list = QList<octave_dock_widget *> ();
 list.append (static_cast<octave_dock_widget *> (m_command_window));
 list.append (static_cast<octave_dock_widget *> (m_history_window));
 list.append (static_cast<octave_dock_widget *> (m_file_browser_window));
 move (0, 0);
 resize (2*win_x/3, 7*win_y/8);
 }
-void main_window::reset_windows (void)
+void main_window::reset_windows ()
 {
 // Slot for resetting the window layout to the default one
 hide ();
 showNormal ();              // Unmaximize
 do_reset_windows (true, true, true);   // Add all widgets

Mercurial > octave

comparison libgui/src/main-window.cc @ 31771:21f9b34eb893