Mercurial > hg > octave-lyh

comparison libgui/src/settings-dialog.cc @ 16667:7f6f0b3f7369

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow build to continue without QScintilla lexer for Octave Needed for changeset 72665c4ae25b. * settings-dialog.cc: Include Qsci/qscilexeroctave.h if it is available, otherwise include Qsci/qscilexermatlab.h if it is available.
author Ben Abbott <bpabbott@mac.com>
date Thu, 16 May 2013 13:50:26 +0800
parents 025bc6b5080e
children f6dfc7705623
comparison
equal deleted inserted replaced
16666:af7287d567dc 16667:7f6f0b3f7369
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
39 #if defined (HAVE_QSCI_QSCILEXEROCTAVE_H)
40 //#define HAVE_LEXER_OCTAVE
38 #include <Qsci/qscilexeroctave.h> 41 #include <Qsci/qscilexeroctave.h>
42 #elif defined (HAVE_QSCI_QSCILEXERMATLAB_H)
43 //#define HAVE_LEXER_MATLAB
44 #include <Qsci/qscilexermatlab.h>
45 #endif
39 #include <Qsci/qscilexercpp.h> 46 #include <Qsci/qscilexercpp.h>
40 #include <Qsci/qscilexerbash.h> 47 #include <Qsci/qscilexerbash.h>
41 #include <Qsci/qscilexerperl.h> 48 #include <Qsci/qscilexerperl.h>
42 #include <Qsci/qscilexerbatch.h> 49 #include <Qsci/qscilexerbatch.h>
43 #include <Qsci/qscilexerdiff.h> 50 #include <Qsci/qscilexerdiff.h>
135 read_terminal_colors (settings); 142 read_terminal_colors (settings);
136 143
137 #ifdef HAVE_QSCINTILLA 144 #ifdef HAVE_QSCINTILLA
138 // editor styles: create lexer, read settings, and create dialog elements 145 // editor styles: create lexer, read settings, and create dialog elements
139 QsciLexer *lexer; 146 QsciLexer *lexer;
147 #if defined (HAVE_LEXER_OCTAVE)
140 lexer = new QsciLexerOctave (); 148 lexer = new QsciLexerOctave ();
141 read_lexer_settings (lexer,settings); 149 read_lexer_settings (lexer,settings);
142 delete lexer; 150 delete lexer;
151 #elif defined (HAVE_LEXER_MATLAB)
152 lexer = new QsciLexerMatlab ();
153 read_lexer_settings (lexer,settings);
154 delete lexer;
155 #endif
143 lexer = new QsciLexerCPP (); 156 lexer = new QsciLexerCPP ();
144 read_lexer_settings (lexer,settings); 157 read_lexer_settings (lexer,settings);
145 delete lexer; 158 delete lexer;
146 lexer = new QsciLexerPerl (); 159 lexer = new QsciLexerPerl ();
147 read_lexer_settings (lexer,settings); 160 read_lexer_settings (lexer,settings);
391 settings->sync (); 404 settings->sync ();
392 405
393 #ifdef HAVE_QSCINTILLA 406 #ifdef HAVE_QSCINTILLA
394 // editor styles: create lexer, get dialog contents, and write settings 407 // editor styles: create lexer, get dialog contents, and write settings
395 QsciLexer *lexer; 408 QsciLexer *lexer;
409 #if defined (HAVE_LEXER_OCTAVE)
396 lexer = new QsciLexerOctave (); 410 lexer = new QsciLexerOctave ();
397 write_lexer_settings (lexer,settings); 411 write_lexer_settings (lexer,settings);
398 delete lexer; 412 delete lexer;
413 #elif defined (HAVE_LEXER_MATLAB)
414 lexer = new QsciLexerMatlab ();
415 write_lexer_settings (lexer,settings);
416 delete lexer;
417 #endif
399 lexer = new QsciLexerCPP (); 418 lexer = new QsciLexerCPP ();
400 write_lexer_settings (lexer,settings); 419 write_lexer_settings (lexer,settings);
401 delete lexer; 420 delete lexer;
402 lexer = new QsciLexerPerl (); 421 lexer = new QsciLexerPerl ();
403 write_lexer_settings (lexer,settings); 422 write_lexer_settings (lexer,settings);