Mercurial > octave-nkf

comparison libgui/src/settings-dialog.cc @ 16646:025bc6b5080e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d788ee8b8a99
children 7f6f0b3f7369
comparison
equal deleted inserted replaced
16643:4258750c76ed 16646:025bc6b5080e
33 #include <QFileInfo> 33 #include <QFileInfo>
34 #include <QVector> 34 #include <QVector>
35 35
36 #ifdef HAVE_QSCINTILLA 36 #ifdef HAVE_QSCINTILLA
37 #include <QScrollArea> 37 #include <QScrollArea>
38 #include <Qsci/qscilexeroctave.h>
38 #include <Qsci/qscilexercpp.h> 39 #include <Qsci/qscilexercpp.h>
39 #include <Qsci/qscilexerbash.h> 40 #include <Qsci/qscilexerbash.h>
40 #include <Qsci/qscilexerperl.h> 41 #include <Qsci/qscilexerperl.h>
41 #include <Qsci/qscilexerbatch.h> 42 #include <Qsci/qscilexerbatch.h>
42 #include <Qsci/qscilexerdiff.h> 43 #include <Qsci/qscilexerdiff.h>
134 read_terminal_colors (settings); 135 read_terminal_colors (settings);
135 136
136 #ifdef HAVE_QSCINTILLA 137 #ifdef HAVE_QSCINTILLA
137 // editor styles: create lexer, read settings, and create dialog elements 138 // editor styles: create lexer, read settings, and create dialog elements
138 QsciLexer *lexer; 139 QsciLexer *lexer;
139 lexer = new lexer_octave_gui (); 140 lexer = new QsciLexerOctave ();
140 read_lexer_settings (lexer,settings); 141 read_lexer_settings (lexer,settings);
141 delete lexer; 142 delete lexer;
142 lexer = new QsciLexerCPP (); 143 lexer = new QsciLexerCPP ();
143 read_lexer_settings (lexer,settings); 144 read_lexer_settings (lexer,settings);
144 delete lexer; 145 delete lexer;
390 settings->sync (); 391 settings->sync ();
391 392
392 #ifdef HAVE_QSCINTILLA 393 #ifdef HAVE_QSCINTILLA
393 // editor styles: create lexer, get dialog contents, and write settings 394 // editor styles: create lexer, get dialog contents, and write settings
394 QsciLexer *lexer; 395 QsciLexer *lexer;
395 lexer = new lexer_octave_gui (); 396 lexer = new QsciLexerOctave ();
396 write_lexer_settings (lexer,settings); 397 write_lexer_settings (lexer,settings);
397 delete lexer; 398 delete lexer;
398 lexer = new QsciLexerCPP (); 399 lexer = new QsciLexerCPP ();
399 write_lexer_settings (lexer,settings); 400 write_lexer_settings (lexer,settings);
400 delete lexer; 401 delete lexer;