Merge pull request #5870 from nyalldawson/virtual

Drop redundant virtual keywords on overrides

Author: nyalldawson

python/analysis/network/qgsgraphdirector.sip

@@ -32,8 +32,6 @@ using "builder" design patter.
 %End
   public:
 
-    virtual ~QgsGraphDirector();
-
     virtual void makeGraph( QgsGraphBuilderInterface *builder,
                             const QVector< QgsPointXY > &additionalPoints,
                             QVector< QgsPointXY > &snappedPoints /Out/,

python/analysis/network/qgsnetworkdistancestrategy.sip

@@ -22,6 +22,7 @@ used for finding shortest path between two points.
 %End
   public:
     virtual QVariant cost( double distance, const QgsFeature & ) const;
+
 };
 
 /************************************************************************

python/analysis/network/qgsvectorlayerdirector.sip

@@ -48,8 +48,6 @@ Default constructor
 attribute value is not set or does not equal to the given values
 %End
 
-    virtual ~QgsVectorLayerDirector();
-
      virtual void makeGraph( QgsGraphBuilderInterface *builder,
                     const QVector< QgsPointXY > &additionalPoints,
                     QVector< QgsPointXY> &snappedPoints /Out/,

python/analysis/raster/qgsderivativefilter.sip

@@ -20,10 +20,10 @@ Adds the ability to calculate derivatives in x- and y-directions. Needs to be su
 %End
   public:
     QgsDerivativeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
-    virtual ~QgsDerivativeFilter();
-    virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                         float *x12, float *x22, float *x32,
-                                         float *x13, float *x23, float *x33 ) = 0;
+
+     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
+                                 float *x12, float *x22, float *x32,
+                                 float *x13, float *x23, float *x33 ) = 0;
 
   protected:
     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

@@ -21,7 +21,6 @@ Algorithm from Riley et al. 1999: A terrain ruggedness index that quantifies top
 %End
   public:
     QgsRuggednessFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
-    ~QgsRuggednessFilter();
 
   protected:
 

python/analysis/raster/qgsslopefilter.sip

@@ -20,7 +20,6 @@ Calculates slope values in a window of 3x3 cells based on first order derivative
 %End
   public:
     QgsSlopeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
-    ~QgsSlopeFilter();
 
      virtual float processNineCellWindow( float *x11, float *x21, float *x31,
                                  float *x12, float *x22, float *x32,

python/analysis/raster/qgstotalcurvaturefilter.sip

@@ -20,7 +20,6 @@ Calculates total curvature as described by Wilson, Gallant (2000): terrain analy
 %End
   public:
     QgsTotalCurvatureFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
-    ~QgsTotalCurvatureFilter();
 
   protected:
 

python/core/annotations/qgshtmlannotation.sip

@@ -30,8 +30,6 @@ An annotation item that embeds HTML content.
 Constructor for QgsHtmlAnnotation.
 %End
 
-    ~QgsHtmlAnnotation();
-
     virtual QgsHtmlAnnotation *clone() const /Factory/;
 
 
@@ -55,8 +53,10 @@ Returns the file path for the source HTML file.
 %End
 
     virtual void writeXml( QDomElement &elem, QDomDocument &doc, const QgsReadWriteContext &context ) const;
+
     virtual void readXml( const QDomElement &itemElem, const QgsReadWriteContext &context );
 
+
     virtual void setAssociatedFeature( const QgsFeature &feature );
 
 

python/core/annotations/qgssvgannotation.sip

@@ -31,8 +31,10 @@ Constructor for QgsSvgAnnotation.
 
 
     virtual void writeXml( QDomElement &elem, QDomDocument &doc, const QgsReadWriteContext &context ) const;
+
     virtual void readXml( const QDomElement &itemElem, const QgsReadWriteContext &context );
 
+
     void setFilePath( const QString &file );
 %Docstring
 Sets the file path for the source SVG file.

python/core/annotations/qgstextannotation.sip

@@ -49,8 +49,10 @@ within the annotation. Ownership is not transferred.
 %End
 
     virtual void writeXml( QDomElement &elem, QDomDocument &doc, const QgsReadWriteContext &context ) const;
+
     virtual void readXml( const QDomElement &itemElem, const QgsReadWriteContext &context );
 
+
     static QgsTextAnnotation *create() /Factory/;
 %Docstring
 Returns a new QgsTextAnnotation object.