Mercurial > octave
diff libgui/src/m-editor/octave-qscintilla.cc @ 25951:7a507e71d922 stable
style fixes
* Canvas.cc, Figure.cc, dialog.cc, octave-qscintilla.cc, tab-bar.cc,
variable-editor.cc, gl-render.cc, graphics.cc, load-path.cc,
oct-stream.cc, variables.cc, jit-typeinfo.cc:
Break long lines before && and || operators.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 19 Oct 2018 12:38:01 -0400 |
| parents | 052a0d5dfd2c |
| children | 12d4271aed87 |
line wrap: on
line diff
--- a/libgui/src/m-editor/octave-qscintilla.cc Fri Oct 19 12:28:06 2018 -0400 +++ b/libgui/src/m-editor/octave-qscintilla.cc Fri Oct 19 12:38:01 2018 -0400 @@ -186,8 +186,8 @@ // Primary key int key = cmd_list_mac.at (i)->key (); - if (static_cast<int> (key | Qt::META) == key && - static_cast<int> (key | Qt::CTRL) != key) + if (static_cast<int> (key | Qt::META) == key + && static_cast<int> (key | Qt::CTRL) != key) key = (key ^ Qt::META) | Qt::CTRL; else if (static_cast<int> (key | Qt::CTRL) == key) key = (key ^ Qt::CTRL) | Qt::META; @@ -197,8 +197,8 @@ // Alternate key key = cmd_list_mac.at (i)->alternateKey (); - if (static_cast<int> (key | Qt::META) == key && - static_cast<int> (key | Qt::CTRL) != key) + if (static_cast<int> (key | Qt::META) == key + && static_cast<int> (key | Qt::CTRL) != key) key = (key ^ Qt::META) | Qt::CTRL; else if (static_cast<int> (key | Qt::CTRL) == key) key = (key ^ Qt::CTRL) | Qt::META;