Fix wordcharacters

qgis · Sep 8, 2018 · f1db2ae · f1db2ae
1 parent cebaa81
commit f1db2ae
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/gui/qgscodeeditorexpression.cpp b/src/gui/qgscodeeditorexpression.cpp
@@ -16,12 +16,10 @@
 #include "qgsapplication.h"
 #include "qgscodeeditorexpression.h"
 
-#include <QWidget>
 #include <QString>
 #include <QFont>
 #include <QLabel>
 
-
 QgsCodeEditorExpression::QgsCodeEditorExpression( QWidget *parent )
   : QgsCodeEditor( parent )
 {
@@ -146,18 +144,22 @@ void QgsCodeEditorExpression::updateApis()
   mSqlLexer->setAPIs( mApis );
 }
 
+QgsCaseInsensitiveLexerExpression::QgsCaseInsensitiveLexerExpression( QObject *parent )
+  : QsciLexerSQL( parent )
+{
+}
+
 bool QgsCaseInsensitiveLexerExpression::caseSensitive() const
 {
   return false;
 }
-#if 0
+
 const char *QgsCaseInsensitiveLexerExpression::wordCharacters() const
 {
-  static QString wordChars;
+  return "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_@";
-
-  wordChars = QsciLexerSQL::wordCharacters();
-  wordChars += '@';
-  return wordChars.toUtf8().constData();
 }
 
-#endif
+const char *QgsCaseInsensitiveLexerExpression::autoCompletionFillups() const
+{
+  return "(";
+}
diff --git a/src/gui/qgscodeeditorexpression.h b/src/gui/qgscodeeditorexpression.h
@@ -82,14 +82,14 @@ class QgsCaseInsensitiveLexerExpression : public QsciLexerSQL
     Q_OBJECT
 
   public:
-    //! constructor
+    //! Constructor
-    explicit QgsCaseInsensitiveLexerExpression( QObject *parent = nullptr ) : QsciLexerSQL( parent ) {}
+    explicit QgsCaseInsensitiveLexerExpression( QObject *parent = nullptr );
 
     bool caseSensitive() const override;
 
-#if 0
     const char *wordCharacters() const override;
-#endif
+
+    const char *autoCompletionFillups() const override;
 };
 ///@endcond
 #endif