Skip to content

Commit cb360f0

Browse files
nyalldawsonnyalldawson
committedApr 17, 2023
Make cppcheck test check for missing overrides
·
ltr-3_40final-3_32_0
1 parent 5b4c898 commit cb360f0

File tree

7 files changed

+16
-13
lines changed

7 files changed

+16
-13
lines changed
 

‎python/gui/auto_generated/qgsrelationeditorwidget.sip.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,16 @@ Create a new configuration widget
175175
:param parent: A parent widget
176176
%End
177177

178-
QVariantMap config();
178+
virtual QVariantMap config();
179+
179180
%Docstring
180181
Create a configuration from the current GUI state
181182

182183
:return: A widget configuration
183184
%End
184185

185-
void setConfig( const QVariantMap &config );
186+
virtual void setConfig( const QVariantMap &config );
187+
186188
%Docstring
187189
Update the configuration widget to represent the given configuration.
188190

‎scripts/cppcheck.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ cppcheck --library=qt.cfg --inline-suppr \
3333
-DSIP_FACTORY= \
3434
-DSIP_PYNAME= \
3535
-DSIP_THROW= \
36+
-DFINAL="final" \
3637
-DCMAKE_SOURCE_DIR="/foo/bar" \
3738
-DQ_NOWARN_DEPRECATED_PUSH= \
3839
-DQ_NOWARN_DEPRECATED_POP= \
@@ -63,7 +64,7 @@ ret_code=0
6364
cat ${LOG_FILE} | grep -v -e "syntaxError," -e "cppcheckError," > ${LOG_FILE}.tmp
6465
mv ${LOG_FILE}.tmp ${LOG_FILE}
6566

66-
ERROR_CATEGORIES=("clarifyCalculation" "duplicateExpressionTernary" "redundantCondition" "postfixOperator" "functionConst" "unsignedLessThanZero" "duplicateBranch")
67+
ERROR_CATEGORIES=("clarifyCalculation" "duplicateExpressionTernary" "redundantCondition" "postfixOperator" "functionConst" "unsignedLessThanZero" "duplicateBranch" "missingOverride")
6768

6869
# unusedPrivateFunction not reliable enough in cppcheck 1.72 of Ubuntu 16.04
6970
if test "$(cppcheck --version)" != "Cppcheck 1.72"; then

‎src/3d/mesh/qgsmesh3dentity_p.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ class QgsMeshDataset3dEntity: public Qt3DCore::QEntity, public QgsMesh3dEntity
8080
const QgsMesh3DSymbol *symbol );
8181

8282
private:
83-
virtual void buildGeometry();
84-
virtual void applyMaterial();
83+
void buildGeometry() override;
84+
void applyMaterial() override;
8585

8686
QgsMeshLayer *layer() const;
8787
QgsMapLayerRef mLayerRef;
@@ -101,8 +101,8 @@ class QgsMesh3dTerrainTileEntity: public QgsTerrainTileEntity, public QgsMesh3dE
101101
Qt3DCore::QNode *parent = nullptr );
102102

103103
private:
104-
virtual void buildGeometry();
105-
virtual void applyMaterial();
104+
void buildGeometry() override;
105+
void applyMaterial() override;
106106
};
107107

108108
///@endcond

‎src/3d/mesh/qgsmesh3dgeometry_p.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ class QgsMeshDataset3DGeometryBuilder: public QgsMesh3DGeometryBuilder
233233
float vertScale,
234234
const QgsMeshDataset3dGeometry::VertexData &vertexData,
235235
QObject *parent );
236-
void start();
236+
void start() override;
237237

238238
private:
239239
QgsMesh mNativeMesh;

‎src/core/qgspointlocatorinittask.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class QgsPointLocatorInitTask : public QgsTask
4646
*/
4747
bool isBuildOK() const;
4848

49-
bool run();
49+
bool run() override;
5050

5151
private:
5252

‎src/gui/processing/qgsprocessingmeshdatasetwidget.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class GUI_EXPORT QgsProcessingMeshDatasetGroupsParameterDefinitionWidget : publi
111111
const QgsProcessingParameterDefinition *definition = nullptr,
112112
const QgsProcessingAlgorithm *algorithm = nullptr, QWidget *parent SIP_TRANSFERTHIS = nullptr );
113113

114-
QgsProcessingParameterDefinition *createParameter( const QString &name, const QString &description, QgsProcessingParameterDefinition::Flags flags ) const;
114+
QgsProcessingParameterDefinition *createParameter( const QString &name, const QString &description, QgsProcessingParameterDefinition::Flags flags ) const override;
115115

116116
private:
117117
QComboBox *mParentLayerComboBox = nullptr;
@@ -214,7 +214,7 @@ class GUI_EXPORT QgsProcessingMeshDatasetTimeParameterDefinitionWidget : public
214214
const QgsProcessingParameterDefinition *definition = nullptr,
215215
const QgsProcessingAlgorithm *algorithm = nullptr, QWidget *parent SIP_TRANSFERTHIS = nullptr );
216216

217-
QgsProcessingParameterDefinition *createParameter( const QString &name, const QString &description, QgsProcessingParameterDefinition::Flags flags ) const;
217+
QgsProcessingParameterDefinition *createParameter( const QString &name, const QString &description, QgsProcessingParameterDefinition::Flags flags ) const override;
218218

219219
private:
220220
QComboBox *mParentDatasetComboBox = nullptr;

‎src/gui/qgsrelationeditorwidget.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,14 +294,14 @@ class GUI_EXPORT QgsRelationEditorConfigWidget : public QgsAbstractRelationEdito
294294
*
295295
* \returns A widget configuration
296296
*/
297-
QVariantMap config();
297+
QVariantMap config() override;
298298

299299
/**
300300
* \brief Update the configuration widget to represent the given configuration.
301301
*
302302
* \param config The configuration which should be represented by this widget
303303
*/
304-
void setConfig( const QVariantMap &config );
304+
void setConfig( const QVariantMap &config ) override;
305305

306306
};
307307

0 commit comments

Comments
 (0)
Please sign in to comment.