Avoid cppcheck warnings

qgis · Oct 5, 2020 · 63a5cda · 63a5cda
1 parent 45c40c9
commit 63a5cda
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/src/gui/qgscodeeditorcss.cpp b/src/gui/qgscodeeditorcss.cpp
@@ -31,7 +31,7 @@ QgsCodeEditorCSS::QgsCodeEditorCSS( QWidget *parent )
   }
   setMarginVisible( false );
   setFoldingVisible( true );
-  initializeLexer();
+  QgsCodeEditorCSS::initializeLexer();
 }
 
 void QgsCodeEditorCSS::initializeLexer()

diff --git a/src/gui/qgscodeeditorexpression.cpp b/src/gui/qgscodeeditorexpression.cpp
@@ -30,7 +30,7 @@ QgsCodeEditorExpression::QgsCodeEditorExpression( QWidget *parent )
   setMarginVisible( false );
   setFoldingVisible( true );
   setAutoCompletionCaseSensitivity( false );
-  initializeLexer();
+  QgsCodeEditorExpression::initializeLexer(); // avoid cppcheck warning by explicitly specifying namespace
 }
 
 void QgsCodeEditorExpression::setExpressionContext( const QgsExpressionContext &context )

diff --git a/src/gui/qgscodeeditorexpression.h b/src/gui/qgscodeeditorexpression.h
@@ -60,7 +60,7 @@ class GUI_EXPORT QgsCodeEditorExpression : public QgsCodeEditor
   private:
     void updateApis();
     QsciAPIs *mApis = nullptr;
-    QsciLexerSQL *mSqlLexer;
+    QsciLexerSQL *mSqlLexer = nullptr;
 
     QStringList mVariables;
     QStringList mContextFunctions;

diff --git a/src/gui/qgscodeeditorhtml.cpp b/src/gui/qgscodeeditorhtml.cpp
@@ -32,7 +32,7 @@ QgsCodeEditorHTML::QgsCodeEditorHTML( QWidget *parent )
   }
   setMarginVisible( false );
   setFoldingVisible( true );
-  initializeLexer();
+  QgsCodeEditorHTML::initializeLexer();
 }
 
 void QgsCodeEditorHTML::initializeLexer()

diff --git a/src/gui/qgscodeeditorjs.cpp b/src/gui/qgscodeeditorjs.cpp
@@ -31,7 +31,7 @@ QgsCodeEditorJavascript::QgsCodeEditorJavascript( QWidget *parent )
   }
   setMarginVisible( false );
   setFoldingVisible( true );
-  initializeLexer();
+  QgsCodeEditorJavascript::initializeLexer();
 }
 
 void QgsCodeEditorJavascript::initializeLexer()

diff --git a/src/gui/qgscodeeditorpython.cpp b/src/gui/qgscodeeditorpython.cpp
@@ -35,7 +35,7 @@ QgsCodeEditorPython::QgsCodeEditorPython( QWidget *parent, const QList<QString>
   {
     setTitle( tr( "Python Editor" ) );
   }
-  initializeLexer();
+  QgsCodeEditorPython::initializeLexer();
 }
 
 void QgsCodeEditorPython::initializeLexer()

diff --git a/src/gui/qgscodeeditorsql.cpp b/src/gui/qgscodeeditorsql.cpp
@@ -32,7 +32,7 @@ QgsCodeEditorSQL::QgsCodeEditorSQL( QWidget *parent )
   setMarginVisible( false );
   setFoldingVisible( true );
   setAutoCompletionCaseSensitivity( false );
-  initializeLexer();
+  QgsCodeEditorSQL::initializeLexer(); // avoid cppcheck warning by explicitly specifying namespace
 }
 
 void QgsCodeEditorSQL::initializeLexer()

diff --git a/src/gui/qgscodeeditorsql.h b/src/gui/qgscodeeditorsql.h
@@ -52,7 +52,7 @@ class GUI_EXPORT QgsCodeEditorSQL : public QgsCodeEditor
   private:
     void updateApis();
     QsciAPIs *mApis = nullptr;
-    QsciLexerSQL *mSqlLexer;
+    QsciLexerSQL *mSqlLexer = nullptr;
 
     QStringList mFieldNames;
 };