# HG changeset patch
# User Ben Abbott  <bpabbott@mac.com>
# Date 1368683426 -28800
# Node ID 7f6f0b3f73692cf741ece3fd54ba00e0500224c4
# Parent  af7287d567dc6fe933efa62d6095a0855e6643a5
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.

diff -r af7287d567dc -r 7f6f0b3f7369 libgui/src/settings-dialog.cc
--- a/libgui/src/settings-dialog.cc	Wed May 15 03:17:34 2013 -0400
+++ b/libgui/src/settings-dialog.cc	Thu May 16 13:50:26 2013 +0800
@@ -35,7 +35,14 @@
 
 #ifdef HAVE_QSCINTILLA
 #include <QScrollArea>
+
+#if defined (HAVE_QSCI_QSCILEXEROCTAVE_H)
+//#define HAVE_LEXER_OCTAVE
 #include <Qsci/qscilexeroctave.h>
+#elif defined (HAVE_QSCI_QSCILEXERMATLAB_H)
+//#define HAVE_LEXER_MATLAB
+#include <Qsci/qscilexermatlab.h>
+#endif
 #include <Qsci/qscilexercpp.h>
 #include <Qsci/qscilexerbash.h>
 #include <Qsci/qscilexerperl.h>
@@ -137,9 +144,15 @@
 #ifdef HAVE_QSCINTILLA
   // editor styles: create lexer, read settings, and create dialog elements
   QsciLexer *lexer;
+#if defined (HAVE_LEXER_OCTAVE)
   lexer = new QsciLexerOctave ();
   read_lexer_settings (lexer,settings);
   delete lexer;
+#elif defined (HAVE_LEXER_MATLAB)
+  lexer = new QsciLexerMatlab ();
+  read_lexer_settings (lexer,settings);
+  delete lexer;
+#endif
   lexer = new QsciLexerCPP ();
   read_lexer_settings (lexer,settings);
   delete lexer;
@@ -393,9 +406,15 @@
 #ifdef HAVE_QSCINTILLA
   // editor styles: create lexer, get dialog contents, and write settings
   QsciLexer *lexer;
+#if defined (HAVE_LEXER_OCTAVE)
   lexer = new QsciLexerOctave ();
   write_lexer_settings (lexer,settings);
   delete lexer;
+#elif defined (HAVE_LEXER_MATLAB)
+  lexer = new QsciLexerMatlab ();
+  write_lexer_settings (lexer,settings);
+  delete lexer;
+#endif
   lexer = new QsciLexerCPP ();
   write_lexer_settings (lexer,settings);
   delete lexer;