Skip to content
Permalink
Browse files

Remove redundant virtual on override

  • Loading branch information
m-kuhn authored and nyalldawson committed May 25, 2018
1 parent 2f86c2c commit cb4d11787cb5c2ccaf90ec01015f8dfa5681cd13
Showing with 223 additions and 204 deletions.
  1. +2 −0 python/core/auto_generated/qgsmaplayerlegend.sip.in
  2. +1 −0 python/gui/auto_generated/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.sip.in
  3. +1 −0 python/gui/auto_generated/qgsfilterlineedit.sip.in
  4. +15 −0 python/gui/auto_generated/qgsoptionsdialoghighlightwidgetsimpl.sip.in
  5. +1 −1 src/3d/terrain/quantizedmeshterraingenerator.cpp
  6. +7 −7 src/analysis/processing/qgsalgorithmdifference.h
  7. +1 −1 src/analysis/processing/qgsalgorithmfilter.h
  8. +7 −7 src/analysis/processing/qgsalgorithmintersection.h
  9. +7 −7 src/analysis/processing/qgsalgorithmsymmetricaldifference.h
  10. +7 −7 src/analysis/processing/qgsalgorithmunion.h
  11. +2 −2 src/app/qgsmaptooldigitizefeature.h
  12. +1 −1 src/app/qgsmaptoolselectionhandler.h
  13. +96 −96 src/core/processing/qgsprocessingparametertypeimpl.h
  14. +2 −2 src/core/qgsmaplayerlegend.h
  15. +4 −4 src/core/qgspluginlayer.h
  16. +1 −1 src/gui/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.h
  17. +2 −2 src/gui/processing/qgsprocessingconfigurationwidgets.h
  18. +1 −1 src/gui/qgsfilterlineedit.h
  19. +15 −15 src/gui/qgsoptionsdialoghighlightwidgetsimpl.h
  20. +1 −1 src/native/mac/qgsmacnative.h
  21. +1 −1 src/plugins/globe/featuresource/qgsglobefeaturesource.cpp
  22. +5 −5 src/plugins/globe/globe_plugin.cpp
  23. +1 −1 src/plugins/globe/globe_plugin.h
  24. +1 −1 src/providers/grass/qgsgrassprovidermodule.h
  25. +5 −5 src/providers/ogr/qgsogrprovider.cpp
  26. +4 −4 src/providers/oracle/qgsoracledataitems.h
  27. +3 −3 src/providers/oracle/qgsoracleexpressioncompiler.h
  28. +3 −3 src/providers/oracle/qgsoraclefeatureiterator.h
  29. +9 −9 src/providers/oracle/qgsoracleprovider.h
  30. +9 −9 src/providers/postgres/qgspostgresprojectstorage.h
  31. +2 −2 src/quickgui/qgsquickmapcanvasmap.h
  32. +6 −6 tests/src/core/testqgsprojectstorage.cpp
@@ -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;


};


@@ -44,6 +44,7 @@ Constructor

virtual bool eventFilter( QObject *watched, QEvent *event );


};

/************************************************************************
@@ -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
@@ -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 *
@@ -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 );
@@ -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;

};

@@ -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;

@@ -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;

};

@@ -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;

};

@@ -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;

};

@@ -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 & );
@@ -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;

0 comments on commit cb4d117

Please sign in to comment.
You can’t perform that action at this time.