Mercurial > octave-nkf

comparison libgui/src/m-editor/octave-qscintilla.cc @ 19629:be7ac98fab43 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip trailing whitespace from most source files * NEWS, etc/NEWS.3, libgui/graphics/Backend.h, libgui/graphics/ButtonControl.h, libgui/graphics/EditControl.cc, libgui/graphics/Object.h, libgui/graphics/QtHandlesUtils.cc, libgui/graphics/ToolBarButton.h, libgui/graphics/__init_qt__.cc, libgui/graphics/gl-select.cc, libgui/qterminal/libqterminal/unix/TerminalView.cpp, libgui/qterminal/libqterminal/unix/TerminalView.h, libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp, libgui/src/m-editor/file-editor-tab.cc, libgui/src/m-editor/file-editor.cc, libgui/src/m-editor/file-editor.h, libgui/src/m-editor/octave-qscintilla.cc, libgui/src/settings-dialog.cc, libgui/src/shortcut-manager.cc, libgui/src/workspace-view.cc, libinterp/corefcn/graphics.cc, libinterp/corefcn/input.cc, libinterp/parse-tree/pt-unop.cc, liboctave/array/dSparse.h, scripts/pkg/pkg.m, scripts/polynomial/polyeig.m, test/io.tst: Strip trailing whitespace.
author John W. Eaton <jwe@octave.org>
date Tue, 20 Jan 2015 09:43:29 -0500
parents f90bb1e30de2
children 0e1f5a750d00 3156773fcc80
comparison
equal deleted inserted replaced
19628:fe689210525c 19629:be7ac98fab43
104 // Octave interprets Cmd key as Meta whereas Qscintilla interprets it 104 // Octave interprets Cmd key as Meta whereas Qscintilla interprets it
105 // as Ctrl. We thus invert Meta/Ctrl in Qscintilla's shortcuts list. 105 // as Ctrl. We thus invert Meta/Ctrl in Qscintilla's shortcuts list.
106 QList< QsciCommand * > cmd_list_mac = cmd_set->commands (); 106 QList< QsciCommand * > cmd_list_mac = cmd_set->commands ();
107 for (int i = 0; i < cmd_list_mac.length (); i++) 107 for (int i = 0; i < cmd_list_mac.length (); i++)
108 { 108 {
109 // Primary key 109 // Primary key
110 int key = cmd_list_mac.at (i)->key (); 110 int key = cmd_list_mac.at (i)->key ();
111 111
112 if (static_cast<int> (key | Qt::META) == key && 112 if (static_cast<int> (key | Qt::META) == key &&
113 static_cast<int> (key | Qt::CTRL) != key) 113 static_cast<int> (key | Qt::CTRL) != key)
114 key = (key ^ Qt::META) | Qt::CTRL; 114 key = (key ^ Qt::META) | Qt::CTRL;