Skip to content
Permalink
Browse files

fix Qt 5.15 warning for flags initalization with nullptr

  • Loading branch information
3nids authored and nyalldawson committed Jun 18, 2020
1 parent 5b5f1f5 commit 43b122ede0b5f15c056156f1b9bd7f57ddd0da8b
Showing with 99 additions and 99 deletions.
  1. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrycheckregistry.h
  2. +2 −2 src/analysis/vector/geometry_checker/qgsvectordataproviderfeaturepool.h
  3. +2 −2 src/analysis/vector/geometry_checker/qgsvectorlayerfeaturepool.h
  4. +1 −1 src/app/georeferencer/qgsgeorefmainwindow.h
  5. +1 −1 src/app/layout/qgslayoutdesignerdialog.h
  6. +1 −1 src/app/qgisapp.cpp
  7. +1 −1 src/app/qgsattributetabledialog.h
  8. +1 −1 src/app/qgsgeometryvalidationdock.h
  9. +1 −1 src/core/expression/qgsexpressionfunction.cpp
  10. +1 −1 src/core/geometry/qgscircularstring.h
  11. +1 −1 src/core/geometry/qgscompoundcurve.h
  12. +1 −1 src/core/geometry/qgscurvepolygon.h
  13. +3 −3 src/core/geometry/qgsgeometry.h
  14. +1 −1 src/core/geometry/qgsgeometrycollection.h
  15. +1 −1 src/core/geometry/qgslinestring.h
  16. +1 −1 src/core/geometry/qgspolygon.h
  17. +1 −1 src/core/labeling/qgslabelingengine.cpp
  18. +4 −4 src/core/layout/qgslayoutexporter.h
  19. +1 −1 src/core/layout/qgslayoutitemmapgrid.cpp
  20. +1 −1 src/core/layout/qgslayoutrendercontext.cpp
  21. +2 −2 src/core/processing/qgsprocessingparameters.h
  22. +3 −3 src/core/processing/qgsprocessingutils.h
  23. +1 −1 src/core/providers/memory/qgsmemoryprovider.h
  24. +1 −1 src/core/providers/ogr/qgsogrprovider.h
  25. +3 −3 src/core/qgsfeaturesink.h
  26. +2 −2 src/core/qgsfeaturestore.h
  27. +1 −1 src/core/qgsmaplayer.h
  28. +10 −10 src/core/qgsproject.h
  29. +3 −3 src/core/qgsproxyfeaturesink.h
  30. +3 −3 src/core/qgsremappingproxyfeaturesink.h
  31. +2 −2 src/core/qgsspatialindex.cpp
  32. +6 −6 src/core/qgsspatialindex.h
  33. +1 −1 src/core/qgsvectordataprovider.h
  34. +2 −2 src/core/qgsvectorfilewriter.h
  35. +2 −2 src/core/qgsvectorlayer.h
  36. +2 −2 src/core/qgsvectorlayerexporter.h
  37. +1 −1 src/core/qgsvectorlayerjoinbuffer.h
  38. +1 −1 src/gui/layout/qgslayoutaddpagesdialog.h
  39. +1 −1 src/gui/layout/qgslayoutimageexportoptionsdialog.h
  40. +1 −1 src/gui/layout/qgslayoutitemguiregistry.h
  41. +1 −1 src/gui/layout/qgslayoutnewitempropertiesdialog.h
  42. +1 −1 src/gui/layout/qgslayoutpdfexportoptionsdialog.h
  43. +1 −1 src/gui/layout/qgslayouttablebackgroundcolorsdialog.h
  44. +1 −1 src/gui/processing/models/qgsmodeldesignerdialog.h
  45. +1 −1 src/gui/processing/qgsprocessingalgorithmdialogbase.h
  46. +2 −2 src/gui/processing/qgsprocessingmultipleselectiondialog.h
  47. +1 −1 src/gui/processing/qgsprocessingparameterdefinitionwidget.cpp
  48. +2 −2 src/gui/qgsdockwidget.h
  49. +3 −3 src/gui/qgsmaplayeractionregistry.h
  50. +1 −1 src/gui/qgsnewhttpconnection.h
  51. +1 −1 src/gui/vector/qgsdiagramproperties.cpp
  52. +1 −1 src/providers/db2/qgsdb2provider.h
  53. +2 −2 src/providers/gpx/qgsgpxprovider.h
  54. +1 −1 src/providers/grass/qgsgrassprovider.h
  55. +1 −1 src/providers/mssql/qgsmssqlprovider.h
  56. +1 −1 src/providers/oracle/qgsoracleprovider.h
  57. +1 −1 src/providers/postgres/qgspostgresprovider.h
  58. +1 −1 src/providers/spatialite/qgsspatialiteprovider.h
  59. +1 −1 src/providers/wfs/qgswfsprovider.h
@@ -69,7 +69,7 @@ class ANALYSIS_EXPORT QgsGeometryCheckRegistry
*
* \since QGIS 3.4
*/
QList<QgsGeometryCheckFactory *> geometryCheckFactories( QgsVectorLayer *layer, QgsGeometryCheck::CheckType type, QgsGeometryCheck::Flags flags = nullptr ) const;
QList<QgsGeometryCheckFactory *> geometryCheckFactories( QgsVectorLayer *layer, QgsGeometryCheck::CheckType type, QgsGeometryCheck::Flags flags = QgsGeometryCheck::Flags() ) const;

/**
* Registers a new geometry check factory.
@@ -37,8 +37,8 @@ class ANALYSIS_EXPORT QgsVectorDataProviderFeaturePool : public QgsFeaturePool
*/
QgsVectorDataProviderFeaturePool( QgsVectorLayer *layer, bool selectedOnly = false );

bool addFeature( QgsFeature &feature, QgsFeatureSink::Flags flags = nullptr ) override;
bool addFeatures( QgsFeatureList &features, QgsFeatureSink::Flags flags = nullptr ) override;
bool addFeature( QgsFeature &feature, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() ) override;
bool addFeatures( QgsFeatureList &features, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() ) override;
void updateFeature( QgsFeature &feature ) override;
void deleteFeature( QgsFeatureId fid ) override;

@@ -38,8 +38,8 @@ class ANALYSIS_EXPORT QgsVectorLayerFeaturePool : public QObject, public QgsFeat
*/
QgsVectorLayerFeaturePool( QgsVectorLayer *layer );

bool addFeature( QgsFeature &feature, QgsFeatureSink::Flags flags = nullptr ) override;
bool addFeatures( QgsFeatureList &features, QgsFeatureSink::Flags flags = nullptr ) override;
bool addFeature( QgsFeature &feature, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() ) override;
bool addFeatures( QgsFeatureList &features, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() ) override;
void updateFeature( QgsFeature &feature ) override;
void deleteFeature( QgsFeatureId fid ) override;

@@ -46,7 +46,7 @@ class QgsGeorefDockWidget : public QgsDockWidget
{
Q_OBJECT
public:
QgsGeorefDockWidget( const QString &title, QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr );
QgsGeorefDockWidget( const QString &title, QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags() );
};

class QgsGeoreferencerMainWindow : public QMainWindow, private Ui::QgsGeorefPluginGuiBase
@@ -102,7 +102,7 @@ class QgsLayoutDesignerDialog: public QMainWindow, public Ui::QgsLayoutDesignerB

public:

QgsLayoutDesignerDialog( QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr );
QgsLayoutDesignerDialog( QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags() );

/**
* Returns the designer interface for the dialog.
@@ -7195,7 +7195,7 @@ void QgisApp::dxfExport()
dxfExport.setDestinationCrs( d.crs() );
dxfExport.setForce2d( d.force2d() );

QgsDxfExport::Flags flags = nullptr;
QgsDxfExport::Flags flags = QgsDxfExport::Flags();
if ( !d.useMText() )
flags = flags | QgsDxfExport::FlagNoMText;
dxfExport.setFlags( flags );
@@ -235,7 +235,7 @@ class QgsAttributeTableDock : public QgsDockWidget
Q_OBJECT

public:
QgsAttributeTableDock( const QString &title, QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr );
QgsAttributeTableDock( const QString &title, QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags() );

void closeEvent( QCloseEvent *ev ) override;
};
@@ -35,7 +35,7 @@ class QgsGeometryValidationDock : public QgsDockWidget, public Ui_QgsGeometryVal
Q_OBJECT

public:
QgsGeometryValidationDock( const QString &title, QgsMapCanvas *mapCanvas, QgisApp *parent = nullptr, Qt::WindowFlags flags = nullptr );
QgsGeometryValidationDock( const QString &title, QgsMapCanvas *mapCanvas, QgisApp *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags() );

QgsGeometryValidationModel *geometryValidationModel() const;
void setGeometryValidationModel( QgsGeometryValidationModel *geometryValidationModel );
@@ -2064,7 +2064,7 @@ static QVariant floatToDegreeFormat( const QgsCoordinateFormatter::Format format
if ( values.count() > 3 )
formatString = QgsExpressionUtils::getStringValue( values.at( 3 ), parent );

QgsCoordinateFormatter::FormatFlags flags = nullptr;
QgsCoordinateFormatter::FormatFlags flags = QgsCoordinateFormatter::FormatFlags();
if ( formatString.compare( QLatin1String( "suffix" ), Qt::CaseInsensitive ) == 0 )
{
flags = QgsCoordinateFormatter::FlagDegreesUseStringSuffix;
@@ -75,7 +75,7 @@ class CORE_EXPORT QgsCircularString: public QgsCurve
bool fromWkb( QgsConstWkbPtr &wkb ) override;
bool fromWkt( const QString &wkt ) override;

QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = nullptr ) const override;
QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = QgsAbstractGeometry::WkbFlags() ) const override;
QString asWkt( int precision = 17 ) const override;
QDomElement asGml2( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
@@ -46,7 +46,7 @@ class CORE_EXPORT QgsCompoundCurve: public QgsCurve
bool fromWkb( QgsConstWkbPtr &wkb ) override;
bool fromWkt( const QString &wkt ) override;

QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = nullptr ) const override;
QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = QgsAbstractGeometry::WkbFlags() ) const override;
QString asWkt( int precision = 17 ) const override;
QDomElement asGml2( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
@@ -51,7 +51,7 @@ class CORE_EXPORT QgsCurvePolygon: public QgsSurface
bool fromWkb( QgsConstWkbPtr &wkb ) override;
bool fromWkt( const QString &wkt ) override;

QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = nullptr ) const override;
QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = QgsAbstractGeometry::WkbFlags() ) const override;
QString asWkt( int precision = 17 ) const override;
QDomElement asGml2( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
@@ -376,7 +376,7 @@ class CORE_EXPORT QgsGeometry
*
* \since QGIS 1.5
*/
bool isGeosValid( QgsGeometry::ValidityFlags flags = nullptr ) const;
bool isGeosValid( QgsGeometry::ValidityFlags flags = QgsGeometry::ValidityFlags() ) const;

/**
* Determines whether the geometry is simple (according to OGC definition),
@@ -1561,7 +1561,7 @@ class CORE_EXPORT QgsGeometry
*
* \since QGIS 3.0
*/
QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = nullptr ) const;
QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = QgsAbstractGeometry::WkbFlags() ) const;

/**
* Exports the geometry to WKT
@@ -2079,7 +2079,7 @@ class CORE_EXPORT QgsGeometry
*
* \since QGIS 1.5
*/
void validateGeometry( QVector<QgsGeometry::Error> &errors SIP_OUT, ValidationMethod method = ValidatorQgisInternal, QgsGeometry::ValidityFlags flags = nullptr ) const;
void validateGeometry( QVector<QgsGeometry::Error> &errors SIP_OUT, ValidationMethod method = ValidatorQgisInternal, QgsGeometry::ValidityFlags flags = QgsGeometry::ValidityFlags() ) const;

/**
* Compute the unary union on a list of \a geometries. May be faster than an iterative union on a set of geometries.
@@ -179,7 +179,7 @@ class CORE_EXPORT QgsGeometryCollection: public QgsAbstractGeometry

bool fromWkb( QgsConstWkbPtr &wkb ) override;
bool fromWkt( const QString &wkt ) override;
QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = nullptr ) const override;
QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = QgsAbstractGeometry::WkbFlags() ) const override;
QString asWkt( int precision = 17 ) const override;
QDomElement asGml2( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
@@ -588,7 +588,7 @@ class CORE_EXPORT QgsLineString: public QgsCurve
bool fromWkb( QgsConstWkbPtr &wkb ) override;
bool fromWkt( const QString &wkt ) override;

QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = nullptr ) const override;
QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = QgsAbstractGeometry::WkbFlags() ) const override;
QString asWkt( int precision = 17 ) const override;
QDomElement asGml2( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
@@ -48,7 +48,7 @@ class CORE_EXPORT QgsPolygon: public QgsCurvePolygon
QgsPolygon *clone() const override SIP_FACTORY;
void clear() override;
bool fromWkb( QgsConstWkbPtr &wkb ) override;
QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = nullptr ) const override;
QByteArray asWkb( QgsAbstractGeometry::WkbFlags flags = QgsAbstractGeometry::WkbFlags() ) const override;
QgsPolygon *surfaceToPolygon() const override SIP_FACTORY;

/**
@@ -754,7 +754,7 @@ QString QgsLabelingUtils::encodeLinePlacementFlags( QgsLabeling::LinePlacementFl

QgsLabeling::LinePlacementFlags QgsLabelingUtils::decodeLinePlacementFlags( const QString &string )
{
QgsLabeling::LinePlacementFlags flags = nullptr;
QgsLabeling::LinePlacementFlags flags = QgsLabeling::LinePlacementFlags();
const QStringList flagList = string.split( ',' );
bool foundLineOrientationFlag = false;
for ( const QString &flag : flagList )
@@ -208,7 +208,7 @@ class CORE_EXPORT QgsLayoutExporter
/**
* Layout context flags, which control how the export will be created.
*/
QgsLayoutRenderContext::Flags flags = nullptr;
QgsLayoutRenderContext::Flags flags = QgsLayoutRenderContext::Flags();

/**
* A list of predefined scales to use with the layout. This is used
@@ -292,7 +292,7 @@ class CORE_EXPORT QgsLayoutExporter
/**
* Layout context flags, which control how the export will be created.
*/
QgsLayoutRenderContext::Flags flags = nullptr;
QgsLayoutRenderContext::Flags flags = QgsLayoutRenderContext::Flags();

/**
* Text rendering format, which controls how text should be rendered in the export (e.g.
@@ -446,7 +446,7 @@ class CORE_EXPORT QgsLayoutExporter
/**
* Layout context flags, which control how the export will be created.
*/
QgsLayoutRenderContext::Flags flags = nullptr;
QgsLayoutRenderContext::Flags flags = QgsLayoutRenderContext::Flags();

/**
* A list of predefined scales to use with the layout. This is used
@@ -537,7 +537,7 @@ class CORE_EXPORT QgsLayoutExporter
/**
* Layout context flags, which control how the export will be created.
*/
QgsLayoutRenderContext::Flags flags = nullptr;
QgsLayoutRenderContext::Flags flags = QgsLayoutRenderContext::Flags();

/**
* Text rendering format, which controls how text should be rendered in the export (e.g.
@@ -1494,7 +1494,7 @@ QString QgsLayoutItemMapGrid::gridAnnotationString( double value, QgsLayoutItemM
}

QgsCoordinateFormatter::Format format = QgsCoordinateFormatter::FormatDecimalDegrees;
QgsCoordinateFormatter::FormatFlags flags = nullptr;
QgsCoordinateFormatter::FormatFlags flags = QgsCoordinateFormatter::FormatFlags();
switch ( mGridAnnotationFormat )
{
case Decimal:
@@ -61,7 +61,7 @@ bool QgsLayoutRenderContext::testFlag( const QgsLayoutRenderContext::Flag flag )

QgsRenderContext::Flags QgsLayoutRenderContext::renderContextFlags() const
{
QgsRenderContext::Flags flags = nullptr;
QgsRenderContext::Flags flags = QgsRenderContext::Flags();
if ( mFlags & FlagAntialiasing )
flags = flags | QgsRenderContext::Antialiasing;
if ( mFlags & FlagUseAdvancedEffects )
@@ -81,7 +81,7 @@ class CORE_EXPORT QgsProcessingFeatureSourceDefinition
* the default geometry check method (as dictated by QgsProcessingContext) for this source.
*/
QgsProcessingFeatureSourceDefinition( const QString &source = QString(), bool selectedFeaturesOnly = false, long long featureLimit = -1,
QgsProcessingFeatureSourceDefinition::Flags flags = nullptr, QgsFeatureRequest::InvalidGeometryCheck geometryCheck = QgsFeatureRequest::GeometryAbortOnInvalid )
QgsProcessingFeatureSourceDefinition::Flags flags = QgsProcessingFeatureSourceDefinition::Flags(), QgsFeatureRequest::InvalidGeometryCheck geometryCheck = QgsFeatureRequest::GeometryAbortOnInvalid )
: source( QgsProperty::fromValue( source ) )
, selectedFeaturesOnly( selectedFeaturesOnly )
, featureLimit( featureLimit )
@@ -103,7 +103,7 @@ class CORE_EXPORT QgsProcessingFeatureSourceDefinition
* the default geometry check method (as dictated by QgsProcessingContext) for this source.
*/
QgsProcessingFeatureSourceDefinition( const QgsProperty &source, bool selectedFeaturesOnly = false, long long featureLimit = -1,
QgsProcessingFeatureSourceDefinition::Flags flags = nullptr, QgsFeatureRequest::InvalidGeometryCheck geometryCheck = QgsFeatureRequest::GeometryAbortOnInvalid )
QgsProcessingFeatureSourceDefinition::Flags flags = QgsProcessingFeatureSourceDefinition::Flags(), QgsFeatureRequest::InvalidGeometryCheck geometryCheck = QgsFeatureRequest::GeometryAbortOnInvalid )
: source( source )
, selectedFeaturesOnly( selectedFeaturesOnly )
, featureLimit( featureLimit )
@@ -569,9 +569,9 @@ class CORE_EXPORT QgsProcessingFeatureSink : public QgsProxyFeatureSink
*/
QgsProcessingFeatureSink( QgsFeatureSink *originalSink, const QString &sinkName, QgsProcessingContext &context, bool ownsOriginalSink = false );
~QgsProcessingFeatureSink() override;
bool addFeature( QgsFeature &feature, QgsFeatureSink::Flags flags = nullptr ) override;
bool addFeatures( QgsFeatureList &features, QgsFeatureSink::Flags flags = nullptr ) override;
bool addFeatures( QgsFeatureIterator &iterator, QgsFeatureSink::Flags flags = nullptr ) override;
bool addFeature( QgsFeature &feature, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() ) override;
bool addFeatures( QgsFeatureList &features, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() ) override;
bool addFeatures( QgsFeatureIterator &iterator, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() ) override;

private:

@@ -56,7 +56,7 @@ class QgsMemoryProvider final: public QgsVectorDataProvider
QgsWkbTypes::Type wkbType() const override;
long featureCount() const override;
QgsFields fields() const override;
bool addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flags flags = nullptr ) override;
bool addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() ) override;
bool deleteFeatures( const QgsFeatureIds &id ) override;
bool addAttributes( const QList<QgsField> &attributes ) override;
bool renameAttributes( const QgsFieldNameMap &renamedAttributes ) override;
@@ -121,7 +121,7 @@ class QgsOgrProvider final: public QgsVectorDataProvider
QString defaultValueClause( int fieldIndex ) const override;
bool skipConstraintCheck( int fieldIndex, QgsFieldConstraints::Constraint constraint, const QVariant &value = QVariant() ) const override;
void updateExtents() override;
bool addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flags flags = nullptr ) override;
bool addFeatures( QgsFeatureList &flist, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() ) override;
bool deleteFeatures( const QgsFeatureIds &id ) override;
bool addAttributes( const QList<QgsField> &attributes ) override;
bool deleteAttributes( const QgsAttributeIds &attributes ) override;
@@ -78,20 +78,20 @@ class CORE_EXPORT QgsFeatureSink
* \see addFeatures()
* \returns TRUE in case of success and FALSE in case of failure
*/
virtual bool addFeature( QgsFeature &feature, QgsFeatureSink::Flags flags = nullptr );
virtual bool addFeature( QgsFeature &feature, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() );

/**
* Adds a list of \a features to the sink. Feature addition behavior is controlled by the specified \a flags.
* \see addFeature()
* \returns TRUE in case of success and FALSE in case of failure
*/
virtual bool addFeatures( QgsFeatureList &features, QgsFeatureSink::Flags flags = nullptr ) = 0;
virtual bool addFeatures( QgsFeatureList &features, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() ) = 0;

/**
* Adds all features from the specified \a iterator to the sink. Feature addition behavior is controlled by the specified \a flags.
* \returns TRUE if all features were added successfully, or FALSE if any feature could not be added
*/
virtual bool addFeatures( QgsFeatureIterator &iterator, QgsFeatureSink::Flags flags = nullptr );
virtual bool addFeatures( QgsFeatureIterator &iterator, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() );

/**
* Flushes any internal buffer which may exist in the sink, causing any buffered features to be added to the sink's destination.
@@ -62,8 +62,8 @@ class CORE_EXPORT QgsFeatureStore : public QgsFeatureSink
*/
void setCrs( const QgsCoordinateReferenceSystem &crs ) { mCrs = crs; }

bool addFeature( QgsFeature &feature, QgsFeatureSink::Flags flags = nullptr ) override;
bool addFeatures( QgsFeatureList &features, QgsFeatureSink::Flags flags = nullptr ) override;
bool addFeature( QgsFeature &feature, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() ) override;
bool addFeatures( QgsFeatureList &features, QgsFeatureSink::Flags flags = QgsFeatureSink::Flags() ) override;

/**
* Returns the number of features contained in the store.
@@ -566,7 +566,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
*
* \returns TRUE if successful
*/
bool readLayerXml( const QDomElement &layerElement, QgsReadWriteContext &context, QgsMapLayer::ReadFlags flags = nullptr );
bool readLayerXml( const QDomElement &layerElement, QgsReadWriteContext &context, QgsMapLayer::ReadFlags flags = QgsMapLayer::ReadFlags() );

/**
* Stores state in DOM node

0 comments on commit 43b122e

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