Skip to content

Commit 9d25119

Browse files
authored
Merge pull request #5870 from nyalldawson/virtual
Drop redundant virtual keywords on overrides
2 parents 978d927 + 71a39cb commit 9d25119

File tree

910 files changed

+3544
-2724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

910 files changed

+3544
-2724
lines changed

python/analysis/network/qgsgraphdirector.sip

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ using "builder" design patter.
3232
%End
3333
public:
3434

35-
virtual ~QgsGraphDirector();
36-
3735
virtual void makeGraph( QgsGraphBuilderInterface *builder,
3836
const QVector< QgsPointXY > &additionalPoints,
3937
QVector< QgsPointXY > &snappedPoints /Out/,

python/analysis/network/qgsnetworkdistancestrategy.sip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ used for finding shortest path between two points.
2222
%End
2323
public:
2424
virtual QVariant cost( double distance, const QgsFeature & ) const;
25+
2526
};
2627

2728
/************************************************************************

python/analysis/network/qgsvectorlayerdirector.sip

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ Default constructor
4848
attribute value is not set or does not equal to the given values
4949
%End
5050

51-
virtual ~QgsVectorLayerDirector();
52-
5351
virtual void makeGraph( QgsGraphBuilderInterface *builder,
5452
const QVector< QgsPointXY > &additionalPoints,
5553
QVector< QgsPointXY> &snappedPoints /Out/,

python/analysis/raster/qgsderivativefilter.sip

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ Adds the ability to calculate derivatives in x- and y-directions. Needs to be su
2020
%End
2121
public:
2222
QgsDerivativeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
23-
virtual ~QgsDerivativeFilter();
24-
virtual float processNineCellWindow( float *x11, float *x21, float *x31,
25-
float *x12, float *x22, float *x32,
26-
float *x13, float *x23, float *x33 ) = 0;
23+
24+
virtual float processNineCellWindow( float *x11, float *x21, float *x31,
25+
float *x12, float *x22, float *x32,
26+
float *x13, float *x23, float *x33 ) = 0;
2727

2828
protected:
2929
float calcFirstDerX( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 );

python/analysis/raster/qgsruggednessfilter.sip

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Algorithm from Riley et al. 1999: A terrain ruggedness index that quantifies top
2121
%End
2222
public:
2323
QgsRuggednessFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
24-
~QgsRuggednessFilter();
2524

2625
protected:
2726

python/analysis/raster/qgsslopefilter.sip

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Calculates slope values in a window of 3x3 cells based on first order derivative
2020
%End
2121
public:
2222
QgsSlopeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
23-
~QgsSlopeFilter();
2423

2524
virtual float processNineCellWindow( float *x11, float *x21, float *x31,
2625
float *x12, float *x22, float *x32,

python/analysis/raster/qgstotalcurvaturefilter.sip

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Calculates total curvature as described by Wilson, Gallant (2000): terrain analy
2020
%End
2121
public:
2222
QgsTotalCurvatureFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
23-
~QgsTotalCurvatureFilter();
2423

2524
protected:
2625

python/core/annotations/qgshtmlannotation.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ An annotation item that embeds HTML content.
3030
Constructor for QgsHtmlAnnotation.
3131
%End
3232

33-
~QgsHtmlAnnotation();
34-
3533
virtual QgsHtmlAnnotation *clone() const /Factory/;
3634

3735

@@ -55,8 +53,10 @@ Returns the file path for the source HTML file.
5553
%End
5654

5755
virtual void writeXml( QDomElement &elem, QDomDocument &doc, const QgsReadWriteContext &context ) const;
56+
5857
virtual void readXml( const QDomElement &itemElem, const QgsReadWriteContext &context );
5958

59+
6060
virtual void setAssociatedFeature( const QgsFeature &feature );
6161

6262

python/core/annotations/qgssvgannotation.sip

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ Constructor for QgsSvgAnnotation.
3131

3232

3333
virtual void writeXml( QDomElement &elem, QDomDocument &doc, const QgsReadWriteContext &context ) const;
34+
3435
virtual void readXml( const QDomElement &itemElem, const QgsReadWriteContext &context );
3536

37+
3638
void setFilePath( const QString &file );
3739
%Docstring
3840
Sets the file path for the source SVG file.

python/core/annotations/qgstextannotation.sip

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ within the annotation. Ownership is not transferred.
4949
%End
5050

5151
virtual void writeXml( QDomElement &elem, QDomDocument &doc, const QgsReadWriteContext &context ) const;
52+
5253
virtual void readXml( const QDomElement &itemElem, const QgsReadWriteContext &context );
5354

55+
5456
static QgsTextAnnotation *create() /Factory/;
5557
%Docstring
5658
Returns a new QgsTextAnnotation object.

0 commit comments

Comments
 (0)