Mercurial > octave-nkf
diff libgui/src/m-editor/file-editor-tab.cc @ 16646:025bc6b5080e
use QScintilla's lexer for highlighting Octave programs
* file-editor-tab.cc: Include Qsci/qscilexeroctave.h instead of
lexer-octave-gui.h.
(file_editor_tab::update_lexer): Use QsciLexerOctave instead of
lexer_octave_gui.
* settings-dialog.h: Use forward declaration for QsciLexer.
* settings-dialog.cc: Include Qsci/qscilexeroctave.h instead of
lexer-octave-gui.h.
(settings_dialog::settings_dialog): Use QsciLexerOctave instead of
lexer_octave_gui.
* lexer-octave-gui.h, lexer-octave-gui.cc: Delete.
* libgui/src/module.mk: Update file lists.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 12 May 2013 22:21:46 -0400 |
| parents | 3c2e457eeb72 |
| children | 72665c4ae25b |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc Sun May 12 21:05:19 2013 -0400 +++ b/libgui/src/m-editor/file-editor-tab.cc Sun May 12 22:21:46 2013 -0400 @@ -27,9 +27,7 @@ #ifdef HAVE_QSCINTILLA #include <Qsci/qsciapis.h> -// Not available in the Debian repos yet! -// #include <Qsci/qscilexeroctave.h> -#include "lexer-octave-gui.h" +#include <Qsci/qscilexeroctave.h> #include <Qsci/qscilexercpp.h> #include <Qsci/qscilexerbash.h> #include <Qsci/qscilexerperl.h> @@ -215,7 +213,7 @@ || _file_name.endsWith (".M") || _file_name.endsWith ("octaverc")) { - lexer = new lexer_octave_gui (); + lexer = new QsciLexerOctave (); } else if (_file_name.endsWith (".c") || _file_name.endsWith (".cc")