Remove redundant virtual on override

qgis · May 25, 2018 · cb4d117 · cb4d117
1 parent 2f86c2c
commit cb4d117
Show file tree

Hide file tree

Showing 32 changed files with 223 additions and 204 deletions.
diff --git a/python/core/auto_generated/qgsmaplayerlegend.sip.in b/python/core/auto_generated/qgsmaplayerlegend.sip.in
@@ -165,8 +165,10 @@ the keys are rule keys of legend items, the values are labels to be shown.
     virtual QList<QgsLayerTreeModelLegendNode *> createLayerTreeModelLegendNodes( QgsLayerTreeLayer *nodeLayer ) /Factory/;
 
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
+
     virtual QDomElement writeXml( QDomDocument &doc, const QgsReadWriteContext &context ) const;
 
+
 };
 
 

diff --git a/python/gui/auto_generated/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.sip.in
@@ -44,6 +44,7 @@ Constructor
 
     virtual bool eventFilter( QObject *watched, QEvent *event );
 
+
 };
 
 /************************************************************************

diff --git a/python/gui/auto_generated/qgsfilterlineedit.sip.in b/python/gui/auto_generated/qgsfilterlineedit.sip.in
@@ -215,6 +215,7 @@ Will select all text when this widget receives the focus.
 
 
     virtual bool event( QEvent *event );
+
 %Docstring
 Reimplemented to enable/disable the clear action
 depending on read-only status

diff --git a/python/gui/auto_generated/qgsoptionsdialoghighlightwidgetsimpl.sip.in b/python/gui/auto_generated/qgsoptionsdialoghighlightwidgetsimpl.sip.in
@@ -31,8 +31,11 @@ constructs a highlight widget for a label
 %End
   protected:
     virtual bool searchText( const QString &text );
+
     virtual bool highlightText( const QString &text );
+
     virtual void reset();
+
 };
 
 class QgsOptionsDialogHighlightCheckBox : QgsOptionsDialogHighlightWidget
@@ -54,8 +57,11 @@ constructs a highlight widget for a checkbox
 %End
   protected:
     virtual bool searchText( const QString &text );
+
     virtual bool highlightText( const QString &text );
+
     virtual void reset();
+
 };
 
 class QgsOptionsDialogHighlightButton : QgsOptionsDialogHighlightWidget
@@ -77,8 +83,11 @@ constructs a highlight widget for a button.
 %End
   protected:
     virtual bool searchText( const QString &text );
+
     virtual bool highlightText( const QString &text );
+
     virtual void reset();
+
 };
 
 class QgsOptionsDialogHighlightGroupBox : QgsOptionsDialogHighlightWidget
@@ -100,8 +109,11 @@ constructs a highlight widget for a group box.
 %End
   protected:
     virtual bool searchText( const QString &text );
+
     virtual bool highlightText( const QString &text );
+
     virtual void reset();
+
 };
 
 class QgsOptionsDialogHighlightTree : QgsOptionsDialogHighlightWidget
@@ -125,8 +137,11 @@ constructs a highlight widget for a tree view or widget.
 %End
   protected:
     virtual bool searchText( const QString &text );
+
     virtual bool highlightText( const QString &text );
+
     virtual void reset();
+
 };
 /************************************************************************
  * This file has been generated automatically from                      *

diff --git a/src/3d/terrain/quantizedmeshterraingenerator.cpp b/src/3d/terrain/quantizedmeshterraingenerator.cpp
@@ -48,7 +48,7 @@ class QuantizedMeshTerrainChunkLoader : public TerrainChunkLoader
       mapSettings.setExtent( mTerrain->terrainToMapTransform().transformBoundingBox( tileRect ) );
     }
 
-    virtual void load() override
+    void load() override
     {
       QuantizedMeshGeometry::downloadTileIfMissing( tx, ty, tz );
       qmt = QuantizedMeshGeometry::readTile( tx, ty, tz, tileRect );

diff --git a/src/analysis/processing/qgsalgorithmdifference.h b/src/analysis/processing/qgsalgorithmdifference.h
@@ -28,16 +28,16 @@ class QgsDifferenceAlgorithm : public QgsProcessingAlgorithm
     QgsDifferenceAlgorithm() = default;
     QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmDifference.svg" ) ); }
     QString svgIconPath() const override { return QgsApplication::iconPath( QStringLiteral( "/algorithms/mAlgorithmDifference.svg" ) ); }
-    virtual QString name() const override;
-    virtual QString displayName() const override;
-    virtual QString group() const override;
-    virtual QString groupId() const override;
+    QString name() const override;
+    QString displayName() const override;
+    QString group() const override;
+    QString groupId() const override;
     QString shortHelpString() const override;
 
   protected:
-    virtual QgsProcessingAlgorithm *createInstance() const override;
-    virtual void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
-    virtual QVariantMap processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
+    QgsProcessingAlgorithm *createInstance() const override;
+    void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
+    QVariantMap processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
 
 };
 

diff --git a/src/analysis/processing/qgsalgorithmfilter.h b/src/analysis/processing/qgsalgorithmfilter.h
@@ -47,7 +47,7 @@ class QgsFilterAlgorithm : public QgsProcessingAlgorithm
     QStringList tags() const override;
     QString group() const override;
     QString groupId() const override;
-    virtual Flags flags() const override;
+    Flags flags() const override;
     QString shortHelpString() const override;
     QgsFilterAlgorithm *createInstance() const override SIP_FACTORY;
 

diff --git a/src/analysis/processing/qgsalgorithmintersection.h b/src/analysis/processing/qgsalgorithmintersection.h
@@ -28,16 +28,16 @@ class QgsIntersectionAlgorithm : public QgsProcessingAlgorithm
     QgsIntersectionAlgorithm() = default;
     QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmIntersect.svg" ) ); }
     QString svgIconPath() const override { return QgsApplication::iconPath( QStringLiteral( "/algorithms/mAlgorithmIntersect.svg" ) ); }
-    virtual QString name() const override;
-    virtual QString displayName() const override;
-    virtual QString group() const override;
-    virtual QString groupId() const override;
+    QString name() const override;
+    QString displayName() const override;
+    QString group() const override;
+    QString groupId() const override;
     QString shortHelpString() const override;
 
   protected:
-    virtual QgsProcessingAlgorithm *createInstance() const override;
-    virtual void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
-    virtual QVariantMap processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
+    QgsProcessingAlgorithm *createInstance() const override;
+    void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
+    QVariantMap processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
 
 };
 

diff --git a/src/analysis/processing/qgsalgorithmsymmetricaldifference.h b/src/analysis/processing/qgsalgorithmsymmetricaldifference.h
@@ -28,16 +28,16 @@ class QgsSymmetricalDifferenceAlgorithm : public QgsProcessingAlgorithm
     QgsSymmetricalDifferenceAlgorithm() = default;
     QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmSymmetricalDifference.svg" ) ); }
     QString svgIconPath() const override { return QgsApplication::iconPath( QStringLiteral( "/algorithms/mAlgorithmSymmetricalDifference.svg" ) ); }
-    virtual QString name() const override;
-    virtual QString displayName() const override;
-    virtual QString group() const override;
-    virtual QString groupId() const override;
+    QString name() const override;
+    QString displayName() const override;
+    QString group() const override;
+    QString groupId() const override;
     QString shortHelpString() const override;
 
   protected:
-    virtual QgsProcessingAlgorithm *createInstance() const override;
-    virtual void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
-    virtual QVariantMap processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
+    QgsProcessingAlgorithm *createInstance() const override;
+    void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
+    QVariantMap processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
 
 };
 

diff --git a/src/analysis/processing/qgsalgorithmunion.h b/src/analysis/processing/qgsalgorithmunion.h
@@ -29,16 +29,16 @@ class QgsUnionAlgorithm : public QgsProcessingAlgorithm
     QgsUnionAlgorithm() = default;
     QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmUnion.svg" ) ); }
     QString svgIconPath() const override { return QgsApplication::iconPath( QStringLiteral( "/algorithms/mAlgorithmUnion.svg" ) ); }
-    virtual QString name() const override;
-    virtual QString displayName() const override;
-    virtual QString group() const override;
-    virtual QString groupId() const override;
+    QString name() const override;
+    QString displayName() const override;
+    QString group() const override;
+    QString groupId() const override;
     QString shortHelpString() const override;
 
   protected:
-    virtual QgsProcessingAlgorithm *createInstance() const override;
-    virtual void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
-    virtual QVariantMap processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
+    QgsProcessingAlgorithm *createInstance() const override;
+    void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
+    QVariantMap processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
 
 };
 

diff --git a/src/app/qgsmaptooldigitizefeature.h b/src/app/qgsmaptooldigitizefeature.h
@@ -31,8 +31,8 @@ class APP_EXPORT QgsMapToolDigitizeFeature : public QgsMapToolCapture
 
     virtual void digitized( QgsFeature &f );
 
-    virtual void activate() override;
-    virtual void deactivate() override;
+    void activate() override;
+    void deactivate() override;
 
   signals:
     void digitizingCompleted( const QgsFeature & );

diff --git a/src/app/qgsmaptoolselectionhandler.h b/src/app/qgsmaptoolselectionhandler.h
@@ -62,7 +62,7 @@ class QgsDistanceWidget : public QWidget
     void distanceEditingCanceled();
 
   protected:
-    virtual bool eventFilter( QObject *obj, QEvent *ev ) override;
+    bool eventFilter( QObject *obj, QEvent *ev ) override;
 
   private:
     QHBoxLayout *mLayout = nullptr;