Mercurial > octave
diff libgui/src/m-editor/file-editor-tab.cc @ 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.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 19 Jul 2019 14:15:04 -0400 |
| parents | 9de4741a896e |
| children | db687716fed6 |
line wrap: on
line diff
--- 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 ()) {