Mercurial > octave-nkf

changeset 16607:1eeeb2599870

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix style of matching braces in octave lexer * lexer-octave-gui.cc/.h (brace::Style): new function returning brace style * lexer-octave-gui.cc(defaultFont): fix shadow warnings during compilation
author Torsten <ttl@justmail.de>
date Fri, 03 May 2013 20:59:46 +0200
parents 6698d0c42fbf
children 739d7eb97b85
files libgui/src/m-editor/lexer-octave-gui.cc libgui/src/m-editor/lexer-octave-gui.h
diffstat 2 files changed, 15 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/m-editor/lexer-octave-gui.cc	Fri May 03 02:57:43 2013 -0400
+++ b/libgui/src/m-editor/lexer-octave-gui.cc	Fri May 03 20:59:46 2013 +0200
@@ -145,20 +145,29 @@
 QFont
 lexer_octave_gui::defaultFont (int style) const
 {
-  QFont font;
+  QFont f;
 
   switch (style)
     {
       case Keyword:
-        font = QsciLexer::defaultFont (style);
-        font.setBold(true);
+        f = QsciLexer::defaultFont (style);
+        f.setBold(true);
         break;
 
       default:
-        font = QsciLexer::defaultFont (style);
+        f = QsciLexer::defaultFont (style);
     }
 
-  return font;
+  return f;
+}
+
+// -----------------------------------------------------
+//  The style used for braces
+// -----------------------------------------------------
+int
+lexer_octave_gui::braceStyle() const
+{
+    return Operator;
 }
 
 // -----------------------------------------------------
--- a/libgui/src/m-editor/lexer-octave-gui.h	Fri May 03 02:57:43 2013 -0400
+++ b/libgui/src/m-editor/lexer-octave-gui.h	Fri May 03 20:59:46 2013 +0200
@@ -56,6 +56,7 @@
   QString description (int style) const;
   QColor defaultColor (int style) const;
   QFont defaultFont (int style) const;
+  int braceStyle() const;
 
 private:
   lexer_octave_gui (const lexer_octave_gui &);