Rename lexer

qgis · Sep 9, 2018 · 4b9cc9b · 4b9cc9b
1 parent beb8912
commit 4b9cc9b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/gui/qgscodeeditorexpression.cpp b/src/gui/qgscodeeditorexpression.cpp
@@ -106,7 +106,7 @@ void QgsCodeEditorExpression::initializeLexer()
   // The font size gotten from getMonospaceFont() is too small on Mac
   font.setPointSize( QLabel().font().pointSize() );
 #endif
-  mSqlLexer = new QgsCaseInsensitiveLexerExpression( this );
+  mSqlLexer = new QgsLexerExpression( this );
   mSqlLexer->setDefaultFont( font );
   mSqlLexer->setFont( font, -1 );
   font.setBold( true );
@@ -145,17 +145,22 @@ void QgsCodeEditorExpression::updateApis()
 }
 
 ///@cond PRIVATE
-QgsCaseInsensitiveLexerExpression::QgsCaseInsensitiveLexerExpression( QObject *parent )
+QgsLexerExpression::QgsLexerExpression( QObject *parent )
   : QsciLexerSQL( parent )
 {
 }
 
-bool QgsCaseInsensitiveLexerExpression::caseSensitive() const
+const char *QgsLexerExpression::language() const
+{
+  return "QGIS Expression";
+}
+
+bool QgsLexerExpression::caseSensitive() const
 {
   return false;
 }
 
-const char *QgsCaseInsensitiveLexerExpression::wordCharacters() const
+const char *QgsLexerExpression::wordCharacters() const
 {
   return "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_@";
 }

diff --git a/src/gui/qgscodeeditorexpression.h b/src/gui/qgscodeeditorexpression.h
@@ -77,13 +77,15 @@ class GUI_EXPORT QgsCodeEditorExpression : public QgsCodeEditor
    \note not available in Python bindings
    \ingroup gui
 */
-class QgsCaseInsensitiveLexerExpression : public QsciLexerSQL
+class QgsLexerExpression : public QsciLexerSQL
 {
     Q_OBJECT
 
   public:
     //! Constructor
-    explicit QgsCaseInsensitiveLexerExpression( QObject *parent = nullptr );
+    explicit QgsLexerExpression( QObject *parent = nullptr );
+
+    const char *language() const override;
 
     bool caseSensitive() const override;