Merge pull request #36873 from rouault/cppcheck_gh_action

Fix remaining cppcheck warnings, add scripts/cppcheck.sh and corresponding GH workflow jobs
qgis · Jun 2, 2020 · b4f5b48 · b4f5b48
2 parents dd86a5a + 9df71ef
commit b4f5b48
Show file tree

Hide file tree

Showing 97 changed files with 613 additions and 396 deletions.
diff --git a/.github/workflows/code_layout.yml b/.github/workflows/code_layout.yml
@@ -158,3 +158,29 @@ jobs:
         run: ./tests/code_layout/test_sip_include.sh
       - name: Sip Files Up To Date
         run: ./tests/code_layout/test_sipfiles_uptodate.sh
+
+  cppcheck_16_04:
+    runs-on: ubuntu-16.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install Requirements
+        run: |
+          sudo apt install -y cppcheck
+
+      - name: Run cppcheck test
+        run: ./scripts/cppcheck.sh
+
+  cppcheck_18_04:
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install Requirements
+        run: |
+          sudo apt install -y cppcheck
+
+      - name: Run cppcheck test
+        run: ./scripts/cppcheck.sh
diff --git a/python/core/auto_generated/diagram/qgsdiagram.sip.in b/python/core/auto_generated/diagram/qgsdiagram.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsDiagram
+class QgsDiagram /NoDefaultCtors/
 {
 %Docstring
 Base class for all diagram types*

diff --git a/python/core/auto_generated/diagram/qgshistogramdiagram.sip.in b/python/core/auto_generated/diagram/qgshistogramdiagram.sip.in
@@ -11,7 +11,7 @@
 
 
 
-class QgsHistogramDiagram: QgsDiagram
+class QgsHistogramDiagram: QgsDiagram /NoDefaultCtors/
 {
 
 %TypeHeaderCode

diff --git a/python/core/auto_generated/diagram/qgspiediagram.sip.in b/python/core/auto_generated/diagram/qgspiediagram.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsPieDiagram: QgsDiagram
+class QgsPieDiagram: QgsDiagram /NoDefaultCtors/
 {
 
 %TypeHeaderCode

diff --git a/python/core/auto_generated/diagram/qgsstackedbardiagram.sip.in b/python/core/auto_generated/diagram/qgsstackedbardiagram.sip.in
@@ -11,7 +11,7 @@
 
 
 
-class QgsStackedBarDiagram: QgsDiagram
+class QgsStackedBarDiagram: QgsDiagram /NoDefaultCtors/
 {
 %Docstring
 

diff --git a/python/core/auto_generated/diagram/qgstextdiagram.sip.in b/python/core/auto_generated/diagram/qgstextdiagram.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsTextDiagram: QgsDiagram
+class QgsTextDiagram: QgsDiagram /NoDefaultCtors/
 {
 
 %TypeHeaderCode

diff --git a/python/core/auto_generated/effects/qgsblureffect.sip.in b/python/core/auto_generated/effects/qgsblureffect.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsBlurEffect : QgsPaintEffect
+class QgsBlurEffect : QgsPaintEffect /NoDefaultCtors/
 {
 %Docstring
 A paint effect which blurs a source picture, using a number of different blur

diff --git a/python/core/auto_generated/effects/qgscoloreffect.sip.in b/python/core/auto_generated/effects/qgscoloreffect.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsColorEffect : QgsPaintEffect
+class QgsColorEffect : QgsPaintEffect /NoDefaultCtors/
 {
 %Docstring
 A paint effect which alters the colors (e.g., brightness, contrast) in a

diff --git a/python/core/auto_generated/effects/qgseffectstack.sip.in b/python/core/auto_generated/effects/qgseffectstack.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsEffectStack : QgsPaintEffect
+class QgsEffectStack : QgsPaintEffect /NoDefaultCtors/
 {
 %Docstring
 A paint effect which consists of a stack of other chained paint effects

diff --git a/python/core/auto_generated/effects/qgspainteffect.sip.in b/python/core/auto_generated/effects/qgspainteffect.sip.in
@@ -10,7 +10,7 @@
 
 
 
-class QgsPaintEffect
+class QgsPaintEffect /NoDefaultCtors/
 {
 %Docstring
 Base class for visual effects which can be applied to QPicture drawings
@@ -319,7 +319,7 @@ to rendering results onto a painter.
 };
 
 
-class QgsDrawSourceEffect : QgsPaintEffect
+class QgsDrawSourceEffect : QgsPaintEffect /NoDefaultCtors/
 {
 %Docstring
 A paint effect which draws the source picture with minor or no alterations

diff --git a/python/core/auto_generated/effects/qgsshadoweffect.sip.in b/python/core/auto_generated/effects/qgsshadoweffect.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsShadowEffect : QgsPaintEffect
+class QgsShadowEffect : QgsPaintEffect /NoDefaultCtors/
 {
 %Docstring
 Base class for paint effects which offset, blurred shadows
@@ -295,7 +295,7 @@ the picture.
 };
 
 
-class QgsDropShadowEffect : QgsShadowEffect
+class QgsDropShadowEffect : QgsShadowEffect /NoDefaultCtors/
 {
 %Docstring
 A paint effect which draws an offset and optionally blurred drop shadow
@@ -331,7 +331,7 @@ Creates a new QgsDropShadowEffect effect from a properties string map.
 
 };
 
-class QgsInnerShadowEffect : QgsShadowEffect
+class QgsInnerShadowEffect : QgsShadowEffect /NoDefaultCtors/
 {
 %Docstring
 A paint effect which draws an offset and optionally blurred drop shadow

diff --git a/python/core/auto_generated/effects/qgstransformeffect.sip.in b/python/core/auto_generated/effects/qgstransformeffect.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsTransformEffect : QgsPaintEffect
+class QgsTransformEffect : QgsPaintEffect /NoDefaultCtors/
 {
 %Docstring
 A paint effect which applies transformations (such as move,

diff --git a/python/core/auto_generated/layertree/qgslayertreenode.sip.in b/python/core/auto_generated/layertree/qgslayertreenode.sip.in
@@ -313,6 +313,7 @@ Low-level removal of children from the node.
 %End
 
   protected:
+
 };
 
 

diff --git a/python/server/auto_generated/qgsaccesscontrol.sip.in b/python/server/auto_generated/qgsaccesscontrol.sip.in
@@ -38,6 +38,7 @@ Constructor
 
     ~QgsAccessControl();
 
+
     void resolveFilterFeatures( const QList<QgsMapLayer *> &layers );
 %Docstring
 Resolve features' filter of layers

diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+set -eu
+
+SCRIPT_DIR=$(dirname "$0")
+case $SCRIPT_DIR in
+    "/"*)
+        ;;
+    ".")
+        SCRIPT_DIR=$(pwd)
+        ;;
+    *)
+        SCRIPT_DIR=$(pwd)/$(dirname "$0")
+        ;;
+esac
+
+LOG_FILE=/tmp/cppcheck_qgis.txt
+
+rm -f ${LOG_FILE}
+echo "Checking ${SCRIPT_DIR}/../src ..."
+
+cppcheck --library=qt.cfg --inline-suppr \
+         --template='{file}:{line},{severity},{id},{message}' \
+         --enable=all --inconclusive --std=c++11 \
+         -DPROJ_VERSION_MAJOR=6 \
+         -USIP_RUN \
+         -DSIP_TRANSFER= \
+         -DSIP_TRANSFERTHIS= \
+         -DSIP_INOUT= \
+         -DSIP_OUT= \
+         -j $(nproc) \
+         ${SCRIPT_DIR}/../src \
+         >>${LOG_FILE} 2>&1 &
+
+PID=$!
+while kill -0 $PID 2>/dev/null; do
+    printf "."
+    sleep 1
+done
+echo " done"
+if ! wait $PID; then
+    echo "cppcheck failed"
+    exit 1
+fi
+
+ret_code=0
+
+for category in "error" "style" "performance" "portability"; do
+    if grep "${category}," ${LOG_FILE} >/dev/null; then
+        echo "INFO: Issues in '${category}' category found, but not considered as making script to fail:"
+        grep "${category}," ${LOG_FILE} | grep -v "clarifyCalculation,"
+        echo ""
+    fi
+done
+
+for category in "warning" "clarifyCalculation"; do
+    if grep "${category}," ${LOG_FILE}  >/dev/null; then
+        echo "ERROR: Issues in '${category}' category found:"
+        grep "${category}," ${LOG_FILE}
+        echo ""
+        echo "${category} check failed !"
+        ret_code=1
+    fi
+done
+
+if [ ${ret_code} = 0 ]; then
+    echo "cppcheck succeeded"
+fi
+
+exit ${ret_code}
diff --git a/src/3d/mesh/qgsmesh3dentity_p.cpp b/src/3d/mesh/qgsmesh3dentity_p.cpp
@@ -49,11 +49,10 @@ void QgsMesh3dEntity::build()
 
 void QgsMeshDataset3dEntity::buildGeometry()
 {
-  Qt3DRender::QGeometryRenderer *mesh = new Qt3DRender::QGeometryRenderer;
-
   if ( !layer() )
     return;
 
+  Qt3DRender::QGeometryRenderer *mesh = new Qt3DRender::QGeometryRenderer;
   mesh->setGeometry( new QgsMeshDataset3dGeometry( layer(), mMapSettings.temporalRange(), mMapSettings.origin(), mSymbol, mesh ) );
   addComponent( mesh );
 }
@@ -82,11 +81,10 @@ QgsMesh3dTerrainTileEntity::QgsMesh3dTerrainTileEntity( const Qgs3DMapSettings &
 
 void QgsMesh3dTerrainTileEntity::buildGeometry()
 {
-  Qt3DRender::QGeometryRenderer *mesh = new Qt3DRender::QGeometryRenderer;
-
   if ( !layer() )
     return;
 
+  Qt3DRender::QGeometryRenderer *mesh = new Qt3DRender::QGeometryRenderer;
   mesh->setGeometry( new QgsMeshTerrain3dGeometry( layer(), mMapSettings.origin(), mSymbol, mesh ) );
   addComponent( mesh );
 }

diff --git a/src/3d/symbols/qgspoint3dsymbol.h b/src/3d/symbols/qgspoint3dsymbol.h
@@ -112,6 +112,8 @@ class _3D_EXPORT QgsPoint3DSymbol : public QgsAbstract3DSymbol
     std::unique_ptr<QgsMarkerSymbol> mBillboardSymbol;
 #ifdef SIP_RUN
     QgsPoint3DSymbol &operator=( const QgsPoint3DSymbol & );
+#else
+    QgsPoint3DSymbol &operator=( const QgsPoint3DSymbol & ) = delete;
 #endif
 };
 

diff --git a/src/analysis/processing/qgsalgorithmgrid.cpp b/src/analysis/processing/qgsalgorithmgrid.cpp
@@ -286,7 +286,7 @@ void QgsGridAlgorithm::createLineGrid( std::unique_ptr< QgsFeatureSink > &sink,
 
   while ( x <= mGridExtent.xMaximum() )
   {
-    if ( feedback && feedback->isCanceled() )
+    if ( feedback->isCanceled() )
       break;
 
     QgsPoint pt1 = QgsPoint( x, mGridExtent.yMaximum() );

diff --git a/src/analysis/processing/qgsalgorithmrandompointsextent.cpp b/src/analysis/processing/qgsalgorithmrandompointsextent.cpp
@@ -113,7 +113,7 @@ QVariantMap QgsRandomPointsExtentAlgorithm::processAlgorithm( const QVariantMap
     int i = 0;
     while ( i < mNumPoints )
     {
-      if ( feedback && feedback->isCanceled() )
+      if ( feedback->isCanceled() )
         break;
 
       double rx = x_distribution( random_device );
@@ -136,7 +136,7 @@ QVariantMap QgsRandomPointsExtentAlgorithm::processAlgorithm( const QVariantMap
     int i = 0;
     while ( i < mNumPoints )
     {
-      if ( feedback && feedback->isCanceled() )
+      if ( feedback->isCanceled() )
         break;
 
       double rx = x_distribution( random_device );

diff --git a/src/analysis/processing/qgsalgorithmzonalhistogram.cpp b/src/analysis/processing/qgsalgorithmzonalhistogram.cpp
@@ -116,7 +116,7 @@ QVariantMap QgsZonalHistogramAlgorithm::processAlgorithm( const QVariantMap &par
   QgsFeature f;
   while ( it.nextFeature( f ) )
   {
-    if ( feedback && feedback->isCanceled() )
+    if ( feedback->isCanceled() )
     {
       break;
     }

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h b/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h
@@ -180,6 +180,8 @@ class ANALYSIS_EXPORT QgsGeometryCheckerUtils
             QgsFeatureIds::const_iterator mFeatureIt;
             const LayerFeatures *mParent = nullptr;
             std::unique_ptr<QgsGeometryCheckerUtils::LayerFeature> mCurrentFeature;
+
+            iterator &operator= ( const iterator & ) = delete;
         };
 
         /**

diff --git a/src/analysis/vector/qgszonalstatistics.cpp b/src/analysis/vector/qgszonalstatistics.cpp
@@ -173,31 +173,31 @@ int QgsZonalStatistics::calculateStatistics( QgsFeedback *feedback )
   vectorProvider->addAttributes( newFieldList );
 
   //index of the new fields
-  int countIndex = mStatistics & QgsZonalStatistics::Count ? vectorProvider->fieldNameIndex( countFieldName ) : -1;
-  int sumIndex = mStatistics & QgsZonalStatistics::Sum ? vectorProvider->fieldNameIndex( sumFieldName ) : -1;
-  int meanIndex = mStatistics & QgsZonalStatistics::Mean ? vectorProvider->fieldNameIndex( meanFieldName ) : -1;
-  int medianIndex = mStatistics & QgsZonalStatistics::Median ? vectorProvider->fieldNameIndex( medianFieldName ) : -1;
-  int stdevIndex = mStatistics & QgsZonalStatistics::StDev ? vectorProvider->fieldNameIndex( stdevFieldName ) : -1;
-  int minIndex = mStatistics & QgsZonalStatistics::Min ? vectorProvider->fieldNameIndex( minFieldName ) : -1;
-  int maxIndex = mStatistics & QgsZonalStatistics::Max ? vectorProvider->fieldNameIndex( maxFieldName ) : -1;
-  int rangeIndex = mStatistics & QgsZonalStatistics::Range ? vectorProvider->fieldNameIndex( rangeFieldName ) : -1;
-  int minorityIndex = mStatistics & QgsZonalStatistics::Minority ? vectorProvider->fieldNameIndex( minorityFieldName ) : -1;
-  int majorityIndex = mStatistics & QgsZonalStatistics::Majority ? vectorProvider->fieldNameIndex( majorityFieldName ) : -1;
-  int varietyIndex = mStatistics & QgsZonalStatistics::Variety ? vectorProvider->fieldNameIndex( varietyFieldName ) : -1;
-  int varianceIndex = mStatistics & QgsZonalStatistics::Variance ? vectorProvider->fieldNameIndex( varianceFieldName ) : -1;
-
-  if ( ( mStatistics & QgsZonalStatistics::Count && countIndex == -1 )
-       || ( mStatistics & QgsZonalStatistics::Sum && sumIndex == -1 )
-       || ( mStatistics & QgsZonalStatistics::Mean && meanIndex == -1 )
-       || ( mStatistics & QgsZonalStatistics::Median && medianIndex == -1 )
-       || ( mStatistics & QgsZonalStatistics::StDev && stdevIndex == -1 )
-       || ( mStatistics & QgsZonalStatistics::Min && minIndex == -1 )
-       || ( mStatistics & QgsZonalStatistics::Max && maxIndex == -1 )
-       || ( mStatistics & QgsZonalStatistics::Range && rangeIndex == -1 )
-       || ( mStatistics & QgsZonalStatistics::Minority && minorityIndex == -1 )
-       || ( mStatistics & QgsZonalStatistics::Majority && majorityIndex == -1 )
-       || ( mStatistics & QgsZonalStatistics::Variety && varietyIndex == -1 )
-       || ( mStatistics & QgsZonalStatistics::Variance && varianceIndex == -1 )
+  int countIndex = ( mStatistics & QgsZonalStatistics::Count ) ? vectorProvider->fieldNameIndex( countFieldName ) : -1;
+  int sumIndex = ( mStatistics & QgsZonalStatistics::Sum ) ? vectorProvider->fieldNameIndex( sumFieldName ) : -1;
+  int meanIndex = ( mStatistics & QgsZonalStatistics::Mean ) ? vectorProvider->fieldNameIndex( meanFieldName ) : -1;
+  int medianIndex = ( mStatistics & QgsZonalStatistics::Median ) ? vectorProvider->fieldNameIndex( medianFieldName ) : -1;
+  int stdevIndex = ( mStatistics & QgsZonalStatistics::StDev ) ? vectorProvider->fieldNameIndex( stdevFieldName ) : -1;
+  int minIndex = ( mStatistics & QgsZonalStatistics::Min ) ? vectorProvider->fieldNameIndex( minFieldName ) : -1;
+  int maxIndex = ( mStatistics & QgsZonalStatistics::Max ) ? vectorProvider->fieldNameIndex( maxFieldName ) : -1;
+  int rangeIndex = ( mStatistics & QgsZonalStatistics::Range ) ? vectorProvider->fieldNameIndex( rangeFieldName ) : -1;
+  int minorityIndex = ( mStatistics & QgsZonalStatistics::Minority ) ? vectorProvider->fieldNameIndex( minorityFieldName ) : -1;
+  int majorityIndex = ( mStatistics & QgsZonalStatistics::Majority ) ? vectorProvider->fieldNameIndex( majorityFieldName ) : -1;
+  int varietyIndex = ( mStatistics & QgsZonalStatistics::Variety ) ? vectorProvider->fieldNameIndex( varietyFieldName ) : -1;
+  int varianceIndex = ( mStatistics & QgsZonalStatistics::Variance ) ? vectorProvider->fieldNameIndex( varianceFieldName ) : -1;
+
+  if ( ( ( mStatistics & QgsZonalStatistics::Count ) && countIndex == -1 )
+       || ( ( mStatistics & QgsZonalStatistics::Sum ) && sumIndex == -1 )
+       || ( ( mStatistics & QgsZonalStatistics::Mean ) && meanIndex == -1 )
+       || ( ( mStatistics & QgsZonalStatistics::Median ) && medianIndex == -1 )
+       || ( ( mStatistics & QgsZonalStatistics::StDev ) && stdevIndex == -1 )
+       || ( ( mStatistics & QgsZonalStatistics::Min ) && minIndex == -1 )
+       || ( ( mStatistics & QgsZonalStatistics::Max ) && maxIndex == -1 )
+       || ( ( mStatistics & QgsZonalStatistics::Range ) && rangeIndex == -1 )
+       || ( ( mStatistics & QgsZonalStatistics::Minority ) && minorityIndex == -1 )
+       || ( ( mStatistics & QgsZonalStatistics::Majority ) && majorityIndex == -1 )
+       || ( ( mStatistics & QgsZonalStatistics::Variety ) && varietyIndex == -1 )
+       || ( ( mStatistics & QgsZonalStatistics::Variance ) && varianceIndex == -1 )
      )
   {
     //failed to create a required field