Mercurial > octave
changeset 31718:52a5bec0fc74
style fixes: avoid breaking lines after "(" and prefer "" over QString ("")
Affected files: documentation-bookmarks.cc, files-dock-widget.cc
gui-preferences-sd.h, gui-utils.cc, led-indicator.cc, file-editor.cc,
main-window.cc, octave-dock-widget.cc, settings-dialog.cc,
workspace-view.cc, amd.cc, dasrt.cc, fcn-info.cc, graphics.cc,
input.cc, lsode.cc, mex.cc, ordschur.cc, strfns.cc, symtab.cc,
time.cc, toplev.cc, urlwrite.cc, utils.cc, cdef-class.cc,
cdef-package.cc, ov-cell.cc, ov-class.cc, ov-fcn-handle.cc,
ov-struct.cc.
line wrap: on
line diff
--- a/libgui/src/documentation-bookmarks.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libgui/src/documentation-bookmarks.cc Fri Jan 06 17:19:16 2023 -0500 @@ -369,8 +369,7 @@ for (auto it = items.begin () ; it != items.end (); it++) { if (*it) - m_tree->takeTopLevelItem ( - m_tree->indexOfTopLevelItem (*it)); + m_tree->takeTopLevelItem (m_tree->indexOfTopLevelItem (*it)); } }
--- a/libgui/src/files-dock-widget.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libgui/src/files-dock-widget.cc Fri Jan 06 17:19:16 2023 -0500 @@ -254,10 +254,10 @@ popdown_menu->addAction (m_sync_octave_directory_action); popdown_button->setMenu (popdown_menu); popdown_button->setPopupMode (QToolButton::InstantPopup); - popdown_button->setDefaultAction ( - new QAction (settings.icon ("folder-settings", false, - "applications-system"), - "", m_navigation_tool_bar)); + popdown_button->setDefaultAction + (new QAction (settings.icon ("folder-settings", false, + "applications-system"), + "", m_navigation_tool_bar)); popdown_menu->addSeparator (); popdown_menu->addAction (settings.icon ("folder"), @@ -311,8 +311,8 @@ m_file_system_model = new file_system_model (this); m_file_system_model->setResolveSymlinks (false); - m_file_system_model->setFilter ( - QDir::System | QDir::NoDotAndDotDot | QDir::AllEntries); + m_file_system_model->setFilter + (QDir::System | QDir::NoDotAndDotDot | QDir::AllEntries); QModelIndex rootPathIndex = m_file_system_model->setRootPath (startup_dir.absolutePath ()); @@ -859,9 +859,9 @@ { // see if directory is empty QDir path (info.absoluteFilePath ()); - QList<QFileInfo> fileLst = path.entryInfoList ( - QDir::Hidden | QDir::AllEntries | - QDir::NoDotAndDotDot | QDir::System); + QList<QFileInfo> fileLst + = path.entryInfoList (QDir::Hidden | QDir::AllEntries + | QDir::NoDotAndDotDot | QDir::System); if (fileLst.count () != 0) QMessageBox::warning (this, tr ("Delete file/directory"),
--- a/libgui/src/gui-preferences-sd.h Fri Jan 06 16:51:35 2023 -0500 +++ b/libgui/src/gui-preferences-sd.h Fri Jan 06 17:19:16 2023 -0500 @@ -37,32 +37,32 @@ extern gui_pref sd_last_editor_styles_tab; // Textstrings for second color schemes -const QString settings_color_modes = QT_TRANSLATE_NOOP ( - "octave::settings_dialog", - "Second color mode (light/dark)"); +const QString settings_color_modes + = QT_TRANSLATE_NOOP ("octave::settings_dialog", + "Second color mode (light/dark)"); -const QString settings_color_modes_tooltip = QT_TRANSLATE_NOOP ( - "octave::settings_dialog", - "Switches to another set of colors.\n" - "Useful for defining a dark/light mode.\n" - "Discards non-applied current changes!"); +const QString settings_color_modes_tooltip + = QT_TRANSLATE_NOOP ("octave::settings_dialog", + "Switches to another set of colors.\n" + "Useful for defining a dark/light mode.\n" + "Discards non-applied current changes!"); -const QString settings_reload_colors = QT_TRANSLATE_NOOP ( - "octave::settings_dialog", - "&Reload default colors"); +const QString settings_reload_colors + = QT_TRANSLATE_NOOP ("octave::settings_dialog", + "&Reload default colors"); -const QString settings_reload_colors_tooltip = QT_TRANSLATE_NOOP ( - "octave::settings_dialog", - "Reloads the default colors,\n" - "depending on currently selected mode."); +const QString settings_reload_colors_tooltip + = QT_TRANSLATE_NOOP ("octave::settings_dialog", + "Reloads the default colors,\n" + "depending on currently selected mode."); -const QString settings_reload_styles = QT_TRANSLATE_NOOP ( - "octave::settings_dialog", - "&Reload default styles"); +const QString settings_reload_styles + = QT_TRANSLATE_NOOP ("octave::settings_dialog", + "&Reload default styles"); -const QString settings_reload_styles_tooltip = QT_TRANSLATE_NOOP ( - "octave::settings_dialog", - "Reloads the default values of the styles,\n" - "depending on currently selected mode."); +const QString settings_reload_styles_tooltip + = QT_TRANSLATE_NOOP ("octave::settings_dialog", + "Reloads the default values of the styles,\n" + "depending on currently selected mode."); #endif
--- a/libgui/src/gui-utils.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libgui/src/gui-utils.cc Fri Jan 06 17:19:16 2023 -0500 @@ -117,8 +117,9 @@ // And compute again the intersection with the screen if this resizing // led to corners outside the screen - actual_geometry = actual_screen_geom.intersected ( - QRect (QPoint (isx1,isy1), QPoint (isx2,isy2))); + actual_geometry + = actual_screen_geom.intersected (QRect (QPoint (isx1, isy1), + QPoint (isx2, isy2))); } OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/led-indicator.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libgui/src/led-indicator.cc Fri Jan 06 17:19:16 2023 -0500 @@ -67,11 +67,10 @@ { QColor col_light = interpolate_color (col, QColor (Qt::white), 0.25, 0.9); - const QString style = QString ( - "border-radius: %1; background-color: " - "qlineargradient(spread:pad, x1:0.2, y1:0.2, x2:1, y2:1, stop:0 " - "%2, stop:1 %3);" - ).arg (width ()/2).arg (col_light.name ()).arg (col.name ()); + const QString style + = QString ("border-radius: %1; background-color: " + "qlineargradient(spread:pad, x1:0.2, y1:0.2, x2:1, y2:1, stop:0 " + "%2, stop:1 %3);").arg (width ()/2).arg (col_light.name ()).arg (col.name ()); return style; }
--- a/libgui/src/m-editor/file-editor.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libgui/src/m-editor/file-editor.cc Fri Jan 06 17:19:16 2023 -0500 @@ -1255,8 +1255,7 @@ if (m_tmp_closed_files.at (i).new_file_name.isEmpty ()) m_tmp_closed_files.at (i).editor_tab->file_has_changed (QString (), true); else - m_tmp_closed_files.at (i).editor_tab->set_file_name ( - m_tmp_closed_files.at (i).new_file_name); + m_tmp_closed_files.at (i).editor_tab->set_file_name (m_tmp_closed_files.at (i).new_file_name); } else { @@ -1336,13 +1335,13 @@ { QString icon = global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-close.png"; - QString close_button_css_mac ( - "QTabBar::close-button" - " { image: url(" + icon + ");" - " padding: 4px;" - " subcontrol-position: bottom; }\n" - "QTabBar::close-button:hover" - " { background-color: #cccccc; }"); + QString close_button_css_mac + ("QTabBar::close-button" + " { image: url(" + icon + ");" + " padding: 4px;" + " subcontrol-position: bottom; }\n" + "QTabBar::close-button:hover" + " { background-color: #cccccc; }"); style_sheet = style_sheet + close_button_css_mac; }
--- a/libgui/src/main-window.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libgui/src/main-window.cc Fri Jan 06 17:19:16 2023 -0500 @@ -2192,9 +2192,9 @@ gui_settings settings; - m_open_action = add_action ( - file_menu, settings.icon ("document-open"), tr ("Open..."), - SLOT (request_open_file (void)), this); + m_open_action + = add_action (file_menu, settings.icon ("document-open"), tr ("Open..."), + SLOT (request_open_file (void)), this); m_open_action->setToolTip (tr ("Open an existing file in editor")); #if defined (HAVE_QSCINTILLA) @@ -2203,19 +2203,19 @@ file_menu->addSeparator (); - m_load_workspace_action = add_action ( - file_menu, QIcon (), tr ("Load Workspace..."), - SLOT (handle_load_workspace_request (void)), this); - - m_save_workspace_action = add_action ( - file_menu, QIcon (), tr ("Save Workspace As..."), - SLOT (handle_save_workspace_request (void)), this); + m_load_workspace_action + = add_action (file_menu, QIcon (), tr ("Load Workspace..."), + SLOT (handle_load_workspace_request (void)), this); + + m_save_workspace_action + = add_action (file_menu, QIcon (), tr ("Save Workspace As..."), + SLOT (handle_save_workspace_request (void)), this); file_menu->addSeparator (); - m_exit_action = add_action ( - file_menu, QIcon (), tr ("Exit"), - SLOT (close (void)), this); + m_exit_action + = add_action (file_menu, QIcon (), tr ("Exit"), + SLOT (close (void)), this); m_exit_action->setMenuRole (QAction::QuitRole); // Connect signal related to opening or creating editor files @@ -2237,17 +2237,17 @@ gui_settings settings; - m_new_script_action = add_action ( - new_menu, settings.icon ("document-new"), tr ("New Script"), - SLOT (request_new_script (void)), this); - - m_new_function_action = add_action ( - new_menu, QIcon (), tr ("New Function..."), - SLOT (request_new_function (void)), this); - - m_new_figure_action = add_action ( - new_menu, QIcon (), tr ("New Figure"), - SLOT (handle_new_figure_request (void)), this); + m_new_script_action + = add_action (new_menu, settings.icon ("document-new"), tr ("New Script"), + SLOT (request_new_script (void)), this); + + m_new_function_action + = add_action (new_menu, QIcon (), tr ("New Function..."), + SLOT (request_new_function (void)), this); + + m_new_figure_action + = add_action (new_menu, QIcon (), tr ("New Figure"), + SLOT (handle_new_figure_request (void)), this); } void main_window::construct_edit_menu (QMenuBar *p) @@ -2286,7 +2286,8 @@ edit_menu->addSeparator (); m_find_files_action - = edit_menu->addAction (settings.icon ("edit-find"), tr ("Find Files...")); + = edit_menu->addAction (settings.icon ("edit-find"), + tr ("Find Files...")); edit_menu->addSeparator ();
--- a/libgui/src/octave-dock-widget.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libgui/src/octave-dock-widget.cc Fri Jan 06 17:19:16 2023 -0500 @@ -233,17 +233,14 @@ m_close_action->setToolTip (tr ("Hide widget")); - setStyleSheet (qdockwidget_css ( - global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-close.png", - QString ("Close widget"), - global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-undock.png", - QString ("Undock widget"), - m_icon_size, - QString (""), - QString (""))); + setStyleSheet (qdockwidget_css + (global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-close.png", + QString ("Close widget"), + global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-undock.png", + QString ("Undock widget"), m_icon_size, "", "")); if (widget ()) - widget ()->setToolTip (QString ("")); + widget ()->setToolTip (""); m_icon_color = ""; m_title_3d = 50; @@ -787,8 +784,8 @@ } else { - css_foreground = QString (""); - css_background = QString (""); + css_foreground = ""; + css_background = ""; } QString full_dock_icon = dock_icon + icon_col;
--- a/libgui/src/settings-dialog.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libgui/src/settings-dialog.cc Fri Jan 06 17:19:16 2023 -0500 @@ -198,20 +198,16 @@ } // focus follows mouse - cb_focus_follows_mouse->setChecked ( - settings.bool_value (dw_focus_follows_mouse)); + cb_focus_follows_mouse->setChecked (settings.bool_value (dw_focus_follows_mouse)); // prompt on exit - cb_prompt_to_exit->setChecked ( - settings.bool_value (global_prompt_to_exit)); + cb_prompt_to_exit->setChecked (settings.bool_value (global_prompt_to_exit)); // Main status bar - cb_status_bar->setChecked ( - settings.bool_value (global_status_bar)); + cb_status_bar->setChecked (settings.bool_value (global_status_bar)); // Octave startup - cb_restore_octave_dir->setChecked ( - settings.bool_value (global_restore_ov_dir)); + cb_restore_octave_dir->setChecked (settings.bool_value (global_restore_ov_dir)); le_octave_dir->setText (settings.string_value (global_ov_startup_dir)); connect (pb_octave_dir, &QPushButton::pressed, @@ -220,10 +216,8 @@ // // editor // - useCustomFileEditor->setChecked ( - settings.bool_value (global_use_custom_editor)); - customFileEditor->setText ( - settings.string_value (global_custom_editor)); + useCustomFileEditor->setChecked (settings.bool_value (global_use_custom_editor)); + customFileEditor->setText (settings.string_value (global_custom_editor)); editor_showLineNumbers->setChecked (settings.bool_value (ed_show_line_numbers)); editor_linenr_size->setValue (settings.int_value (ed_line_numbers_size)); @@ -443,14 +437,16 @@ QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_styles.toStdString ().data ())); pb_reload_default_colors->setToolTip (tr (settings_reload_styles_tooltip.toStdString ().data ())); - color_picker *current_line_color = new color_picker ( - settings.value (ed_highlight_current_line_color.settings_key () + - settings_color_modes_ext[mode], - ed_highlight_current_line_color.def ()).value<QColor> (), this); + color_picker *current_line_color + = new color_picker + (settings.value (ed_highlight_current_line_color.settings_key () + + settings_color_modes_ext[mode], + ed_highlight_current_line_color.def ()).value<QColor> (), + this); current_line_color->setObjectName (ed_highlight_current_line_color.settings_key ()); - QLabel *current_line_color_label = new QLabel( - tr ("Color of highlighted current line (magenta (255,0,255) for automatic color)") - ); + + QLabel *current_line_color_label + = new QLabel(tr ("Color of highlighted current line (magenta (255,0,255) for automatic color)")); QHBoxLayout *color_mode = new QHBoxLayout (); color_mode->addWidget (cb_color_mode);
--- a/libgui/src/workspace-view.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libgui/src/workspace-view.cc Fri Jan 06 17:19:16 2023 -0500 @@ -115,9 +115,9 @@ // Set header properties for sorting m_view->horizontalHeader ()->setSectionsClickable (true); m_view->horizontalHeader ()->setSectionsMovable (true); - m_view->horizontalHeader ()->setSortIndicator ( - settings.int_value (ws_sort_column), - static_cast<Qt::SortOrder> (settings.uint_value (ws_sort_order))); + m_view->horizontalHeader ()->setSortIndicator + (settings.int_value (ws_sort_column), + static_cast<Qt::SortOrder> (settings.uint_value (ws_sort_order))); // FIXME: use value<Qt::SortOrder> instead of static cast after // dropping support of Qt 5.4 @@ -165,9 +165,9 @@ gui_settings settings; - m_view->sortByColumn ( - settings.int_value (ws_sort_column), - static_cast<Qt::SortOrder> (settings.uint_value (ws_sort_order))); + m_view->sortByColumn + (settings.int_value (ws_sort_column), + static_cast<Qt::SortOrder> (settings.uint_value (ws_sort_order))); // FIXME: use value<Qt::SortOrder> instead of static cast after // dropping support of Qt 5.4
--- a/libinterp/corefcn/amd.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/amd.cc Fri Jan 06 17:19:16 2023 -0500 @@ -132,8 +132,7 @@ AMD_NAME (_defaults) (Control); if (nargin > 1) { - octave_scalar_map arg1 = args( - 1).xscalar_map_value ("amd: OPTS argument must be a scalar structure"); + octave_scalar_map arg1 = args(1).xscalar_map_value ("amd: OPTS argument must be a scalar structure"); octave_value tmp;
--- a/libinterp/corefcn/dasrt.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/dasrt.cc Fri Jan 06 17:19:16 2023 -0500 @@ -466,11 +466,9 @@ ColumnVector state = args(argp++).xvector_value ("dasrt: initial state X_0 must be a vector"); - ColumnVector stateprime = args( - argp++).xvector_value ("dasrt: initial derivatives XDOT_0 must be a vector"); + ColumnVector stateprime = args(argp++).xvector_value ("dasrt: initial derivatives XDOT_0 must be a vector"); - ColumnVector out_times = args( - argp++).xvector_value ("dasrt: output time variable T must be a vector"); + ColumnVector out_times = args(argp++).xvector_value ("dasrt: output time variable T must be a vector"); double tzero = out_times (0);
--- a/libinterp/corefcn/fcn-info.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/fcn-info.cc Fri Jan 06 17:19:16 2023 -0500 @@ -1183,8 +1183,7 @@ if (nargin == 1) { - std::string sval = args( - 0).xstring_value ("ignore_function_time_stamp: first argument must be a string"); + std::string sval = args(0).xstring_value ("ignore_function_time_stamp: first argument must be a string"); if (sval == "all") Vignore_function_time_stamp = 2;
--- a/libinterp/corefcn/graphics.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/graphics.cc Fri Jan 06 17:19:16 2023 -0500 @@ -2022,8 +2022,7 @@ if (args.length () < 1) error ("addproperty: missing possible values for radio property"); - std::string sv = args( - 0).xstring_value ("addproperty: argument for radio property must be a string"); + std::string sv = args(0).xstring_value ("addproperty: argument for radio property must be a string"); retval = property (new radio_property (name, h, sv)); @@ -12313,8 +12312,7 @@ caseless_str property; if (nargin > 1) - property = args( - 1).xstring_value ("get: second argument must be property name or cell array of property names"); + property = args(1).xstring_value ("get: second argument must be property name or cell array of property names"); vals.resize (dim_vector (hcv_len, 1));
--- a/libinterp/corefcn/input.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/input.cc Fri Jan 06 17:19:16 2023 -0500 @@ -1444,8 +1444,7 @@ if (nargin < 1 || nargin > 2) print_usage (); - std::string hook_fcn_id = args( - 0).xstring_value ("remove_input_event_hook: argument not valid as a hook function name or id"); + std::string hook_fcn_id = args(0).xstring_value ("remove_input_event_hook: argument not valid as a hook function name or id"); bool warn = (nargin < 2);
--- a/libinterp/corefcn/lsode.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/lsode.cc Fri Jan 06 17:19:16 2023 -0500 @@ -135,8 +135,7 @@ warned_jac_imaginary = true; } - retval = tmp( - 0).xmatrix_value ("lsode: expecting user supplied jacobian function to return numeric array"); + retval = tmp(0).xmatrix_value ("lsode: expecting user supplied jacobian function to return numeric array"); if (retval.isempty ()) err_user_supplied_eval ("lsode");
--- a/libinterp/corefcn/mex.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/mex.cc Fri Jan 06 17:19:16 2023 -0500 @@ -3113,28 +3113,24 @@ mxArray_cell (bool interleaved, mwSize ndims, const mwSize *dims) : mxArray_matlab (interleaved, mxCELL_CLASS, ndims, dims), - m_data (static_cast<mxArray * *> ( - mxArray::calloc (get_number_of_elements (), sizeof (mxArray *)))) + m_data (static_cast<mxArray **> (mxArray::calloc (get_number_of_elements (), sizeof (mxArray *)))) { } mxArray_cell (bool interleaved, const dim_vector& dv) : mxArray_matlab (interleaved, mxCELL_CLASS, dv), - m_data (static_cast<mxArray * *> ( - mxArray::calloc (get_number_of_elements (), sizeof (mxArray *)))) + m_data (static_cast<mxArray **> (mxArray::calloc (get_number_of_elements (), sizeof (mxArray *)))) { } mxArray_cell (bool interleaved, mwSize m, mwSize n) : mxArray_matlab (interleaved, mxCELL_CLASS, m, n), - m_data (static_cast<mxArray * *> ( - mxArray::calloc (get_number_of_elements (), sizeof (mxArray *)))) + m_data (static_cast<mxArray **> (mxArray::calloc (get_number_of_elements (), sizeof (mxArray *)))) { } private: mxArray_cell (const mxArray_cell& val) : mxArray_matlab (val), - m_data (static_cast<mxArray * *> ( - mxArray::malloc (get_number_of_elements () * sizeof (mxArray *)))) + m_data (static_cast<mxArray **> (mxArray::malloc (get_number_of_elements () * sizeof (mxArray *)))) { mwSize nel = get_number_of_elements ();
--- a/libinterp/corefcn/ordschur.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/ordschur.cc Fri Jan 06 17:19:16 2023 -0500 @@ -82,8 +82,7 @@ if (args.length () != 3) print_usage (); - const Array<octave_idx_type> sel_arg = args( - 2).xoctave_idx_type_vector_value ("ordschur: SELECT must be an array of integers"); + const Array<octave_idx_type> sel_arg = args(2).xoctave_idx_type_vector_value ("ordschur: SELECT must be an array of integers"); const octave_idx_type sel_n = sel_arg.numel (); @@ -98,10 +97,8 @@ octave_value_list retval; - const bool double_type = args(0).is_double_type () - || args(1).is_double_type (); - const bool complex_type = args(0).iscomplex () - || args(1).iscomplex (); + const bool double_type = args(0).is_double_type () || args(1).is_double_type (); + const bool complex_type = args(0).iscomplex () || args(1).iscomplex (); #define PREPARE_ARGS(TYPE, TYPE_M, TYPE_COND) \ TYPE ## Matrix U = args(0).x ## TYPE_M ## _value \
--- a/libinterp/corefcn/strfns.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/strfns.cc Fri Jan 06 17:19:16 2023 -0500 @@ -1219,8 +1219,7 @@ if (nargin < 1 || nargin > 3) print_usage (); - string_vector s = args( - 0).xstring_vector_value ("list_in_columns: ARG must be a cellstr or char array"); + string_vector s = args(0).xstring_vector_value ("list_in_columns: ARG must be a cellstr or char array"); int width = -1;
--- a/libinterp/corefcn/symtab.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/symtab.cc Fri Jan 06 17:19:16 2023 -0500 @@ -741,8 +741,7 @@ return symtab.dump (); else { - std::string fname = args( - 0).xstring_value ("__dump_symtab_info__: argument must be a function name"); + std::string fname = args(0).xstring_value ("__dump_symtab_info__: argument must be a function name"); fcn_info *finfo = symtab.get_fcn_info (fname); @@ -762,8 +761,7 @@ if (args.length () != 1) print_usage (); - std::string name = args( - 0).xstring_value ("__get_cmdline_fcn_txt__: first argument must be function name"); + std::string name = args(0).xstring_value ("__get_cmdline_fcn_txt__: first argument must be function name"); symbol_table& symtab = interp.get_symbol_table ();
--- a/libinterp/corefcn/time.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/time.cc Fri Jan 06 17:19:16 2023 -0500 @@ -267,8 +267,7 @@ if (args.length () != 1) print_usage (); - octave_scalar_map map = args( - 0).xscalar_map_value ("mktime: TM_STRUCT argument must be a structure"); + octave_scalar_map map = args(0).xscalar_map_value ("mktime: TM_STRUCT argument must be a structure"); sys::base_tm tm = extract_tm (map, "mktime");
--- a/libinterp/corefcn/toplev.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/toplev.cc Fri Jan 06 17:19:16 2023 -0500 @@ -614,8 +614,7 @@ if (nargin == 1) { - std::string arg = args( - 0).xstring_value ("__octave_config_info__: OPTION argument must be a string"); + std::string arg = args(0).xstring_value ("__octave_config_info__: OPTION argument must be a string"); octave_value info = find_config_info (config, arg);
--- a/libinterp/corefcn/urlwrite.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/urlwrite.cc Fri Jan 06 17:19:16 2023 -0500 @@ -126,8 +126,7 @@ if (method != "get" && method != "post") error (R"(urlwrite: METHOD must be "get" or "post")"); - param = args( - 3).xcellstr_value ("urlwrite: parameters (PARAM) for get and post requests must be given as a cell array of strings"); + param = args(3).xcellstr_value ("urlwrite: parameters (PARAM) for get and post requests must be given as a cell array of strings"); if (param.numel () % 2 == 1) error ("urlwrite: number of elements in PARAM must be even"); @@ -238,8 +237,7 @@ if (method != "get" && method != "post") error (R"(urlread: METHOD must be "get" or "post")"); - param = args( - 2).xcellstr_value ("urlread: parameters (PARAM) for get and post requests must be given as a cell array of strings"); + param = args(2).xcellstr_value ("urlread: parameters (PARAM) for get and post requests must be given as a cell array of strings"); if (param.numel () % 2 == 1) error ("urlread: number of elements in PARAM must be even");
--- a/libinterp/corefcn/utils.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/corefcn/utils.cc Fri Jan 06 17:19:16 2023 -0500 @@ -573,8 +573,7 @@ if (nargin < 1 || nargin > 2) print_usage (); - string_vector names = args( - 0).xstring_vector_value ("file_in_loadpath: FILE argument must be a string"); + string_vector names = args(0).xstring_vector_value ("file_in_loadpath: FILE argument must be a string"); if (names.empty ()) error ("file_in_loadpath: FILE argument must not be empty"); @@ -585,8 +584,7 @@ return ovl (sys::env::make_absolute (lp.find_first_of (names))); else { - std::string opt = args( - 1).xstring_value ("file_in_loadpath: optional second argument must be a string"); + std::string opt = args(1).xstring_value ("file_in_loadpath: optional second argument must be a string"); if (opt != "all") error (R"(file_in_loadpath: "all" is only valid second argument)"); @@ -940,8 +938,7 @@ if (args.length () != 1) print_usage (); - std::string str = args( - 0).xstring_value ("do_string_escapes: STRING argument must be of type string"); + std::string str = args(0).xstring_value ("do_string_escapes: STRING argument must be of type string"); return ovl (do_string_escapes (str)); }
--- a/libinterp/octave-value/cdef-class.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/octave-value/cdef-class.cc Fri Jan 06 17:19:16 2023 -0500 @@ -584,8 +584,7 @@ if (idx.front ().length () != 1) error ("invalid meta.class indexing"); - std::string nm = idx.front ()( - 0).xstring_value ("invalid meta.class indexing, expected a method or property name"); + std::string nm = idx.front ()(0).xstring_value ("invalid meta.class indexing, expected a method or property name"); cdef_method meth = find_method (nm);
--- a/libinterp/octave-value/cdef-package.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/octave-value/cdef-package.cc Fri Jan 06 17:19:16 2023 -0500 @@ -133,8 +133,7 @@ if (idx.front ().length () != 1) error ("invalid meta.package indexing"); - std::string nm = idx.front ()( - 0).xstring_value ("invalid meta.package indexing, expected a symbol name"); + std::string nm = idx.front ()(0).xstring_value ("invalid meta.package indexing, expected a symbol name"); #if DEBUG_TRACE std::cerr << "meta.package query: " << nm << std::endl;
--- a/libinterp/octave-value/ov-cell.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/octave-value/ov-cell.cc Fri Jan 06 17:19:16 2023 -0500 @@ -1336,8 +1336,7 @@ return ovl (args(0)); else { - string_vector s = args( - 0).xstring_vector_value ("cellstr: argument STRING must be a 2-D character array"); + string_vector s = args(0).xstring_vector_value ("cellstr: argument STRING must be a 2-D character array"); return ovl (s.isempty () ? Cell (octave_value ("")) : Cell (s, true));
--- a/libinterp/octave-value/ov-class.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/octave-value/ov-class.cc Fri Jan 06 17:19:16 2023 -0500 @@ -1223,8 +1223,7 @@ if (! is) break; - Cell tcell = (t2.iscell () ? t2.xcell_value ("load: internal error loading class elements") : Cell ( - t2)); + Cell tcell = (t2.iscell () ? t2.xcell_value ("load: internal error loading class elements") : Cell (t2)); m.assign (nm, tcell); } @@ -1348,8 +1347,7 @@ if (! is) break; - Cell tcell = (t2.iscell () ? t2.xcell_value ("load: internal error loading class elements") : Cell ( - t2)); + Cell tcell = (t2.iscell () ? t2.xcell_value ("load: internal error loading class elements") : Cell (t2)); m.assign (nm, tcell); } @@ -1597,8 +1595,7 @@ { octave_value t2 = dsub.tc; - Cell tcell = (t2.iscell () ? t2.xcell_value ("load: internal error loading class elements") : Cell ( - t2)); + Cell tcell = (t2.iscell () ? t2.xcell_value ("load: internal error loading class elements") : Cell (t2)); m.assign (dsub.name, tcell); @@ -1824,8 +1821,7 @@ octave_value obj = args(0); // not const because of find_parent_class () std::string obj_cls = obj.class_name (); - Array<std::string> clsnames = args( - 1).xcellstr_value ("isa: CLASSNAME must be a string or cell array of strings"); + Array<std::string> clsnames = args(1).xcellstr_value ("isa: CLASSNAME must be a string or cell array of strings"); boolNDArray matches (clsnames.dims (), false);
--- a/libinterp/octave-value/ov-fcn-handle.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/octave-value/ov-fcn-handle.cc Fri Jan 06 17:19:16 2023 -0500 @@ -3459,8 +3459,7 @@ if (args.length () != 1) print_usage (); - octave_fcn_handle *fh = args( - 0).xfcn_handle_value ("functions: FCN_HANDLE argument must be a function handle object"); + octave_fcn_handle *fh = args(0).xfcn_handle_value ("functions: FCN_HANDLE argument must be a function handle object"); return ovl (fh->info ()); } @@ -3476,8 +3475,7 @@ if (args.length () != 1) print_usage (); - octave_fcn_handle *fh = args( - 0).xfcn_handle_value ("func2str: FCN_HANDLE argument must be a function handle object"); + octave_fcn_handle *fh = args(0).xfcn_handle_value ("func2str: FCN_HANDLE argument must be a function handle object"); if (! fh) error ("func2str: FCN_HANDLE must be a valid function handle"); @@ -3527,8 +3525,7 @@ if (nargin < 1 || nargin > 2) print_usage (); - std::string nm - = args(0).xstring_value ("str2func: FCN_NAME must be a string"); + std::string nm = args(0).xstring_value ("str2func: FCN_NAME must be a string"); if (nm.empty ()) error ("str2func: invalid function name");
--- a/libinterp/octave-value/ov-struct.cc Fri Jan 06 16:51:35 2023 -0500 +++ b/libinterp/octave-value/ov-struct.cc Fri Jan 06 17:19:16 2023 -0500 @@ -1794,8 +1794,7 @@ { if (nargin == 2) { - Array<std::string> cstr = args( - 1).xcellstr_value ("struct: second argument should be a cell array of field names"); + Array<std::string> cstr = args(1).xcellstr_value ("struct: second argument should be a cell array of field names"); return ovl (octave_map (args(0).dims (), cstr)); } @@ -2091,8 +2090,7 @@ if (nargin < 2 || nargin > 3) print_usage (); - const Cell vals - = args(0).xcell_value ("cell2struct: argument CELL must be of type cell"); + const Cell vals = args(0).xcell_value ("cell2struct: argument CELL must be of type cell"); const Array<std::string> fields = get_cell2struct_fields (args(1));