Mercurial > octave
changeset 27276:7455523fdf01
style fixes: avoid breaking lines immediately after '('
Files affected: ButtonControl.cc, ButtonGroup.cc, Container.cc,
EditControl.cc, Table.cc, annotation-dialog.cc, QTerminal.cc,
QTerminal.h, documentation.cc, files-dock-widget.cc,
gui-preferences.h, history-dock-widget.cc, file-editor-tab.cc,
file-editor.cc, find-dialog.cc, octave-qscintilla.cc, main-window.cc,
qt-interpreter-events.cc, resource-manager.cc, settings-dialog.cc,
shortcut-manager.cc, workspace-view.cc, graphics.cc, lu.cc, sysdep.cc,
__fltk_uigetfile__.cc, cdef-class.cc, ov-flt-complex.cc, ov-java.cc,
idx-vector.cc, oct-env.cc, and cmd-edit.cc.
line wrap: on
line diff
--- a/libgui/graphics/ButtonControl.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/graphics/ButtonControl.cc Fri Jul 19 14:15:04 2019 -0400 @@ -92,8 +92,7 @@ btn->setChecked (false); if (up.style_is ("radiobutton") || up.style_is ("togglebutton")) { - Object *parent = Object::parentObject (gh_manager::get_object ( - up.get___myhandle__ ())); + Object *parent = Object::parentObject (gh_manager::get_object (up.get___myhandle__ ())); ButtonGroup *btnGroup = dynamic_cast<ButtonGroup *>(parent); if (btnGroup) btnGroup->selectNothing ();
--- a/libgui/graphics/ButtonGroup.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/graphics/ButtonGroup.cc Fri Jul 19 14:15:04 2019 -0400 @@ -489,8 +489,7 @@ eventData.setfield ("NewValue", newValue.as_octave_value ()); eventData.setfield ("Source", bp.get___myhandle__ ().as_octave_value ()); eventData.setfield ("EventName", "SelectionChanged"); - octave_value selectionChangedEventObject = octave_value (new octave_struct ( - eventData)); + octave_value selectionChangedEventObject (new octave_struct (eventData)); gh_manager::post_callback (m_handle, "selectionchangedfcn", selectionChangedEventObject); }
--- a/libgui/graphics/Container.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/graphics/Container.cc Fri Jul 19 14:15:04 2019 -0400 @@ -94,9 +94,11 @@ { Matrix bb = go.get_properties ().get_boundingbox (false); - obj->qWidget<QWidget> ()->setGeometry ( - octave::math::round (bb(0)), octave::math::round (bb(1)), - octave::math::round (bb(2)), octave::math::round (bb(3))); + obj->qWidget<QWidget> ()->setGeometry + (octave::math::round (bb(0)), + octave::math::round (bb(1)), + octave::math::round (bb(2)), + octave::math::round (bb(3))); } } }
--- a/libgui/graphics/EditControl.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/graphics/EditControl.cc Fri Jul 19 14:15:04 2019 -0400 @@ -104,8 +104,8 @@ uicontrol::properties& up = properties<uicontrol> (); edit->setAcceptRichText (false); - edit->setPlainText (Utils::fromStringVector ( - up.get_string_vector ()).join ("\n")); + edit->setPlainText (Utils::fromStringVector + (up.get_string_vector ()).join ("\n")); connect (edit, SIGNAL (textChanged (void)), SLOT (textChanged (void))); @@ -190,8 +190,8 @@ switch (pId) { case uicontrol::properties::ID_STRING: - edit->setPlainText (Utils::fromStringVector ( - up.get_string_vector ()).join ("\n")); + edit->setPlainText (Utils::fromStringVector + (up.get_string_vector ()).join ("\n")); return true; case uicontrol::properties::ID_MIN:
--- a/libgui/graphics/Table.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/graphics/Table.cc Fri Jul 19 14:15:04 2019 -0400 @@ -183,8 +183,8 @@ text = Utils::fromStdString (""); \ } - static std::pair<Qt::AlignmentFlag, QString> qStringValueFor ( - octave_value val, std::string format = "") + static std::pair<Qt::AlignmentFlag, QString> + qStringValueFor (octave_value val, std::string format = "") { Qt::AlignmentFlag flag = Qt::AlignRight; QString text; @@ -507,18 +507,17 @@ Table::cellClicked (int row, int col) { QCheckBox *checkBox = nullptr; - QWidget *widget = qobject_cast<QWidget *> ( - m_tableWidget->cellWidget (row, col)); + QWidget *widget + = qobject_cast<QWidget *> (m_tableWidget->cellWidget (row, col)); if (widget && ! widget->children ().isEmpty ()) { - QHBoxLayout *layout = qobject_cast<QHBoxLayout *> ( - widget->children ().first ()); + QHBoxLayout *layout + = qobject_cast<QHBoxLayout *> (widget->children ().first ()); + if (layout && layout->count () > 0) - { - checkBox = qobject_cast<QCheckBox *> ( - layout->itemAt (0)-> widget ()); - } + checkBox = qobject_cast<QCheckBox *> (layout->itemAt (0)-> widget ()); } + if (checkBox && checkBox->property ("Enabled").toBool ()) checkBoxClicked (row, col, checkBox); } @@ -1237,8 +1236,8 @@ int index = -1; for (int k = 0; k < format_value.numel (); k++) { - QString popup_item = Utils::fromStdString ( - format_value.fast_elem_extract (k).string_value ()); + QString popup_item + = Utils::fromStdString (format_value.fast_elem_extract (k).string_value ()); comboBox->addItem (popup_item); @@ -1331,21 +1330,20 @@ QCheckBox *checkBox = nullptr; if (widget && ! widget->children ().isEmpty ()) { - QHBoxLayout *layout = qobject_cast<QHBoxLayout *> ( - widget->children ().first ()); + QHBoxLayout *layout + = qobject_cast<QHBoxLayout *> (widget->children ().first ()); + if (layout && layout->count () > 0) - { - checkBox = qobject_cast<QCheckBox *> ( - layout->itemAt (0)-> widget ()); - } + checkBox = qobject_cast<QCheckBox *> (layout->itemAt (0)-> widget ()); } + if (checkBox) - { - widget->setProperty ("Enabled", QVariant (enabled & editable)); - } + widget->setProperty ("Enabled", QVariant (enabled & editable)); else { - widget->setAttribute (Qt::WA_TransparentForMouseEvents, !(editable & enabled)); + widget->setAttribute (Qt::WA_TransparentForMouseEvents, + !(editable & enabled)); + widget->setFocusPolicy (Qt::NoFocus); } } @@ -1571,24 +1569,25 @@ case Qt::Key_Space: { QCheckBox *checkBox = nullptr; - QWidget *widget = qobject_cast<QWidget *> ( - m_tableWidget->cellWidget (row, col)); + + QWidget *widget + = qobject_cast<QWidget *> (m_tableWidget->cellWidget (row, col)); + if (widget && ! widget->children ().isEmpty ()) { - QHBoxLayout *layout = qobject_cast<QHBoxLayout *> ( - widget->children ().first ()); + QHBoxLayout *layout + = qobject_cast<QHBoxLayout *> (widget->children ().first ()); + if (layout && layout->count () > 0) - { - checkBox = qobject_cast<QCheckBox *> ( - layout->itemAt (0)-> widget ()); - } + checkBox = qobject_cast<QCheckBox *> (layout->itemAt (0)-> widget ()); } + if (checkBox && checkBox->property ("Enabled").toBool ()) checkBoxClicked (row, col, checkBox); - QComboBox *comboBox = qobject_cast<QComboBox *> ( - m_tableWidget->cellWidget (row, - col)); + QComboBox *comboBox + = qobject_cast<QComboBox *> (m_tableWidget->cellWidget (row, col)); + if (comboBox) comboBox->showPopup (); } @@ -1692,8 +1691,9 @@ { for (int col = 0; col < m_tableWidget->columnCount (); col++) { - QComboBox *comboBox_1 = qobject_cast<QComboBox *> ( - m_tableWidget->cellWidget (row, col)); + QComboBox *comboBox_1 + = qobject_cast<QComboBox *> (m_tableWidget->cellWidget (row, col)); + if (comboBox_0 == comboBox_1) m_tableWidget->setCurrentCell (row, col); }
--- a/libgui/graphics/annotation-dialog.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/graphics/annotation-dialog.cc Fri Jul 19 14:15:04 2019 -0400 @@ -206,23 +206,23 @@ } else if (name == "units") { - ui->cb_units->setCurrentIndex (ui->cb_units->findText (props( - 1*i +1).string_value ().c_str ())); + ui->cb_units->setCurrentIndex + (ui->cb_units->findText (props(1*i +1).string_value ().c_str ())); } else if (name == "horizontalalignment") { - ui->cb_horz_align->setCurrentIndex (ui->cb_horz_align->findText (props( - 1*i +1).string_value ().c_str ())); + ui->cb_horz_align->setCurrentIndex + (ui->cb_horz_align->findText (props(1*i +1).string_value ().c_str ())); } else if (name == "verticalalignment") { - ui->cb_vert_align->setCurrentIndex (ui->cb_vert_align->findText (props( - 1*i +1).string_value ().c_str ())); + ui->cb_vert_align->setCurrentIndex + (ui->cb_vert_align->findText (props(1*i +1).string_value ().c_str ())); } else if (name == "fontname") { - ui->cb_vert_align->setCurrentIndex (ui->cb_font_name->findText (props( - 1*i +1).string_value ().c_str ())); + ui->cb_vert_align->setCurrentIndex + (ui->cb_font_name->findText (props(1*i +1).string_value ().c_str ())); } else if (name == "fontsize") {
--- a/libgui/qterminal/libqterminal/QTerminal.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/qterminal/libqterminal/QTerminal.cc Fri Jul 19 14:15:04 2019 -0400 @@ -83,10 +83,11 @@ } else { - _interrupt_action->setShortcut ( - QKeySequence (Qt::ControlModifier | Qt::Key_C)); - _nop_action->setShortcut ( - QKeySequence (Qt::ControlModifier | Qt::Key_D)); + _interrupt_action->setShortcut + (QKeySequence (Qt::ControlModifier | Qt::Key_C)); + + _nop_action->setShortcut + (QKeySequence (Qt::ControlModifier | Qt::Key_D)); } }
--- a/libgui/qterminal/libqterminal/QTerminal.h Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/qterminal/libqterminal/QTerminal.h Fri Jul 19 14:15:04 2019 -0400 @@ -134,24 +134,24 @@ _contextMenu = new QMenu (this); - _copy_action = _contextMenu->addAction - (octave::resource_manager::icon ("edit-copy"), - tr ("Copy"), this, SLOT (copyClipboard ())); + _copy_action + = _contextMenu->addAction (octave::resource_manager::icon ("edit-copy"), + tr ("Copy"), this, SLOT (copyClipboard ())); - _paste_action = _contextMenu->addAction - (octave::resource_manager::icon ("edit-paste"), - tr ("Paste"), this, SLOT (pasteClipboard ())); + _paste_action + = _contextMenu->addAction (octave::resource_manager::icon ("edit-paste"), + tr ("Paste"), this, SLOT (pasteClipboard ())); _contextMenu->addSeparator (); - _selectall_action = _contextMenu->addAction ( - tr ("Select All"), this, SLOT (selectAll ())); + _selectall_action + = _contextMenu->addAction (tr ("Select All"), this, SLOT (selectAll ())); - _run_selection_action = _contextMenu->addAction ( - tr ("Run Selection"), this, SLOT (run_selection ())); + _run_selection_action + = _contextMenu->addAction (tr ("Run Selection"), this, + SLOT (run_selection ())); - _edit_action = _contextMenu->addAction ( - tr (""), this, SLOT (edit_file ())); + _edit_action = _contextMenu->addAction (tr (""), this, SLOT (edit_file ())); _contextMenu->addSeparator (); @@ -189,8 +189,8 @@ _interrupt_action = new QAction (this); addAction (_interrupt_action); - _interrupt_action->setShortcut ( - QKeySequence (Qt::ControlModifier + Qt::Key_C)); + _interrupt_action->setShortcut + (QKeySequence (Qt::ControlModifier + Qt::Key_C)); connect (_interrupt_action, SIGNAL (triggered ()), this, SLOT (terminal_interrupt ())); @@ -199,8 +199,7 @@ _nop_action = new QAction (this); addAction (_nop_action); - _nop_action->setShortcut ( - QKeySequence (Qt::ControlModifier + Qt::Key_D)); + _nop_action->setShortcut (QKeySequence (Qt::ControlModifier + Qt::Key_D)); } private:
--- a/libgui/src/documentation.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/documentation.cc Fri Jul 19 14:15:04 2019 -0400 @@ -199,8 +199,7 @@ m_filter->setInsertPolicy (QComboBox::NoInsert); m_filter->setMaxCount (10); m_filter->setMaxVisibleItems (10); - m_filter->setSizeAdjustPolicy ( - QComboBox::AdjustToMinimumContentsLengthWithIcon); + m_filter->setSizeAdjustPolicy (QComboBox::AdjustToMinimumContentsLengthWithIcon); QSizePolicy sizePol (QSizePolicy::Expanding, QSizePolicy::Preferred); m_filter->setSizePolicy (sizePol); m_filter->completer ()->setCaseSensitivity (Qt::CaseSensitive); @@ -265,8 +264,8 @@ } // Initial view: Contents - m_doc_browser->setSource (QUrl ( - "qthelp://org.octave.interpreter-1.0/doc/octave.html/index.html")); + m_doc_browser->setSource + (QUrl ("qthelp://org.octave.interpreter-1.0/doc/octave.html/index.html")); } documentation::~documentation (void)
--- a/libgui/src/files-dock-widget.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/files-dock-widget.cc Fri Jul 19 14:15:04 2019 -0400 @@ -120,8 +120,7 @@ m_current_directory->setEditable (true); m_current_directory->setMaxCount (MaxMRUDirs); m_current_directory->setInsertPolicy (QComboBox::NoInsert); - m_current_directory->setSizeAdjustPolicy ( - QComboBox::AdjustToMinimumContentsLengthWithIcon); + m_current_directory->setSizeAdjustPolicy (QComboBox::AdjustToMinimumContentsLengthWithIcon); QSizePolicy sizePol (QSizePolicy::Expanding, QSizePolicy::Preferred); m_current_directory->setSizePolicy (sizePol); @@ -132,15 +131,13 @@ m_sync_browser_directory_action = new QAction (resource_manager::icon ("go-first"), tr ("Show Octave directory"), m_navigation_tool_bar); - m_sync_browser_directory_action->setToolTip ( - tr ("Go to current Octave directory")); + m_sync_browser_directory_action->setToolTip (tr ("Go to current Octave directory")); m_sync_browser_directory_action->setEnabled (false); m_sync_octave_directory_action = new QAction (resource_manager::icon ("go-last"), tr ("Set Octave directory"), m_navigation_tool_bar); - m_sync_octave_directory_action->setToolTip ( - tr ("Set Octave directory to current browser directory")); + m_sync_octave_directory_action->setToolTip (tr ("Set Octave directory to current browser directory")); m_sync_octave_directory_action->setEnabled (false); QToolButton *popdown_button = new QToolButton (); @@ -153,8 +150,8 @@ popdown_menu->addAction (m_sync_octave_directory_action); popdown_button->setMenu (popdown_menu); popdown_button->setPopupMode (QToolButton::InstantPopup); - popdown_button->setDefaultAction (new QAction ( - resource_manager::icon ("applications-system"), "", + popdown_button->setDefaultAction (new QAction (resource_manager::icon ("applications-system"), + "", m_navigation_tool_bar)); popdown_menu->addSeparator (); @@ -214,8 +211,8 @@ } m_file_system_model = new QFileSystemModel (this); - QModelIndex rootPathIndex = m_file_system_model->setRootPath ( - startup_dir.absolutePath ()); + QModelIndex rootPathIndex + = m_file_system_model->setRootPath (startup_dir.absolutePath ()); // Attach the model to the QTreeView and set the root index m_file_tree_view = new FileTreeViewer (container); @@ -229,14 +226,13 @@ // get sort column and order as well as cloumn state (order and width) - m_file_tree_view->sortByColumn ( - settings->value (fb_sort_column.key, fb_sort_column.def).toInt (), - static_cast<Qt::SortOrder> ( - settings->value (fb_sort_order.key, fb_sort_order.def).toUInt ())); + m_file_tree_view->sortByColumn + (settings->value (fb_sort_column.key, fb_sort_column.def).toInt (), + static_cast<Qt::SortOrder> (settings->value (fb_sort_order.key, fb_sort_order.def).toUInt ())); if (settings->contains (fb_column_state.key)) - m_file_tree_view->header ()->restoreState ( - settings->value (fb_column_state.key).toByteArray ()); + m_file_tree_view->header ()->restoreState + (settings->value (fb_column_state.key).toByteArray ()); // Set header properties for sorting #if defined (HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE) @@ -255,8 +251,8 @@ settings->value (fb_mru_list.key).toStringList (); m_current_directory->addItems (mru_dirs); - m_current_directory->setEditText ( - m_file_system_model->fileInfo (rootPathIndex). absoluteFilePath ()); + m_current_directory->setEditText + (m_file_system_model->fileInfo (rootPathIndex). absoluteFilePath ()); connect (m_file_tree_view, SIGNAL (activated (const QModelIndex &)), this, SLOT (item_double_clicked (const QModelIndex &))); @@ -472,8 +468,9 @@ m_sig_mapper, SLOT (map ())); m_sig_mapper->setMapping (action, i); action->setCheckable (true); - action->setChecked (settings->value ( - m_columns_shown_keys.at (i), m_columns_shown_defs.at (i)).toBool ()); + action->setChecked + (settings->value (m_columns_shown_keys.at (i), + m_columns_shown_defs.at (i)).toBool ()); } connect (m_sig_mapper, SIGNAL (mapped (int)), @@ -907,8 +904,8 @@ else m_file_system_model->setFilter (QDir::NoDotAndDotDot | QDir::AllEntries); - m_file_tree_view->setAlternatingRowColors ( - settings->value (m_columns_shown_keys.at (4),true).toBool ()); + m_file_tree_view->setAlternatingRowColors + (settings->value (m_columns_shown_keys.at (4),true).toBool ()); m_file_tree_view->setModel (m_file_system_model); // enable the buttons to sync octave/browser dir
--- a/libgui/src/gui-preferences.h Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/gui-preferences.h Fri Jul 19 14:15:04 2019 -0400 @@ -92,20 +92,25 @@ // Session data const gui_pref ed_session_names ("editor/savedSessionTabs", - QVariant (QStringList ())); + QVariant (QStringList ())); + const gui_pref ed_session_enc ("editor/saved_session_encodings", - QVariant (QStringList ())); + QVariant (QStringList ())); + const gui_pref ed_session_ind ("editor/saved_session_tab_index", - QVariant (QStringList ())); + QVariant (QStringList ())); + const gui_pref ed_session_lines ("editor/saved_session_lines", - QVariant (QStringList ())); + QVariant (QStringList ())); // Tabs -const QStringList ed_tab_position_names ( - QStringList () << QT_TRANSLATE_NOOP ("file_editor::file_editor","Top") - << QT_TRANSLATE_NOOP ("file_editor::file_editor","Bottom") - << QT_TRANSLATE_NOOP ("file_editor::file_editor","Left") - << QT_TRANSLATE_NOOP ("file_editor::file_editor","Right")); +const QStringList +ed_tab_position_names (QStringList () + << QT_TRANSLATE_NOOP ("file_editor::file_editor", "Top") + << QT_TRANSLATE_NOOP ("file_editor::file_editor", "Bottom") + << QT_TRANSLATE_NOOP ("file_editor::file_editor", "Left") + << QT_TRANSLATE_NOOP ("file_editor::file_editor", "Right")); + const gui_pref ed_tab_position ("editor/tab_position", QVariant (QTabWidget::North));
--- a/libgui/src/history-dock-widget.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/history-dock-widget.cc Fri Jul 19 14:15:04 2019 -0400 @@ -270,8 +270,8 @@ m_history_list_view->setModel (&m_sort_filter_proxy_model); m_history_list_view->setAlternatingRowColors (true); m_history_list_view->setEditTriggers (QAbstractItemView::NoEditTriggers); - m_history_list_view->setStatusTip ( - tr ("Double-click a command to transfer it to the Command Window.")); + m_history_list_view->setStatusTip + (tr ("Double-click a command to transfer it to the Command Window.")); m_history_list_view->setSelectionMode (QAbstractItemView::ExtendedSelection); m_history_list_view->setContextMenuPolicy (Qt::CustomContextMenu); connect (m_history_list_view, @@ -283,8 +283,8 @@ m_filter->setEditable (true); m_filter->setMaxCount (MaxFilterHistory); m_filter->setInsertPolicy (QComboBox::NoInsert); - m_filter->setSizeAdjustPolicy ( - QComboBox::AdjustToMinimumContentsLengthWithIcon); + m_filter->setSizeAdjustPolicy + (QComboBox::AdjustToMinimumContentsLengthWithIcon); QSizePolicy sizePol (QSizePolicy::Expanding, QSizePolicy::Preferred); m_filter->setSizePolicy (sizePol); m_filter->completer ()->setCaseSensitivity (Qt::CaseSensitive); @@ -319,8 +319,8 @@ = settings->value ("history_dock_widget/filter_shown",true).toBool (); m_filter_widget->setVisible (m_filter_shown); - m_filter->addItems ( - settings->value ("history_dock_widget/mru_list").toStringList ()); + m_filter->addItems + (settings->value ("history_dock_widget/mru_list").toStringList ()); bool filter_state = settings->value ("history_dock_widget/filter_active", false).toBool ();
--- a/libgui/src/m-editor/file-editor-tab.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/m-editor/file-editor-tab.cc Fri Jul 19 14:15:04 2019 -0400 @@ -664,10 +664,10 @@ + QString (OCTAVE_VERSION) + "/qsci/"; // get settings which infos are used for octave - bool octave_builtins = settings->value ( - "editor/codeCompletion_octave_builtins", true).toBool (); - bool octave_functions = settings->value ( - "editor/codeCompletion_octave_functions", true).toBool (); + bool octave_builtins + = settings->value ("editor/codeCompletion_octave_builtins", true).toBool (); + bool octave_functions + = settings->value ("editor/codeCompletion_octave_functions", true).toBool (); QCoreApplication::setApplicationName (tmp_app_name); // Restore name @@ -1544,11 +1544,12 @@ bool ok; QSettings *settings = resource_manager::get_settings (); - used_comment_str = QInputDialog::getText ( - this, tr ("Comment selected text"), - tr ("Comment string to use:\n"), QLineEdit::Normal, - settings->value (ed_last_comment_str, comment_str.at (0)).toString (), - &ok); + used_comment_str + = QInputDialog::getText (this, tr ("Comment selected text"), + tr ("Comment string to use:\n"), + QLineEdit::Normal, + settings->value (ed_last_comment_str, comment_str.at (0)).toString (), + &ok); if ((! ok) || used_comment_str.isEmpty ()) return; // No input, do nothing @@ -2006,8 +2007,8 @@ int os_eol_mode = QsciScintilla::EolUnix; #endif QSettings *settings = resource_manager::get_settings (); - QsciScintilla::EolMode eol_mode = static_cast<QsciScintilla::EolMode> ( - settings->value ("editor/default_eol_mode",os_eol_mode).toInt ()); + QsciScintilla::EolMode eol_mode + = static_cast<QsciScintilla::EolMode> (settings->value ("editor/default_eol_mode",os_eol_mode).toInt ()); int count_max = 0; @@ -2103,9 +2104,7 @@ #else int eol_mode = QsciScintilla::EolUnix; #endif - _edit_area->setEolMode ( - static_cast<QsciScintilla::EolMode> ( - settings->value ("editor/default_eol_mode",eol_mode).toInt ())); + _edit_area->setEolMode (static_cast<QsciScintilla::EolMode> (settings->value ("editor/default_eol_mode",eol_mode).toInt ())); update_eol_indicator (); @@ -2675,8 +2674,7 @@ else _edit_area->setWhitespaceVisibility (QsciScintilla::WsInvisible); - _edit_area->setEolVisibility ( - settings->value ("editor/show_eol_chars",false).toBool ()); + _edit_area->setEolVisibility (settings->value ("editor/show_eol_chars",false).toBool ()); if (settings->value ("editor/showLineNumbers", true).toBool ()) {
--- a/libgui/src/m-editor/file-editor.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/m-editor/file-editor.cc Fri Jul 19 14:15:04 2019 -0400 @@ -1044,8 +1044,8 @@ { std::string ndir = new_name.toStdString (); std::string ofile = old.fileName ().toStdString (); - f_data.new_file_name = QString::fromStdString ( - sys::env::make_absolute (ofile, ndir)); + f_data.new_file_name + = QString::fromStdString (sys::env::make_absolute (ofile, ndir)); } else f_data.new_file_name = new_name; @@ -1104,8 +1104,9 @@ m_tool_bar->setIconSize (QSize (icon_size, icon_size)); // Tab position - QTabWidget::TabPosition pos = static_cast<QTabWidget::TabPosition>( - settings->value (ed_tab_position.key, ed_tab_position.def).toInt ()); + QTabWidget::TabPosition pos + = static_cast<QTabWidget::TabPosition> (settings->value (ed_tab_position.key, ed_tab_position.def).toInt ()); + m_tab_widget->setTabPosition (pos); // Update style sheet properties depending on position @@ -1151,12 +1152,12 @@ #if defined (Q_OS_MAC) // FIXME: This is a workaround for missing tab close buttons on MacOS // in several Qt versions (https://bugreports.qt.io/browse/QTBUG-61092) - QString close_button_css ( - "QTabBar::close-button" - " { width: 6px; image: url(:/actions/icons/widget-close.png);}\n" - "QTabBar::close-button:hover" - " { background-color: #cccccc; }" - ); + QString close_button_css + ("QTabBar::close-button" + " { width: 6px; image: url(:/actions/icons/widget-close.png);}\n" + "QTabBar::close-button:hover" + " { background-color: #cccccc; }"); + style_sheet = style_sheet + close_button_css; #endif
--- a/libgui/src/m-editor/find-dialog.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/m-editor/find-dialog.cc Fri Jul 19 14:15:04 2019 -0400 @@ -385,19 +385,19 @@ } // Do the search - _find_result_available = _edit_area->findFirst ( - _search_line_edit->text (), - _regex_check_box->isChecked (), - _case_check_box->isChecked (), - _whole_words_check_box->isChecked (), - do_wrap, - do_forward, - line,col, - true + _find_result_available + = _edit_area->findFirst (_search_line_edit->text (), + _regex_check_box->isChecked (), + _case_check_box->isChecked (), + _whole_words_check_box->isChecked (), + do_wrap, + do_forward, + line,col, + true #if defined (HAVE_QSCI_VERSION_2_6_0) - , true + , true #endif - ); + ); if (_find_result_available) {
--- a/libgui/src/m-editor/octave-qscintilla.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/m-editor/octave-qscintilla.cc Fri Jul 19 14:15:04 2019 -0400 @@ -462,15 +462,12 @@ switch (lexer) { case SCLEX_CPP: - return (ST_LINE_COMMENT * ( - style == QsciLexerCPP::CommentLine + return (ST_LINE_COMMENT * (style == QsciLexerCPP::CommentLine || style == QsciLexerCPP::CommentLineDoc) - + ST_BLOCK_COMMENT * ( - style == QsciLexerCPP::Comment + + ST_BLOCK_COMMENT * (style == QsciLexerCPP::Comment || style == QsciLexerCPP::CommentDoc || style == QsciLexerCPP::CommentDocKeyword - || style == QsciLexerCPP::CommentDocKeywordError) - ); + || style == QsciLexerCPP::CommentDocKeywordError)); #if defined (HAVE_LEXER_MATLAB) case SCLEX_MATLAB: @@ -539,8 +536,7 @@ if (do_auto_close && ! inline_end - && ! first_word.contains ( - QRegExp ("(case|otherwise|unwind_protect_cleanup)"))) + && ! first_word.contains (QRegExp ("(case|otherwise|unwind_protect_cleanup)"))) { // Do auto close auto_close (do_auto_close, line, prevline, first_word);
--- a/libgui/src/main-window.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/main-window.cc Fri Jul 19 14:15:04 2019 -0400 @@ -572,8 +572,8 @@ void main_window::open_online_documentation_page (void) { - QDesktopServices::openUrl ( - QUrl ("https://octave.org/doc/interpreter/index.html")); + QDesktopServices::openUrl + (QUrl ("https://octave.org/doc/interpreter/index.html")); } void main_window::display_release_notes (void) @@ -1495,12 +1495,10 @@ // of an error from the default layout if (settings) { - if (! restoreState ( - settings->value (mw_state.key, mw_state.def).toByteArray ())) + if (! restoreState (settings->value (mw_state.key, mw_state.def).toByteArray ())) restoreState (mw_state.def.toByteArray ()); - if (! restoreGeometry ( - settings->value (mw_geometry.key, mw_geometry.def).toByteArray ())) + if (! restoreGeometry (settings->value (mw_geometry.key, mw_geometry.def).toByteArray ())) restoreGeometry (mw_geometry.def.toByteArray ()); } @@ -2463,30 +2461,30 @@ { 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))); - - m_debug_step_into = construct_debug_menu_item ( - "db-step-in", tr ("Step In"), - SLOT (debug_step_into (void))); - - m_debug_step_out = construct_debug_menu_item ( - "db-step-out", tr ("Step Out"), - SLOT (debug_step_out (void))); - - m_debug_continue = construct_debug_menu_item ( - "db-cont", tr ("Continue"), - SLOT (debug_continue (void))); + m_debug_step_over + = construct_debug_menu_item ("db-step", tr ("Step"), + SLOT (debug_step_over (void))); + + m_debug_step_into + = construct_debug_menu_item ("db-step-in", tr ("Step In"), + SLOT (debug_step_into (void))); + + m_debug_step_out + = construct_debug_menu_item ("db-step-out", tr ("Step Out"), + SLOT (debug_step_out (void))); + + m_debug_continue + = construct_debug_menu_item ("db-cont", tr ("Continue"), + SLOT (debug_continue (void))); 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))); + m_debug_quit + = construct_debug_menu_item ("db-stop", tr ("Quit Debug Mode"), + SLOT (debug_quit (void))); } void main_window::editor_tabs_changed (bool have_tabs) @@ -2656,8 +2654,7 @@ m_current_directory_combo_box->setEditable (true); m_current_directory_combo_box->setInsertPolicy (QComboBox::NoInsert); m_current_directory_combo_box->setToolTip (tr ("Enter directory name")); - m_current_directory_combo_box->setMaxVisibleItems ( - current_directory_max_visible); + m_current_directory_combo_box->setMaxVisibleItems (current_directory_max_visible); m_current_directory_combo_box->setMaxCount (current_directory_max_count); QSizePolicy sizePol (QSizePolicy::Preferred, QSizePolicy::Preferred); m_current_directory_combo_box->setSizePolicy (sizePol); @@ -2666,12 +2663,12 @@ // need to delete these upon destroying this main_window. m_main_tool_bar->addWidget (new QLabel (tr ("Current Directory: "))); m_main_tool_bar->addWidget (m_current_directory_combo_box); - QAction *current_dir_up = m_main_tool_bar->addAction ( - resource_manager::icon ("go-up"), - tr ("One directory up")); - QAction *current_dir_search = m_main_tool_bar->addAction ( - resource_manager::icon ("folder"), - tr ("Browse directories")); + QAction *current_dir_up + = m_main_tool_bar->addAction (resource_manager::icon ("go-up"), + tr ("One directory up")); + QAction *current_dir_search + = m_main_tool_bar->addAction (resource_manager::icon ("folder"), + tr ("Browse directories")); connect (m_current_directory_combo_box, SIGNAL (activated (QString)), this, SLOT (set_current_working_directory (QString)));
--- a/libgui/src/qt-interpreter-events.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/qt-interpreter-events.cc Fri Jul 19 14:15:04 2019 -0400 @@ -335,8 +335,7 @@ retval.push_back (it->toStdString ()); retval.push_back (uiwidget_creator.get_dialog_path ()->toStdString ()); - retval.push_back ((QString ("%1").arg ( - uiwidget_creator.get_dialog_result ())).toStdString ()); + retval.push_back ((QString ("%1").arg (uiwidget_creator.get_dialog_result ())).toStdString ()); uiwidget_creator.unlock ();
--- a/libgui/src/resource-manager.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/resource-manager.cc Fri Jul 19 14:15:04 2019 -0400 @@ -333,13 +333,16 @@ && m_settings->isWritable () && m_settings->status () == QSettings::NoError)) { - QString msg = QString (QT_TR_NOOP ( - "The settings file\n%1\n" - "does not exist and can not be created.\n" - "Make sure you have read and write permissions to\n%2\n\n" - "Octave GUI must be closed now.")); - QMessageBox::critical (nullptr, QString (QT_TR_NOOP ("Octave Critical Error")), + QString msg + = QString (QT_TR_NOOP ("The settings file\n%1\n" + "does not exist and can not be created.\n" + "Make sure you have read and write permissions to\n%2\n\n" + "Octave GUI must be closed now.")); + + QMessageBox::critical (nullptr, + QString (QT_TR_NOOP ("Octave Critical Error")), msg.arg (do_get_settings_file ()).arg (do_get_settings_directory ())); + exit (1); } }
--- a/libgui/src/settings-dialog.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/settings-dialog.cc Fri Jul 19 14:15:04 2019 -0400 @@ -294,8 +294,8 @@ cb_show_hscrollbar->setChecked (settings->value ("editor/show_hscroll_bar", true).toBool ()); editor_combox_tab_pos->insertItems (0, ed_tab_position_names); - editor_combox_tab_pos->setCurrentIndex ( - settings->value (ed_tab_position.key, ed_tab_position.def).toInt ()); + editor_combox_tab_pos->setCurrentIndex + (settings->value (ed_tab_position.key, ed_tab_position.def).toInt ()); int selected_comment_string, selected_uncomment_string; @@ -1054,8 +1054,8 @@ style_grid->addWidget (m_ws_hide_tool_tips, row++, column, 1, 4); connect (m_ws_enable_colors, SIGNAL (toggled (bool)), m_ws_hide_tool_tips, SLOT(setEnabled (bool))); - m_ws_hide_tool_tips->setChecked ( - settings->value (ws_hide_tool_tips.key, ws_hide_tool_tips.def).toBool ()); + m_ws_hide_tool_tips->setChecked + (settings->value (ws_hide_tool_tips.key, ws_hide_tool_tips.def).toBool ()); for (int i = 0; i < nr_of_classes; i++) {
--- a/libgui/src/shortcut-manager.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/shortcut-manager.cc Fri Jul 19 14:15:04 2019 -0400 @@ -520,8 +520,8 @@ index = m_action_hash[key] - 1; if (index > -1 && index < m_sc.count ()) - action->setShortcut (QKeySequence ( - m_settings->value ("shortcuts/" + key, m_sc.at (index).m_default_sc).toString ())); + action->setShortcut + (QKeySequence (m_settings->value ("shortcuts/" + key, m_sc.at (index).m_default_sc).toString ())); else qDebug () << "Key: " << key << " not found in m_action_hash"; } @@ -744,12 +744,15 @@ help->setWordWrap (true); box->addWidget (help); - QCheckBox *direct = new QCheckBox ( - tr ("Enter shortcut directly by performing it")); - QCheckBox *shift = new QCheckBox ( - tr ("Add Shift modifier\n" - "(allows to enter number keys)")); - shift->setStyleSheet ("QCheckBox::indicator { subcontrol-position: left top; }"); + QCheckBox *direct + = new QCheckBox (tr ("Enter shortcut directly by performing it")); + + QCheckBox *shift + = new QCheckBox (tr ("Add Shift modifier\n" + "(allows to enter number keys)")); + + shift->setStyleSheet + ("QCheckBox::indicator { subcontrol-position: left top; }"); connect (direct, SIGNAL (clicked (bool)), shift, SLOT (setEnabled (bool)));
--- a/libgui/src/workspace-view.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libgui/src/workspace-view.cc Fri Jul 19 14:15:04 2019 -0400 @@ -111,8 +111,8 @@ //enable sorting (setting column and order after model was set) m_view->setSortingEnabled (true); // Initialize column order and width of the workspace - m_view->horizontalHeader ()->restoreState ( - settings->value ("workspaceview/column_state").toByteArray ()); + m_view->horizontalHeader ()->restoreState + (settings->value ("workspaceview/column_state").toByteArray ()); // Set header properties for sorting #if defined (HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE)
--- a/libinterp/corefcn/graphics.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libinterp/corefcn/graphics.cc Fri Jul 19 14:15:04 2019 -0400 @@ -872,12 +872,10 @@ if (is_rectangle) { ColumnVector v1, v2; - v1 = ax_xform.untransform ( - retval(0) + ax_bbox(0) - 1, - ax_bbox(1) + ax_bbox(3) - retval(1) + 1); - v2 = ax_xform.untransform ( - retval(0) + retval(2) + ax_bbox(0) - 1, - ax_bbox(1) + ax_bbox(3) - (retval(1) + retval(3)) + 1); + v1 = ax_xform.untransform (retval(0) + ax_bbox(0) - 1, + ax_bbox(1) + ax_bbox(3) - retval(1) + 1); + v2 = ax_xform.untransform (retval(0) + retval(2) + ax_bbox(0) - 1, + ax_bbox(1) + ax_bbox(3) - (retval(1) + retval(3)) + 1); retval.resize (1, 4); @@ -889,9 +887,8 @@ else { ColumnVector v; - v = ax_xform.untransform ( - retval(0) + ax_bbox(0) - 1, - ax_bbox(1) + ax_bbox(3) - retval(1) + 1); + v = ax_xform.untransform (retval(0) + ax_bbox(0) - 1, + ax_bbox(1) + ax_bbox(3) - retval(1) + 1); retval.resize (1, 3);
--- a/libinterp/corefcn/lu.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libinterp/corefcn/lu.cc Fri Jul 19 14:15:04 2019 -0400 @@ -211,10 +211,9 @@ { retval.resize (nargout == 3 ? 3 : 2); retval(1) - = octave_value ( - fact.U () * fact.Pc_mat ().transpose (), - MatrixType (MatrixType::Permuted_Upper, - nc, fact.col_perm ())); + = octave_value (fact.U () * fact.Pc_mat ().transpose (), + MatrixType (MatrixType::Permuted_Upper, + nc, fact.col_perm ())); PermMatrix P = fact.Pr_mat (); SparseMatrix L = fact.L (); @@ -281,10 +280,9 @@ { retval.resize (nargout == 3 ? 3 : 2); retval(1) - = octave_value ( - fact.U () * fact.Pc_mat ().transpose (), - MatrixType (MatrixType::Permuted_Upper, - nc, fact.col_perm ())); + = octave_value (fact.U () * fact.Pc_mat ().transpose (), + MatrixType (MatrixType::Permuted_Upper, + nc, fact.col_perm ())); PermMatrix P = fact.Pr_mat (); SparseComplexMatrix L = fact.L ();
--- a/libinterp/corefcn/sysdep.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libinterp/corefcn/sysdep.cc Fri Jul 19 14:15:04 2019 -0400 @@ -833,8 +833,7 @@ if (type == REG_DWORD) value = octave_int32 (*data); else if (type == REG_SZ || type == REG_EXPAND_SZ) - value = string_vector (sys::u8_from_wstring ( - reinterpret_cast<wchar_t *> (data))); + value = string_vector (sys::u8_from_wstring (reinterpret_cast<wchar_t *> (data))); return result; }
--- a/libinterp/dldfcn/__fltk_uigetfile__.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libinterp/dldfcn/__fltk_uigetfile__.cc Fri Jul 19 14:15:04 2019 -0400 @@ -131,12 +131,10 @@ } if (multi_type == Fl_File_Chooser::DIRECTORY) - retval(0) = octave::sys::file_ops::native_separator_path ( - std::string (fc.value ())); + retval(0) = octave::sys::file_ops::native_separator_path (std::string (fc.value ())); else { - retval(1) = octave::sys::file_ops::native_separator_path ( - std::string (fc.directory ()) + sep); + retval(1) = octave::sys::file_ops::native_separator_path (std::string (fc.directory ()) + sep); retval(2) = fc.filter_value () + 1; } }
--- a/libinterp/octave-value/cdef-class.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libinterp/octave-value/cdef-class.cc Fri Jul 19 14:15:04 2019 -0400 @@ -647,8 +647,8 @@ { // Populate the object with default property values - std::list<cdef_class> super_classes = lookup_classes ( - get ("SuperClasses").cell_value ()); + std::list<cdef_class> super_classes + = lookup_classes (get ("SuperClasses").cell_value ()); for (auto& cls : super_classes) cls.initialize_object (obj);
--- a/libinterp/octave-value/ov-flt-complex.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libinterp/octave-value/ov-flt-complex.cc Fri Jul 19 14:15:04 2019 -0400 @@ -86,8 +86,7 @@ // 1x1 matrix back to a scalar value. Need a better solution // to this problem. - octave_value tmp (new octave_float_complex_matrix ( - float_complex_matrix_value ())); + octave_value tmp (new octave_float_complex_matrix (float_complex_matrix_value ())); return tmp.do_index_op (idx, resize_ok); }
--- a/libinterp/octave-value/ov-java.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/libinterp/octave-value/ov-java.cc Fri Jul 19 14:15:04 2019 -0400 @@ -570,9 +570,8 @@ error ("unable to find Java Runtime Environment: %s::%s", key.c_str (), value.c_str ()); - jversion = regval.xstring_value ( - "initialize_jvm: registry value \"%s\" at \"%s\" must be a string", - value.c_str (), key.c_str ()); + jversion = regval.xstring_value ("initialize_jvm: registry value \"%s\" at \"%s\" must be a string", + value.c_str (), key.c_str ()); } key = key + '\\' + jversion; @@ -589,9 +588,9 @@ error ("unable to find Java Runtime Environment: %s::%s", key.c_str (), value.c_str ()); - std::string jvm_lib_path = regval.xstring_value ( - "initialize_jvm: registry value \"%s\" at \"%s\" must be a string", - value.c_str (), key.c_str ()); + std::string jvm_lib_path + = regval.xstring_value ("initialize_jvm: registry value \"%s\" at \"%s\" must be a string", + value.c_str (), key.c_str ()); if (jvm_lib_path.empty ()) error ("unable to find Java Runtime Environment: %s::%s",
--- a/liboctave/array/idx-vector.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/liboctave/array/idx-vector.cc Fri Jul 19 14:15:04 2019 -0400 @@ -468,8 +468,8 @@ } // This is wrapped in unique_ptr so that we don't leak on out-of-memory. - std::unique_ptr<idx_vector_rep> new_rep ( - new idx_vector_rep (nullptr, len, ext, orig_dims, DIRECT)); + std::unique_ptr<idx_vector_rep> new_rep + (new idx_vector_rep (nullptr, len, ext, orig_dims, DIRECT)); if (ext > len*octave::math::log2 (1.0 + len)) { @@ -541,8 +541,8 @@ idx_vector::idx_vector_rep::sort_idx (Array<octave_idx_type>& idx) { // This is wrapped in unique_ptr so that we don't leak on out-of-memory. - std::unique_ptr<idx_vector_rep> new_rep ( - new idx_vector_rep (nullptr, len, ext, orig_dims, DIRECT)); + std::unique_ptr<idx_vector_rep> new_rep + (new idx_vector_rep (nullptr, len, ext, orig_dims, DIRECT)); if (ext > len*octave::math::log2 (1.0 + len)) {
--- a/liboctave/system/oct-env.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/liboctave/system/oct-env.cc Fri Jul 19 14:15:04 2019 -0400 @@ -27,12 +27,12 @@ Free Software Foundation, Inc. octave::sys::env::do_absolute_pathname - octave::sys:env::do_base_pathname - octave::sys:env::do_chdir - octave::sys:env::do_getcwd - octave::sys:env::do_make_absolute - octave::sys:env::do_polite_directory_format - octave::sys:env::pathname_backup + octave::sys::env::do_base_pathname + octave::sys::env::do_chdir + octave::sys::env::do_getcwd + octave::sys::env::do_make_absolute + octave::sys::env::do_polite_directory_format + octave::sys::env::pathname_backup */ @@ -484,8 +484,7 @@ if (hd.empty ()) { - sys::password pw = sys::password::getpwuid ( - sys::getuid ()); + sys::password pw = sys::password::getpwuid (sys::getuid ()); hd = (pw ? pw.dir () : std::string (sys::file_ops::dir_sep_str ())); } @@ -498,8 +497,7 @@ { if (user_name.empty ()) { - sys::password pw = sys::password::getpwuid ( - sys::getuid ()); + sys::password pw = sys::password::getpwuid (sys::getuid ()); user_name = (pw ? pw.name () : "unknown"); }
--- a/liboctave/util/cmd-edit.cc Sun Jul 21 10:16:11 2019 -0400 +++ b/liboctave/util/cmd-edit.cc Fri Jul 19 14:15:04 2019 -0400 @@ -570,8 +570,8 @@ if (looks_like_filename (l, ' ') || looks_like_filename (l, '\'') || looks_like_filename (l, '"')) { - ::octave_rl_set_completer_quote_characters ( - completer_quote_characters.c_str ()); + ::octave_rl_set_completer_quote_characters + (completer_quote_characters.c_str ()); return dir_sep; }