Make cppcheck test check for missing overrides

qgis · Apr 17, 2023 · cb360f0 · cb360f0
1 parent 5b4c898
commit cb360f0
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/python/gui/auto_generated/qgsrelationeditorwidget.sip.in b/python/gui/auto_generated/qgsrelationeditorwidget.sip.in
@@ -175,14 +175,16 @@ Create a new configuration widget
 :param parent: A parent widget
 %End
 
-    QVariantMap config();
+    virtual QVariantMap config();
+
 %Docstring
 Create a configuration from the current GUI state
 
 :return: A widget configuration
 %End
 
-    void setConfig( const QVariantMap &config );
+    virtual void setConfig( const QVariantMap &config );
+
 %Docstring
 Update the configuration widget to represent the given configuration.
 

diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh
@@ -33,6 +33,7 @@ cppcheck --library=qt.cfg --inline-suppr \
          -DSIP_FACTORY= \
          -DSIP_PYNAME= \
          -DSIP_THROW= \
+         -DFINAL="final" \
          -DCMAKE_SOURCE_DIR="/foo/bar" \
          -DQ_NOWARN_DEPRECATED_PUSH= \
          -DQ_NOWARN_DEPRECATED_POP= \
@@ -63,7 +64,7 @@ ret_code=0
 cat ${LOG_FILE} | grep -v -e "syntaxError," -e "cppcheckError," > ${LOG_FILE}.tmp
 mv ${LOG_FILE}.tmp ${LOG_FILE}
 
-ERROR_CATEGORIES=("clarifyCalculation" "duplicateExpressionTernary" "redundantCondition" "postfixOperator" "functionConst" "unsignedLessThanZero" "duplicateBranch")
+ERROR_CATEGORIES=("clarifyCalculation" "duplicateExpressionTernary" "redundantCondition" "postfixOperator" "functionConst" "unsignedLessThanZero" "duplicateBranch" "missingOverride")
 
 # unusedPrivateFunction not reliable enough in cppcheck 1.72 of Ubuntu 16.04
 if test "$(cppcheck --version)" != "Cppcheck 1.72"; then

diff --git a/src/3d/mesh/qgsmesh3dentity_p.h b/src/3d/mesh/qgsmesh3dentity_p.h
@@ -80,8 +80,8 @@ class QgsMeshDataset3dEntity: public Qt3DCore::QEntity, public QgsMesh3dEntity
                             const QgsMesh3DSymbol *symbol );
 
   private:
-    virtual void buildGeometry();
-    virtual void applyMaterial();
+    void buildGeometry() override;
+    void applyMaterial() override;
 
     QgsMeshLayer *layer() const;
     QgsMapLayerRef mLayerRef;
@@ -101,8 +101,8 @@ class QgsMesh3dTerrainTileEntity: public QgsTerrainTileEntity, public QgsMesh3dE
                                 Qt3DCore::QNode *parent = nullptr );
 
   private:
-    virtual void buildGeometry();
-    virtual void applyMaterial();
+    void buildGeometry() override;
+    void applyMaterial() override;
 };
 
 ///@endcond

diff --git a/src/3d/mesh/qgsmesh3dgeometry_p.h b/src/3d/mesh/qgsmesh3dgeometry_p.h
@@ -233,7 +233,7 @@ class QgsMeshDataset3DGeometryBuilder: public QgsMesh3DGeometryBuilder
                                      float vertScale,
                                      const QgsMeshDataset3dGeometry::VertexData &vertexData,
                                      QObject *parent );
-    void start();
+    void start() override;
 
   private:
     QgsMesh mNativeMesh;

diff --git a/src/core/qgspointlocatorinittask.h b/src/core/qgspointlocatorinittask.h
@@ -46,7 +46,7 @@ class QgsPointLocatorInitTask : public QgsTask
      */
     bool isBuildOK() const;
 
-    bool run();
+    bool run() override;
 
   private:
 

diff --git a/src/gui/processing/qgsprocessingmeshdatasetwidget.h b/src/gui/processing/qgsprocessingmeshdatasetwidget.h
@@ -111,7 +111,7 @@ class GUI_EXPORT QgsProcessingMeshDatasetGroupsParameterDefinitionWidget : publi
         const QgsProcessingParameterDefinition *definition = nullptr,
         const QgsProcessingAlgorithm *algorithm = nullptr, QWidget *parent SIP_TRANSFERTHIS = nullptr );
 
-    QgsProcessingParameterDefinition *createParameter( const QString &name, const QString &description, QgsProcessingParameterDefinition::Flags flags ) const;
+    QgsProcessingParameterDefinition *createParameter( const QString &name, const QString &description, QgsProcessingParameterDefinition::Flags flags ) const override;
 
   private:
     QComboBox *mParentLayerComboBox = nullptr;
@@ -214,7 +214,7 @@ class GUI_EXPORT QgsProcessingMeshDatasetTimeParameterDefinitionWidget : public
         const QgsProcessingParameterDefinition *definition = nullptr,
         const QgsProcessingAlgorithm *algorithm = nullptr, QWidget *parent SIP_TRANSFERTHIS = nullptr );
 
-    QgsProcessingParameterDefinition *createParameter( const QString &name, const QString &description, QgsProcessingParameterDefinition::Flags flags ) const;
+    QgsProcessingParameterDefinition *createParameter( const QString &name, const QString &description, QgsProcessingParameterDefinition::Flags flags ) const override;
 
   private:
     QComboBox *mParentDatasetComboBox = nullptr;

diff --git a/src/gui/qgsrelationeditorwidget.h b/src/gui/qgsrelationeditorwidget.h
@@ -294,14 +294,14 @@ class GUI_EXPORT QgsRelationEditorConfigWidget : public QgsAbstractRelationEdito
      *
      * \returns A widget configuration
      */
-    QVariantMap config();
+    QVariantMap config() override;
 
     /**
      * \brief Update the configuration widget to represent the given configuration.
      *
      * \param config The configuration which should be represented by this widget
      */
-    void setConfig( const QVariantMap &config );
+    void setConfig( const QVariantMap &config ) override;
 
 };